From bc049b350628552840beaae75064e4d1ba1253a4 Mon Sep 17 00:00:00 2001
From: Daniel W Bond <dbond2@gmu.edu>
Date: Sun, 28 May 2017 15:03:36 -0400
Subject: [PATCH] templates wrap at 89 characters-- mostly

---
 .../templates/create_confirmation.html        |  5 +-
 .../templates/delete_confirmation.html        |  5 +-
 .../accounts/templates/delete_student.html    | 26 ++++++---
 .../accounts/templates/detail_student.html    |  8 ++-
 roomlist/accounts/templates/list_majors.html  | 12 +++-
 .../templates/room_change_warning.html        |  8 ++-
 .../templates/room_select_widget.html         | 12 +++-
 .../accounts/templates/search/search.html     |  4 +-
 .../templates/social/remove_social.html       |  4 +-
 .../accounts/templates/update_student.html    | 58 +++++++++++++------
 .../housing/templates/detail_building.html    | 15 +++--
 roomlist/housing/templates/detail_floor.html  |  9 ++-
 roomlist/housing/templates/detail_room.html   |  5 +-
 .../housing/templates/list_buildings.html     | 19 ++++--
 roomlist/templates/about.html                 | 15 ++++-
 roomlist/templates/index.html                 | 20 +++++--
 roomlist/templates/landing.html               |  4 +-
 roomlist/templates/layouts/base.html          |  7 ++-
 roomlist/templates/layouts/navbar.html        | 16 +++--
 roomlist/templates/messages.html              |  6 +-
 roomlist/templates/privacy.html               | 11 +++-
 roomlist/welcome/templates/welcome_major.html | 30 +++++++---
 roomlist/welcome/templates/welcome_name.html  | 41 +++++++++----
 .../welcome/templates/welcome_privacy.html    | 33 +++++++----
 .../welcome/templates/welcome_social.html     |  8 ++-
 25 files changed, 275 insertions(+), 106 deletions(-)

diff --git a/roomlist/accounts/templates/create_confirmation.html b/roomlist/accounts/templates/create_confirmation.html
index 53acaab..ef7b6f5 100644
--- a/roomlist/accounts/templates/create_confirmation.html
+++ b/roomlist/accounts/templates/create_confirmation.html
@@ -1,6 +1,7 @@
 {% extends 'layouts/base.html' %}
-
-{% block title %} SRCT RoomList | Flag {{ student.get_full_name_or_uname }}  {% endblock %}
+{% block title %}
+SRCT Roomlist &bull; Flag {{ student.get_full_name_or_uname }}
+{% endblock %}
 
 {% block message_queue %}
 {% endblock %}
diff --git a/roomlist/accounts/templates/delete_confirmation.html b/roomlist/accounts/templates/delete_confirmation.html
index b735fdb..7d661ab 100644
--- a/roomlist/accounts/templates/delete_confirmation.html
+++ b/roomlist/accounts/templates/delete_confirmation.html
@@ -1,6 +1,7 @@
 {% extends 'layouts/base.html' %}
-
-{% block title %} SRCT RoomList | Remove Flag {{ confirmation.student.get_full_name_or_uname }}  {% endblock %}
+{% block title %}
+SRCT Roomlist &bull; Remove Flag {{ confirmation.student.get_full_name_or_uname }}
+{% endblock %}
 
 {% block message_queue %}
 {% endblock %}
diff --git a/roomlist/accounts/templates/delete_student.html b/roomlist/accounts/templates/delete_student.html
index c960c9a..4c0a404 100644
--- a/roomlist/accounts/templates/delete_student.html
+++ b/roomlist/accounts/templates/delete_student.html
@@ -1,6 +1,7 @@
 {% extends 'layouts/base.html' %}
-
-{% block title %} SRCT RoomList &bull; Delete My Account {% endblock %}
+{% block title %}
+SRCT Roomlist &bull; Delete My Account
+{% endblock %}
 
 {% block message_queue %}
 {% endblock %}
@@ -40,16 +41,21 @@
         <hr />
         <ul class="text-center">
           {% for error in form.non_field_errors %}
-            <li class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</li>
+            <li class="text-danger">
+              <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+            </li>
           {% endfor %}
         </ul>
         <hr />
         {% endif %}
-        <form class="form-horizontal" autocomplete="off" action="" method="post">{% csrf_token %}
+        <form class="form-horizontal" autocomplete="off" action="" method="post">
+        {% csrf_token %}
           <fieldset>
             {% if form.leaving.errors %}
               {% for error in form.leaving.errors %}
-                <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+                <p class="text-danger">
+                  <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+                </p>
               {% endfor %}
             {% endif %}
             <div class="form-group">
@@ -65,7 +71,9 @@
             <hr/>
             {% if form.feedback.errors %}
               {% for error in form.feedback.errors %}
-                <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+                <p class="text-danger">
+                  <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+                </p>
               {% endfor %}
             {% endif %}
             <div class="form-group">
@@ -88,13 +96,15 @@
     <a href="{{ student.get_absolute_url }}" style="margin:10px">
       <button type="button" class="btn btn-default">Cancel</button>
     </a>
-    <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#deleteModal">
+    <button type="button" class="btn btn-danger"
+            data-toggle="modal" data-target="#deleteModal">
       Delete Me
     </button>
   </div>
 </div>
 
