Commits

Scott Nixon  committed a98a2e7

Fixed issue with FB meta links without http protocol. Disabled wymeditor on posts. Updated link on new_here template.

  • Participants
  • Parent commits a9a3244

Comments (0)

Files changed (10)

File article/forms.py

 from widgets import WYMEditor
 
 class PostAdminModelForm(forms.ModelForm):
-    post_content = forms.CharField(widget=WYMEditor())
+    #post_content = forms.CharField(widget=WYMEditor())
 
     class Meta:
         model = get_model('article', 'post')

File article/templates/category_list.html

 
     <meta property="og:title" content="Blog Category: {{ tag_obj }} | Happy Herbivore"/>
     <meta property="og:type" content="website"/>
-    <meta property="og:image" content="//photos.happyherbivore.com/logos/Big-Baby-Elephant.png"/>
+    <meta property="og:image" content="http://photos.happyherbivore.com/logos/Big-Baby-Elephant.png"/>
     <meta property="og:description"
           content="Lindsay S. Nixon's cookbooks will save you money by using 'everyday' inexpensive ingredients, save you time with easy, no fuss recipes and improve your health with each nutritional bite. "/>
     <link rel="alternate" type="application/rss+xml" title="Public Feeds" href="http://feeds.feedburner.com/HappyHerbivore-Blog">

File article/templates/cookbooks.html

 	<meta name="description" content="Lindsay S. Nixon's cookbooks will save you money by using 'everyday' inexpensive ingredients, save you time with easy, no fuss recipes and improve your health with each nutritional bite. Over 70,000 cookbooks." />
 
     <meta property="og:type" content="website"/>
-    <meta property="og:image" content="//photos.happyherbivore.com/logos/Big-Baby-Elephant.png"/>
+    <meta property="og:image" content="http://photos.happyherbivore.com/logos/Big-Baby-Elephant.png"/>
     <meta property="og:title" content="Happy Herbivore Cookbooks by Lindsay S. Nixon"/>
 
     <meta property="og:description"

File article/templates/ehh.html

 
     <meta property="og:type" content="book"/>
     <meta property="og:title" content="{{ flatpage.title }} Cookbook"/>
-    <meta property="og:image" content="//photos.happyherbivore.com/cookbooks/EverydayHappyHerbivore_FrontCover_300.jpg"/>
+    <meta property="og:image" content="http://photos.happyherbivore.com/cookbooks/EverydayHappyHerbivore_FrontCover_300.jpg"/>
     <meta property="og:book:author" content="Lindsay S. Nixon" />
     <meta property="og:book:isbn" content="1936661381" />
     <meta property="og:book:release_date" content="2011-12-06" />
     <ul>
       <li><a href="http://www.amazon.com/Everyday-Happy-Herbivore-Quick-Easy/dp/1936661381/?tag=hh-ehh-20" class="amazon" rel="nofollow">Buy Everyday Happy Herbivore on Amazon</a></li>
       <li><a href="http://www.barnesandnoble.com/w/everyday-happy-herbivore-lindsay-s-nixon/1102047621" class="barnes" rel="nofollow">Buy Everyday Happy Herbivore on Barnes & Noble</a></li>
-      <li><a href="http://www.amazon.com/Everyday-Happy-Herbivore-Quick-Easy/dp/1936661381/?tag=hh-ehh-20" class="kindle" rel="nofollow">Buy Everyday Happy Herbivore on the Kindle</a></li>
+      <li><a href="http://www.amazon.com/Everyday-Happy-Herbivore-Quick-ebook/dp/B006L8KGKY/?tag=hh-ehh-20" class="kindle" rel="nofollow">Buy Everyday Happy Herbivore on the Kindle</a></li>
       <li><a href="http://www.indiebound.org/book/9781936661381" class="indie" rel="nofollow">Buy Everyday Happy Herbivore at Indie Bound</a></li>
     </ul>
   </div>

File article/templates/hhcb.html

     <meta name="description" content="The Happy Herbivore Cookbook: The World's Most Approachable Cookbook. Easy to make healthy food at home in minutes using inexpensive, 'everyday' ingredients and tools." />
     <meta property="og:type" content="book"/>
     <meta property="og:title" content="{{ flatpage.title }} Cookbook"/>
-    <meta property="og:image" content="//photos.happyherbivore.com/cookbooks/HappyHerbivoreCookbook_FrontCover_300.jpg"/>
+    <meta property="og:image" content="http://photos.happyherbivore.com/cookbooks/HappyHerbivoreCookbook_FrontCover_300.jpg"/>
     <meta property="og:book:author" content="Lindsay S. Nixon" />
     <meta property="og:book:isbn" content="1935618121" />
     <meta property="og:book:release_date" content="2011-02-01" />

File article/templates/new_here.html

 
     <meta property="og:title" content="LEAF: Low Fat, Everyday, Affordable & Fast Recipes | Happy Herbivore"/>
     <meta property="og:type" content="website"/>
