Scott Nixon avatar Scott Nixon committed ab4a555 Draft

Changed styles reference in template to use django Cached media.

Comments (0)

Files changed (3)

article/templates/contact.html

 {% extends "theme_base.html" %}
+{% load staticfiles %}
+{% load crispy_forms_tags %}
 
 {% block extra_head %}
 <script type="text/javascript">
                         {% if success %}
                             <span class="btn btn-success"><i class="icon-ok icon-white"></i> Your message has been sent!</span>
                         {% else %}
-                            <script src="{{ STATIC_URL }}js/angular.min.js"></script>
-                            <script src="{{ STATIC_URL }}js/angular-resource.min.js"></script>
-                            <script src="{{ STATIC_URL }}js/faq.js"></script>
+                            <script src="{% static "js/angular.min.js" %}"></script>
+                            <script src="{% static "js/angular-resource.min.js" %}"></script>
+                            <script src="{% static "js/faq.js" %}"></script>
                         {% endif %}
                         <h2 class="title">Do you have a Question?</h2>
                         <h3 class="subtitle">With any luck, we already have an answer for you.</h3>
                             </div>
                         </div>
 
-                        {% load crispy_forms_tags %}
                         <div ng-show="checked">
                             {% crispy form %}
                         </div>

article/templates/theme_base.html

+{% load generic_flatblocks %}
+{% load staticfiles %}
 {% spaceless %}
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en">
     <meta charset="utf-8" />
     <title>{% block head_title_base %}{% block head_title %}{% endblock %}{% endblock %} | Happy Herbivore</title>
 
-    {% load generic_flatblocks %}
-
     {% block meta_base %}
         
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         {% if debug %}
         <!-- styles -->
         <link href="/media/css/bootstrap.css" rel="stylesheet">
-        <link href="/media/css/style.css" rel="stylesheet">
+        
         <link href="/media/css/bootstrap-responsive.css" rel="stylesheet">
 
 
 	          href="/media/css/print.css" />
         {% else %}
         <link href="//css.happyherbivore.com/bootstrap.css" rel="stylesheet">
-        <link rel="stylesheet" href="{{ main_css }}" />
+        
         <link href="//css.happyherbivore.com/bootstrap-responsive.css" rel="stylesheet">
         <link rel="stylesheet" type="text/css" media="print"
 	          href="{{ print_css }}" />
 
         {% endif %}
+        <link href="{% static "css/style.css" %}" rel="stylesheet">
         {% endspaceless %}
         {% block css %}
         <link href="//css.happyherbivore.com/skins/tango/skin.css" rel="stylesheet">
 
 from article.models import Post, Recipe, Ingredient
 from article.models import RecipeIngredient, RecipePhotos, UserPhotos
-from community.models import UserProfile, Transaction
 from article.forms import ContactForm
 
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.