Browse Source

Add blog entries on home page

Maxime Vidori 9 years ago
parent
commit
127787bae2

+ 0 - 14
content/blog/2015-04-14-pytest-fixture.md

@@ -8,20 +8,6 @@ when it comes to tests, [pytest](http://pytest.org/) is *THE* library to use.
 I also use [Flask](http://flask.pocoo.org/) a lot, so today I will show you
 some of my snippets.
 
-First one the app fixture:
-
-```python
-
-@pytest.fixture(autouse=True)
-def app():
-    """Load flask in testing mode"""
-    app_test = myapp
-    app_test.config['TESTING'] = True
-    app_test.json_encoder = my_encoder
-
-    return app_test.test_client()
-```
-
 This create an app fixture which will be used to test the application, it
 returns a test client to interact with my Flask application.
 

+ 6 - 0
theme/static/css/main.css

@@ -492,6 +492,12 @@ Home page
 	margin-left: 20px;
 }
 
+#content-home .hentry h2 {
+	font-family: 'Oswald', arial, serif;
+	margin-left: 0;
+  font-weight: 300;
+}
+
 #content-home hr {
 	width: 100%;
 	height: 10px;

+ 24 - 0
theme/templates/home.html

@@ -6,7 +6,31 @@
   {% import 'translations.html' as translations with context %}
   {{ translations.translations_for(page) }}
   {{ page.content }}
+  {% if articles %}
+      <ol id="posts-list" class="hfeed">
+  {% for article in articles[:3] %}
+  <li>
+    <article class="hentry">
+      <header>
+        <h2>
+          <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">
+            {{ article.title }}
+          </a>
+        </h2>
+      </header>
 
+      <div class="entry-content">
+        {% include 'article_infos.html' %}
+        {{ article.summary }}
+        <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
+        {% include 'comments.html' %}
+      </div><!-- /.entry-content -->
+
+    </article>
+  </li>
+  {% endfor %}
+  </ol>
+  {% endif %}
 </div>
 
 {% endblock %}

+ 52 - 48
theme/templates/index.html

@@ -6,57 +6,61 @@
 
 {# First item #}
 {% if loop.first and not articles_page.has_previous() %}
-<aside id="featured">
-  <article>
-    <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
-    {% include 'article_infos.html' %}{{ article.content }}{% include 'comments.html' %}
-  </article>
-</aside><!-- /#featured -->
-{% if loop.length > 1 %}
-<section class="m3y">
-  <h1>Autres articles</h1>
-  <hr />
-  <ol id="posts-list" class="hfeed">
-    {% endif %}
-    {# other items #}
-    {% else %}
-    {% if loop.first %}
+  <aside id="featured">
+    <article>
+      <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
+      {% include 'article_infos.html' %}{{ article.content }}{% include 'comments.html' %}
+    </article>
+  </aside><!-- /#featured -->
+  {% if loop.length > 1 %}
+    <section class="m3y">
+      <h1>Autres articles</h1>
+      <hr />
+      <ol id="posts-list" class="hfeed">
+  {% endif %}
+{# other items #}
+{% else %}
+  {% if loop.first %}
     <section id="content">
       <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
-        {% endif %}
-        <li><article class="hentry">
-            <header>
-              <h1>
-                <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">
-                  {{ article.title }}
-                </a>
-              </h1>
-            </header>
+  {% endif %}
+  <li>
+    <article class="hentry">
+      <header>
+        <h1>
+          <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">
+            {{ article.title }}
+          </a>
+        </h1>
+      </header>
+
+      <div class="entry-content">
+        {% include 'article_infos.html' %}
+        {{ article.summary }}
+        <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
+        {% include 'comments.html' %}
+      </div><!-- /.entry-content -->
+    </article>
+  </li>
+{% endif %}
 
-            <div class="entry-content">
-              {% include 'article_infos.html' %}
-              {{ article.summary }}
-              <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
-              {% include 'comments.html' %}
-            </div><!-- /.entry-content -->
-          </article></li>
-          {% endif %}
-          {% if loop.last %}
-          {% if loop.length > 1 or articles_page.has_other_pages() %}
-      </ol><!-- /#posts-list -->
-      {% if articles_page.has_other_pages() %}
+{% if loop.last %}
+  {% if loop.length > 1 or articles_page.has_other_pages() %}
+    </ol><!-- /#posts-list -->
+    {% if articles_page.has_other_pages() %}
       {% include 'pagination.html' %}
-      {% endif %}
-    </section><!-- /#content -->
     {% endif %}
-    {% endif %}
-    {% endfor %}
-    {% else %}
-    <section id="content">
-      <h2>Pages</h2>
-      {% for page in PAGES %}
+    </section><!-- /#content -->
+  {% endif %}
+{% endif %}
+{% endfor %}
+
+{% else %}
+  <section id="content">
+    <h2>Pages</h2>
+    {% for page in PAGES %}
       <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
-      {% endfor %}
-    </section>
-    {% endif %}
-    {% endblock content %}
+    {% endfor %}
+  </section>
+{% endif %}
+{% endblock content %}