Scott Nixon avatar Scott Nixon committed 5524165 Draft

Updated templates to use the static template tag.

Comments (0)

Files changed (5)

 
     class Media:
         js = (
-            '//happyherb-photos.s3.amazonaws.com/admin/grappelli/jquery/jquery-1.6.2.min.js',
-            '//photos.happyherbivore.com/admin/redactor/redactor-802v1.js',
+            '//media.happyherbivore.com/grappelli/jquery/jquery-1.7.2.min.js',
+            #'//happyherb-photos.s3.amazonaws.com/admin/grappelli/jquery/jquery-1.6.2.min.js',
+            '//photos.happyherbivore.com/admin/redactor/811/redactor.min.js',
             '//photos.happyherbivore.com/admin/redactor/redactor_init-v2.js',
             )
         css = {
-            "all" : ('//photos.happyherbivore.com/admin/redactor/802/redactor.css',
-                '//photos.happyherbivore.com/admin/redactor/custom_redactor-v0.css')
+            "all" : ('//photos.happyherbivore.com/admin/redactor/811/redactor.css',
+                '//photos.happyherbivore.com/admin/redactor/custom_redactor-v2.css')
             }
 
 class RecipeAdminModelForm(forms.ModelForm):
     class Media:
         js = (
             '//happyherb-photos.s3.amazonaws.com/admin/grappelli/jquery/jquery-1.6.2.min.js',
-            '//photos.happyherbivore.com/admin/redactor/redactor-802v1.js',
+            '//photos.happyherbivore.com/admin/redactor/811/redactor.min.js',
             '//photos.happyherbivore.com/admin/redactor/redactor_init-v2.js',
             )
         css = {
-            "all" : ('//photos.happyherbivore.com/admin/redactor/802/redactor.css',
-                '//photos.happyherbivore.com/admin/redactor/custom_redactor-v0.css')
+            "all" : ('//photos.happyherbivore.com/admin/redactor/811/redactor.css',
+                '//photos.happyherbivore.com/admin/redactor/custom_redactor-v2.css')
             }
 
 class FlatPagesAdminModelForm(FlatpageForm):
     class Media:
         js = (
             '//happyherb-photos.s3.amazonaws.com/admin/grappelli/jquery/jquery-1.6.2.min.js',
-            '//photos.happyherbivore.com/admin/redactor/redactor-802v1.js',
+            '//photos.happyherbivore.com/admin/redactor/811/redactor.min.js',
             '//photos.happyherbivore.com/admin/redactor/redactor_init-v2.js',
             )
         css = {
-            "all" : ('//photos.happyherbivore.com/admin/redactor/802/redactor.css',
-                '//photos.happyherbivore.com/admin/redactor/custom_redactor-v0.css')
+            "all" : ('//photos.happyherbivore.com/admin/redactor/811/redactor.css',
+                '//photos.happyherbivore.com/admin/redactor/custom_redactor-v2.css')
             }
 
 class RecipePhotosAdminForm(forms.ModelForm):
 
 
 class ContactForm(forms.Form):
