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 /notmyidea-cms-fr/templates/index.html | |
| parent | 2950b6abdad62fdd74682880acdec32f9b417420 (diff) | |
| parent | 83892b7112e27721218556c4030cdd5c8d26f98b (diff) | |
| download | pelican-themes-98f0d46f2bbddf86e8d202b533af35fa79da2d2f.tar.gz | |
[dev-random] resolved conflicts
Diffstat (limited to 'notmyidea-cms-fr/templates/index.html')
| -rw-r--r-- | notmyidea-cms-fr/templates/index.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/notmyidea-cms-fr/templates/index.html b/notmyidea-cms-fr/templates/index.html index ab68f81..1216f24 100644 --- a/notmyidea-cms-fr/templates/index.html +++ b/notmyidea-cms-fr/templates/index.html @@ -18,7 +18,7 @@ Par <a class="url fn" href="#">{{ article.author }}</a> </address> {% endif %} - <p>Dans <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">télécharger le PDF</a>{% endif %}</p> + <p>Dans <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">télécharger le PDF</a>{% endif %}</p> {% include 'taglist.html' %} </footer><!-- /.post-info --> {{ article.content }} @@ -43,7 +43,7 @@ <address class="vcard author"> Par <a class="url fn" href="#">{{ article.author }}</a> </address> - <p> Dans <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></p> + <p> Dans <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></p> {% include 'taglist.html' %} <p>{% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">PDF</a>{% endif %}</p> </footer><!-- /.post-info --> |