Update settings.py

[flowspy] / templates / base.html

diff --git a/templates/base.html b/templates/base.html
index c8d146b..c63b8da 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -9,6 +9,7 @@
 <script src="/fodstatic/js/jquery.min.js" type="text/javascript"></script>
 <script src="/fodstatic/js/jquery_csrf_protect.js" type="text/javascript"></script>
 <link rel="stylesheet" type="text/css" href="/fodstatic/css/bootstrap.css">
+<link rel="stylesheet" type="text/css" href="/fodstatic/css/bootstrap-responsive.css">
 <link rel="stylesheet" type="text/css" href="/fodstatic/css/smoothness/jquery-ui-1.8.13.custom.css">
 <link rel="stylesheet" type="text/css" href="/fodstatic/css/base.css">
 
@@ -23,6 +24,20 @@
        }
 
 </script>
+<style>
+body {
+    background-color: #EEEEEE;
+    height: 100%;
+    overflow-y: scroll;
+}
+#content {
+    background-color: #FFFFFF;
+    min-height: 100%;
+    padding: 20px;
+    padding-top: 90px;
+    position: relative;
+}
+</style>
 {% block extrahead %}{% endblock %}
 </head>
 
@@ -79,13 +94,19 @@
                                    <div class="container">
                                       
                                    {% block topmenu %}
-                                   <a class="brand" href="{% url group-routes %}"><img src="/fodstatic/fod_logo.png" /></a>
+                                   <a class="brand brandimg" href="{% url group-routes %}"><img src="/fodstatic/img/fod_logo.png" /></a>
                                    <ul class="nav">
                                    {% if user.is_authenticated %}
                                    
+                                   {% if user.get_profile.peer %}
                                        <li>
                                            <a href="{% url user-profile %}">{% trans "My profile" %}</a>
                                        </li>
+                                   {% endif %}
+                                       
+                                   {% if perms.accounts.overview %}<li>
+                            <a href="{% url overview %}">{% trans "Overview" %}</a>
+                        </li>{% endif %}
                                    {% if user.is_superuser %}
                                                <li {% block hometop %}{% endblock %}>
                                                        <a href="{% url admin:index %}">{% trans "Admin" %}</a>
@@ -121,18 +142,29 @@
                                                <a href="{% url logout %}">{% trans "Logout" %}</a>
                                        </li>
                                        {% else %}
+                                       {% if error %}
+                                               {% if inactive %}
+                                                       <li><a href="{% url login %}">{% trans "Shibboleth Login" %}</a></li>
+                                               {% else %}
+                                               <li>
+                                                       <a id='ttip' data-placement="bottom" rel="tooltip" href="{% url logout %}" data-original-title="{% trans 'After clicking Retry Login, it is strongly suggested to close your browser and visit the page again' %}">{% trans "Retry Login" %}</a>
+                                               </li>{% endif %}
+                                               {% else %}                                              
                                        <li><a href="{% url login %}">{% trans "Shibboleth Login" %}</a></li>
                                        {% endif %}
+                                       {% endif %}
                                    </ul>
                                        
                                    </div>    
                                </div>
                        </div>
+                       {% block contentplaceholder %}
                        <div id="content" class="container">
                                {% block brcrmb_container %}
-                               <ul class="breadcrumb">{% if user.is_authenticated %}<li><a href="{% url group-routes %}">{% trans "My rules" %}</a></li>{% endif %}
+                               <ul class="breadcrumb">{% if user.is_authenticated %}<li><a href="{% url group-routes %}">{% trans "My rules" %}</a></li>{% else %}<li><a href="{% url welcome %}">{% trans "Welcome" %}</a></li>{% endif %}
                                {% block breadcrumbs %}{% endblock %}
                                </ul>
+                               {% endblock %}
                                {% if messages %}
                                <div id="messages">
                                {% for message in messages %}
@@ -140,11 +172,13 @@
                                {% endfor %}
                                </div>
                                {% endif %}
-                               {% endblock %}
+                               
+                               
                                {% block content %}
                                {% endblock %}
 
                        </div>
+                       {% endblock %}
                        {% block footerblock %}
                                {% include "footer.html" %}
                        {% endblock %}