From 9c349d82c60d06563e1c1fc52600179f702cebc2 Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Mon, 14 May 2012 18:17:00 +0100 Subject: Use object.url to get the url for author, category and tags --- Just-Read/templates/archives.html | 4 ++-- Just-Read/templates/metadata.html | 6 +++--- Just-Read/templates/tags.html | 4 ++-- bootstrap/templates/base.html | 4 ++-- bootstrap/templates/categories.html | 2 +- bootstrap/templates/metadata.html | 6 +++--- bootstrap/templates/tags.html | 2 +- bootstrap2/templates/base.html | 2 +- bootstrap2/templates/sidebar.html | 6 +++--- bootstrap2/templates/tags.html | 4 ++-- brownstone/templates/article.html | 4 ++-- brownstone/templates/base.html | 4 ++-- brownstone/templates/index.html | 4 ++-- dev-random/templates/article.html | 10 +++++----- dev-random/templates/index.html | 4 ++-- dev-random/templates/tags.html | 2 +- lightweight/templates/meta.html | 4 ++-- lightweight/templates/sidebar.html | 4 ++-- lightweight/templates/tags.html | 2 +- martyalchin/templates/article.html | 2 +- mnmlist/templates/categories.html | 2 +- mnmlist/templates/taglist.html | 2 +- mnmlist/templates/tags.html | 2 +- notmyidea-cms-fr/templates/article.html | 2 +- notmyidea-cms-fr/templates/base.html | 4 ++-- notmyidea-cms-fr/templates/index.html | 4 ++-- notmyidea-cms-fr/templates/taglist.html | 2 +- notmyidea-cms/templates/article_infos.html | 4 ++-- notmyidea-cms/templates/base.html | 4 ++-- notmyidea-cms/templates/taglist.html | 2 +- sneakyidea/templates/article_infos.html | 4 ++-- sneakyidea/templates/base.html | 2 +- sneakyidea/templates/comments.html | 2 +- sneakyidea/templates/taglist.html | 2 +- sneakyidea/templates/tags.html | 4 ++-- tuxlite_tbs/templates/base.html | 2 +- tuxlite_tbs/templates/categories.html | 2 +- tuxlite_tbs/templates/metadata.html | 6 +++--- tuxlite_tbs/templates/tags.html | 2 +- waterspill/templates/article.html | 4 ++-- waterspill/templates/base.html | 4 ++-- waterspill/templates/index.html | 6 +++--- 42 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Just-Read/templates/archives.html b/Just-Read/templates/archives.html index 72fd2a5..e4f26b8 100644 --- a/Just-Read/templates/archives.html +++ b/Just-Read/templates/archives.html @@ -30,7 +30,7 @@

Tags

@@ -43,4 +43,4 @@ $("#jquerytabs").tabs(); }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/Just-Read/templates/metadata.html b/Just-Read/templates/metadata.html index c051c75..b4865f8 100644 --- a/Just-Read/templates/metadata.html +++ b/Just-Read/templates/metadata.html @@ -1,12 +1,12 @@
{% if PDF_PROCESSOR %}

Download the .pdf

{% endif %} -
\ No newline at end of file + diff --git a/Just-Read/templates/tags.html b/Just-Read/templates/tags.html index 8ddbcd1..27240ef 100644 --- a/Just-Read/templates/tags.html +++ b/Just-Read/templates/tags.html @@ -8,10 +8,10 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/bootstrap/templates/base.html b/bootstrap/templates/base.html index 5710a5e..9458d6e 100644 --- a/bootstrap/templates/base.html +++ b/bootstrap/templates/base.html @@ -35,7 +35,7 @@ {% endfor %} {% endif %} {% for cat, null in categories %} -
  • {{ cat }}
    • +
  • {{ cat }}
    • {% endfor %}

    [archives] [tags]

    @@ -73,4 +73,4 @@ - \ No newline at end of file + diff --git a/bootstrap/templates/categories.html b/bootstrap/templates/categories.html index 4500237..de7cbc3 100644 --- a/bootstrap/templates/categories.html +++ b/bootstrap/templates/categories.html @@ -3,7 +3,7 @@ {% block content %} {% endblock %} diff --git a/bootstrap/templates/metadata.html b/bootstrap/templates/metadata.html index 876df8f..8c9f261 100644 --- a/bootstrap/templates/metadata.html +++ b/bootstrap/templates/metadata.html @@ -1,4 +1,4 @@ Permalink: {{ article.date }} -{% if article.author %}by {{ article.author }}{% endif %} -in {{ article.category }} -{% if article.tags %}tags: {% for tag in article.tags %}{{ tag }} {% endfor %}{% endif %} +{% if article.author %}by {{ article.author }}{% endif %} +in {{ article.category }} +{% if article.tags %}tags: {% for tag in article.tags %}{{ tag }} {% endfor %}{% endif %} diff --git a/bootstrap/templates/tags.html b/bootstrap/templates/tags.html index a3b37be..d481bc3 100644 --- a/bootstrap/templates/tags.html +++ b/bootstrap/templates/tags.html @@ -3,7 +3,7 @@ {% block content %} {% endblock %} diff --git a/bootstrap2/templates/base.html b/bootstrap2/templates/base.html index 3e42e65..26195f7 100644 --- a/bootstrap2/templates/base.html +++ b/bootstrap2/templates/base.html @@ -82,7 +82,7 @@ {% endif %} {% for cat, null in categories %}
  • - + {{ cat }}
    • diff --git a/bootstrap2/templates/sidebar.html b/bootstrap2/templates/sidebar.html index fb94733..ae2e009 100644 --- a/bootstrap2/templates/sidebar.html +++ b/bootstrap2/templates/sidebar.html @@ -19,7 +19,7 @@

  • Categories

    • {% for cat, null in categories %}
  • - + {{ cat }}
    • @@ -28,7 +28,7 @@

  • Tags

    • {% for tag in tag_cloud %}
  • - + {{ tag.0 }}
    • @@ -40,4 +40,4 @@ {% if SIDEBAR_CUSTOM %} {{ SIDEBAR_CUSTOM }} {% endif %} - \ No newline at end of file + diff --git a/bootstrap2/templates/tags.html b/bootstrap2/templates/tags.html index 6e8a22f..862eff6 100644 --- a/bootstrap2/templates/tags.html +++ b/bootstrap2/templates/tags.html @@ -4,10 +4,10 @@

  • Tags

    • {% for tag in tag_cloud %}
  • - + {{ tag.0 }}
    • {% endfor %} -{% endblock %} \ No newline at end of file +{% endblock %} 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 @@

    {{ article.title }}

    -

    Le {{ article.locale_date }} Par {{ article.author }}  | Catégorie : {{ article.category }}

    +

    Le {{ article.locale_date }} Par {{ article.author }}  | Catégorie : {{ article.category }}

    Tags : {% for tag in article.tags %} -{{ tag }} / +{{ tag }} / {% endfor %}

     
    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

    Catégories

    @@ -82,7 +82,7 @@ Released : 20100928

    Tags

    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 @@

    {{ article.title }}

    -

    Le {{ article.date.locale_date }} Par {{ article.author }}  | Catégorie : {{ article.category }}

    +

    Le {{ article.date.locale_date }} Par {{ article.author }}  | Catégorie : {{ article.category }}

    Tags : {% for tag in article.tags %} -{{ tag }} / +{{ tag }} / {% endfor %}

     
    diff --git a/dev-random/templates/article.html b/dev-random/templates/article.html index ab5679c..6048b5a 100644 --- a/dev-random/templates/article.html +++ b/dev-random/templates/article.html @@ -22,8 +22,8 @@
    - Dans «{{ article.category }}» - par {{ article.author}} + Dans «{{ article.category }}» + par {{ article.author}}
    @@ -31,9 +31,9 @@
    {% if DISQUS_SITENAME %} diff --git a/dev-random/templates/index.html b/dev-random/templates/index.html index 11314d1..aeb5986 100644 --- a/dev-random/templates/index.html +++ b/dev-random/templates/index.html @@ -18,8 +18,8 @@
    - Dans «{{ article.category }}» - par {{ article.author}} + Dans «{{ article.category }}» + par {{ article.author}}
    diff --git a/dev-random/templates/tags.html b/dev-random/templates/tags.html index b95d401..5d8a8c7 100644 --- a/dev-random/templates/tags.html +++ b/dev-random/templates/tags.html @@ -7,7 +7,7 @@

    Mots-clés

    diff --git a/lightweight/templates/meta.html b/lightweight/templates/meta.html index db29579..db36173 100644 --- a/lightweight/templates/meta.html +++ b/lightweight/templates/meta.html @@ -1,5 +1,5 @@
    Publié le - {% if article.author %} par {{ article.author }}{% endif %} dans «{{ article.category }}». - {% if article.tags %}Mots-clés: {% for tag in article.tags %}{%if loop.index > 1%}, {%endif%}{{ tag }}{% endfor %}

    {% endif %} + {% if article.author %} par {{ article.author }}{% endif %} dans «{{ article.category }}». + {% if article.tags %}Mots-clés: {% for tag in article.tags %}{%if loop.index > 1%}, {%endif%}{{ tag }}{% endfor %}

    {% endif %}
    diff --git a/lightweight/templates/sidebar.html b/lightweight/templates/sidebar.html index d73fa91..8e25cbf 100644 --- a/lightweight/templates/sidebar.html +++ b/lightweight/templates/sidebar.html @@ -6,7 +6,7 @@

    Catégories

    @@ -16,7 +16,7 @@

    Mots-clés:

    diff --git a/lightweight/templates/tags.html b/lightweight/templates/tags.html index 60ac7db..a5d5f9e 100644 --- a/lightweight/templates/tags.html +++ b/lightweight/templates/tags.html @@ -6,7 +6,7 @@

    Liste des mots-clés

    {% endblock %} diff --git a/martyalchin/templates/article.html b/martyalchin/templates/article.html index f5c6591..b6ec1c0 100644 --- a/martyalchin/templates/article.html +++ b/martyalchin/templates/article.html @@ -7,7 +7,7 @@ By {{ article.author }} {% endif %} on {{ article.date.locale_date }} - about {{ article.category }} + about {{ article.category }}
    {{ article.content }} {% endblock %} diff --git a/mnmlist/templates/categories.html b/mnmlist/templates/categories.html index 78362e4..e29be0c 100644 --- a/mnmlist/templates/categories.html +++ b/mnmlist/templates/categories.html @@ -2,7 +2,7 @@ {% block content %} {% endblock %} diff --git a/mnmlist/templates/taglist.html b/mnmlist/templates/taglist.html index 0f4862d..c792fd7 100644 --- a/mnmlist/templates/taglist.html +++ b/mnmlist/templates/taglist.html @@ -1,2 +1,2 @@ -{% if article.tags %}

    tags: {% for tag in article.tags %}{{ tag }}{% endfor %}

    {% endif %} +{% if article.tags %}

    tags: {% for tag in article.tags %}{{ tag }}{% endfor %}

    {% endif %} {% if PDF_PROCESSOR %}

    get the pdf

    {% endif %} diff --git a/mnmlist/templates/tags.html b/mnmlist/templates/tags.html index 5bee1e1..a6011a0 100644 --- a/mnmlist/templates/tags.html +++ b/mnmlist/templates/tags.html @@ -2,7 +2,7 @@ {% block content %} {% endblock %} 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 {{ article.author }} {% endif %} -

    Dans {{ article.category }}. +

    Dans {{ article.category }}. {% include 'taglist.html' %} {{ 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 %} -

  • {{ cat }}
    • +
  • {{ cat }}
    • {% endfor %}#} @@ -51,7 +51,7 @@

    Catégories

    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 {{ article.author }} {% endif %} -

    Dans {{ article.category }}. {% if PDF_PROCESSOR %}télécharger le PDF{% endif %}

    +

    Dans {{ article.category }}. {% if PDF_PROCESSOR %}télécharger le PDF{% endif %}

    {% include 'taglist.html' %} {{ article.content }} @@ -43,7 +43,7 @@
    Par {{ article.author }}
    -

    Dans {{ article.category }}

    +

    Dans {{ article.category }}

    {% include 'taglist.html' %}

    {% if PDF_PROCESSOR %}PDF{% endif %}

    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 %}

    tags: {% for tag in article.tags %}{{ tag }}{% endfor %}

    {% endif %} +{% if article.tags %}

    tags: {% for tag in article.tags %}{{ tag }}{% endfor %}

    {% endif %} {% if PDF_PROCESSOR %}Télécharger le PDF{% endif %}

    diff --git a/notmyidea-cms/templates/article_infos.html b/notmyidea-cms/templates/article_infos.html index e1803be..a1993a0 100644 --- a/notmyidea-cms/templates/article_infos.html +++ b/notmyidea-cms/templates/article_infos.html @@ -5,10 +5,10 @@ {% if article.author %}
    - By {{ article.author }} + By {{ article.author }}
    {% endif %} -

    In {{ article.category }}. {% if PDF_PROCESSOR %}get the pdf{% endif %}

    +

    In {{ article.category }}. {% if PDF_PROCESSOR %}get the pdf{% endif %}

    {% include 'taglist.html' %} {% include 'translations.html' %} diff --git a/notmyidea-cms/templates/base.html b/notmyidea-cms/templates/base.html index 8f3d20e..02833f6 100644 --- a/notmyidea-cms/templates/base.html +++ b/notmyidea-cms/templates/base.html @@ -37,7 +37,7 @@ {% endfor %} {% endif %} {#{% for cat, null in categories %} -
  • {{ cat }}
    • +
  • {{ cat }}
    • {% endfor %}#} @@ -50,7 +50,7 @@

    Categories

    diff --git a/notmyidea-cms/templates/taglist.html b/notmyidea-cms/templates/taglist.html index 4259077..7ed6bf1 100644 --- a/notmyidea-cms/templates/taglist.html +++ b/notmyidea-cms/templates/taglist.html @@ -1,2 +1,2 @@ -{% if article.tags %}

    tags: {% for tag in article.tags %}{{ tag }}{% endfor %}

    {% endif %} +{% if article.tags %}

    tags: {% for tag in article.tags %}{{ tag }}{% endfor %}

    {% endif %} {% if PDF_PROCESSOR %}get the pdf{% endif %}

    diff --git a/sneakyidea/templates/article_infos.html b/sneakyidea/templates/article_infos.html index b5af6c5..d7cb534 100644 --- a/sneakyidea/templates/article_infos.html +++ b/sneakyidea/templates/article_infos.html @@ -6,10 +6,10 @@ {% if article.author %}
    - By {{ article.author }} + By {{ article.author }}
    {% endif %} -

    In {{ article.category }}. {% if PDF_PROCESSOR %}get the pdf{% endif %}

    +

    In {{ article.category }}. {% if PDF_PROCESSOR %}get the pdf{% endif %}

    {% include 'taglist.html' %} {{ translations.translate(article) }} diff --git a/sneakyidea/templates/base.html b/sneakyidea/templates/base.html index a4a7564..a6cfb79 100644 --- a/sneakyidea/templates/base.html +++ b/sneakyidea/templates/base.html @@ -38,7 +38,7 @@ {% endfor %} {% endif %} {% for cat, null in categories %} -
  • {{ cat }}
    • +
  • {{ cat }}
    • {% endfor %} {% for title, link in MENUITEMS %}
  • {{ title }}
    • diff --git a/sneakyidea/templates/comments.html b/sneakyidea/templates/comments.html index ea693af..bb033c0 100644 --- a/sneakyidea/templates/comments.html +++ b/sneakyidea/templates/comments.html @@ -1 +1 @@ -{% if DISQUS_SITENAME %}

    There are comments.

    {% endif %} +{% if DISQUS_SITENAME %}

    There are comments.

    {% endif %} diff --git a/sneakyidea/templates/taglist.html b/sneakyidea/templates/taglist.html index 4259077..7ed6bf1 100644 --- a/sneakyidea/templates/taglist.html +++ b/sneakyidea/templates/taglist.html @@ -1,2 +1,2 @@ -{% if article.tags %}

    tags: {% for tag in article.tags %}{{ tag }}{% endfor %}

    {% endif %} +{% if article.tags %}

    tags: {% for tag in article.tags %}{{ tag }}{% endfor %}

    {% endif %} {% if PDF_PROCESSOR %}get the pdf{% endif %}

    diff --git a/sneakyidea/templates/tags.html b/sneakyidea/templates/tags.html index bd18105..43bec00 100644 --- a/sneakyidea/templates/tags.html +++ b/sneakyidea/templates/tags.html @@ -5,8 +5,8 @@

    Tags

    diff --git a/tuxlite_tbs/templates/base.html b/tuxlite_tbs/templates/base.html index d8b195b..2a71f74 100644 --- a/tuxlite_tbs/templates/base.html +++ b/tuxlite_tbs/templates/base.html @@ -85,7 +85,7 @@ {% for cat, null in categories %} -
  • {{ cat }}
    • +
  • {{ cat }}
    • {% endfor %}
    diff --git a/tuxlite_tbs/templates/categories.html b/tuxlite_tbs/templates/categories.html index c96774d..2b95d34 100644 --- a/tuxlite_tbs/templates/categories.html +++ b/tuxlite_tbs/templates/categories.html @@ -3,7 +3,7 @@ {% block content %} diff --git a/tuxlite_tbs/templates/metadata.html b/tuxlite_tbs/templates/metadata.html index cb04053..f3148f7 100644 --- a/tuxlite_tbs/templates/metadata.html +++ b/tuxlite_tbs/templates/metadata.html @@ -1,13 +1,13 @@ {{ article.date.strftime("%d %b %Y") }} {% if article.author %} -by {{ article.author }} +by {{ article.author }} {% endif %} -{# Filed under {{ article.category }} #} +{# Filed under {{ article.category }} #} {# {% if article.tags %} - Tags {% for tag in article.tags %}{{ tag }} {% endfor %} + Tags {% for tag in article.tags %}{{ tag }} {% endfor %} {% endif %} #} diff --git a/tuxlite_tbs/templates/tags.html b/tuxlite_tbs/templates/tags.html index df6f55f..dea6672 100644 --- a/tuxlite_tbs/templates/tags.html +++ b/tuxlite_tbs/templates/tags.html @@ -3,7 +3,7 @@ {% block content %} {% endblock %} diff --git a/waterspill/templates/article.html b/waterspill/templates/article.html index 975d441..baa42cf 100644 --- a/waterspill/templates/article.html +++ b/waterspill/templates/article.html @@ -11,9 +11,9 @@ {{ article.content }} {% include 'twitter.html' %} -

    Par {{ article.author }}, Catégorie : {{ article.category }}

    +

    Par {{ article.author }}, Catégorie : {{ article.category }}

    Tags : {% for tag in article.tags %} -{{ tag }} / +{{ tag }} / {% endfor %}

    diff --git a/waterspill/templates/base.html b/waterspill/templates/base.html index 0ec8d25..1f9049d 100644 --- a/waterspill/templates/base.html +++ b/waterspill/templates/base.html @@ -53,7 +53,7 @@

    Categories

    {% if LINKS %} @@ -84,7 +84,7 @@

    Tags

    diff --git a/waterspill/templates/index.html b/waterspill/templates/index.html index bbc6a1f..d7bd1e3 100644 --- a/waterspill/templates/index.html +++ b/waterspill/templates/index.html @@ -13,9 +13,9 @@ {{ article.content }} -

    Par {{ article.author }}, Catégorie : {{ article.category }}

    +

    Par {{ article.author }}, Catégorie : {{ article.category }}

    Tags : {% for tag in article.tags %} -{{ tag }} / +{{ tag }} / {% endfor %}

    @@ -31,7 +31,7 @@

    Le {{ article.locale_date }}

    {{ article.summary }} -

    Par {{ article.author }}, Catégorie : {{ article.category }}

    +

    Par {{ article.author }}, Catégorie : {{ article.category }}

    Lire la suite … -- cgit v1.1