X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Ftemplates%2Fqcg%2Fbase.html;h=b907fe37eac123ae047152abc435b5db31ff5063;hb=5d89371016f27ca592862971f0e4c56a32c497bd;hp=8318ed351834bc676261670b08ab17b4176e9086;hpb=05260e5290c07e848090b9c3f69f03bf487a9fa0;p=qcg-portal.git

diff --git a/qcg/templates/qcg/base.html b/qcg/templates/qcg/base.html
index 8318ed3..b907fe3 100644
--- 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">