Added a template block into base to ease rendering of errors.html

[flowspy] / templates / base.html

diff --git a/templates/base.html b/templates/base.html
index a4374f4..363f022 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -11,6 +11,7 @@
 <link rel="stylesheet" type="text/css" href="/static/css/smoothness/jquery-ui-1.8.13.custom.css">
 <script type="text/javascript" src="/static/js/jquery-ui-1.8.12.custom.min.js"></script>
 <script type="text/javascript" src="/static/js/jquery.tooltip.min.js"></script>
+<script type="text/javascript" src="/static/js/jquery.cookie.js"></script>
 <script type="text/javascript">
 
        function setlang(lang){
@@ -18,23 +19,6 @@
                $("#langform").submit();
        }
 
-//function highlight(elemId){
-//    var elem = $(elemId);
-//    elem.css("background-color", "#ffffbb");
-//    setTimeout(function() { $(elemId).animate({ backgroundColor: "white" }, 2000)}, 1500);
-//}
-//
-//   
-//$(document).ready( function(){
-//     if (document.location.hash) {
-//         highlight(document.location.hash);
-//     }
-//     $('a[href*=#]').click(function(){
-//         var elemId = '#' + $(this).attr('href').split('#')[1];
-//         highlight(elemId);
-//     });
-//});
-
 </script>
 {% block extrahead %}{% endblock %}
 </head>
@@ -52,6 +36,7 @@
                                </div>
                                <div class="loginform">
                                        <div id="formcontent">
+                                       {% block menublock %}
                                                {% if user.is_authenticated %}
                                                <span class="topmenuuser">{% trans "Welcome" %} <strong>{{user}}</strong></span>
                                                {% endif %}
@@ -75,6 +60,7 @@
                                                {% else %}
                                                <span class="topmenuaction"><a href="{% url login %}">{% trans "Shibboleth Login" %}</a></span>
                                                {% endif %}
+                                               {% endblock %}
                                        </div>
                                        
                                </div>
@@ -101,7 +87,7 @@
                        {% if user.is_authenticated %}
                        {% trans "If you have any questions or need help, contact GRNET Helpdesk at <a href='mailto:helpdesk@grnet.gr'>helpdesk@grnet.gr</a> or 800-11-47638." %}<br />
                        {% endif %}
-                       <a href="http://www.grnet.gr">{% trans "GRNET" %} NOC</a> | <a href="#">{% trans "Info" %}</a> | <a href="#">{% trans "Service Terms" %}</a>
+                       <a href="http://www.grnet.gr">{% trans "GRNET" %} NOC</a> | <a href="/fod/about/info/">{% trans "Info" %}</a> | <a href="/fod/about/terms-of-service/">{% trans "Service Terms" %}</a>
                        </div>
        </div>
 </body>