Changeset b926df6

Timestamp:

Jan 22, 2012, 2:52:26 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

2ca295b

Parents:

5e2645b

git-author:

Alex Dehnert <adehnert@…> (01/22/12 14:52:26)

git-committer:

Alex Dehnert <adehnert@…> (01/22/12 14:52:26)

Message:

Add new "About" page and link "Use of Data" page

Location:

asadb

Files:

• template/about/index.html (added)
• template/base.html (modified) (1 diff)
• template/index.html (modified) (1 diff)
• urls.py (modified) (1 diff)

asadb/template/base.html

@@ -14 +14 @@
         <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>
+        <li{% ifequal pagename "about"    %} class='selected'{% endifequal %}><a href="{% url about %}">About</a></li>
         {% if user.is_staff %}<li><a href='{% url admin:index %}'>Admin</a></li>{% endif %}
     </ul>

asadb/template/index.html

@@ -31 +31 @@
         {%if perms.groups.add_group %}<li><a href='{% url groups:startup-list %}'>Review startup applications</a></li>{%endif%}
         {%if perms.groups.recognize_nge %}<li><a href='{% url groups:recognize-nge %}'>Recognize Non-Group Entity</a></li>{%endif%}
+    </ul></li>
+    <li><a href='{% url about %}'>About the ASA Database</a><ul>
+        <li><a href='{% url about-data %}'>Use of Data</a></li>
     </ul></li>
 </ul>

asadb/urls.py

@@ -17 +17 @@
         'django.views.generic.simple.direct_to_template',
         {'template': 'about/data.html', 'extra_context': { 'pagename':'about' }, },
-        name='data',
+        name='about-data',
+    ),
+    url(
+        r'^$',
+        'django.views.generic.simple.direct_to_template',
+        {'template': 'about/index.html', 'extra_context': { 'pagename':'about' }, },
+        name='about',
     ),
 )