WeAllCode · karbassi · Jan 12, 2017 · Jan 12, 2017
diff --git a/coderdojochi/context_processors.py b/coderdojochi/context_processors.py
@@ -5,8 +5,8 @@
 
 def main_config_processor(request):
     return {
-        'SITE_URL': settings.SITE_URL,
         'DEBUG': settings.DEBUG,
+        'SITE_URL': settings.SITE_URL,
         'STATIC_URL': settings.STATIC_URL,
         'CONTACT_EMAIL': settings.CONTACT_EMAIL,
     }
diff --git a/coderdojochi/emailtemplates/_email-base.html b/coderdojochi/emailtemplates/_email-base.html
@@ -1,3 +1,4 @@
+{% load static %}
 <!DOCTYPE html>
 <html>
 <head>
@@ -47,8 +48,8 @@
                 <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 500px;" class="wrapper">
                     <tr>
                         <td align="center" valign="top" style="padding: 15px 0;" class="logo">
-                            {% block header_image %}<a href="{{ site_url }}" target="_blank">
-                            <img alt="CoderDojoChi logo" src="{{ static_url }}/images/coderdojochi_email.png" width="300" height="150" style="display: block; font-family: Helvetica, Arial, sans-serif; color: #ffffff; font-size: 16px;" border="0">
+                            {% block header_image %}<a href="{{ SITE_URL }}" target="_blank">
+                            <img alt="CoderDojoChi logo" src="{% static "images/coderdojochi_email.png" %}" width="300" height="150" style="display: block; font-family: Helvetica, Arial, sans-serif; color: #ffffff; font-size: 16px;" border="0">
                         </a>{% endblock %}
                     </td>
                 </tr>

diff --git a/coderdojochi/emailtemplates/avatar-rejected-mentor.html b/coderdojochi/emailtemplates/avatar-rejected-mentor.html
@@ -9,7 +9,7 @@
                     <td style="padding: 0; font-size: 16px; line-height: 25px; font-family: Helvetica, Arial, sans-serif; color: #666666;" class="padding">
                         <p>Unfortunately your recent avatar image was rejected.</p>
 
-                        <p>Please <a href="{{ site_url }}/dojo/">upload a new image</a> as soon as you get a chance.</p>
+                        <p>Please <a href="{{ SITE_URL }}/dojo/">upload a new image</a> as soon as you get a chance.</p>
                     </td>
                 </tr>
             </table>
@@ -22,7 +22,7 @@
                     <td align="center" style="padding-top: 25px;" class="padding">
                         <table border="0" cellspacing="0" cellpadding="0" class="mobile-button-container">
                             <tr>
-                                <td align="center" style="border-radius: 3px;" bgcolor="#86C447"><a href="{{ site_url }}/dojo/" target="_blank" style="font-size: 16px; font-family: Helvetica, Arial, sans-serif; font-weight: 700; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; border-radius: 3px; padding: 15px 25px; border: 1px solid #86C447; display: inline-block;" class="mobile-button">UPLOAD NEW PHOTO &rarr;</a></td>
+                                <td align="center" style="border-radius: 3px;" bgcolor="#86C447"><a href="{{ SITE_URL }}/dojo/" target="_blank" style="font-size: 16px; font-family: Helvetica, Arial, sans-serif; font-weight: 700; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; border-radius: 3px; padding: 15px 25px; border: 1px solid #86C447; display: inline-block;" class="mobile-button">UPLOAD NEW PHOTO &rarr;</a></td>
                             </tr>
                         </table>
                     </td>

diff --git a/coderdojochi/emailtemplates/class-announcement-guardian.html b/coderdojochi/emailtemplates/class-announcement-guardian.html
@@ -55,7 +55,7 @@
                                             <td align="center" style="padding-top: 25px;" class="padding">
                                                 <table border="0" cellspacing="0" cellpadding="0" class="mobile-button-container">
                                                     <tr>
