Added a template block into base to ease rendering of errors.html
[flowspy] / templates / base.html
index 197bdca..363f022 100644 (file)
@@ -3,12 +3,15 @@
 <head>
 <title>GRNET's FoD :: {% block title %}{% endblock %} </title>
 <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
-<META HTTP-EQUIV="Expires" CONTENT="-1">
+<META HTTP-EQUIV="expires" CONTENT="Wed, 26 Feb 1997 08:21:57 GMT">
+
 <script src="/static/js/jquery.min.js" type="text/javascript"></script>
+<script src="/static/js/jquery_csrf_protect.js" type="text/javascript"></script>
 <link rel="stylesheet" type="text/css" href="/static/css/base.css">
 <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="{% url load-js 'poller' %}"></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){
                $("#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>
                                        <img class="logoimg" src="/static/grnet_logo.png">
                                </a>
                                <div id="title">
-                                       <a href="/">Firewall on Demand</a>
+                                       <a href="{% url group-routes %}">Firewall on Demand</a>
                                </div>
                                <div class="loginform">
                                        <div id="formcontent">
+                                       {% block menublock %}
                                                {% if user.is_authenticated %}
                                                <span class="topmenuuser">{% trans "Welcome" %} <strong>{{user}}</strong></span>
                                                {% endif %}
                                                {% endif %}
                                                <span class="topmenuaction"><a href="{% url logout %}">{% trans "Logout" %}</a></span>
                                                {% else %}
-                                               <span class="topmenuaction"><a href="{% url login %}">{% trans "Login" %}</a></span>
+                                               <span class="topmenuaction"><a href="{% url login %}">{% trans "Shibboleth Login" %}</a></span>
                                                {% endif %}
+                                               {% endblock %}
                                        </div>
                                        
                                </div>
                        </div>
                        <div id="content">
                                {% block brcrmb_container %}
-                               <div class="info_content_title">{% if user.is_authenticated %}<a href="{% url group-routes %}">{% trans "My routes" %}</a>{% endif %}
+                               <div class="info_content_title">{% if user.is_authenticated %}<a href="{% url group-routes %}">{% trans "My rules" %}</a>{% endif %}
                                {% block breadcrumbs %}{% endblock %}
                                </div>
-                               
+                               {% if messages %}
+                               <div id="messages">
+                               {% for message in messages %}
+                                       <span{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</span><br />
+                               {% endfor %}
+                               </div>
+                               {% endif %}
                                {% endblock %}
                                {% block content %}
                                {% endblock %}
 
                        </div>
+                       
                        <div id="footer">
                        {% 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="/about/info/">{% trans "Info" %}</a> | <a href="/about/terms-of-service">{% 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>