Merge pull request jokull#3 from Skami18/master

Added support for pagintation
VIP000 · May 8, 2011 · da90d19 · da90d19
2 parents 1ead8bc + 6fdc8cd
commit da90d19
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 4 deletions.
diff --git a/lightweight/static/css/main.css b/lightweight/static/css/main.css
@@ -17,7 +17,7 @@ body {
   font-size: .8em; 
   line-height: 1.3;
   color: #111; 
-  background: white; 
+  background: white url(../images/bg.png) repeat scroll;
 } 
 
 h1, h2, h3, h4, h5, h6 { 
@@ -184,6 +184,10 @@ div#page {
     	width: 75%;
         border-right: 1px solid grey;
     }
+        section#content img {
+            max-width: 98%;
+            max-height: 98%;
+        }
 
 	    section#content article.post {
             margin: 10px;
@@ -228,6 +232,19 @@ div#page {
             text-align: center;
         }
 
+        #content>nav.pagination {
+           width: 100%;
+           //font-weight: bolder;
+           font-size: 14px;
+           font-family: 'Goudy Bookletter 1911';
+           border-top: 1px solid grey;
+           text-align: center; 
+        }
+        nav.pagination a {
+            text-decoration: none;
+            font-weight: bolder;
+        }
+
     aside#sidebar {
 	    float: right;
         width: 24%;

diff --git a/lightweight/static/images/bg.png b/lightweight/static/images/bg.png
diff --git a/lightweight/templates/archives.html b/lightweight/templates/archives.html
@@ -12,7 +12,7 @@ <h2 class="page_title">Archives</h1>
       </tr>
   {% for article in dates %}
       <tr>
-        <td>{{ article.date.strftime(DEFAULT_DATE_FORMAT or '%a %d %B %Y') }}</td>
+        <td>{{ article.date.locale_date }}</td>
         <td><a href='{{ article.url }}'>{{ article.title }}</a></td>
       </tr>
   {% endfor %}

diff --git a/lightweight/templates/index.html b/lightweight/templates/index.html
@@ -3,7 +3,7 @@
 
 {% block content %}
  {% if articles %}
-  {% for article in articles %} 
+  {% for article in (articles_page.object_list if articles_page else articles) %}  
     <article class="post">
       <h2 class="title"><a href="{{ SITEURL }}/{{ article.url}}">{{ article.title }}</a></h2>
       {%include 'meta.html'%}
@@ -14,5 +14,22 @@ <h2 class="title"><a href="{{ SITEURL }}/{{ article.url}}">{{ article.title }}</
       </section>
     </article>
   {% endfor %}
+
+      {% if articles_page %}
+      <nav class="pagination">
+      {% if articles_page.has_previous() %}
+        {% if articles_page.previous_page_number() == 1 %}
+            <a href="{{ SITEURL }}/{{ page_name }}.html">&#60;&#60;</a>
+        {% else %}
+            <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html">&#60;&#60;</a>
+        {% endif %}
+      {% endif %}
+      Page <b>{{ articles_page.number }}</b> sur <b>{{ articles_paginator.num_pages }}</b>
+      {% if articles_page.has_next() %}
+        <a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">&#62;&#62;</a>
+      {% endif %}
+      </nav>
+    {% endif%}
+
  {% endif %}
 {% endblock %}
diff --git a/lightweight/templates/meta.html b/lightweight/templates/meta.html
@@ -1,5 +1,5 @@
         <details class="meta">
-          Publié le <time datetime="{{ article.date.isoformat() }}" pubdate="pubdate">{{ article.date.strftime(DEFAULT_DATE_FORMAT or '%a %d %B %Y') }}</time>
+          Publié le <time datetime="{{ article.date.isoformat() }}" pubdate="pubdate">{{ article.locale_date }}</time>
           {% if article.author %} par {{ article.author }}{% endif %} dans «<a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>».  
           {% if article.tags %}Mots-clés: {% for tag in article.tags %}{%if loop.index > 1%}, {%endif%}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a>{% endfor %}</p>{% endif %}
         </details>