-                                                        <td align="center" style="border-radius: 3px;" bgcolor="#86C447"><a href="{ class_url }}" target="_blank" style="font-size: 16px; font-family: Helvetica, Arial, sans-serif; font-weight: 700; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; border-radius: 3px; padding: 15px 25px; border: 1px solid #86C447; display: inline-block;" class="mobile-button">ENROLL NOW &rarr;</a></td>
+                                                        <td align="center" style="border-radius: 3px;" bgcolor="#86C447"><a href="{{ class_url }}" target="_blank" style="font-size: 16px; font-family: Helvetica, Arial, sans-serif; font-weight: 700; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; border-radius: 3px; padding: 15px 25px; border: 1px solid #86C447; display: inline-block;" class="mobile-button">ENROLL NOW &rarr;</a></td>
                                                     </tr>
                                                 </table>
                                             </td>

diff --git a/coderdojochi/emailtemplates/class-announcement-mentor.html b/coderdojochi/emailtemplates/class-announcement-mentor.html
@@ -53,7 +53,7 @@
                                             <td align="center" style="padding-top: 25px;" class="padding">
                                                 <table border="0" cellspacing="0" cellpadding="0" class="mobile-button-container">
                                                     <tr>
-                                                        <td align="center" style="border-radius: 3px;" bgcolor="#86C447"><a href="{ class_url }}" target="_blank" style="font-size: 16px; font-family: Helvetica, Arial, sans-serif; font-weight: 700; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; border-radius: 3px; padding: 15px 25px; border: 1px solid #86C447; display: inline-block;" class="mobile-button">MENTOR NOW &rarr;</a></td>
+                                                        <td align="center" style="border-radius: 3px;" bgcolor="#86C447"><a href="{{ class_url }}" target="_blank" style="font-size: 16px; font-family: Helvetica, Arial, sans-serif; font-weight: 700; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; border-radius: 3px; padding: 15px 25px; border: 1px solid #86C447; display: inline-block;" class="mobile-button">MENTOR NOW &rarr;</a></td>
                                                     </tr>
                                                 </table>
                                             </td>

diff --git a/coderdojochi/emailtemplates/meeting-confirm-mentor.html b/coderdojochi/emailtemplates/meeting-confirm-mentor.html
@@ -1,32 +1,5 @@
 {% extends "_email-base.html" %}
 
-{% block content %}
-<p>Thanks for signing up for our next meeting, {{ first_name }}. We look forward to seeing you there.</p>
-
-<p><strong>Details</strong>:</p>
-
-<p>{{ meeting_title }}<br>
-{{ meeting_start_date }} {{ meeting_start_time }}-{{ meeting_end_time }}<br>
-{{ meeting_location_name }}<br>
-{{ meeting_location_address }}, {{ meeting_location_address2 }}<br>
-{{ meeting_location_city }}, {{ meeting_location_state }} {{ meeting_location_zip }}</p>
-{% if meeting_additional_info %}
-
-<p><strong>Note</strong>:</p>
-
-<p>{{ meeting_additional_info }}</p>
-{% endif %}
-
-<p>Know others who might be interested in becoming mentors? <a href="{{ site_url }}" target="_blank">Invite them!</a></p>
-
-<p>If you have any questions, just reply back to this email.</p>
-
-<p>The CoderDojoChi Team</p>
-{% endblock %}
-
-
-{% extends "_email-base.html" %}
-
 {% block content %}
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
     <tr>
@@ -203,7 +176,7 @@
                                 <td align="left" style="padding: 20px 0 0 0; font-size: 16px; line-height: 25px; font-family: Helvetica, Arial, sans-serif; color: #666666;" class="padding-copy">
                                     <p>We hope you&rsquo;re as excited about it as we are. Mark it in your calendar.</p>
 
-                                    <p>Know others who might be interested in becoming mentors? <a href="{{ site_url }}" target="_blank">Invite them!</a></p>
+                                    <p>Know others who might be interested in becoming mentors? <a href="{{ SITE_URL }}" target="_blank">Invite them!</a></p>
 
                                     <p>If you have any questions, just reply back to this email.</p>
 

diff --git a/coderdojochi/emailtemplates/waitlist-offer-guardian.html b/coderdojochi/emailtemplates/waitlist-offer-guardian.html
@@ -6,7 +6,7 @@ <h1>Guardian Waitlist Offer</h1>
     {{ subject }}
     {{ current_year }}
     {{ company_name }}
