Home Explore Help
Sign In
caleb
/
pelican-elegant
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Update code to read include files from _includes folder

Close #60
Talha Mansoor 11 years ago
parent
0fbfefc0bf
commit
7acc69b318
5 changed files with 17 additions and 17 deletions
Unified View Show Diff Stats
  1. 5 5
      templates/article.html
  2. 6 6
      templates/base.html
  3. 1 1
      templates/categories.html
  4. 4 4
      templates/page.html
  5. 1 1
      templates/tags.html

+ 5 - 5
templates/article.html
View File 

@@ -38,7 +38,7 @@
 
             {% endif %}
 
             {% endif %}
 
 
 
             {{ article.content }}
 
             {{ article.content }}
 
-            {% from 'comments.html' import comments with context %}
 
+            {% from '_includes/comments.html' import comments with context %}
 
             {{ comments(article) }}
 
             {{ comments(article) }}
 
             <hr/>
 
             <hr/>
 
             {% if article.prev_article or article.next_article %}
 
             {% if article.prev_article or article.next_article %}
 
@@ -75,7 +75,7 @@
 
             {% set day = article.date.strftime('%d')|int %}
 
             {% set day = article.date.strftime('%d')|int %}
 
             <time pubdate="pubdate" datetime="{{ article.date.isoformat() }}">{{ article.date.strftime('%b') }} {{ day }} {{- article.date.strftime(', %Y') }}</time>
 
             <time pubdate="pubdate" datetime="{{ article.date.isoformat() }}">{{ article.date.strftime('%b') }} {{ day }} {{- article.date.strftime(', %Y') }}</time>
 
             {% endif %}
 
             {% endif %}
 
-            {% include 'last_updated.html' %}
 
+            {% include '_includes/last_updated.html' %}
 
             {% if article.category|trim|count > 0 %}
 
             {% if article.category|trim|count > 0 %}
 
             <h4>Category</h4>
 
             <h4>Category</h4>
 
             <a class="category-link" href="{{ SITEURL }}/categories.html#{{ category.slug }}-ref">{{ article.category }}</a>
 
             <a class="category-link" href="{{ SITEURL }}/categories.html#{{ category.slug }}-ref">{{ article.category }}</a>
 
@@ -91,8 +91,8 @@
 
                 {% endfor %}
 
                 {% endfor %}
 
             </ul>
 
             </ul>
 
             {% endif %}
 
             {% endif %}
 
-            {% include 'social_links.html' %}
 
-            {% include 'mailchimp.html' %}
 
+            {% include '_includes/social_links.html' %}
 
+            {% include '_includes/mailchimp.html' %}
 
         </div>
 
         </div>
 
         </section>
 
         </section>
 
 </div>
 
 </div>
 
@@ -101,6 +101,6 @@
 
 
 
 {% block script %}
 
 {% block script %}
 
     {{ super() }}
 
     {{ super() }}
 
-    {% from 'comments.html' import comments_script with context %}
 
+    {% from '_includes/comments.html' import comments_script with context %}
 
     {{ comments_script(article) }}
 
     {{ comments_script(article) }}
 
 {% endblock script %}
 
 {% endblock script %}

+ 6 - 6
templates/base.html
View File 

@@ -14,7 +14,7 @@
 
         <meta name="author" content="{{ AUTHOR }}" />
 
         <meta name="author" content="{{ AUTHOR }}" />
 
         <meta name="copyright" content="{{ AUTHOR }}" />
 
         <meta name="copyright" content="{{ AUTHOR }}" />
 
         {% endif %}
 
         {% endif %}
 
-        {% include 'latex.html' %}
 
+        {% include '_includes/latex.html' %}
 
 
 
         {% if SITE_DESCRIPTION %}
 
         {% if SITE_DESCRIPTION %}
 
         <meta name="description" content="{% block head_description %}{{ SITE_DESCRIPTION }}{% endblock head_description %}" />
 
         <meta name="description" content="{% block head_description %}{{ SITE_DESCRIPTION }}{% endblock head_description %}" />
 
