Merge branch 'favicons' into 'master'

Favicon works, and static files are referenced properly See merge request !4

Merge branch 'favicons' into 'master'
Favicon works, and static files are referenced properly See merge request !4
1f7ef634 · Renfred Harper · e90a1494 · fb747167 · 1f7ef634 · 1f7ef634
Commit 1f7ef634 authored Oct 17, 2014 by Renfred Harper
--- a/whats_open/templates/layouts/about.html
+++ b/whats_open/templates/layouts/about.html
 {% block about %}
 <div class="row about-content">
    <div class="col-md-10 col-md-offset-1">    
-        <a id="about-close"><img src="{{ STATIC_URL }}img/close.png"></a> 
+        <a id="about-close"><img src="{% static "img/close.png" %}"></a> 
        <h3>What is this?</h3>
        <p><b>What's Open</b> is a dynamic web application that lets you easily find out which on-campus locations are currently available. It's a simple alternative to searching for campus hours and filtering though them to figure out which ones are open.</p> 
        <h3>How does it work?</h3>

--- a/whats_open/templates/layouts/base.html
+++ b/whats_open/templates/layouts/base.html
+{% load staticfiles %}
 <!DOCTYPE html>
 <html>
    {% block head %}
@@ -16,7 +17,7 @@
            <div id="info-body">
 	            <div class="container" id="info-container">
 		            <div class="row" id="info-row">
-    		            <a id="info-close"><img src="{{ STATIC_URL }}img/close.png"></a>
+    		            <a id="info-close"><img src="{% static "img/close.png" %}"></a>
 			            <div class="col-md-12" id="info-name"></div>
 			            <div class="col-md-3" id="info-status"></div>
 			            <div class="col-md-3" id="info-next"></div>

--- a/whats_open/templates/layouts/footer.html
+++ b/whats_open/templates/layouts/footer.html
 {% block footer %}
 <div id="footer">
    <div class="footer-row">
-      <a class="gmu-brand" href="http://www.gmu.edu"><img src="{{ STATIC_URL }}img/gmurgb.png" class="gmu-logo"></a>
+      <a class="gmu-brand" href="http://www.gmu.edu">
+      <img src="{% static "img/gmurgb.png" %}" class="gmu-logo"></a>
      <div class="col-md-8 col-md-offset-2">
        <p class="footer-text">A project of <a href="http://srct.gmu.edu">GMU SRCT</a>. <a href="http://opensource.org/licenses/apache-2.0">Some rights reserved</a>.<span id="footer-line">&nbsp;&nbsp;|&nbsp;&nbsp;</span><br class="visible-xs visible-sm"/> George Mason University <a href="http://dining.gmu.edu/">Dining Services</a>&nbsp;&nbsp;&nbsp; &nbsp;</p>
      </div>

--- a/whats_open/templates/layouts/head.html
+++ b/whats_open/templates/layouts/head.html
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 <meta name="description=" content="What's Open is a dynamic web application that lets you easily find out which on-campus locations are currently available. It's a simple alternative to searching for Mason's campus hours and filtering though them to figure out which ones are open.">
-<link rel="icon" href="/favicon.ico">
-<link href="{{ STATIC_URL }}css/bootstrap.min.css" rel="stylesheet">
-<link href="{{ STATIC_URL }}css/style.css" rel="stylesheet">
+<link rel="icon" href="{% static "img/favicon.ico" %}">
+<link href="{% static "css/bootstrap.min.css" %}" rel="stylesheet">
+<link href="{% static "css/style.css" %}" rel="stylesheet">
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/datejs/1.0/date.min.js"></script>
-<script src="{{ STATIC_URL }}js/bootstrap.min.js"></script>
-<script src="{{ STATIC_URL }}js/grid.js"></script>
-<script src="{{ STATIC_URL }}js/typeAhead.js"></script>
-<script src="{{ STATIC_URL }}js/info.js"></script>
-<script src="{{ STATIC_URL }}js/about.js"></script>
+<script src="{% static "js/bootstrap.min.js" %}"></script>
+<script src="{% static "js/grid.js" %}"></script>
+<script src="{% static "js/typeAhead.js" %}"></script>
+<script src="{% static "js/info.js" %}"></script>
+<script src="{% static "js/about.js" %}"></script>
 {% block title %}
 <title>
 What's Open - George Mason University

--- a/whats_open/templates/layouts/navbar.html
+++ b/whats_open/templates/layouts/navbar.html
@@ -18,7 +18,8 @@
        <ul class="nav navbar-nav navbar-right">
            <li>
                <a id="about-link">
-                    <span id="about-link-text">About</span><img id="about-close-nav" src="{{ STATIC_URL }}img/close.png">
+                    <span id="about-link-text">About</span>
+                    <img id="about-close-nav" src="{% static "img/close.png" %}">
                </a>
            </li>
            <li class="dropdown" style="display:none;">