-    {{ site_url }}
+    {{ SITE_URL }}
     {{ first_name }}
     {{ last_name }}
     {{ student_first_name }}

diff --git a/coderdojochi/emailtemplates/welcome-guardian.html b/coderdojochi/emailtemplates/welcome-guardian.html
@@ -14,7 +14,7 @@
 
                         <p>Thanks for checking out CoderDojoChi. We&rsquo;re thrilled that you&rsquo;re interested.</p>
 
-                        <p>We offer several classes throughout the year, so we&rsquo;ll keep you updated with the latest news and announcements. If you&rsquo;d like to participate in other ways, such as donating time or <a href="{{ site_url }}/donate" target="_blank">making a generous contribution to our nonprofit</a> (wink wink), you&rsquo;re a click away.</p>
+                        <p>We offer several classes throughout the year, so we&rsquo;ll keep you updated with the latest news and announcements. If you&rsquo;d like to participate in other ways, such as donating time or <a href="{{ SITE_URL }}/donate" target="_blank">making a generous contribution to our nonprofit</a> (wink wink), you&rsquo;re a click away.</p>
 
                         <p>Thanks again for your interest in CoderDojoChi. We&rsquo;ll see you soon!</p>
 

diff --git a/coderdojochi/emailtemplates/welcome-mentor.html b/coderdojochi/emailtemplates/welcome-mentor.html
@@ -22,7 +22,7 @@
 
                         <p>We&rsquo;re glad to have you on the team and look forward to seeing you then.</p>
 
-                        <p>Don&rsquo;t want to come alone? That&rsquo;s cool&mdash;bring a friend! Send <a href="{{ site_url }}" target="_blank">CoderDojoChi.org</a> to your friends who might be interested in becoming mentors too. Now you&rsquo;ll have a familiar face to sit next to, and you already helped recruit a new mentor&mdash;wasn&rsquo;t that easy?</p>
+                        <p>Don&rsquo;t want to come alone? That&rsquo;s cool&mdash;bring a friend! Send <a href="{{ SITE_URL }}" target="_blank">CoderDojoChi.org</a> to your friends who might be interested in becoming mentors too. Now you&rsquo;ll have a familiar face to sit next to, and you already helped recruit a new mentor&mdash;wasn&rsquo;t that easy?</p>
 
                         <p>The CoderDojoChi Team</p>
                     </td>

diff --git a/coderdojochi/templates/404.html b/coderdojochi/templates/404.html
@@ -1,3 +1,4 @@
+{% load static %}
 <html>
     <head>
         <meta charset="utf-8">
@@ -23,7 +24,7 @@
 				bottom: 10px;
 				height: 150px;
 				width: 100%;
-				background-image: url({{ STATIC_URL }}images/coderdojochi_600x300_transparent.png);
+				background-image: url("{% static "images/coderdojochi_600x300_transparent.png" %}");
 			    background-repeat: no-repeat;
 			    background-position: left bottom;
 			    background-size: 300px 150px;

diff --git a/coderdojochi/templates/500.html b/coderdojochi/templates/500.html
@@ -4,7 +4,7 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <title>Server error</title>
         <meta name="description" content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1">        
+        <meta name="viewport" content="width=device-width, initial-scale=1">
         <style>
         	body {
 			    background:#87c448;
@@ -23,7 +23,8 @@
 				bottom: 10px;
 				height: 150px;
 				width: 100%;
-				background-image: url(/static/images/coderdojochi_600x300_transparent.png);
+				background-image: url("{% static "images/coderdojochi_600x300_transparent.png" %}");
+
 			    background-repeat: no-repeat;
 			    background-position: left bottom;
 			    background-size: 300px 150px;
@@ -87,7 +88,7 @@
 			blink {
 			  -webkit-animation: blink 1s steps(5, start) infinite;
 			  -moz-animation:    blink 1s steps(5, start) infinite;
-			  -o-animation:      blink 1s steps(5, start) infinite; 
+			  -o-animation:      blink 1s steps(5, start) infinite;
 			  animation:         blink 1s steps(5, start) infinite;
 			  color: #fff;
 			}
@@ -148,4 +149,4 @@
         </script>
 
     </body>
-</html>
+</html>
diff --git a/coderdojochi/templates/_base.html b/coderdojochi/templates/_base.html
@@ -1,4 +1,4 @@
-{% load staticfiles i18n %}<!DOCTYPE html>
+{% load static i18n %}<!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE }}" {% if DEBUG %}class="debug"{% endif %}>
     <head>
         <title>{% block title %}CoderDojoChi - Welcome!{% endblock %}</title>
