Merge branch '76-fix-fonts' into '2.2-dev'

Resolve "CSRF and CSRF-Like Protection"

See merge request !91

go/go/templates/admin/useradmin.html

@@ -7,17 +7,20 @@
 <!-- define the content block for the page -->
 {% block content %}
 
+<!-- Tell Django to load static files -->
+{% load staticfiles %}
+
 <!-- define the page header div -->
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-balance-scale fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Moderation Panel</i>
-      </strong></h1>
+        Moderation Panel
+      </h1>
     </div>
   </div>
 </div>
@@ -309,8 +312,7 @@
     </form>
   </div>
 </div>
-<script src="../../static/js/useradmin.js">
 
-</script>
+<script src="{% static "js/useradmin.js" %}"></script>
 
 {% endblock %}
\ No newline at end of file

go/go/templates/banned.html

@@ -10,13 +10,13 @@ SRCT Go • Account Blocked
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-ban fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Account Is Blocked</i>
-      </strong></h1>
+        Account Is Blocked
+      </h1>
     </div>
   </div>
 </div>
@@ -32,10 +32,11 @@ SRCT Go &bull; Account Blocked
     <p>
       If you believe this is an error, please contact the <a href="mailto:srct@gmu.edu">Go Admins</a>
       <br />
-      <br/>
+      <br />
       Thank you, and have a nice day!
     </p>
-    <br/><br/>
+    <br />
+    <br />
   </div>
 </div>
 {% endblock %}

go/go/templates/core/about.html

@@ -13,13 +13,13 @@ SRCT Go • About
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-question fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">About</i>
-      </strong></h1>
+        About
+      </h1>
     </div>
   </div>
 </div>
@@ -27,7 +27,7 @@ SRCT Go &bull; About
 <!-- define the terms of use div -->
 <div class="row" id="terms">
   <div class="col-md-12">
-    <h4><i class="fa">Terms of Use</i></h4>
+    <h4>Terms of Use</h4>
     <legend></legend>
       <p>
         By using Go you acknowledge that you are a current George Mason Student or faculty member.
@@ -53,7 +53,7 @@ SRCT Go &bull; About
 <!-- define the who made go? div -->
 <div class="row">
   <div class="col-md-12">
-    <h4><i class="fa">Who made Go?</i></h4>
+    <h4>Who made Go?</h4>
     <legend></legend>
       <p>
         Members of the
@@ -77,7 +77,7 @@ SRCT Go &bull; About
 <!-- define the thanks! div -->
 <div class="row">
   <div class="col-md-12">
-    <h4><i class="fa">Thanks</i></h4>
+    <h4>Thanks</h4>
     <legend></legend>
     <p>
       This project was made possible through the collective contributions of multiple Mason SRCT members.

go/go/templates/core/edit_link.html

@@ -19,13 +19,13 @@ SRCT Go • Edit Link
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-wrench fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Edit Link</i>
-      </strong></h1>
+        Edit Link
+      </h1>
     </div>
   </div>
 </div>

go/go/templates/core/index.html

@@ -13,13 +13,13 @@ SRCT Go • My Links
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-link fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">My Links</i>
-      </strong></h1>
+        My Links
+      </h1>
     </div>
   </div>
   <div class="newlink" style="text-align: right;">

go/go/templates/core/new_link.html

@@ -19,13 +19,13 @@ SRCT Go • New Link
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-link fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Shorten URL</i>
-      </strong></h1>
+        Shorten URL
+      </h1>
     </div>
   </div>
 </div>

go/go/templates/core/signup.html

@@ -16,13 +16,13 @@ SRCT Go • Apply
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-user-plus fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Apply to Go</i>
-      </strong></h1>
+        Apply to Go
+      </h1>
     </div>
   </div>
 </div>

go/go/templates/layouts/base.html

@@ -30,9 +30,8 @@
         <!-- Load in global CSS -->
         <link href="https://fonts.googleapis.com/css?family=Carrois+Gothic"
         rel="stylesheet" type="text/css">
