Changeset bd72d5c for asadb/template/base.html

Timestamp:

Sep 15, 2011, 3:34:54 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

5c68184

Parents:

ceaf3bd (diff), fbb362a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (09/15/11 15:34:54)

git-committer:

Alex Dehnert <adehnert@…> (09/15/11 15:34:54)

Message:

Merge remote branch 'remotes/origin/new-db'

File:

• asadb/template/base.html (modified) (1 diff)

asadb/template/base.html

@@ -12 +12 @@
     <ul class='tab-navigation'>
         <li{% ifequal pagename "homepage" %} class='selected'{% endifequal %}><a href="{% url homepage   %}">Home</a></li>
-        <li{% ifequal pagename "groups"   %} class='selected'{% endifequal %}><a href="{% url group-list %}">Groups</a></li>
+        <li{% ifequal pagename "groups"   %} class='selected'{% endifequal %}><a href="{% url groups:list %}">Groups</a></li>
         <li{% ifequal pagename "fysm"     %} class='selected'{% endifequal %}><a href="{% url fysm       %}">FYSM</a></li>
+        {% if user.is_staff %}<li><a href='{% url admin:index %}'>Admin</a></li>{% endif %}
     </ul>
     <div id='content'>