@@ -7,7 +7,7 @@
             <meta name="viewport" content="width=device-width, initial-scale=1">
             <meta name="description" content="CoderDojoChi is volunteer run nonprofit organization that teaches web, game, and app development to youth ages 7 to 17 free of charge.">
             <meta property="og:description" content="CoderDojoChi is volunteer run nonprofit organization that teaches web, game, and app development to youth ages 7 to 17 free of charge.">
-            <meta property="og:image" content="{{ static_url }}/images/coderdojochi.jpg">
+            <meta property="og:image" content="{% static "images/coderdojochi.jpg" %}">
             <meta property="og:site_name" content="CoderDojoChi">
             <meta property="fb:app_id" content="1454178301519376">
 
@@ -72,41 +72,38 @@
             </footer>
         {% endblock %}
 
-        {% block script_base %}
+        <!-- jQuery CDN -->
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
 
-            <!-- jQuery CDN -->
-            <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+        <!-- jQuery local fallback -->
+        <script>window.jQuery || document.write('<script src="{% static "js/vendor/jquery-1.12.4.min.js" %}"><\/script>')</script>
 
-            <!-- jQuery local fallback -->
-            <script>window.jQuery || document.write('<script src="{% static 'js/vendor/jquery-1.12.4.min.js' %}"><\/script>')</script>
+        <!-- Bootstrap JS CDN -->
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
-            <!-- Bootstrap JS CDN -->
-            <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+        <!-- Bootstrap JS local fallback -->
+        <script>if(typeof($.fn.modal) === 'undefined') {document.write('<script src="{% static "js/vendor/bootstrap-3.3.7.min.js" %}"><\/script>')}</script>
 
-            <!-- Bootstrap JS local fallback -->
-            <script>if(typeof($.fn.modal) === 'undefined') {document.write('<script src="{% static 'js/vendor/bootstrap-3.3.7.min.js' %}"><\/script>')}</script>
+        <!-- Bootstrap CSS local fallback -->
+        <script>
+            $(document).ready(function() {
+                var bodyColor = $('body').css('color');
+                if (bodyColor != 'rgb(51, 51, 51)') {
+                    $("head").prepend('<link rel="stylesheet" href="{% static "css/vendor/bootstrap-3.3.7.min.css" %}">');
+                }
+            });
+        </script>
 
-            <!-- Bootstrap CSS local fallback -->
-            <script>
-                $(document).ready(function() {
-                    var bodyColor = $('body').css('color');
-                    if (bodyColor != 'rgb(51, 51, 51)') {
-                        $("head").prepend('<link rel="stylesheet" href="{% static 'css/vendor/bootstrap-3.3.7.min.css' %}">');
-                    }
-                });
-            </script>
 
+        <script src="{% static "js/vendor/jquery.maskedinput.min.js" %}"></script>
 
-            <script src="{% static "js/vendor/jquery.maskedinput.min.js" %}"></script>
+        {% if DEBUG %}
+            <script src="{% static "js/cdc.js" %}"></script>
+        {% else %}
+            <script src="{% static "js/cdc.min.js" %}"></script>
+        {% endif %}
 
-            {% if DEBUG %}
-                <script src="{% static "js/cdc.js" %}"></script>
-            {% else %}
-                <script src="{% static "js/cdc.min.js" %}"></script>
-            {% endif %}
-
-            {% block extra_script %}{% endblock %}
-        {% endblock %}
+        {% block extra_script %}{% endblock %}
 
         {% block extra_body %}{% endblock %}
 

diff --git a/coderdojochi/templates/_topnav.html b/coderdojochi/templates/_topnav.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
     <div class="container">
         <div class="navbar-header">