-<div class="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+<div class="modal fade" id="deleteModal" tabindex="-1"
+     role="dialog" aria-labelledby="myModalLabel">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
 
diff --git a/roomlist/accounts/templates/detail_student.html b/roomlist/accounts/templates/detail_student.html
index dca6358..43e0a8c 100644
--- a/roomlist/accounts/templates/detail_student.html
+++ b/roomlist/accounts/templates/detail_student.html
@@ -12,7 +12,9 @@ SRCT Roomlist &bull; {{ student.user.first_name }} {{ student.user.last_name }}
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-2 col-md-offset-1 text-center">
-      <img class="img-circle img-responsive center center-block profile-image" src="{{ student.profile_image_url }}" alt="{{ student.get_full_name_or_uname }} profile picture">
+      <img class="img-circle img-responsive center center-block profile-image"
+           src="{{ student.profile_image_url }}"
+           alt="{{ student.get_full_name_or_uname }} profile picture">
     </div>
 
     <div class="col-md-6 text-center">
@@ -89,7 +91,9 @@ SRCT Roomlist &bull; {{ student.user.first_name }} {{ student.user.last_name }}
         </tr>
 
         <tr>
-          <td><h4><strong>Email</strong>: <a href="mailto:{{ student.user.email }}">{{ student.user.email }}</a></h4></a></td>
+          <td><h4><strong>Email</strong>:
+            <a href="mailto:{{ student.user.email }}">{{ student.user.email }}</a></h4></a>
+          </td>
         </tr>
         {% if student.show_gender %}
           <tr>
diff --git a/roomlist/accounts/templates/list_majors.html b/roomlist/accounts/templates/list_majors.html
index ce0df95..9504cb6 100644
--- a/roomlist/accounts/templates/list_majors.html
+++ b/roomlist/accounts/templates/list_majors.html
@@ -4,12 +4,16 @@
 
 {% block og_metadata %}
 <meta property="og:title" content="SRCT Roomlist Majors"/>
-<meta property="og:description" content="Undergraduate majors on SRCT Roomlist. Log in with your Mason username and password to find your on-campus neighbors."/>
+<meta property="og:description"
+      content="Undergraduate majors on SRCT Roomlist. Log in with your Mason username
+               and password to find your on-campus neighbors."/>
 {% endblock %}
 
 {% block tw_metadata %}
 <meta name="twitter:title" content="SRCT Roomlist Majors" />
-<meta name="twitter:description" content="Undergraduate majors on SRCT Roomlist. Log in with your Mason username and password to find your on-campus neighbors." />
+<meta name="twitter:description"
+      content="Undergraduate majors on SRCT Roomlist. Log in with your Mason username
+               and password to find your on-campus neighbors." />
 {% endblock tw_metadata %}
 
 {% block content %}
@@ -43,7 +47,9 @@
 <div class="row">
   <div class="col-lg-10 col-lg-offset-1 col-md-12 col-md-offset-0 col-sm-10 col-sm-offset-1 col-xs-12 col-xs-offset-0">
     {% for letter in majors_by_letter %}
-    <legend><a name="{{ letter.grouper }}" href="#{{ letter.grouper }}">{{ letter.grouper }}</a></legend>
+    <legend>
+      <a name="{{ letter.grouper }}" href="#{{ letter.grouper }}">{{ letter.grouper }}</a>
+    </legend>
       <div class="major-row">
         <div class="row">
         {% for major in letter.list %}
diff --git a/roomlist/accounts/templates/room_change_warning.html b/roomlist/accounts/templates/room_change_warning.html
index 74216fc..3f41f68 100644
--- a/roomlist/accounts/templates/room_change_warning.html
+++ b/roomlist/accounts/templates/room_change_warning.html
@@ -3,10 +3,14 @@
   <div class="col-md-12">
     {% if request.user.student.recent_changes <= 2 %}
       <div class="alert alert-warning text-center" role="alert">
-        <strong>To safeguard everyone's privacy, the number of times you can change your room in a semester is limited.</strong>
+        <strong>To safeguard everyone's privacy, the number of times you can change
+        your room in a semester is limited.</strong>
     {% else %}
       <div class="alert alert-danger text-center" role="alert">
-        <strong>To safeguard everyone's privacy, the number of times you can change your room in a semester is limited. Email <a href="mailto:roomlist@lists.srct.gmu.edu?Subject=I%20Don%27t%20Know%20Where%20I%20Live%3A%20Halp%20Pls">roomlist@lists.srct.gmu.edu</a> to have your room changed.</strong>
+        <strong>To safeguard everyone's privacy, the number of times you can change
+        your room in a semester is limited. Email
+        <a href="mailto:roomlist@lists.srct.gmu.edu?Subject=I%20Don%27t%20Know%20Where%20I%20Live%3A%20Halp%20Pls">
+        roomlist@lists.srct.gmu.edu</a> to have your room changed.</strong>
     {% endif %}
     </div>
   </div>
diff --git a/roomlist/accounts/templates/room_select_widget.html b/roomlist/accounts/templates/room_select_widget.html
index 519f2ad..1d73912 100644
--- a/roomlist/accounts/templates/room_select_widget.html
+++ b/roomlist/accounts/templates/room_select_widget.html
@@ -17,9 +17,13 @@
   <option value="">---</option>
   {% for building in buildings %}
     {% if user.student.get_building == building %}
