aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis Metaireau <ametaireau@gmail.com>2011-05-08 16:48:28 -0700
committerAlexis Metaireau <ametaireau@gmail.com>2011-05-08 16:48:28 -0700
commitda90d1995ac6376317cd0954f6e0d71356d902ed (patch)
treefc0af0c59136c668f80b740c129efea2937bcf3c
parent1ead8bc446753e49ab1e7ce845a923f876816df7 (diff)
parent6fdc8cd7a27ebc7ea030ca5ac3c7ab9d9fbf2533 (diff)
downloadpelican-themes-da90d1995ac6376317cd0954f6e0d71356d902ed.tar.gz
Merge pull request #3 from Skami18/master
Added support for pagintation
-rw-r--r--lightweight/static/css/main.css19
-rw-r--r--lightweight/static/images/bg.pngbin0 -> 6862 bytes
-rw-r--r--lightweight/templates/archives.html2
-rw-r--r--lightweight/templates/index.html19
-rw-r--r--lightweight/templates/meta.html2
5 files changed, 38 insertions, 4 deletions
diff --git a/lightweight/static/css/main.css b/lightweight/static/css/main.css
index eed184e..6b8223a 100644
--- 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
new file mode 100644
index 0000000..9ee4c6b
--- /dev/null
+++ b/lightweight/static/images/bg.png
Binary files differ
diff --git a/lightweight/templates/archives.html b/lightweight/templates/archives.html
index 4d6234f..8f8a8a5 100644
--- a/lightweight/templates/archives.html
+++ b/lightweight/templates/archives.html
@@ -12,7 +12,7 @@
</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
index d5879bd..9f8c568 100644
--- 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 @@
</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
index 14257bd..db29579 100644
--- 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>