fixes the 'see other people's username in the navbar' problem

roomlist/accounts/templates/list_majors.html

@@ -3,6 +3,8 @@
 {% block title %} SRCT Roomlist | Majors | {{ major.name }} {% endblock title %}
 
 {% block content %}
+{% load cache %}
+{% cache 900 list_majors %}
 
 <div class="page-header" id="banner">
   <div class="row">
@@ -47,4 +49,5 @@
   </div>
 </div>
 
+{% endcache %}
 {% endblock content %}

roomlist/accounts/urls.py

@@ -2,7 +2,6 @@
 from __future__ import absolute_import, print_function
 # core django imports
 from django.conf.urls import patterns, include, url
-from django.views.decorators.cache import cache_page
 # imports from your apps
 from .views import (DetailStudent, UpdateStudent, DetailStudentSettings,
                     DetailCurrentStudent, DetailCurrentStudentSettings, ListMajors,
@@ -17,9 +16,7 @@ urlpatterns = patterns('',
     url(r'', include('allauth.urls')),
 
     # majors pages
-    url(r'^majors/$',
-        cache_page(60 * 15)(ListMajors.as_view()),
-        name='list_majors'),
+    url(r'^majors/$', ListMajors.as_view(), name='list_majors'),
 
     url(r'^majors/(?P<slug>[\w-]+)/(?P<major>[\w-]+)/$',
         DetailMajor.as_view(), name='detail_major'),
@@ -34,8 +31,7 @@ urlpatterns = patterns('',
 
     # student settings
     url(r'^student/(?P<slug>[\w-]+)/settings/$',
-        cache_page(4)(UpdateStudent.as_view()),
-        name='updateStudent'),
+        UpdateStudent.as_view(), name='updateStudent'),
 
     url(r'^student/(?P<slug>[\w-]+)/settings/social/remove/$',
         RemoveSocialConfirmationView.as_view(),

roomlist/housing/templates/detail_building.html

 {% extends 'layouts/base.html' %}
 {% block title %} SRCT Roomlist • {{ building.name }} {% endblock %}
 {% block content %}
+{% load cache %}
+{% cache 900 detail_building building %}
 
 <div class="page-header" id="banner">
   <div class="row">
@@ -33,4 +35,5 @@
   {% endfor %}
 </div>
 
+{% endcache %}
 {% endblock %}

roomlist/housing/templates/list_buildings.html

 {% extends 'layouts/base.html' %}
 
-{% block title %} SRCT RoomList • Neighborhoods {% endblock title %}
+{% block title %} SRCT Roomlist • Neighborhoods {% endblock title %}
 
 {% block content %}
+{% load cache %}
+{% cache 900 list_buildings %}
 
 <div class="page-header" id="banner">
   <div class="row">
@@ -77,4 +79,5 @@
   </div>
 </div>
 
+{% endcache %}
 {% endblock %}

roomlist/housing/urls.py

@@ -2,18 +2,16 @@
 from __future__ import absolute_import, print_function
 # core django imports
 from django.conf.urls import patterns, url
-from django.views.decorators.cache import cache_page
 # imports from your apps
 from .views import ListBuildings, DetailBuilding, DetailFloor, DetailRoom
 
 
 urlpatterns = patterns('',
 
-    url(r'^$', cache_page(60 * 15)(ListBuildings.as_view()), name='list_buildings'),
+    url(r'^$', ListBuildings.as_view(), name='list_buildings'),
 
     url(r'^(?P<slug>[\w-]+)/(?P<building>[\w-]+)/$',
-        cache_page(60 * 15)(DetailBuilding.as_view()),
-        name='detail_building'),
+        DetailBuilding.as_view(), name='detail_building'),
 
     url(r'^(?P<slug>[\w-]+)/(?P<building>[\w-]+)/(?P<floor>[\w-]+)/$',
         DetailFloor.as_view(), name='detail_floor'),

roomlist/settings/urls.py

@@ -5,7 +5,6 @@ from django.conf.urls import patterns, include, url
 from django.contrib.auth.decorators import login_required
 from django.views.generic import TemplateView
 from django.contrib import admin
-from django.views.decorators.cache import cache_page
 # imports from your apps
 from .views import HomePageView
 from haystack.views import SearchView
@@ -20,12 +19,8 @@ urlpatterns = patterns('',
 
     # project-level urls
     url(r'^$', HomePageView.as_view(), name='homepage'),
-    url(r'^about/$',
-        cache_page(60 * 15)(TemplateView.as_view(template_name='about.html')),
-        name='about'),
-    url(r'^privacy/$',
-        cache_page(60 * 15)(TemplateView.as_view(template_name='privacy.html')),
-        name='privacy'),
+    url(r'^about/$', TemplateView.as_view(template_name='about.html'), name='about'),
+    url(r'^privacy/$', TemplateView.as_view(template_name='privacy.html'), name='privacy'),
 
     # app-level urls
     url(r'^housing/', include('housing.urls')),

roomlist/templates/about.html

@@ -6,6 +6,9 @@ SRCT Roomlist • About
 
 {% block content %}
 
+{% load cache %}
+{% cache 900 about %}
+
 <div class="container container-padding">
   <div class="row">
     <div class="col-lg-12 license">
@@ -88,4 +91,5 @@ SRCT Roomlist &bull; About
   </div>
 </div>
 
+{% endcache %}
 {% endblock %}

roomlist/templates/privacy.html

@@ -5,6 +5,8 @@ SRCT Roomlist • Privacy Policy
 {% endblock %}
 
 {% block content %}
+{% load cache %}
+{% cache 900 privacy %}
 
 <div class="page-header" id="banner">
   <div class="row">
@@ -171,4 +173,5 @@ SRCT Roomlist &bull; Privacy Policy
   </div>
 </div>
 
+{% endcache %}
 {% endblock %}