fancy error pages

[qcg-portal.git] / qcg / templates / qcg / base.html

diff --git a/qcg/templates/qcg/base.html b/qcg/templates/qcg/base.html
index 9f38b0c..b907fe3 100644 (file)
--- a/qcg/templates/qcg/base.html
+++ b/qcg/templates/qcg/base.html
@@ -32,8 +32,8 @@
                         <li{% ifequal request.resolver_match.url_name 'jobs' %} class="active"{% endifequal %}>
                             <a href="{% url 'jobs' %}">Zadania</a>
                         </li>
-                        <li{% ifequal request.resolver_match.url_name 'job_new' %} class="active"{% endifequal %}>
-                            <a href="{% url 'job_new' %}">Zleć zadanie</a>
+                        <li{% if request.resolver_match.url_name == 'job_submit' or request.resolver_match.url_name == 'template_submit' %} class="active"{% endif %}>
+                            <a href="{% url 'job_submit' %}">Zleć zadanie</a>
                         </li>
                         <li{% ifequal request.resolver_match.url_name 'gridftp' %} class="active"{% endifequal %}>
                             <a href="{% url 'gridftp' %}">GridFTP</a>
@@ -48,12 +48,18 @@
                                     {% firstof user.get_full_name user.username  %} <b class="caret"></b>
                                 </a>
                                 <ul class="dropdown-menu">
+                                    <li><a href="{% url 'job_templates' %}">
+                                        <span class="glyphicon glyphicon-floppy-disk"></span>&nbsp;Szablony zadania</a>
+                                    </li>
+
                                     {% if request.user.is_superuser %}
-                                        <li><a href="{% url 'admin:index' %}" target="_blank">
-                                            <span class="glyphicon glyphicon-wrench"></span>&nbsp;Panel Administracyjny</a></li>
                                         <li class="divider"></li>
+                                        <li><a href="{% url 'admin:index' %}" target="_blank">
+                                            <span class="glyphicon glyphicon-wrench"></span>&nbsp;Panel Administracyjny</a>
+                                        </li>
                                     {% endif %}
 
+                                    <li class="divider"></li>
                                     <li>
                                         <a href="{% url 'logout' %}" role="button">
                                             <span class="glyphicon glyphicon-off"></span>&nbsp;Wyloguj
@@ -70,6 +76,12 @@
     </nav>
 
     <div class="container">
+        {% block messages %}
+            {% for message in messages %}
+                <div class="{{ message.tags }}">{{ message }}</div>
+            {% endfor %}
+        {% endblock messages %}
+
         {% block container %}
 
             <div class="jumbotron">
@@ -103,15 +115,18 @@
         {% endblock container %}
     </div><!-- /.container -->
 
-    <footer class="navbar navbar-default navbar-fixed-bottom">
-        <div class="container">
-            <div class="row">
-                <p class="navbar-text text-center" style="float: none">
-                    Copyright &copy; 2015, <a href="http://www.man.poznan.pl" class="navbar-link">PCSS</a>
-                </p>
+    {% block footer %}
+        <footer class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container">
+                <div class="row">
+                    <p class="navbar-text text-center" style="float: none">
+                        Copyright &copy; 2015, <a href="http://www.man.poznan.pl" class="navbar-link">PCSS</a>
+                    </p>
+                </div>
             </div>
-        </div>
-    </footer>
+        </footer>
+    {% endblock footer %}
+
     {% endblock body %}
 
     <script src="{% static 'qcg/jquery/jquery.min.js' %}"></script>