job templates as main page for submitting jobs

diff --git a/qcg/templates/qcg/base.html b/qcg/templates/qcg/base.html
index b907fe3..133b6f2 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{% 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{% if request.resolver_match.url_name == 'job_templates' or request.resolver_match.url_name == 'job_submit' or request.resolver_match.url_name == 'template_submit' %} class="active"{% endif %}>
+                            <a href="{% url 'job_templates' %}">Zlecanie zadań</a>
                         </li>
                         <li{% ifequal request.resolver_match.url_name 'gridftp' %} class="active"{% endifequal %}>
                             <a href="{% url 'gridftp' %}">GridFTP</a>
@@ -48,18 +48,13 @@
                                     {% 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 class="divider"></li>
                                         <li><a href="{% url 'admin:index' %}" target="_blank">
                                             <span class="glyphicon glyphicon-wrench"></span>&nbsp;Panel Administracyjny</a>
                                         </li>
+                                        <li class="divider"></li>
                                     {% endif %}
 
-                                    <li class="divider"></li>
                                     <li>
                                         <a href="{% url 'logout' %}" role="button">
                                             <span class="glyphicon glyphicon-off"></span>&nbsp;Wyloguj

diff --git a/qcg/templates/qcg/job_templates.html b/qcg/templates/qcg/job_templates.html
index 43c7846..f3e25c4 100644 (file)
--- a/qcg/templates/qcg/job_templates.html
+++ b/qcg/templates/qcg/job_templates.html
@@ -15,7 +15,11 @@
 {% endblock %}
 
 {% block container %}
-    <h1 class="page-header">{% block title %}Szablony zadania{% endblock %}</h1>
+    <h1 class="page-header">{% block title %}Zlecanie zadań{% endblock %}</h1>
+
+    <p>Zleć <a class="btn btn-default" href="{% url 'job_submit' %}" role="button">nowe zadanie</a> lub wybierz z listy zapisanych szablonów poniżej.</p>
+    <hr>
+    <h3>Zapisane szablony zadania</h3>
 
     {% if templates %}
         <table class="table table-hover">