diff --git a/coderdojochi/templates/account/email/_allauth-email-base.html b/coderdojochi/templates/account/email/_allauth-email-base.html
@@ -1,6 +1,8 @@
 {% extends "_email-base.html" %}
 
-{% block header_image %}<a href="http://{{ current_site.domain }}"><img alt="" border="0" id="headerImage" src="{{ static_url }}/images/coderdojochi_600x300_transparent.png"></a>{% endblock header_image %}
+{% load static %}
+
+{% block header_image %}<a href="http://{{ current_site.domain }}"><img alt="" border="0" id="headerImage" src="{% static '/images/coderdojochi_600x300_transparent.png' %}"></a>{% endblock header_image %}
 
 {% block subject %}{% block child_subject %}{% endblock %}{% endblock %}
 {% block preheader %}{% block child_preheader %}{% endblock %}{% endblock %}

diff --git a/coderdojochi/templates/dashboard/_admin-base.html b/coderdojochi/templates/dashboard/_admin-base.html
@@ -1,4 +1,4 @@
-{% load staticfiles i18n %}<!DOCTYPE html>
+{% load static i18n %}<!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE }}" {% if DEBUG %}class="debug"{% endif %}>
     <head>
         <title>{% block title %}CoderDojoChi - Welcome!{% endblock %}</title>
@@ -44,20 +44,20 @@
             <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
 
             <!-- jQuery local fallback -->
-            <script>window.jQuery || document.write('<script src="{% static 'js/vendor/jquery-1.12.4.min.js' %}"><\/script>')</script>
+            <script>window.jQuery || document.write('<script src="{% static "js/vendor/jquery-1.12.4.min.js" %}"><\/script>')</script>
 
             <!-- Bootstrap JS CDN -->
             <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 
             <!-- Bootstrap JS local fallback -->
-            <script>if(typeof($.fn.modal) === 'undefined') {document.write('<script src="{% static 'js/vendor/bootstrap-3.3.7.min.js' %}"><\/script>')}</script>
+            <script>if(typeof($.fn.modal) === 'undefined') {document.write('<script src="{% static "js/vendor/bootstrap-3.3.7.min.js" %}"><\/script>')}</script>
 
             <!-- Bootstrap CSS local fallback -->
             <script>
                 $(document).ready(function() {
                     var bodyColor = $('body').css('color');
                     if (bodyColor != 'rgb(51, 51, 51)') {
-                        $("head").prepend('<link rel="stylesheet" href="{% static 'css/vendor/bootstrap-3.3.7.min.css' %}">');
+                        $("head").prepend('<link rel="stylesheet" href="{% static "css/vendor/bootstrap-3.3.7.min.css" %}">');
                     }
                 });
             </script>

diff --git a/coderdojochi/templates/donate.html b/coderdojochi/templates/donate.html
@@ -161,7 +161,9 @@ <h2>{% trans "You can help!" %}</h2>
             $('.alert-danger', $personalInfo).remove();
             $input.closest('.form-group')
                 .addClass('has-error')
-                .before('<div class="alert alert-danger">' + message + '</div>');
+                .before(
+                    '<div class="alert alert-danger">' + message + "<\/div>"
+                );
         };
 
         $donateForm.submit(donateFormSubmit);

diff --git a/coderdojochi/templates/home.html b/coderdojochi/templates/home.html
@@ -1,6 +1,6 @@
 {% extends "_base.html" %}
 
-{% load staticfiles i18n coderdojochi_extras %}
+{% load static i18n coderdojochi_extras %}
 
 {% block body_class %}page-homepage{% endblock %}
 
@@ -54,7 +54,7 @@ <h1><a href="{% url 'donate' %}">Donate</a></h1>
 {% if upcoming_classes %}
 <div class="upcoming-sessions">
     {% for session in upcoming_classes %}
-        <div class="upcoming-session" style="background-image: url({% if session.bg_image %}{{ session.bg_image.url }}{% else %}{{ STATIC_URL }}images/{{ session.image_url }}{% endif %});">
+        <div class="upcoming-session" style="background-image: url({% if session.bg_image %}{{ session.bg_image.url }}{% else %}{% static '' %}images/{{ session.image_url }}{% endif %});">
             <div class="session-shim">
                 <div class="container">
                     <div class="date">