-      <option value="{{ building.name }}" class="{{ building.neighbourhood }}" selected="selected">{{ building.name }}</option>
+      <option value="{{ building.name }}" class="{{ building.neighbourhood }}" selected="selected">
+        {{ building.name }}
+      </option>
     {% else %}
-      <option value="{{ building.name }}" class="{{ building.neighbourhood }}">{{ building.name }}</option>
+      <option value="{{ building.name }}" class="{{ building.neighbourhood }}">
+        {{ building.name }}
+      </option>
     {% endif %}
   {% endfor %}
 </select>
@@ -31,7 +35,9 @@
   {% load cache %}
   {% cache 3600 floor_list %}
   {% for floor in floors %}
-    <option value="{{ floor.pk }}" class="{{ floor.building.name }}">{{ floor.number|ordinal }}</option>
+    <option value="{{ floor.pk }}" class="{{ floor.building.name }}">
+      {{ floor.number|ordinal }}
+    </option>
   {% endfor %}
   {% endcache %}
 </select>
diff --git a/roomlist/accounts/templates/search/search.html b/roomlist/accounts/templates/search/search.html
index 4490974..28ec049 100644
--- a/roomlist/accounts/templates/search/search.html
+++ b/roomlist/accounts/templates/search/search.html
@@ -1,5 +1,4 @@
 {% extends 'layouts/base.html' %}
-
 {% block title %}
 SRCT Roomlist &bull; Search Students
 {% endblock %}
@@ -16,7 +15,8 @@ SRCT Roomlist &bull; Search Students
 
 <form class="form-horizontal" method="get" action=".">
   <div class="form-group"> 
-    <label for="{{ form.q.id_for_label }}" class="col-lg-1 col-lg-offset-2 col-md-2 col-md-offset-1 col-sm-2 col-xs-12">
+    <label for="{{ form.q.id_for_label }}"
+           class="col-lg-1 col-lg-offset-2 col-md-2 col-md-offset-1 col-sm-2 col-xs-12">
       <strong>Name</strong> or <strong>Username</strong>
     </label>
     <div class="col-lg-6 col-md-6 col-sm-9 col-xs-10">
diff --git a/roomlist/accounts/templates/social/remove_social.html b/roomlist/accounts/templates/social/remove_social.html
index 2b2fd30..d6232e0 100644
--- a/roomlist/accounts/templates/social/remove_social.html
+++ b/roomlist/accounts/templates/social/remove_social.html
@@ -10,7 +10,9 @@
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12 text-center">
-      <h1><i class="fa fa-fw fa-2x fa-times"></i> <i class="fa fa-fw fa-2x fa-{{ application }}"></i></h1>
+      <h1>
+        <i class="fa fa-fw fa-2x fa-times"></i> <i class="fa fa-fw fa-2x fa-{{ application }}"></i>
+      </h1>
       <p class="lead">Remove My {{ branding }} Account</p>
     </div>
   </div>
diff --git a/roomlist/accounts/templates/update_student.html b/roomlist/accounts/templates/update_student.html
index ebe10eb..c2c410f 100644
--- a/roomlist/accounts/templates/update_student.html
+++ b/roomlist/accounts/templates/update_student.html
@@ -1,6 +1,7 @@
 {% extends 'layouts/base.html' %}
-
-{% block title %} SRCT Roomlist &bull; My Settings {% endblock %}
+{% block title %}
+SRCT Roomlist &bull; My Settings
+{% endblock %}
 
 {% block css %}
 <link href="/static/css/chosen.min.css" rel="stylesheet" media="screen">
@@ -47,22 +48,29 @@
         {% if form.non_field_errors %}
         <ul class="text-center">
           {% for error in form.non_field_errors %}
-            <li class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</li>
+            <li class="text-danger">
+              <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+            </li>
           {% endfor %}
         </ul>
         <hr />
         {% endif %}
         {% spaceless %}
