projects
/
qcg-portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
eeb792c
..
b907fe3
100644
(file)
--- a/
qcg/templates/qcg/base.html
+++ b/
qcg/templates/qcg/base.html
@@
-32,7
+32,7
@@
<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 'jobs' %} class="active"{% endifequal %}>
<a href="{% url 'jobs' %}">Zadania</a>
</li>
- <li{% ifequal request.resolver_match.url_name 'job_submit' %} class="active"{% endifequal %}>
+ <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 'job_submit' %}">Zleć zadanie</a>
</li>
<li{% ifequal request.resolver_match.url_name 'gridftp' %} class="active"{% endifequal %}>
@@
-48,12
+48,18
@@
{% firstof user.get_full_name user.username %} <b class="caret"></b>
</a>
<ul class="dropdown-menu">
{% 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> Szablony zadania</a>
+ </li>
+
{% if request.user.is_superuser %}
{% if request.user.is_superuser %}
- <li><a href="{% url 'admin:index' %}" target="_blank">
- <span class="glyphicon glyphicon-wrench"></span> Panel Administracyjny</a></li>
<li class="divider"></li>
<li class="divider"></li>
+ <li><a href="{% url 'admin:index' %}" target="_blank">
+ <span class="glyphicon glyphicon-wrench"></span> Panel Administracyjny</a>
+ </li>
{% endif %}
{% endif %}
+ <li class="divider"></li>
<li>
<a href="{% url 'logout' %}" role="button">
<span class="glyphicon glyphicon-off"></span> Wyloguj
<li>
<a href="{% url 'logout' %}" role="button">
<span class="glyphicon glyphicon-off"></span> Wyloguj
@@
-70,6
+76,12
@@
</nav>
<div class="container">
</nav>
<div class="container">
+ {% block messages %}
+ {% for message in messages %}
+ <div class="{{ message.tags }}">{{ message }}</div>
+ {% endfor %}
+ {% endblock messages %}
+
{% block container %}
<div class="jumbotron">
{% block container %}
<div class="jumbotron">