-    <meta property="og:image" content="//photos.happyherbivore.com/logos/Big-Baby-Elephant.png"/>
+    <meta property="og:image" content="http://photos.happyherbivore.com/img/lindsay.jpg"/>
     <meta property="og:description"
           content="Lindsay S. Nixon's cookbooks will save you money by using 'everyday' inexpensive ingredients, save you time with easy, no fuss recipes and improve your health with each nutritional bite. Over 70,000 cookbooks."/>
 {% endblock %}
           <h3>Getting Started</h3>
           <p>Most of the ingredients found for low-fat vegan cooking can be found in any supermarket, but a select few might require a trip to the health food store, of if you prefer, placing an order online.</p>
  
-          <p>I’ve compiled a grocery list to help you get started. (LINK)</p>
+          <p>I’ve compiled a basic shopping list to help <a href="http://happyherbivore.com/2011/08/pantry-list-pantry-food-shopping-list/">you get started.</a></p>
  
           <p>I’ve also created a <a href="/2011/08/how-become-a-vegetarian/">How to Become Vegetarian/Vegan</a> post that gives you tips and instructions on where to begin. I’ve also created three different plans on how to become a vegetarian.</p>
           <h3>Resources</h3>

File article/templates/post_detail.html

     {% if post.post_image %}
     <meta property="og:image" content="{{ post.post_image }}"/>
     {% else %}
-    <meta property="og:image" content="//photos.happyherbivore.com/logos/Big-Baby-Elephant.png"/>
+    <meta property="og:image" content="http://photos.happyherbivore.com/logos/Big-Baby-Elephant.png"/>
     {% endif %}
 
     <meta property="og:description" content="{{ post.post_content|striptags|truncatewords:100 }}"/>
                 {% gblock 6 for "gblocks.TitleAndText" into "FeedBurner" %}
                 {{ FeedBurner.text|safe }}
 
-                <div class="categories-box">
-                  <h4>All Categories</h4>
-                  <ul>
-                    {% load tagging_tags %}
-                    {% tags_for_model article.Post as tag_list %}
-                    {% for t in tag_list %}
-                        <li><a class="label-orange" href="{% url category t.name %}#">{{t.name}}</a></li>
-                    {% endfor %}
-                  </ul>
-                </div><!-- / categories-box -->
 
                 <hr class="separator" />
 

File article/templates/post_list.html

 
     <meta property="og:title" content="Blog Index | Happy Herbivore"/>
     <meta property="og:type" content="website"/>
-    <meta property="og:image" content="//photos.happyherbivore.com/logos/Big-Baby-Elephant.png"/>
+    <meta property="og:image" content="http://photos.happyherbivore.com/logos/Big-Baby-Elephant.png"/>
     <meta property="og:description"
           content="Lindsay S. Nixon's recipes and cookbooks will save you money by using 'everyday' inexpensive ingredients, save you time with easy, no fuss recipes and improve your health with each nutritional bite."/>
     <link rel="alternate" type="application/rss+xml" title="Public Feeds" href="http://feeds.feedburner.com/HappyHerbivore-Blog">
                 {% gblock 6 for "gblocks.TitleAndText" into "FeedBurner" %}
                 {{ FeedBurner.text|safe }}                
 
-                <div class="categories-box">
-                  <h4>Topics</h4>
-                  <ul>
-                    {% load tagging_tags %}
-                    {% tags_for_model article.Post as tag_list %}
-                    {% for t in tag_list %}
-                        <li><a {% if tag_obj == t.name %}class="label-green"{% else %}class="label-orange"{% endif %} href="{% url category t.name %}">{{t.name}}</a></li>
-                    {% endfor %}
-                    <!-- <li><a href="#" class="label-green">Herbie Lifestyle</a></li>-->
-                  </ul>
-                </div><!-- / categories-box -->
 
                 <hr class="separator" />
 

File article/templates/recipe_list.html

 
     <meta property="og:title" content="Recipe Index | Happy Herbivore"/>
     <meta property="og:type" content="website"/>
-    <meta property="og:image" content="//photos.happyherbivore.com/logos/Big-Baby-Elephant.png"/>
+    <meta property="og:image" content="http://photos.happyherbivore.com/2012/04/FruitWithVeggies.jpg"/>
     <meta property="og:description"
           content="Lindsay S. Nixon's recipes and cookbooks will save you money by using 'everyday' inexpensive ingredients, save you time with easy, no fuss recipes and improve your health with each nutritional bite."/>
 {% endblock %}

File article/templates/testimonials.html

 
     <meta property="og:title" content="Testimonials | Happy Herbivore"/>
     <meta property="og:type" content="website"/>
-    <meta property="og:image" content="//photos.happyherbivore.com/logos/Big-Baby-Elephant.png"/>
+    <meta property="og:image" content="http://photos.happyherbivore.com/logos/Big-Baby-Elephant.png"/>
     <meta property="og:description"
           content="Lindsay S. Nixon's recipes and cookbooks will save you money by using 'everyday' inexpensive ingredients, save you time with easy, no fuss recipes and improve your health with each nutritional bite."/>