Add namespaced documents URL to menu

website/documents/templates/documents/meetingyear.html

@@ -29,12 +29,12 @@
             {% if user.is_authenticated %}
             <ul class="gw-go-body">
                 {% for document in meeting.generalmeetingdocument_set.all %}
-                    <li class="wordbreak"><a href="{% url 'general-meeting-document' meeting.pk document.pk %}" target="_blank">{{ document|filename }}</a></li>
+                    <li class="wordbreak"><a href="{% url 'documents:general-meeting-document' meeting.pk document.pk %}" target="_blank">{{ document|filename }}</a></li>
                 {% endfor %}
             </ul>
             <div class="gw-go-footer">
                 {% if meeting.minutes %}
-                    <a href="{% url 'minutes' meeting.pk %}" class="gw-go-btn gw-go-btn-medium" target="_blank">Notulen</a>
+                    <a href="{% url 'documents:minutes' meeting.pk %}" class="gw-go-btn gw-go-btn-medium" target="_blank">Notulen</a>
                 {% else %}
                     <div style='padding-top:10px;'>{% trans "No minutes<br>available" %}</div>
                 {% endif %}

website/documents/templates/documents/miscellaneous.html

@@ -15,7 +15,7 @@
             </div>
             <ul class="post-overlay-icons">
                 <li>
-                    <span></span><a href="{% url 'miscellaneous-document' document.pk %}" class="overlay-icon-link" target="_blank"></a>
+                    <span></span><a href="{% url 'documents:miscellaneous-document' document.pk %}" class="overlay-icon-link" target="_blank"></a>
                 </li>
             </ul>
         </div>

website/documents/templates/documents/policydocument.html

@@ -22,13 +22,13 @@
                     <a target="_blank"
                     {% if forloop.first %}
                         {% if forloop.last %}
-                            href="{% url 'association-document' 'policy-document' year %}"
+                            href="{% url 'documents:association-document' 'policy-document' year %}"
                         {% else %}
-                            href="{% url 'association-document' 'annual-report' year %}"
+                            href="{% url 'documents:association-document' 'annual-report' year %}"
                         {% endif %}
                         class="overlay-icon-link"
                     {% else %}
-                        href="{% url 'association-document' 'financial-report' year %}"
+                        href="{% url 'documents:association-document' 'financial-report' year %}"
                         class="overlay-icon-euro"
                     {% endif %}
                     ></a>

website/documents/urls.py

@@ -2,7 +2,7 @@ from django.conf.urls import include, url
 
 from . import views
 
-
+app_name = "documents"
 urlpatterns = [
     url('^miscellaneous/(?P<pk>[0-9]*)', views.get_miscellaneous_document,
         name='miscellaneous-document'),
@@ -17,5 +17,5 @@ urlpatterns = [
         url('^(?P<document_pk>[0-9]*)', views.get_general_meeting_document,
             name='general-meeting-document'),
     ])),
-    url('^', views.index),
+    url('^', views.index, name='index'),
 ]

website/thaliawebsite/menus.py

@@ -6,7 +6,7 @@ main = [
         {'title': _('Board'), 'name': '#'},
         {'title': _('Committees'), 'name': '#'},
         {'title': _('Members'), 'name': '#'},
-        {'title': _('Documents'), 'name': '#'},
+        {'title': _('Documents'), 'name': 'documents:index'},
         {'title': _('Members'), 'name': '#'},
         {'title': _('Sister Associations'), 'name': '#'},
         {'title': _('Become Member'), 'name': '#'},

website/thaliawebsite/urls.py

@@ -22,7 +22,9 @@ urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'^members/', include('members.urls')),
     url(r'^nyi$', TemplateView.as_view(template_name='status/nyi.html'), name='#'),
-    url(r'^documents/', include('documents.urls')),
+    url(r'^association/', include([
+        url(r'^documents/', include('documents.urls', namespace='documents')),
+    ])),
     # Default login helpers
     url(r'^', include('django.contrib.auth.urls')),
 ]