cas now links to the proper place

roomlist/settings/urls.py

@@ -21,7 +21,7 @@ urlpatterns = patterns('',
 
     # login and logout
     url(r'^login/$', 'cas.views.login', name='login'),
-    url(r'login/$', 'cas.views.logout', name='logout'),
+    url(r'^logout/$', 'cas.views.logout', name='logout'),
 
     # alternate interfaces
     url(r'^api/', include('api.urls')),

roomlist/templates/layouts/navbar.html

@@ -22,10 +22,10 @@
         {% if user.is_authenticated %}
         <li><a href="/accounts/student/{{ user.username }}">{{ user.username }}</a>
         </li>
-        <li><a href="/accounts/logout/">Logout</a>
+        <li><a href="{% url 'logout' %}">Logout</a>
         </li>
         {% else %}
-        <li><a href="/accounts/login/">Login</a>
+        <li><a href="{% url 'login' %}">Login</a>
         </li>
         {% endif %}
       </ul>