Commits

Robert Myers  committed 38d39fc

making urls better

  • Participants
  • Parent commits 153822c
  • Branches worker

Comments (0)

Files changed (2)

File cannula/templates/cannula/base.html

         <ul class="span-11">
         {% block global-nav %}
         	<li><a href="{{MEDIA_URL}}cannula/docs/">Docs</a></li>
-        	<li>Groups</li>
-        	<li>Projects</li>
+        	<li><a href="{% url cannula-groups %}">Groups</a></li>
+        	<li><a href="{% url cannula-projects %}">Projects</a></li>
         {% endblock %}
         </ul>
         <form class="inline span-7 last right"><input type="text" /><input type="submit" value="Search" /></form>

File cannula/urls.py

     url(r'^$', 'index', name='cannula-index'),
     url(r'^create/group/$', api.groups.create_view, name='create-group'),
     url(r'^create/project/$', api.projects.create_view, name='create-project'),
-    url(r'^groups/$', api.groups.list_view, name='list-groups'),
+    url(r'^groups/$', api.groups.list_view, name='cannula-groups'),
     url(r'^groups/(?P<group>[^/]*)/$', api.groups.details_view, name='group-details'),
     url(r'^groups/(?P<group>[^/]*)/__(?P<action>add|mod)/$', api.groups.mod_member_view, name='group-mod-member'),
     url(r'^groups/(?P<group>[^/]*)/(?P<project>[^/]*)/deploy/$', api.projects.deploy_view, name='deploy-application'),
     url(r'^groups/(?P<group>[^/]*)/(?P<project>[^/]*)/(?P<cluster>[^/]*)/$', api.deployments.modify_view, name='control-application'),
     url(r'^groups/(?P<group>[^/]*)/(?P<project>[^/]*)/(?P<cluster>[^/]*)/delete/$', api.deployments.delete_view, name='delete-application'),
     url(r'^groups/(?P<group>[^/]*)/(?P<project>[^/]*)/$', api.projects.details_view, name='project-details'),
-    url(r'^projects/$', api.projects.list_view, name='list-projects'),
+    url(r'^projects/$', api.projects.list_view, name='cannula-projects'),
 )
 
 if settings.DEBUG: