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 | |
| parent | 2950b6abdad62fdd74682880acdec32f9b417420 (diff) | |
| parent | 83892b7112e27721218556c4030cdd5c8d26f98b (diff) | |
| download | pelican-themes-98f0d46f2bbddf86e8d202b533af35fa79da2d2f.tar.gz | |
[dev-random] resolved conflicts
Diffstat (limited to 'notmyidea-cms-fr')
| -rw-r--r-- | notmyidea-cms-fr/templates/article.html | 2 | ||||
| -rw-r--r-- | notmyidea-cms-fr/templates/base.html | 4 | ||||
| -rw-r--r-- | notmyidea-cms-fr/templates/index.html | 4 | ||||
| -rw-r--r-- | notmyidea-cms-fr/templates/taglist.html | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/notmyidea-cms-fr/templates/article.html b/notmyidea-cms-fr/templates/article.html index 501bb95..24767dd 100644 --- a/notmyidea-cms-fr/templates/article.html +++ b/notmyidea-cms-fr/templates/article.html @@ -16,7 +16,7 @@ Par <a class="url fn" href="#">{{ article.author }}</a> </address> {% endif %} - <p>Dans <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. + <p>Dans <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. {% include 'taglist.html' %} </footer><!-- /.post-info --> {{ article.content }} diff --git a/notmyidea-cms-fr/templates/base.html b/notmyidea-cms-fr/templates/base.html index 12db9ca..b954762 100644 --- a/notmyidea-cms-fr/templates/base.html +++ b/notmyidea-cms-fr/templates/base.html @@ -38,7 +38,7 @@ {% endfor %} {% endif %} {#{% 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></nav> </header><!-- /#banner --> @@ -51,7 +51,7 @@ <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> </div> 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 --> diff --git a/notmyidea-cms-fr/templates/taglist.html b/notmyidea-cms-fr/templates/taglist.html index 8ca52db..f1238b6 100644 --- a/notmyidea-cms-fr/templates/taglist.html +++ b/notmyidea-cms-fr/templates/taglist.html @@ -1,2 +1,2 @@ -{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a>{% endfor %}</p>{% endif %} +{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}</p>{% endif %} {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">Télécharger le PDF</a>{% endif %}</p> |