-        <form class="form-horizontal" autocomplete="off" action="" method="post">{% csrf_token %}
+        <form class="form-horizontal" autocomplete="off" action="" method="post">
+        {% csrf_token %}
           <fieldset>
           {% if form.first_name.errors %}
             {% for error in form.first_name.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           {% if form.last_name.errors %}
             {% for error in form.last_name.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           <div class="form-group">
@@ -91,7 +99,9 @@
           </div>
           {% if form.gender.errors %}
             {% for error in form.gender.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           <div class="form-group">
@@ -110,7 +120,9 @@
           </div>
           {% if form.show_gender.errors %}
             {% for error in form.show_gender.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           <div class="form-group">
@@ -126,7 +138,9 @@
           <hr />
           {% if form.major.errors %}
             {% for error in form.major.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           <div class="form-group">
@@ -139,7 +153,9 @@
           </div>
           {% if form.graduating_year.errors %}
             {% for error in form.graduating_year.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           <div class="form-group">
@@ -154,7 +170,9 @@
           <hr />
           {% if form.on_campus.errors %}
             {% for error in form.on_campus.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           {% if request.user.student.is_staff %}
@@ -178,7 +196,9 @@
             We'll let everyone know when we add them.</p>
             {% if form.room.errors %}
               {% for error in form.room.errors %}
-                <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+                <p class="text-danger">
+                  <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+                </p>
               {% endfor %}
             {% endif %}
             <div class="form-group">
@@ -192,7 +212,9 @@
           </p>
           {% if form.privacy.errors %}
             {% for error in form.privacy.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           <div class="form-group">
@@ -209,7 +231,9 @@
           </p>
           {% if form.blocked_kids.errors %}
             {% for error in form.blocked_kids.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           <div class="form-group">
@@ -228,9 +252,9 @@
       </div>
     </div>
     {% if not request.user.student.is_staff %}
-    <p>
-      <small><a href="{% url 'delete_student' request.user.username %}">Delete Account</a></small>
-    </p>
+    <p><small>
+      <a href="{% url 'delete_student' request.user.username %}">Delete Account</a>
+    </small></p>
     {% endif %}
   </div>
 
diff --git a/roomlist/housing/templates/detail_building.html b/roomlist/housing/templates/detail_building.html
index 41b9a6d..1546635 100644
--- a/roomlist/housing/templates/detail_building.html
+++ b/roomlist/housing/templates/detail_building.html
@@ -1,14 +1,20 @@
 {% extends 'layouts/base.html' %}
-{% block title %} SRCT Roomlist &bull; {{ building.name }} {% endblock %}
+{% block title %}
+SRCT Roomlist &bull; {{ building.name }}
+{% endblock %}
 
 {% block og_metadata %}
 <meta property="og:title" content="SRCT Roomlist - {{ building.name }}"/>
-<meta property="og:description" content="Do you live in {{ building.name }}? Log in with your Mason username and password to find your neighbors."/>
+<meta property="og:description"
+      content="Do you live in {{ building.name }}?
+               Log in with your Mason username and password to find your neighbors."/>
 {% endblock %}
 
 {% block tw_metadata %}
 <meta name="twitter:title" content="SRCT Roomlist - {{ building.name }}" />
-<meta name="twitter:description" content="Do you live in {{ building.name }}? Log in with your Mason username and password to find your neighbors." />
+<meta name="twitter:description"
+      content="Do you live in {{ building.name }}?
+               Log in with your Mason username and password to find your neighbors." />
 {% endblock tw_metadata %}
 
 {% block content %}
@@ -35,7 +41,8 @@
 <div class="row">
   {% for floor in floors %}
   <div class="col-sm-3 minor-padding text-center">
-    <a href="{{ floor.get_absolute_url }}" class="btn btn-primary btn-lg btn-block">{{ floor.number|ordinal }} Floor</a>
+    <a href="{{ floor.get_absolute_url }}" class="btn btn-primary btn-lg btn-block">
+     {{ floor.number|ordinal }} Floor</a>
   </div>
   {% if forloop.counter|divisibleby:4 %}
 </div>
diff --git a/roomlist/housing/templates/detail_floor.html b/roomlist/housing/templates/detail_floor.html
index c07f13e..7a90b1f 100644
--- a/roomlist/housing/templates/detail_floor.html
+++ b/roomlist/housing/templates/detail_floor.html
@@ -1,6 +1,13 @@
 {% extends 'layouts/base.html' %}
 {% load humanize %}
-{% block title %} SRCT Roomlist &bull; {{ floor.building.name }} {{ floor.number|ordinal }}{% endblock title %}
+{% block title %}
+SRCT Roomlist &bull; {{ floor.building.name }} {{ floor.number|ordinal }}
+{% endblock title %}
+
+{% comment %}
+No metadata tags because a link to this page would just show the cas login page
+{% endcomment %}
+
 {% block content %}
 {% load cache %}
 {% cache 15 floor_students request.user.username floor %}
diff --git a/roomlist/housing/templates/detail_room.html b/roomlist/housing/templates/detail_room.html
index 135cfc8..33e5e65 100644
--- a/roomlist/housing/templates/detail_room.html
+++ b/roomlist/housing/templates/detail_room.html
@@ -1,5 +1,8 @@
 {% extends 'layouts/base.html' %}
-{% block title %} SRCT Roomlist &bull; {{ room.floor.building.name }} {{ room.number }}{% endblock %}
+{% block title %}
+SRCT Roomlist &bull; {{ room.floor.building.name }} {{ room.number }}
+{% endblock %}
+
 {% block content %}
 {% load cache %}
 {% cache 15 room_students request.user.username room %}
diff --git a/roomlist/housing/templates/list_buildings.html b/roomlist/housing/templates/list_buildings.html
index 48742e6..4b523c4 100644
--- a/roomlist/housing/templates/list_buildings.html
+++ b/roomlist/housing/templates/list_buildings.html
@@ -1,15 +1,20 @@
 {% extends 'layouts/base.html' %}
-
-{% block title %} SRCT Roomlist &bull; Neighborhoods {% endblock title %}
+{% block title %}
+SRCT Roomlist &bull; Neighborhoods
+{% endblock title %}
 
 {% block og_metadata %}
 <meta property="og:title" content="SRCT Roomlist Neighborhoods"/>
-<meta property="og:description" content="Housing locations on SRCT Roomlist. Log in with your Mason username and password to find your on-campus neighbors."/>
+<meta property="og:description"
+      content="Housing locations on SRCT Roomlist. Log in with your Mason username
+               and password to find your on-campus neighbors."/>
 {% endblock og_metadata %}
 
 {% block tw_metadata %}
 <meta name="twitter:title" content="SRCT Roomlist Neighborhoods" />
-<meta name="twitter:description" content="Housing locations on SRCT Roomlist. Log in with your Mason username and password to find your on-campus neighbors." />
+<meta name="twitter:description"
+      content="Housing locations on SRCT Roomlist. Log in with your Mason username
+               and password to find your on-campus neighbors." />
 {% endblock tw_metadata %}
 
 {% block content %}
@@ -41,7 +46,11 @@
 </div>
 
 {% for neighbourhood, buildings in buildings_by_neighbourhood.items %}
-<legend><strong><a name="{{ neighbourhood }}" href="#{{ neighbourhood }}">{{ neighbourhood }}</a></strong></legend>
+<legend>
+  <strong>
+    <a name="{{ neighbourhood }}" href="#{{ neighbourhood }}">{{ neighbourhood }}</a>
+  </strong>
+</legend>
 
 <div class="row">
   {% for building in buildings %}
diff --git a/roomlist/templates/about.html b/roomlist/templates/about.html
index af1f8fc..2b7e941 100644
--- a/roomlist/templates/about.html
+++ b/roomlist/templates/about.html
@@ -4,12 +4,16 @@
 
 {% block og_metadata %}
 <meta property="og:title" content="About SRCT Roomlist"/>
-<meta property="og:description" content="Roomlist is a Mason student housing directory, developed and hosted by Student-Run Computing and Tech, a registered student org."/>
+<meta property="og:description"
+      content="Roomlist is a Mason student housing directory, developed and hosted
+               by Student-Run Computing and Tech, a registered student org."/>
 {% endblock %}
 
 {% block tw_metadata %}
 <meta name="twitter:title" content="About SRCT Roomlist" />
-<meta name="twitter:description" content="Roomlist is a Mason student housing directory, developed and hosted by Student-Run Computing and Tech, a registered student org." />
+<meta name="twitter:description"
+      content="Roomlist is a Mason student housing directory, developed and hosted
+               by Student-Run Computing and Tech, a registered student org." />
 {% endblock tw_metadata %}
 
 {% block content %}
@@ -23,7 +27,12 @@
       <div class="jumbotron jumboabout">
         <h1>About Roomlist</h1>
       </div>
-      <a href="https://creativecommons.org/licenses/by-nc/2.0/" target="_blank"><img alt="Creative Commons License" style="border-width:0" src="https://licensebuttons.net/l/by-nc/2.0/80x15.png" title="'Campus Dorms East side of Campus' by Flickr user cgs_gmu2005 is licensed under a Creative Commons Attribution-NonCommerical 2.0 General License."></a>
+      <a href="https://creativecommons.org/licenses/by-nc/2.0/" target="_blank">
+        <img alt="Creative Commons License" style="border-width:0"
+         src="https://licensebuttons.net/l/by-nc/2.0/80x15.png"
+         title="'Campus Dorms East side of Campus' by Flickr user cgs_gmu2005
+                is licensed under a Creative Commons Attribution-NonCommerical
+                2.0 General License."/></a>
     </div>
   </div>
 </div>
diff --git a/roomlist/templates/index.html b/roomlist/templates/index.html
index 27b4331..e5e1c71 100644
--- a/roomlist/templates/index.html
+++ b/roomlist/templates/index.html
@@ -1,14 +1,20 @@
 {% extends 'layouts/base.html' %}
-{% block title %} SRCT Roomlist &bull; Homepage {% endblock title %}
+{% block title %}
+SRCT Roomlist &bull; Homepage
+{% endblock title %}
 
 {% block og_metadata %}
 <meta property="og:title" content="SRCT Roomlist"/>
-<meta property="og:description" content="Welcome to SRCT Roomlist! Log in with your Mason username and password to find your on-campus neighbors."/>
+<meta property="og:description"
+      content="Welcome to SRCT Roomlist! Log in with your Mason username and password
+               to find your on-campus neighbors."/>
 {% endblock %}
 
 {% block tw_metadata %}
 <meta name="twitter:title" content="SRCT Roomlist" />
-<meta name="twitter:description" content="Welcome to SRCT Roomlist! Log in with your Mason username and password to find your on-campus neighbors." />
+<meta name="twitter:description"
+      content="Welcome to SRCT Roomlist! Log in with your Mason username and password
+               to find your on-campus neighbors." />
 
 {% endblock tw_metadata %}
 
@@ -24,8 +30,12 @@
         <h1 class="text-center"><strong>SRCT</strong>&#8203;ROOMLIST</h1>
         <h3 class="text-center">Find your on-campus neighbors</h3>
       </div>
-      <a href="https://creativecommons.org/licenses/by-nc/2.0/" target="_blank"><img alt="Creative Commons License" style="border-width:0" src="https://licensebuttons.net/l/by-nc/2.0/80x15.png" title="'North Section of President's Park Dorms' by Flickr user cgs_gmu2005 is licensed under a Creative Commons Attribution-NonCommercial 2.0 Generic License."
-        />
+      <a href="https://creativecommons.org/licenses/by-nc/2.0/" target="_blank">
+        <img alt="Creative Commons License" style="border-width:0"
+             src="https://licensebuttons.net/l/by-nc/2.0/80x15.png"
+             title="'North Section of President's Park Dorms' by Flickr user
+                    cgs_gmu2005 is licensed under a Creative Commons
+                    Attribution-NonCommercial 2.0 Generic License."/>
       </a>
     </div>
   </div>
diff --git a/roomlist/templates/landing.html b/roomlist/templates/landing.html
index 6849b12..b20b21d 100644
--- a/roomlist/templates/landing.html
+++ b/roomlist/templates/landing.html
@@ -1,5 +1,7 @@
 {% extends 'layouts/base.html' %}
-{% block title %} SRCT Roomlist &bull; Homepage {% endblock title %}
+{% block title %}
+SRCT Roomlist &bull; Homepage
+{% endblock title %}
 
 {% block content %}
 
diff --git a/roomlist/templates/layouts/base.html b/roomlist/templates/layouts/base.html
index 416c889..f79558f 100644
--- a/roomlist/templates/layouts/base.html
+++ b/roomlist/templates/layouts/base.html
@@ -18,7 +18,8 @@
   <!-- Facebook -->
   {% block og_metadata %}
   <meta property="og:title" content="SRCT Roomlist"/>
-  <meta property="og:description" content="Log in with your Mason username and password to find your on-campus neighbors."/>
+  <meta property="og:description"
+        content="Log in with your Mason username and password to find your on-campus neighbors."/>
   {% endblock og_metadata %}
   <meta property="og:type" content="website"/>
   <meta property="og:image" content="https://srct.gmu.edu/static/media/SRCT_square_sm.png"/>
@@ -29,7 +30,9 @@
   <meta name="twitter:site" content="@MasonSRCT" />
   {% block tw_metadata %}
   <meta name="twitter:title" content="SRCT Roomlist" />
-  <meta name="twitter:description" content="Log in with your Mason username and password to find your on-campus neighbors." /> <!-- Maximum 200 characters. -->
+  <meta name="twitter:description"
+        content="Log in with your Mason username and password to find your on-campus neighbors." />
+        <!-- Maximum 200 characters. -->
   {% endblock tw_metadata %}
   <!-- Twitterbot now automatically crawls for the url: no url tag. -->
   <meta name="twitter:image" content="https://srct.gmu.edu/static/media/SRCT_square_sm.png" />
diff --git a/roomlist/templates/layouts/navbar.html b/roomlist/templates/layouts/navbar.html
index 7e9c80b..40662a3 100644
--- a/roomlist/templates/layouts/navbar.html
+++ b/roomlist/templates/layouts/navbar.html
@@ -1,13 +1,18 @@
 <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
   <div class="container">
     <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+      <button type="button" class="navbar-toggle collapsed"
+              data-toggle="collapse" data-target="#navbar"
+              aria-expanded="false" aria-controls="navbar">
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="{% url 'homepage' %}"><img src="/static/img/SRCT_square.svg" height="25" width="25" alt="SRCT"> ROOMLIST</a>
+      <a class="navbar-brand" href="{% url 'homepage' %}">
+        <img src="/static/img/SRCT_square.svg" height="25" width="25" alt="SRCT">
+        ROOMLIST
+      </a>
     </div>
     <div id="navbar" class="navbar-collapse collapse">
       <ul class="nav navbar-nav">
@@ -29,12 +34,15 @@
         <!-- Puts profile picture in navbar next to username-->
         <li>
           <a href="{{ user.student.get_absolute_url }}">
-            <img src="{{ request.user.student.profile_image_url }}" height="35" width="35" alt="{{ student.profile_image_url }}" class="img-circle img-responsive hidden-xs navbar-profile">
+            <img src="{{ request.user.student.profile_image_url }}"
+                 height="35" width="35" alt="{{ student.profile_image_url }}"
+                 class="img-circle img-responsive hidden-xs navbar-profile">
             {{ user.username }}
           </a>
         </li>
         <li class="visible-lg visible-md visible-sm">
-          <a href="{% url 'update_student' request.user.username %}"><i class="fa fa-cog fa-fw fa-lg"></i></a>
+          <a href="{% url 'update_student' request.user.username %}">
+            <i class="fa fa-cog fa-fw fa-lg"></i></a>
         </li>
         <li class="visible-xs">
           <a href="{% url 'update_student' request.user.username %}">Settings</a>
diff --git a/roomlist/templates/messages.html b/roomlist/templates/messages.html
index 34abc03..b8b6048 100644
--- a/roomlist/templates/messages.html
+++ b/roomlist/templates/messages.html
@@ -2,8 +2,10 @@
   {% for message in messages %}
   <div class="row">
     <div class="col-md-12">
-      <div class="alert alert-{{ message.tags }} alert-dismissable text-center" style='font-size:14px' role="alert">
-      <button type="button" class="close" data-dismiss="alert" aria-label="close"><span aria-hidden="true">&times;</span></button>
+      <div class="alert alert-{{ message.tags }} alert-dismissable text-center"
+           style='font-size:14px' role="alert">
+      <button type="button" class="close" data-dismiss="alert" aria-label="close">
+        <span aria-hidden="true">&times;</span></button>
       <strong>{{ message }}</strong>
       </div>
     </div>
diff --git a/roomlist/templates/privacy.html b/roomlist/templates/privacy.html
index b878623..692dfa8 100644
--- a/roomlist/templates/privacy.html
+++ b/roomlist/templates/privacy.html
@@ -6,12 +6,16 @@ SRCT Roomlist &bull; Privacy Policy
 
 {% block og_metadata %}
 <meta property="og:title" content="SRCT Roomlist Privacy Policy"/>
-<meta property="og:description" content="Roomlist is available only to individuals with full Mason credentials. Control who sees your information on your settings page."/>
+<meta property="og:description"
+      content="Roomlist is available only to individuals with full Mason credentials.
+               Control who sees your information on your settings page."/>
 {% endblock %}
 
 {% block tw_metadata %}
 <meta name="twitter:title" content="SRCT Roomlist Privacy Policy" />
-<meta name="twitter:description" content="Roomlist is available only to individuals with full Mason credentials. Control who sees your information on your settings page."/>
+<meta name="twitter:description"
+      content="Roomlist is available only to individuals with full Mason credentials.
+               Control who sees your information on your settings page."/>
 {% endblock tw_metadata %}
 
 {% block content %}
@@ -143,7 +147,8 @@ SRCT Roomlist &bull; Privacy Policy
     </p>
     <p>
       Your information may be removed if it is in violation of Mason's
-      <a href="https://http://universitypolicy.gmu.edu/policies/responsible-use-of-computing/">responsible use of computing policy</a>,
+      <a href="https://http://universitypolicy.gmu.edu/policies/responsible-use-of-computing/">
+      responsible use of computing policy</a>,
       <a href="https://srct.gmu.edu/documents/usage_policy/">SRCT terms of service</a>,
       or other order, or upon graduation or other termination of relationship with the
       university and the end of your full access GMU account.
diff --git a/roomlist/welcome/templates/welcome_major.html b/roomlist/welcome/templates/welcome_major.html
index a272ef7..50a9c35 100644
--- a/roomlist/welcome/templates/welcome_major.html
+++ b/roomlist/welcome/templates/welcome_major.html
@@ -1,6 +1,7 @@
 {% extends 'layouts/base.html' %}
-
-{% block title %} SRCT RoomList | Welcome | Step 3 of 4 {% endblock %}
+{% block title %}
+SRCT Roomlist &bull; Welcome &bull; Step 3 of 4
+{% endblock %}
 
 {% block css %}
 <link href="/static/css/chosen.min.css" rel="stylesheet" media="screen">
@@ -12,7 +13,8 @@
 {% block content %}
 
 <div class="progress">
-  <div class="progress-bar" role="progressbar" aria-valuenow="75" aria-valuemin="0" aria-valuemax="100" style="width: 75%;">
+  <div class="progress-bar" role="progressbar"
+       aria-valuenow="75" aria-valuemin="0" aria-valuemax="100" style="width: 75%;">
     <span class="sr-only">75% complete</span>
   </div>
 </div>
@@ -48,16 +50,21 @@
         <hr />
           <ul class="text-center">
             {% for error in form.non_field_errors %}
-              <li class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</li>
+              <li class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </li>
             {% endfor %}
           </ul>
         <hr />
         {% endif %}
-        <form class="form-horizontal" autocomplete="off" action="" method="post">{% csrf_token %}
+        <form class="form-horizontal" autocomplete="off" action="" method="post">
+          {% csrf_token %}
           <fieldset>
           {% if form.major.errors %}
             {% for error in form.major.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           <div class="form-group">
@@ -70,7 +77,9 @@
           </div>
           {% if form.graduating_year.errors %}
             {% for error in form.graduating_year.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           <div class="form-group">
@@ -94,8 +103,11 @@
 <div class="row">
   <div class="col-md-8 col-md-offset-2 text-center">
     <div class="alert alert-danger" role="alert">
-      <p><i class="fa fa-exclamation-circle fa-fw fa-lg"></i> <strong>Changing your major here serves only to make it easier for others to find you on this site.</strong></p>
-      <p>Talk with your academic advisor and file all necessary paperwork to officially change your major with the registrar.</p>
+      <p><i class="fa fa-exclamation-circle fa-fw fa-lg"></i>
+         <strong>Changing your major here serves only to make it easier for others
+         to find you on this site.</strong></p>
+      <p>Talk with your academic advisor and file all necessary paperwork to officially
+         change your major with the registrar.</p>
     </div>
   </div>
 </div>
diff --git a/roomlist/welcome/templates/welcome_name.html b/roomlist/welcome/templates/welcome_name.html
index b533597..0ac7eed 100644
--- a/roomlist/welcome/templates/welcome_name.html
+++ b/roomlist/welcome/templates/welcome_name.html
@@ -1,7 +1,11 @@
 {% extends 'layouts/base.html' %}
+{% block title %}
+SRCT Roomlist &bull; Welcome &bull; Step 1 of 4
+{% endblock %}
 
-{% block title %} SRCT RoomList | Welcome | Step 1 of 4 {% endblock %}
-
+{% comment %}
+Do not display messages.
+{% endcomment %}
 {% block message_queue %}
 {% endblock %}
 
@@ -10,7 +14,8 @@
 {% load accounts_extras %}
 
 <div class="progress">
-  <div class="progress-bar" role="progressbar" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100" style="width: 25%;">
+  <div class="progress-bar" role="progressbar"
+       aria-valuenow="25" aria-valuemin="0" aria-valuemax="100" style="width: 25%;">
     <span class="sr-only">25% complete</span>
   </div>
 </div>
@@ -40,21 +45,28 @@
       {% if error in form.non_field_errors %}
       <ul class="text-center">
         {% for error in form.non_field_errors %}
-          <li class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</li>
+          <li class="text-danger">
+            <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+          </li>
         {% endfor %}
       </ul>
       {% endif %}
       <div class="panel-body">
-        <form class="form-horizontal" autocomplete="off" action="" method="post">{% csrf_token %}
+        <form class="form-horizontal" autocomplete="off" action="" method="post">
+          {% csrf_token %}
           <fieldset>
           {% if form.first_name.errors %}
             {% for error in form.first_name.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           {% if form.last_name.errors %}
             {% for error in form.last_name.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           <div class="form-group">
@@ -84,7 +96,9 @@
 
           {% if form.gender.errors %}
             {% for error in form.gender.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           <div class="form-group">
@@ -103,7 +117,9 @@
 
           {% if form.show_gender.errors %}
             {% for error in form.show_gender.errors %}
-              <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+              <p class="text-danger">
+                <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+              </p>
             {% endfor %}
           {% endif %}
           <div class="form-group">
@@ -130,8 +146,11 @@
 <div class="row">
   <div class="col-md-8 col-md-offset-2 text-center">
     <div class="alert alert-danger" role="alert">
-      <p><i class="fa fa-exclamation-circle fa-fw fa-lg"></i> <strong>Changing your name here serves only to make it easier for others to find you on this particular site.</strong></p>
-      <p>Talk with the Registrar's Office to handle the paperwork necessary to change your name officially with the university.</p>
+      <p><i class="fa fa-exclamation-circle fa-fw fa-lg"></i>
+         <strong>Changing your name here serves only to make it easier for others
+                 to find you on this particular site.</strong></p>
+      <p>Talk with the Registrar's Office to handle the paperwork necessary to
+         change your name officially with the university.</p>
     </div>
   </div>
 </div>
diff --git a/roomlist/welcome/templates/welcome_privacy.html b/roomlist/welcome/templates/welcome_privacy.html
index 9888cc7..a76fe23 100644
--- a/roomlist/welcome/templates/welcome_privacy.html
+++ b/roomlist/welcome/templates/welcome_privacy.html
@@ -1,6 +1,7 @@
 {% extends 'layouts/base.html' %}
-
-{% block title %} SRCT RoomList | Welcome | Step 2 of 4 {% endblock %}
+{% block title %}
+SRCT Roomlist &bull; Welcome &bull; Step 2 of 4
+{% endblock %}
 
 {% block message_queue %}
 {% endblock %}
@@ -8,7 +9,8 @@
 {% block content %}
 
 <div class="progress">
-  <div class="progress-bar" role="progressbar" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100" style="width: 50%;">
+  <div class="progress-bar" role="progressbar"
+       aria-valuenow="50" aria-valuemin="0" aria-valuemax="100" style="width: 50%;">
     <span class="sr-only">50% complete</span>
   </div>
 </div>
@@ -58,16 +60,21 @@
         {% if form.non_field_errors %}
         <ul class="text-center">
           {% for error in form.non_field_errors %}
-            <li class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</li>
+            <li class="text-danger">
+              <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+            </li>
           {% endfor %}
         </ul>
         <hr />
         {% endif %}
-        <form class="form-horizontal" autocomplete="off" action="" method="post">{% csrf_token %}
+        <form class="form-horizontal" autocomplete="off" action="" method="post">
+          {% csrf_token %}
           <fieldset>
             {% if form.on_campus.errors %}
               {% for error in form.on_campus.errors %}
-                <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+                <p class="text-danger">
+                  <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+                </p>
               {% endfor %}
             {% endif %}
             <div class="form-group">
@@ -89,7 +96,9 @@
               </p>
               {% if form.room.errors %}
                 {% for error in form.room.errors %}
-                  <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+                  <p class="text-danger">
+                    <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+                  </p>
                 {% endfor %}
               {% endif %}
               <div class="form-group">
@@ -97,7 +106,9 @@
               </div>
               {% if form.privacy.errors %}
                 {% for error in form.privacy.errors %}
-                  <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
+                  <p class="text-danger">
+                    <i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}
+                  </p>
                 {% endfor %}
               {% endif %}
               <div class="form-group">
@@ -128,8 +139,10 @@
 <div class="row">
   <div class="col-md-8 col-md-offset-2 text-center">
     <div class="alert alert-danger" role="alert">
-      <p><i class="fa fa-exclamation-circle fa-fw fa-lg"></i> <strong>Changing your room here changes it only on this particular site.</strong></p>
-      <p>To actually switch your room, you'll need to go through a lengthy process with the Housing Office.</p>
+      <p><i class="fa fa-exclamation-circle fa-fw fa-lg"></i>
+         <strong>Changing your room here changes it only on this particular site.
+      </strong></p>
+      <p>To actually switch your room, please contact your RA or the Housing Office.</p>
     </div>
   </div>
 </div>
diff --git a/roomlist/welcome/templates/welcome_social.html b/roomlist/welcome/templates/welcome_social.html
index e6dbf0c..cf2de77 100644
--- a/roomlist/welcome/templates/welcome_social.html
+++ b/roomlist/welcome/templates/welcome_social.html
@@ -1,11 +1,13 @@
 {% extends 'layouts/base.html' %}
-
-{% block title %} SRCT RoomList | Welcome | Step 4 of 4 {% endblock %}
+{% block title %}
+SRCT Roomlist &bull; Welcome &bull; Step 4 of 4
+{% endblock %}
 
 {% block content %}
 
 <div class="progress">
-  <div class="progress-bar" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%;">
+  <div class="progress-bar" role="progressbar"
+       aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%;">
     <span class="sr-only">100% complete</span>
   </div>
 </div>
-- 
GitLab