-    #question = forms.CharField(widget=forms.TextInput())
     message = forms.CharField(widget=forms.Textarea(attrs={'class':'span5', 'placeholder':"Type your message here..."}))
     name = forms.CharField()
     email = forms.EmailField()
         
         self.helper.layout = Layout(
             HTML('<hr>'),
-            HTML("<div class='contactlindsay'><p>Hiya Herbie!</p><p>Nothing lifts my spirits like your personal stories and I love answering your questions! I do, however, respond to over 3,400 emails every month. Can you do me a favor and search below before emailing me? Chances are I've already addressed your question on this site. Thank you!</p><p>- Lindsay (HH)</p></div>"),
+            HTML("<div class='contactlindsay'><p>Hiya Herbie!</p><p>Nothing lifts my spirits like your personal stories and I love answering your questions! I do, however, respond to over 3,400 emails every month. Can you do me a favor and search the FAQ or the site search before emailing me? Chances are I've already addressed your question on this site. Thank you!</p><p>- Lindsay (HH)</p></div>"),
             HTML('<hr>'),
             'message',
             PrependedText('name', '<i class="icon-user"></i>'),

article/templates/500.html

       <div class="span15">
 
         <div class='error-page'>
-		  <h3>Sorry there has been an error on the Server. Our system has automatically notified of this issue and will work to resolve it.</h3> <p>If you'd like to submit feedback do so from our <a href="/about/contact/">Contact</a> form.</p>
+		  <h3>Sorry there has been an error on the Server. Our system has automatically notified of this issue and will work to resolve it.</h3> 
+        <p>
+            If you'd like to submit feedback do so from our <a href="/about/contact/">Contact</a> form.
+            {{ siteroot }}
+        </p>
 	
 		      <p>Or Checkout these Blog Posts instead</p>
 		      {% load random %}

article/templates/contact.html

                 <div class="row">
                     <div class="span7">
                         {% if success %}
-                            <span class="btn btn-success"><i class="icon-ok icon-white"></i> Your message has been sent!</span>
-                        {% else %}
-                            <script src="{% static "js/angular.min.js" %}"></script>
-                            <script src="{% static "js/angular-resource.min.js" %}"></script>
-                            <script src="{% static "js/faq.js" %}"></script>
+                            <div>
+                                <span class="btn btn-success"><i class="icon-ok icon-white"></i> Your message has been sent!</span>
+                            </div>
                         {% endif %}
+                        <script src="{% static "js/angular.min.js" %}"></script>
+                        <script src="{% static "js/angular-resource.min.js" %}"></script>
+                        <script src="{% static "js/faq.js" %}"></script>
                         <h2 class="title">Do you have a Question?</h2>
                         <h3 class="subtitle">With any luck, we already have an answer for you.</h3>
                         <div class="faq-search">
                                 </div>
                             </div><!-- /search-wrapper -->
                         </div><!-- / faq search -->
+                    </div> <!-- span7 -->
+                </div> <!-- row -->
 
+                <div class="row">
+                    <div class="span7">
                         <div ng-hide="checked">
                             <h3 class="subtitle">Do you still need to email Lindsay?</h2>
                             <div class="askcontact">
                         </div>
 
                     </div> <!-- span7 -->
+                    <div class="span5">
+                        <p><i class="icon-book"></i> Your official 7-Day Meal Plans support hours are from:</p>
+                        <ul>
+                            <li>Monday-Friday 9AM-9PM Eastern Time</li>
+                            <li>Saturday 10AM-2PM Eastern Time</li>
+                            <li>Sun Closed</li>
+                        </ul>
+                        <p>You can typically expect a response in less than 8 hours, but please allow for 24-48 hours for a response.</p>
+                    </div>
                 </div> <!-- row -->
+
             </div> <!-- / wrapper-box -->
         </div> <!-- container -->
     </div><!-- / outer-wrapper -->

article/templates/new_here.html

     {% load generic_flatblocks %}
 <div id="content">
 
-  <!-- breadcrumb -->
-  <div class="container">
-    <div class="row">
-      <div class="span15">
-        <ul class="breadc clearfix">
-          <li><a href="/">Home</a></li>
-          <li><a href="{% url new_here %}">Get Started</a></li>
-        </ul>
-        <h1 class="page-title">Get Started</h1>
-      </div>
+    <!-- breadcrumb -->
+    <div class="container">
+        <div class="row">
+            <div class="span15">
+                <ul class="breadc clearfix">
+                    <li><a href="/">Home</a></li>
+                    <li><a href="{% url new_here %}">Get Started</a></li>
+                </ul>
+                <h1 class="page-title">Get Started</h1>
+            </div>
+        </div>
     </div>
-  </div>
 
 
-  <div id="outer-wrapper">
-    <div class="container">
-      <!-- Content -->
-      <div class="row">
-        <div class="wrapper-box new-here">
-          <div class="span7">
-          <h3>About Lindsay</h3>
-          <p>Hi! I'm Lindsay and Happy Herbivore is my recipe website, home to more than 140 fat-free and low fat healthy vegan recipes! I cook with no added fats and mostly whole, unprocessed food. You won't find processed flour, refined sugars and oil or margarine in my recipes. What you will find, however, is food that is good for you and tastes great!</p>
-          <img src="http://photos.happyherbivore.com/img/lindsay.jpg" alt="Lindsay S. Nixon in the kitchen." title="Lindsay Nixon" class="lindsay">
-          <p>I'm the author of <a href="/cookbook/happy-herbivore-cookbook/">The Happy Herbivore Cookbook</a>, <a href="/cookbook/everyday-happy-herbivore/">Everyday Happy Herbivore</a>, and <a href="http://www.amazon.com/Happy-Herbivore-Abroad-Travelogue-Fat-Free/dp/1937856046/?tag=happyherbi-20">Happy Herbivore Abroad</a> available December 4, 2012. I write doable recipes that are quick and easy, you could cook from scratch three meals and day with whatever ingredients you have on hand. I take care to write most of my  recipes so they can come together in twenty minutes, my recipes are no-fuss so you can save time and still improve your health while eating a delicious meal.</p>
-          <h3>Why Plant Based?</h3>
-          <p>Eating a plant-based diet is the nation’s fastest-growing food trend, and for good reason. The more plant-based meals we eat, the more benefits we will feel and bestow. Whenever someone asks me why I’m a vegan, I reply, “For my health, my pocketbook, the animals, the environment…and for you.” Here’s my post on what <a href="http://happyherbivore.com/2011/09/what-is-vegan/">veganism means to me.</a></p>
+    <div id="outer-wrapper">
+        <div class="container">
+          <!-- Content -->
+          <div class="row">
+            <div class="wrapper-box new-here">
+              <div class="span7">
+                  <h3>About Lindsay</h3>
+                  <p>Hi! I'm Lindsay and Happy Herbivore is my recipe website, home to more than 140 fat-free and low fat healthy vegan recipes! I cook with no added fats and mostly whole, unprocessed food. You won't find processed flour, refined sugars and oil or margarine in my recipes. What you will find, however, is food that is good for you and tastes great!</p>
+                  <img src="http://photos.happyherbivore.com/img/lindsay.jpg" alt="Lindsay S. Nixon in the kitchen." title="Lindsay Nixon" class="lindsay">
+                  <p>I'm the author of <a href="/cookbook/happy-herbivore-cookbook/">The Happy Herbivore Cookbook</a>, <a href="/cookbook/everyday-happy-herbivore/">Everyday Happy Herbivore</a>, and <a href="http://www.amazon.com/Happy-Herbivore-Abroad-Travelogue-Fat-Free/dp/1937856046/?tag=happyherbi-20">Happy Herbivore Abroad</a> available December 4, 2012. I write doable recipes that are quick and easy, you could cook from scratch three meals and day with whatever ingredients you have on hand. I take care to write most of my  recipes so they can come together in twenty minutes, my recipes are no-fuss so you can save time and still improve your health while eating a delicious meal.</p>
+                  <h3>Why Plant Based?</h3>
+                  <p>Eating a plant-based diet is the nation’s fastest-growing food trend, and for good reason. The more plant-based meals we eat, the more benefits we will feel and bestow. Whenever someone asks me why I’m a vegan, I reply, “For my health, my pocketbook, the animals, the environment…and for you.” Here’s my post on what <a href="http://happyherbivore.com/2011/09/what-is-vegan/">veganism means to me.</a></p>
  
-          <p>Health: A plant-based diet has zero dietary cholesterol, and a low-fat vegan diet also tends to be low in calories but high in fiber. Read about my path to a <a href="http://happyherbivore.com/2011/11/what-plant-based-diet/">plant-based diet.</a></p>
+                  <p>Health: A plant-based diet has zero dietary cholesterol, and a low-fat vegan diet also tends to be low in calories but high in fiber. Read about my path to a <a href="http://happyherbivore.com/2011/11/what-plant-based-diet/">plant-based diet.</a></p>
  
-          <p>Wallets: A plant-based diet can be a bargain. Many vegan staples (like beans and rice) cost a fraction of the price of meat and dairy products. Eating healthfully will save you on health-care costs in the long run. I wrote a post about how to <a href="http://happyherbivore.com/2011/11/eating-healthy-budget/">eat plant-based on a budget.</a></p>
+                  <p>Wallets: A plant-based diet can be a bargain. Many vegan staples (like beans and rice) cost a fraction of the price of meat and dairy products. Eating healthfully will save you on health-care costs in the long run. I wrote a post about how to <a href="http://happyherbivore.com/2011/11/eating-healthy-budget/">eat plant-based on a budget.</a></p>
 
  
           <h3>Why Fat-Free and Low-Fat?</h3>
           <div class="two-columns">
           <h4>Everyday Cooking Tips</h4>
           <ul>
-            <li><a href="http://www.happyherbivore.com/2011/08/what-is-quinoa/">How to Cook with Quinoa</a></li>
-            <li><a href="http://happyherbivore.com/2011/08/low-sodium/">How to Reduce Salt</a></li>
-            <li><a href="http://happyherbivore.com/2011/08/what-is-tofu/">What Is Tofu</a></li>
-            <li><a href="http://happyherbivore.com/2011/08/tofu-scramble/">Tofu Scramble Workshop</a></li>
-            <li><a href="http://happyherbivore.com/2011/08/make-ahead/">Make Ahead (Cook One Day A Week)</a></li>
-            <li><a href="http://happyherbivore.com/2010/10/kitchen-essentials/">Kitchen Essentials</a></li>
-            <li><a href="http://happyherbivore.com/2010/09/top-10-spices">Top 10 Spices I Use</a></li>
+              <li><a href="http://www.happyherbivore.com/2011/08/what-is-quinoa/">How to Cook with Quinoa</a></li>
+              <li><a href="http://happyherbivore.com/2011/08/low-sodium/">How to Reduce Salt</a></li>
+              <li><a href="http://happyherbivore.com/2011/08/what-is-tofu/">What Is Tofu</a></li>
+              <li><a href="http://happyherbivore.com/2011/08/tofu-scramble/">Tofu Scramble Workshop</a></li>
+              <li><a href="http://happyherbivore.com/2011/08/make-ahead/">Make Ahead (Cook One Day A Week)</a></li>
+              <li><a href="http://happyherbivore.com/2010/10/kitchen-essentials/">Kitchen Essentials</a></li>
+              <li><a href="http://happyherbivore.com/2010/09/top-10-spices">Top 10 Spices I Use</a></li>
           </ul>
 
           <h4>Cheat Sheets</h4>
             <a rel="nofollow" href="http://www.amazon.com/Super-Size-Me-John-Banzhaf/dp/B0002OXVBO/?tag=happyherbi-20">Supersize Me</a>.</p>
 
           <h4>Books</h4>
-          <p><a rel="nofollow" href="http://www.amazon.com/Eating-Animals-Jonathan-Safran-Foer/dp/0316069884/?tag=happyherbi-20">Eating Animals</a>, 
+          <p>
+            <a rel="nofollow" href="http://www.amazon.com/The-Starch-Solution-Regain-Health/dp/1609613937/?tag=happyherbi-20">The Starch Solution</a>, 
+            <a rel="nofollow" href="http://www.amazon.com/Whole-Rethinking-Nutrition-Colin-Campbell/dp/1937856240/?tag=happyherbi-20">Whole: Rethinking the Science of Nutrition</a>, 
+            <a rel="nofollow" href="http://www.amazon.com/Eating-Animals-Jonathan-Safran-Foer/dp/0316069884/?tag=happyherbi-20">Eating Animals</a>, 
             <a rel="nofollow" href="http://www.amazon.com/Mindless-Eating-More-Than-Think/dp/0345526880/?tag=happyherbi-20">Mindless Eating</a>, <a rel="nofollow" href="http://www.amazon.com/Volumetrics-Weight-Control-Plan-Fewer-Calories/dp/B000GG4ZKY/?tag=happyherbi-20">Volumetrics</a>, <a rel="nofollow" href="http://www.amazon.com/Skinny-Bitch-Rory-Freedman/dp/0762424931/?tag=happyherbi-20">Skinny Bitch</a>, 
             <a rel="nofollow" href="http://www.amazon.com/Diet-New-America-John-Robbins/dp/0915811812/?tag=happyherbi-20">Diet for a New America</a>, the 
             <a rel="nofollow" href="http://www.amazon.com/Omnivores-Dilemma-Natural-History-Meals/dp/0143038583/?tag=happyherbi-20">Omnivore's Dilemma</a>, <a rel="nofollow" href="http://www.amazon.com/Defense-Food-Eaters-Manifesto/dp/0143114964/?tag=happyherbi-20">In Defense of Food</a>, the 

article/templates/theme_base.html

 
     {% block css_base %}
         {% spaceless %}
-        {% if debug %}
-        <!-- styles -->
-        <link href="/media/css/bootstrap.css" rel="stylesheet">
-        
-        <link href="/media/css/bootstrap-responsive.css" rel="stylesheet">
-
-
+        <link href="{% static 'css/bootstrap.css' %}" rel="stylesheet">
+        <link href="{% static 'css/bootstrap-responsive.css' %}" rel="stylesheet">
         <link rel="stylesheet" type="text/css" media="print"
-	          href="/media/css/print.css" />
-        {% else %}
-        <link href="//css.happyherbivore.com/bootstrap.css" rel="stylesheet">
-        
-        <link href="//css.happyherbivore.com/bootstrap-responsive.css" rel="stylesheet">
-        <link rel="stylesheet" type="text/css" media="print"
-	          href="{{ print_css }}" />
-
-        {% endif %}
+	          href="{% static "css/print.css" %}" />
         <link href="{% static "css/style.css" %}" rel="stylesheet">
         {% endspaceless %}
         {% block css %}
-        <link href="//css.happyherbivore.com/skins/tango/skin.css" rel="stylesheet">
+        <link href="{% static 'css/skins/tango/skin.css' %}" rel="stylesheet">
         {% endblock %}
     {% endblock %}
      
     <link rel="apple-touch-icon-precomposed" href="ico/apple-touch-icon-57-precomposed.png">
        -->
     {% block js_base %}
-        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script> 
+        <script src="{% static 'jquery/jquery-1.7.1.min.js' %}" type="text/javascript"></script> 
         <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
         <!--[if lt IE 9]>
             <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
-        {% if debug %}
-            <script src="/media/js/hh.js" type="text/javascript"></script> 
-	        <!-- <script src="{{ main_js }}"></script> -->
-        {% else %}
-	        <script src="{{ main_js }}"></script>
-	    {% endif %}
+        <script src="{% static 'js/hh.js' %}" type="text/javascript"></script> 
 
         {% block js %}
         {% endblock %}
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.