diff options
| author | m-r-r <skami@skami-laptop.dyndns.org> | 2012-06-22 07:57:12 +0000 |
|---|---|---|
| committer | m-r-r <skami@skami-laptop.dyndns.org> | 2012-06-22 07:57:12 +0000 |
| commit | 98f0d46f2bbddf86e8d202b533af35fa79da2d2f (patch) | |
| tree | 297d677cfa76bb20d4e80803343c69b99c939e37 /brownstone | |
| parent | 2950b6abdad62fdd74682880acdec32f9b417420 (diff) | |
| parent | 83892b7112e27721218556c4030cdd5c8d26f98b (diff) | |
| download | pelican-themes-98f0d46f2bbddf86e8d202b533af35fa79da2d2f.tar.gz | |
[dev-random] resolved conflicts
Diffstat (limited to 'brownstone')
| -rw-r--r-- | brownstone/templates/article.html | 4 | ||||
| -rw-r--r-- | brownstone/templates/base.html | 4 | ||||
| -rw-r--r-- | brownstone/templates/index.html | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/brownstone/templates/article.html b/brownstone/templates/article.html index 2458ecb..dd07404 100644 --- a/brownstone/templates/article.html +++ b/brownstone/templates/article.html @@ -4,9 +4,9 @@ <div id="content"> <div class="post"> <h2 class="title"><a href="{{ article.url }}">{{ article.title }}</a></h2> - <p class="meta"><span class="date">Le {{ article.locale_date }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span> | Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></span></p> + <p class="meta"><span class="date">Le {{ article.locale_date }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span> | Catégorie : <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></span></p> <p class="meta">Tags : {% for tag in article.tags %} -<span><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> / </span> +<span><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> / </span> {% endfor %}</p> <div style="clear: both;"> </div> <div class="entry"> diff --git a/brownstone/templates/base.html b/brownstone/templates/base.html index cd7cc7b..1da0c60 100644 --- a/brownstone/templates/base.html +++ b/brownstone/templates/base.html @@ -50,7 +50,7 @@ Released : 20100928 <h2>Catégories</h2> <ul> {% for cat, null in categories %} - <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li> + <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li> {% endfor %} </ul> </li> @@ -82,7 +82,7 @@ Released : 20100928 <h2>Tags</h2> <ul> {% for tag, articles in tags %} - <li><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a></li> + <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li> {% endfor %} </ul> </li> diff --git a/brownstone/templates/index.html b/brownstone/templates/index.html index 3ec1781..fbe7476 100644 --- a/brownstone/templates/index.html +++ b/brownstone/templates/index.html @@ -7,9 +7,9 @@ <div id="content"> <div class="post"> <h2 class="title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2> - <p class="meta"><span class="date">Le {{ article.date.locale_date }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span> | Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></span></p> + <p class="meta"><span class="date">Le {{ article.date.locale_date }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span> | Catégorie : <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></span></p> <p class="meta">Tags : {% for tag in article.tags %} -<span><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> / </span> +<span><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> / </span> {% endfor %}</p> <div style="clear: both;"> </div> <div class="entry"> |