@@ -30,11 +30,11 @@
 
         <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/custom.css" media="screen">
 
         <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/custom.css" media="screen">
 
         {% endif %}
 
         {% endif %}
 
         {% endblock head_links %}
 
         {% endblock head_links %}
 
-        {% include 'favicon_links.html' %}
 
+        {% include '_includes/favicon_links.html' %}
 
         {% block feed_links %}
 
         {% block feed_links %}
 
-        {% include 'feeds.html' %}
 
+        {% include '_includes/feeds.html' %}
 
         {% endblock feed_links %}
 
         {% endblock feed_links %}
 
-        {% include 'analytics.html' %}
 
+        {% include '_includes/analytics.html' %}
 
     </head>
 
     </head>
 
     <body>
 
     <body>
 
         <div id="content-sans-footer">
 
         <div id="content-sans-footer">
 
@@ -75,7 +75,7 @@
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
-        {% include 'footer.html' %}
 
+        {% include '_includes/footer.html' %}
 
         {% block script %}
 
         {% block script %}
 
         <script src="http://code.jquery.com/jquery.min.js"></script>
 
         <script src="http://code.jquery.com/jquery.min.js"></script>
 
         <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
 
         <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
 
@@ -86,6 +86,6 @@
 
             }
 
             }
 
         </script>
 
         </script>
 
         {% endblock script %}
 
         {% endblock script %}
 
-        {% include 'stat_counter.html' %}
 
+        {% include '_includes/stat_counter.html' %}
 
     </body>
 
     </body>
 
 </html>
 
 </html>

+ 1 - 1
templates/categories.html
View File 

@@ -10,7 +10,7 @@ All categories of the {{ SITENAME|striptags }} blog.
 
 
 
 {% block feed_links %}
 
 {% block feed_links %}
 
 {{ super() }}
 
 {{ super() }}
 
-{% include 'feeds_categories.html' %}
 
+{% include '_includes/feeds_categories.html' %}
 
 {% endblock feed_links %}
 
 {% endblock feed_links %}
 
 
 
 {% block content %}
 
 {% block content %}

+ 4 - 4
templates/page.html
View File 

@@ -38,13 +38,13 @@
 
             {% endif %}
 
             {% endif %}
 
 
 
             {{ page.content }}
 
             {{ page.content }}
 
-            {% from 'comments.html' import comments with context %}
 
+            {% from '_includes/comments.html' import comments with context %}
 
             {{ comments(page) }}
 
             {{ comments(page) }}
 
         </div>
 
         </div>
 
         <section>
 
         <section>
 
         <div class="span2" style="float:right;font-size:0.9em;">
 
         <div class="span2" style="float:right;font-size:0.9em;">
 
-            {% include 'social_links.html' %}
 
-            {% include 'mailchimp.html' %}
 
+            {% include '_includes/social_links.html' %}
 
+            {% include '_includes/mailchimp.html' %}
 
         </div>
 
         </div>
 
         </section>
 
         </section>
 
     </div>
 
     </div>
 
@@ -53,6 +53,6 @@
 
 
 
     {% block script %}
 
     {% block script %}
 
     {{ super() }}
 
     {{ super() }}
 
-    {% from 'comments.html' import comments_script with context %}
 
+    {% from '_includes/comments.html' import comments_script with context %}
 
     {{ comments_script(page) }}
 
     {{ comments_script(page) }}
 
     {% endblock script %}
 
     {% endblock script %}

+ 1 - 1
templates/tags.html
View File 

@@ -10,7 +10,7 @@ All tags used in the {{ SITENAME|striptags }} blog.
 
 
 
 {% block feed_links %}
 
 {% block feed_links %}
 
 {{ super() }}
 
 {{ super() }}
 
-{% include 'feeds_tags.html' %}
 
+{% include '_includes/feeds_tags.html' %}
 
 {% endblock feed_links %}
 
 {% endblock feed_links %}
 
 
 
 {% block content %}
 
 {% block content %}