-        <link
-        href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
-        rel="stylesheet">
+        <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
+        rel="stylesheet" type="text/css">
         <link rel="stylesheet" href="{% static "css/bootswatch.min.css" %}" />
         <link rel="stylesheet" href="{% static "css/styles.css" %}" />
 

go/go/templates/layouts/navigation.html

@@ -14,7 +14,7 @@
         </button>
         <!-- Go brand logo -->
         <a class="navbar-brand" href="{% url 'index' %}">
-            <i class="fa fa-link"> Go</i>
+            <i class="fa fa-link"></i> Go
         </a>
     </div>
 

go/go/templates/link_box.html

@@ -97,12 +97,12 @@
             <br></br>
             
             <!-- Delete Button  -->
-            <a class="button btn btn-danger btn-sm fa" data-target="#deletionModal-{{url.short}}" data-toggle="modal">
+            <a class="button btn btn-danger btn-sm" data-target="#deletionModal-{{url.short}}" data-toggle="modal">
                 <i class="fa fa-trash-o fa-lg"></i> Delete
             </a>
 
             <!-- Edit Button -->
-            <a href="{{domain}}edit/{{url.short}}" class="button btn btn-info btn-sm fa">
+            <a href="{{domain}}edit/{{url.short}}" class="button btn btn-info btn-sm">
                 <i class="fa fa-cog fa-lg"></i> Edit
             </a>
 

go/go/templates/not_registered.html

@@ -13,13 +13,13 @@ SRCT Go • Account Not Approved
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-ban fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Account Not Approved</i>
-      </strong></h1>
+        Account Not Approved
+      </h1>
     </div>
   </div>
 </div>

go/go/templates/public_landing.html

@@ -27,7 +27,7 @@ SRCT Go • Welcome
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-        <h1><i class="fa"><i class="fa fa-link"></i> Go</i></h1>
+        <h1><i class="fa fa-link"></i> Go</h1>
         <p class="lead">University-branded URL shortening</p>
     </div>
   </div>
@@ -37,7 +37,7 @@ SRCT Go &bull; Welcome
 <div class="row">
     <!-- what is go? -->
     <div class="col-md-4">
-        <h3><i class="fa">What is Go?</i></h3>
+        <h3>What is Go?</h3>
         <legend></legend>
         <p>
             Go provides University-branded URL shortening for student  organizations,
@@ -46,14 +46,14 @@ SRCT Go &bull; Welcome
             that can redirect to a longer URL.
             <br></br>
             Go is a product of the
-            George Mason University <a href="https://srct.gmu.edu">Student-Run  Computing and Technology</a>
+            George Mason University <a href="https://srct.gmu.edu">Student-Run Computing and Technology</a>
             student organization.
         </p>
     </div>
 
     <!-- why should I use Go? -->
     <div class="col-md-4">
-        <h3><i class="fa">Why should I use Go?</i></h3>
+        <h3>Why should I use Go?</h3>
         <legend></legend>
         <p>Go features:</p>
         <ul class="fa-ul">
@@ -78,7 +78,7 @@ SRCT Go &bull; Welcome
 
     <!-- how do I access Go? -->
     <div class="col-md-4">
-        <h3><i class="fa">How do I access Go?</i></h3>
+        <h3>How do I access Go?</h3>
         <legend></legend>
         <p>
             In order to prevent abuse of the URL shortener, access to Go

go/go/templates/registered.html

@@ -13,13 +13,13 @@ SRCT Go • Registration Email Sent
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-envelope-o fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Registration Email Sent</i>
-      </strong></h1>
+        Registration Email Sent
+      </h1>
     </div>
   </div>
 </div>

go/go/templates/view.html

@@ -13,13 +13,13 @@ SRCT Go • Link View
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-link fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Link View</i>
-      </strong></h1>
+        Link View
+      </h1>
     </div>
   </div>
 </div>

go/static/css/styles.css

 html {
   position: relative;
   min-height: 100%;
+  font-family: -apple-system, BlinkMacSystemFont, 
+      "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", 
+      "Fira Sans", "Droid Sans", "Helvetica Neue", 
+      sans-serif;
 }
 body {
   /* Margin bottom by footer height */