job templates as main page for submitting jobs

[qcg-portal.git] / qcg / templates / qcg / base.html
diff --git a/qcg/templates/qcg/base.html b/qcg/templates/qcg/base.html

index 7030598..133b6f2 100644 (file)
--- a/qcg/templates/qcg/base.html
+++ b/qcg/templates/qcg/base.html
@@ -1,4 +1,4 @@
-{% load staticfiles webdesign %}
+{% load staticfiles %}
  {% load firstof from future %}
  
  <!DOCTYPE html>
@@ -14,6 +14,7 @@
      {% block extra_css %}{% endblock %}
  </head>
  <body>
+    {% block body %}
      <nav class="navbar navbar-default navbar-static-top">
          <div class="container">
              <div class="navbar-header">
@@ -31,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_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>
@@ -49,7 +50,8 @@
                                  <ul class="dropdown-menu">
                                      {% if request.user.is_superuser %}
                                          <li><a href="{% url 'admin:index' %}" target="_blank">
-                                            <span class="glyphicon glyphicon-wrench"></span>&nbsp;Panel Administracyjny</a></li>
+                                            <span class="glyphicon glyphicon-wrench"></span>&nbsp;Panel Administracyjny</a>
+                                        </li>
                                          <li class="divider"></li>
                                      {% endif %}
  
@@ -69,6 +71,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">
@@ -102,15 +110,19 @@
          {% 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>
      <script src="{% static 'qcg/bootstrap/js/bootstrap.min.js' %}"></script>