diff options
59 files changed, 838 insertions, 129 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 @@ <h2>Tags</h2> <ul class="tag"> {% for tag in tag_cloud|sort %} - <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">{{ tag.0 }}</a></li> + <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li> {% endfor %} </ul> </div> @@ -43,4 +43,4 @@ $("#jquerytabs").tabs(); }); </script> -{% 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 @@ <div class="meta wrapper"> <time datetime="{{ article.date.isoformat() }}" pubdate>{{ article.locale_date }}</time> <ul class="tag clearfix"> - <li><a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></li> + <li><a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></li> {% if article.tags %} {% for tag in article.tags %} - <li><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a></li> + <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li> {% endfor %} {% endif %} </ul> {% if PDF_PROCESSOR %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">Download the .pdf</a></p>{% endif %} -</div>
\ No newline at end of file +</div> 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 @@ <ul class="tag"> {% for tag in tag_cloud %} - <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">{{ tag.0 }}</a></li> + <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li> {% endfor %} </ul> </div> </div> -{% 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 %} - <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> <p class="pull-right"><a href="{{ SITEURL }}/archives.html">[archives]</a> <a href="{{ SITEURL }}/tags.html">[tags]</a></p> @@ -73,4 +73,4 @@ </div> </body> -</html>
\ No newline at end of file +</html> 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 %} <ul> {% for category, articles in categories %} - <li><a href="{{ SITEURL }}/category/{{ category }}.html">{{ category }}</a></li> + <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li> {% endfor %} </ul> {% 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: <a class="more" href="{{ SITEURL }}/{{ article.url }}">{{ article.date }}</a> -{% if article.author %}by <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a>{% endif %} -in <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a> -{% if article.tags %}tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> {% endfor %}{% endif %} +{% if article.author %}by <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>{% endif %} +in <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a> +{% if article.tags %}tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% 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 %} <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> {% endblock %} diff --git a/bootstrap2/templates/base.html b/bootstrap2/templates/base.html index 21b307f..e98d06e 100644 --- a/bootstrap2/templates/base.html +++ b/bootstrap2/templates/base.html @@ -77,9 +77,9 @@ {% endif %} {% for cat, null in categories %} <li {% if cat == category %}class="active"{% endif %}> - <a href="{{ SITEURL }}/category/{{ cat }}.html"> - <i class="icon-folder-open icon-large"></i>{{ cat }} - </a> + <a href="{{ SITEURL }}/{{ cat.url.url }}"> + <i class="icon-folder-open icon-large"></i>{{ cat }} + </a> </li> {% endfor %} 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 @@ <li class="nav-header"><h4><i class="icon-folder-close icon-large"></i>Categories</h4></li> {% for cat, null in categories %} <li> -<a href="{{ SITEURL }}/category/{{ cat }}.html"> +<a href="{{ SITEURL }}/{{ cat.url }}"> <i class="icon-folder-open icon-large"></i>{{ cat }} </a> </li> @@ -28,7 +28,7 @@ <li class="nav-header"><h4><i class="icon-tags icon-large"></i>Tags</h4></li> {% for tag in tag_cloud %} <li class="tag-{{ tag.1 }}"> - <a href="{{ SITEURL }}/tag/{{ tag.0 }}.html"> + <a href="{{ SITEURL }}/{{ tag.0.url }}"> <i class="icon-tag icon-large"></i>{{ tag.0 }} </a> </li> @@ -40,4 +40,4 @@ {% if SIDEBAR_CUSTOM %} {{ SIDEBAR_CUSTOM }} {% endif %} -</ul>
\ No newline at end of file +</ul> 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 @@ <li class="nav-header"><h4><i class="icon-tags icon-large"></i>Tags</h4></li> {% for tag in tag_cloud %} <li class="tag-{{ tag.1 }}"> - <a href="{{ SITEURL }}/tag/{{ tag.0 }}.html"> + <a href="{{ SITEURL }}/{{ tag.0.url }}"> <i class="icon-tag icon-large"></i>{{ tag.0 }} </a> </li> {% endfor %} </ul> -{% 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 @@ <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"> diff --git a/dev-random/LICENSE.txt b/dev-random/LICENSE.txt new file mode 100644 index 0000000..5a8e332 --- /dev/null +++ b/dev-random/LICENSE.txt @@ -0,0 +1,14 @@ + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + + Copyright (C) 2004 Sam Hocevar <sam@hocevar.net> + + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. You just DO WHAT THE FUCK YOU WANT TO. + diff --git a/dev-random/screenshot.png b/dev-random/screenshot.png Binary files differnew file mode 100644 index 0000000..a1e468b --- /dev/null +++ b/dev-random/screenshot.png diff --git a/dev-random/static/css/main.css b/dev-random/static/css/main.css new file mode 100644 index 0000000..7978af3 --- /dev/null +++ b/dev-random/static/css/main.css @@ -0,0 +1,218 @@ +@import url("pygments.css"); + +/******************************************************************************/ +/* General Style */ +/******************************************************************************/ + + +article, section, +header, footer, +aside, nav { + display: block; +} + +html { + width: 100%; + height: 100%; + margin: 0; + padding: 0; +} + +body { + width: 100%; + height: 100%; + margin: 0; + padding: 0; + min-width: 750px; + + background-color: white; + color: #101010; + + font-family: helvetica, arial, freesans, clean, sans-serif; + font-size: 95%; + line-height: 1.35em; + letter-spacing: .1em; +} + +h1, h2, h3, +h4, h5, h6 { + color: #333333; + + font-family: "Georgia", "FreeSerif", serif; + font-style: italic; + font-weight: bolder; +} + +h1 a, h2 a, +h3 a, h4 a, +h5 a, h6 a { + color: inherit; + + text-decoration: inherit; +} + +h1 a:hover, h2 a:hover, +h3 a:hover, h4 a:hover, +h5 a:hover, h6 a:hover { + text-decoration: inherit; +} + +a { + color: #2a6a88; + + font-weight: bold; + text-decoration: none; +} + + +a:hover { + text-decoration: underline; +} + + +pre { + margin: 1em .5em; + padding: .75em; + border: 1px solid silver; + background: #111111; + color: #ffffff; + + font-family: monospace; + line-height: 1.15em; + + overflow: auto; +} + + + +/******************************************************************************/ +/* Specific Styles */ +/******************************************************************************/ + + +.page .head h1 { + margin: .7em auto; + + font-family: Georgia, "Times New Roman", Times, serif; + font-size: 2.8em; + text-align: center; +} + +.widget ul li { + margin: .1em .4em; + + font-size: 0.8em; + letter-spacing: 0.2em; + text-decoration: none; + font-variant: small-caps; +} + +.content #page-title { + font-size: .9em; +} + + +.content .post { + clear: both; + margin: 1em 0 3em 0; +} + + +.post .post-header { + margin: 0; + padding: .1em; + font-family: Georgia, "Times New Roman", Times, serif; +} + + +.post .post-header time { + margin: 0; + padding: 0; + + font-size: .7em; + line-height: 1em; + text-transform: uppercase; + letter-spacing: .2em; + font-weight: lighter; +} + + +.post .post-header h1 { + margin: 0; + padding: 0; + + border-bottom: thin dashed silver; + + font-size: 1.5em; + font-weight: bolder; + font-style: normal; + letter-spacing: 0.0em; + line-height: 1em; +} + +.post .post-header h1:hover { + border-bottom: thin dashed #333; +} + +.post .post-header .meta { + font-size: .9em; + letter-spacing: 0.2em; + text-decoration: none; +} + + +.post .post-content { + clear: both; + margin: 0; + padding: .5em .1em; +} + + +.post .post-footer { + clear: both; + margin: 0; + padding: .1em; + + font-family: Georgia, "Times New Roman", Times, serif; +} + + +.post .post-footer .readmore { + font-size: 0.8em; + letter-spacing: 0.2em; + text-decoration: none; + font-variant: small-caps; +} + + +.page .foot p { + display: block; + width: 60%; + + text-align: center; + margin-left: auto; + margin-right: auto; +} + + + +/******************************************************************************/ +/* Misc */ +/******************************************************************************/ + +#github-link { + display: block; + position: absolute; + top: 0; + left: 0; + width: 50px; + height: 100px; + background-image: url("../img/corner.png"); + margin: 0; + border: none; + text-decoration: none; + color: transparent; + font-size: 0px; + text-decoration: none; +} + diff --git a/dev-random/static/css/pygments.css b/dev-random/static/css/pygments.css new file mode 100644 index 0000000..046ceca --- /dev/null +++ b/dev-random/static/css/pygments.css @@ -0,0 +1,69 @@ +pre .hll { background-color: #333333 } +pre .c { color: #008800; font-style: italic; background-color: #0f140f } /* Comment */ +pre .err { color: #ffffff } /* Error */ +pre .g { color: #ffffff } /* Generic */ +pre .k { color: #fb660a; font-weight: bold } /* Keyword */ +pre .l { color: #ffffff } /* Literal */ +pre .n { color: #ffffff } /* Name */ +pre .o { color: #ffffff } /* Operator */ +pre .x { color: #ffffff } /* Other */ +pre .p { color: #ffffff } /* Punctuation */ +pre .cm { color: #008800; font-style: italic; background-color: #0f140f } /* Comment.Multiline */ +pre .cp { color: #ff0007; font-weight: bold; font-style: italic; background-color: #0f140f } /* Comment.Preproc */ +pre .c1 { color: #008800; font-style: italic; background-color: #0f140f } /* Comment.Single */ +pre .cs { color: #008800; font-style: italic; background-color: #0f140f } /* Comment.Special */ +pre .gd { color: #ffffff } /* Generic.Deleted */ +pre .ge { color: #ffffff } /* Generic.Emph */ +pre .gr { color: #ffffff } /* Generic.Error */ +pre .gh { color: #ffffff; font-weight: bold } /* Generic.Heading */ +pre .gi { color: #ffffff } /* Generic.Inserted */ +pre .go { color: #aaaaaa; } /* Generic.Output */ +pre .gp { color: #FFA500; } /* Generic.Prompt */ +pre .gs { color: #ffffff } /* Generic.Strong */ +pre .gu { color: #ffffff; font-weight: bold } /* Generic.Subheading */ +pre .gt { color: #ffffff } /* Generic.Traceback */ +pre .kc { color: #fb660a; font-weight: bold } /* Keyword.Constant */ +pre .kd { color: #fb660a; font-weight: bold } /* Keyword.Declaration */ +pre .kn { color: #fb660a; font-weight: bold } /* Keyword.Namespace */ +pre .kp { color: #fb660a } /* Keyword.Pseudo */ +pre .kr { color: #fb660a; font-weight: bold } /* Keyword.Reserved */ +pre .kt { color: #cdcaa9; font-weight: bold } /* Keyword.Type */ +pre .ld { color: #ffffff } /* Literal.Date */ +pre .m { color: #0086f7; font-weight: bold } /* Literal.Number */ +pre .s { color: #0086d2 } /* Literal.String */ +pre .na { color: #ff0086; font-weight: bold } /* Name.Attribute */ +pre .nb { color: #ffffff } /* Name.Builtin */ +pre .nc { color: #ffffff } /* Name.Class */ +pre .no { color: #0086d2 } /* Name.Constant */ +pre .nd { color: #ffffff } /* Name.Decorator */ +pre .ni { color: #ffffff } /* Name.Entity */ +pre .ne { color: #ffffff } /* Name.Exception */ +pre .nf { color: #ff0086; font-weight: bold } /* Name.Function */ +pre .nl { color: #ffffff } /* Name.Label */ +pre .nn { color: #ffffff } /* Name.Namespace */ +pre .nx { color: #ffffff } /* Name.Other */ +pre .py { color: #ffffff } /* Name.Property */ +pre .nt { color: #fb660a; font-weight: bold } /* Name.Tag */ +pre .nv { color: #fb660a } /* Name.Variable */ +pre .ow { color: #ffffff } /* Operator.Word */ +pre .w { color: #888888 } /* Text.Whitespace */ +pre .mf { color: #0086f7; font-weight: bold } /* Literal.Number.Float */ +pre .mh { color: #0086f7; font-weight: bold } /* Literal.Number.Hex */ +pre .mi { color: #0086f7; font-weight: bold } /* Literal.Number.Integer */ +pre .mo { color: #0086f7; font-weight: bold } /* Literal.Number.Oct */ +pre .sb { color: #0086d2 } /* Literal.String.Backtick */ +pre .sc { color: #0086d2 } /* Literal.String.Char */ +pre .sd { color: #0086d2 } /* Literal.String.Doc */ +pre .s2 { color: #0086d2 } /* Literal.String.Double */ +pre .se { color: #0086d2 } /* Literal.String.Escape */ +pre .sh { color: #0086d2 } /* Literal.String.Heredoc */ +pre .si { color: #0086d2 } /* Literal.String.Interpol */ +pre .sx { color: #0086d2 } /* Literal.String.Other */ +pre .sr { color: #0086d2 } /* Literal.String.Regex */ +pre .s1 { color: #0086d2 } /* Literal.String.Single */ +pre .ss { color: #0086d2 } /* Literal.String.Symbol */ +pre .bp { color: #ffffff } /* Name.Builtin.Pseudo */ +pre .vc { color: #fb660a } /* Name.Variable.Class */ +pre .vg { color: #fb660a } /* Name.Variable.Global */ +pre .vi { color: #fb660a } /* Name.Variable.Instance */ +pre .il { color: #0086f7; font-weight: bold } /* Literal.Number.Integer.Long */ diff --git a/dev-random/static/css/skeleton.css b/dev-random/static/css/skeleton.css new file mode 100644 index 0000000..02010f7 --- /dev/null +++ b/dev-random/static/css/skeleton.css @@ -0,0 +1,68 @@ + +.page { + display: block; + margin-top: 5%; +} + +.page .head, +.page .main, +.page .foot { + display: block; + width: 100%; + clear: both; +} + +.page .main { + display: table; + border-collapse: separate; + border-spacing: .5%; + width: 75%; + margin: .5em auto; + clear: both; +} + +.page .main .sidebar { + display: table-cell; + width: 25%; +} + +.page .main .content { + display: table-cell; + width: 74%; +} + +@media screen and (max-width: 800px) { + .page .main { + width: 100%; + clear: both; + } +} + +@media screen and (max-width: 700px) { + .page .main { + display: block; + } + + .page .main .sidebar, + .page .main .content { + display: block; + margin: 0 .5em; + width: 100%; + clear: both; + } + + .widget { + display: block; + } + + .widget ul, + .widget li { + display: inline; + } + + .widget h3 { display: none; } +} + +@media print { + .sidebar { display: none; } +} diff --git a/dev-random/static/img/corner.png b/dev-random/static/img/corner.png Binary files differnew file mode 100644 index 0000000..52e8690 --- /dev/null +++ b/dev-random/static/img/corner.png diff --git a/dev-random/static/js/hex2ascii.js b/dev-random/static/js/hex2ascii.js new file mode 100644 index 0000000..3dde36f --- /dev/null +++ b/dev-random/static/js/hex2ascii.js @@ -0,0 +1,20 @@ + +window.hex2ascii = {}; +window.hex2ascii.init = function() { + var els = document.getElementsByClassName('hex'), + hex, text, + i, j, e; + + for(i=0; i < els.length; i++) { + e = els[i]; + hex = e.innerHTML.split(' '); + text = ""; + + for(j=0; j < hex.length; j++) { + text += String.fromCharCode(parseInt(hex[j], 16)); + } + + e.innerHTML = text; + e.className = e.className.replace('hex',''); + } +}; diff --git a/dev-random/static/js/html5shiv.js b/dev-random/static/js/html5shiv.js new file mode 100644 index 0000000..74c9564 --- /dev/null +++ b/dev-random/static/js/html5shiv.js @@ -0,0 +1,3 @@ +/*! HTML5 Shiv pre3.5 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed + Uncompressed source: https://github.com/aFarkas/html5shiv */ +(function(a,b){function h(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function i(){var a=l.elements;return typeof a=="string"?a.split(" "):a}function j(a){var b={},c=a.createElement,f=a.createDocumentFragment,g=f();a.createElement=function(a){l.shivMethods||c(a);var f;return b[a]?f=b[a].cloneNode():e.test(a)?f=(b[a]=c(a)).cloneNode():f=c(a),f.canHaveChildren&&!d.test(a)?g.appendChild(f):f},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+i().join().replace(/\w+/g,function(a){return b[a]=c(a),g.createElement(a),'c("'+a+'")'})+");return n}")(l,g)}function k(a){var b;return a.documentShived?a:(l.shivCSS&&!f&&(b=!!h(a,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),g||(b=!j(a)),b&&(a.documentShived=b),a)}function p(a){var b,c=a.getElementsByTagName("*"),d=c.length,e=RegExp("^(?:"+i().join("|")+")$","i"),f=[];while(d--)b=c[d],e.test(b.nodeName)&&f.push(b.applyElement(q(b)));return f}function q(a){var b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(n+":"+a.nodeName);while(d--)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return e.style.cssText=a.style.cssText,e}function r(a){var b,c=a.split("{"),d=c.length,e=RegExp("(^|[\\s,>+~])("+i().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),f="$1"+n+"\\:$2";while(d--)b=c[d]=c[d].split("}"),b[b.length-1]=b[b.length-1].replace(e,f),c[d]=b.join("}");return c.join("{")}function s(a){var b=a.length;while(b--)a[b].removeNode()}function t(a){var b,c,d=a.namespaces,e=a.parentWindow;return!o||a.printShived?a:(typeof d[n]=="undefined"&&d.add(n),e.attachEvent("onbeforeprint",function(){var d,e,f,g=a.styleSheets,i=[],j=g.length,k=Array(j);while(j--)k[j]=g[j];while(f=k.pop())if(!f.disabled&&m.test(f.media)){for(d=f.imports,j=0,e=d.length;j<e;j++)k.push(d[j]);try{i.push(f.cssText)}catch(l){}}i=r(i.reverse().join("")),c=p(a),b=h(a,i)}),e.attachEvent("onafterprint",function(){s(c),b.removeNode(!0)}),a.printShived=!0,a)}var c=a.html5||{},d=/^<|^(?:button|form|map|select|textarea|object|iframe)$/i,e=/^<|^(?:a|b|button|code|div|fieldset|form|h1|h2|h3|h4|h5|h6|i|iframe|img|input|label|li|link|ol|option|p|param|q|script|select|span|strong|style|table|tbody|td|textarea|tfoot|th|thead|tr|ul)$/i,f,g;(function(){var c=b.createElement("a");c.innerHTML="<xyz></xyz>",f="hidden"in c,f&&typeof injectElementWithStyles=="function"&&injectElementWithStyles("#modernizr{}",function(b){b.hidden=!0,f=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle).display=="none"}),g=c.childNodes.length==1||function(){try{b.createElement("a")}catch(a){return!0}var c=b.createDocumentFragment();return typeof c.cloneNode=="undefined"||typeof c.createDocumentFragment=="undefined"||typeof c.createElement=="undefined"}()})();var l={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:k};a.html5=l,k(b);var m=/^$|\b(?:all|print)\b/,n="html5shiv",o=!g&&function(){var c=b.documentElement;return typeof b.namespaces!="undefined"&&typeof b.parentWindow!="undefined"&&typeof c.applyElement!="undefined"&&typeof c.removeNode!="undefined"&&typeof a.attachEvent!="undefined"}();l.type+=" print",l.shivPrint=t,t(b)})(this,document)
\ No newline at end of file diff --git a/dev-random/templates/archives.html b/dev-random/templates/archives.html new file mode 100644 index 0000000..1ba36dd --- /dev/null +++ b/dev-random/templates/archives.html @@ -0,0 +1,31 @@ +{% extends "base.html" %} + +{% block content_title %}{{ SITENAME }} — Archives{% endblock %} + +{%- block content %} + <section class="content"> + <h1>Archives</h1> + <dl> + {% for article in articles %} + {% if loop.first or article.date.strftime('%Y %m') != articles[loop.index0-1].date.strftime('%Y %m') %} + <dt> + <h2>{{ article.date.strftime('%B %Y') }}</h2> + <ul> + {% endif %} + + <li> + <a rel="bookmark" + href="{{ SITEURL }}/{{ article.url }}" + title="Lien permanent vers «{{ article.title }}»"> + {{ article.title }} + </a> + </li> + + {% if loop.last or article.date.strftime('%Y %m') != articles[loop.index0+1].date.strftime('%Y %m') %} + </ul> + </dt> + {% endif %} + {% endfor %} + </dl> + </section> +{% endblock content -%} diff --git a/dev-random/templates/article.html b/dev-random/templates/article.html new file mode 100644 index 0000000..6048b5a --- /dev/null +++ b/dev-random/templates/article.html @@ -0,0 +1,57 @@ +{% extends "base.html" %} + +{% block headers %} + {{ super() }} + <meta name="author" content="{{ article.author }}" /> + <meta name="keywords" content="{{ articles.tags|join(' ')}}" /> +{% endblock %} + +{% block title %}{{ article.title }} — {{ super() }}{% endblock %} + +{%- block content %} + <article class="post content"> + <header class="post-header"> + <time datetime="{{ article.date.isoformat() }}" pubdate="pubdate"> + {{ article.locale_date }} + </time> + <h1> + <a rel="bookmark" + href="{{ SITEURL }}/{{ article.url }}" + title="Lien permanent vers «{{ article.title }}»"> + {{ article.title }} + </a> + </h1> + <div class="meta"> + Dans «<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>» + par <a href="{{ SITEURL }}/{{article.author.url}}">{{ article.author}}</a> + </div> + </header> + <div class="post-content"> + {{ article.content}} + </div> + <footer class="post-footer"> + <div class="meta"> + Posté dans «<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>» + par <a href="{{ SITEURL }}/{{article.author.url}}">{{ article.author}}</a><br /> + Mots-clés: {% for tag in article.tags %} #<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %} + </div> + </footer> + {% if DISQUS_SITENAME %} + <hr /> + <div id="disqus_thread"></div> + <script type="text/javascript"> + /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ + var disqus_shortname = '{{ DISQUS_SITENAME }}'; // required: replace example with your forum shortname + + /* * * DON'T EDIT BELOW THIS LINE * * */ + (function() { + var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; + dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; + (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); + })(); + </script> + <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript> + <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a> + {% endif %} + </article> +{% endblock content -%} diff --git a/dev-random/templates/author.html b/dev-random/templates/author.html new file mode 100644 index 0000000..e323690 --- /dev/null +++ b/dev-random/templates/author.html @@ -0,0 +1,5 @@ +{% extends "index.html" %} + +{% block title %}{{ super() }} — Articles de {{ author }}{% endblock %} + +{% block index_title %}Articles de <i>{{ author }}</i> :{% endblock %} diff --git a/dev-random/templates/base.html b/dev-random/templates/base.html new file mode 100644 index 0000000..1424ca4 --- /dev/null +++ b/dev-random/templates/base.html @@ -0,0 +1,65 @@ +<!DOCTYPE html> +<html lang="{{ DEFAULT_LANG }}"> + <head> + {% block headers %} + <meta charset="utf-8" /> + <title>{% block title %}{{ SITENAME }}{%endblock%}</title> + <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/skeleton.css" /> + <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/main.css" /> + <link rel="shortcut icon" type="text/css" href="{{ SITEURL }}/favicon.ico" /> + <link rel="alternate" type="application/atom+xml" + title="{{ SITENAME }} — Flux Atom" + href="{{ SITEURL }}/{{ FEED }}" /> + {% if FEED_RSS %} + <link rel ="alternate" type="application/rss+xml" + title="{{ SITENAME }} — Flux RSS" + href="{{ SITEURL }}/{{ FEED_RSS }}" /> + {% endif %} + <script src="{{ SITEURL }}/theme/js/hex2ascii.js"></script> + <!--[if lte IE 8]><script src="{{ SITEURL }}/theme/js/html5shiv.js"></script><![endif]--> + {% if GOOGLE_ANALYTICS %} + <script type="text/javascript"> + // Google analytics: + var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); + document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); + function enableGA() { + try { + var pageTracker = _gat._getTracker("{{ GOOGLE_ANALYTICS }}"); + pageTracker._trackPageview(); + _gaq.push(['_setCustomVar', + 1, // This custom var is set to slot #1. Required parameter. + 'User-Agent', + navigator.userAgent + ]); + console.log('GA loaded'); + } catch(err) { + setTimeout(500,'enableGA()'); + console.log('Waiting GA ...'); + } + } + setTimeout('enableGA()', 200); + </script> + {% endif %} + {% endblock headers %} + </head> + <body> + <div class="page"> + <header class="head"> + <h1> + <a href="{{ SITEURL }}/index.html">{{ SITENAME }}</a> + </h1> + </header> + + <div class="main"> + {% include "includes/sidebar.html" %} + {% block content %} + {% endblock content %} + </div> + + <footer class="foot"> + <p> {{ FOOTER_TEXT or 'Powered by <a href="http://pelican.readthedocs.org">Pelican</a>' }}</p> + {% if GITHUB_URL %}<p><a id="github-link" href="{{ GITHUB_URL}}">Fork me on Github</a></p>{% endif %} + </footer> + </div> + </body> +</html> diff --git a/dev-random/templates/categories.html b/dev-random/templates/categories.html new file mode 100644 index 0000000..0a5b0f4 --- /dev/null +++ b/dev-random/templates/categories.html @@ -0,0 +1,14 @@ +{% extends "base.html" %} + +{% block title %}{{ super() }} — Catégories{% endblock title %} + +{%- block content %} + <section class="content"> + <h1>Catégories</h1> + <ul id="category-list"> + {% for category, n in categories %} + <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ n|count }} articles)</li> + {% endfor %} + </ul> + </section> +{% endblock content -%} diff --git a/dev-random/templates/category.html b/dev-random/templates/category.html new file mode 100644 index 0000000..0a5dade --- /dev/null +++ b/dev-random/templates/category.html @@ -0,0 +1,5 @@ +{% extends "index.html" %} + +{% block title %}{{ super() }} — Articles dans la catégorie «{{ category }}»{% endblock %} + +{% block index_title %}Articles dans la catégorie <i>«{{ category }}»</i> :{% endblock %} diff --git a/dev-random/templates/includes/sidebar.html b/dev-random/templates/includes/sidebar.html new file mode 100644 index 0000000..3c42ef9 --- /dev/null +++ b/dev-random/templates/includes/sidebar.html @@ -0,0 +1,46 @@ + <aside class="sidebar"> + <nav class="widget"> + <h3>Site</h3> + <ul> + <li><a href="{{ SITEURL }}">Accueil</a></li> + <li><a href="{{ SITEURL }}/archives.html">Archives</a></li> + <li><a href="{{ SITEURL }}/tags.html">Mots-clés</a></li> + {% if MENUITEMS %} + {% for name, uri in MENUITEMS %} + <li><a href="{{ uri|format(SITEURL)|e}}">{{ name }}</a></li> + {% endfor %} + {% endif %} + {% if DISPLAY_PAGES_ON_MENU %} + {% for p in PAGES %} + <li><a href="{{ SITEURL}}/{{ p.url|e }}"{% if p == page %} class="active"{% endif %}>{{ p.title }}</a></li> + {% endfor %} + {% endif %} + </ul> + </nav> + + {% if categories %} + <nav class="widget"> + <h3>Catégories</h3> + <ul> + {% for cat, null in categories %} + <li><a href="{{ SITEURL }}/{{ cat.url|e }}">{{ cat }}</a></li> + {% endfor %} + </ul> + </nav> + {% endif %} + + {% if SOCIAL %} + <nav class="widget"> + <h3>Social</h3> + <ul> + {% for url, name in SOCIAL %} + <li><a href="{{ url|e }}">{{ name }}</a></li> + {% endfor %} + <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">Flux Atom</a></li> + {% if FEED_RSS %} + <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">Flux RSS</a></li> + {% endif %} + </ul> + </nav> + {% endif %} + </aside> diff --git a/dev-random/templates/index.html b/dev-random/templates/index.html new file mode 100644 index 0000000..aeb5986 --- /dev/null +++ b/dev-random/templates/index.html @@ -0,0 +1,64 @@ +{% extends "base.html" %} + +{%- block content %} + <section class="content"> + <h1 id="page-title">{% block index_title %}Tous les articles{% endblock index_title %}</h1> + + {% for article in articles_page.object_list %} + <article class="post"> + <header class="post-header"> + <time datetime="{{ article.date.isoformat() }}" pubdate="pubdate"> + {{ article.locale_date }} + </time> + <h1> + <a rel="bookmark" + href="{{ SITEURL }}/{{ article.url }}" + title="Lien permanent vers «{{ article.title }}»"> + {{ article.title }} + </a> + </h1> + <div class="meta"> + Dans «<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>» + par <a href="{{ SITEURL }}/{{article.author.url}}">{{ article.author}}</a> + </div> + </header> + <div class="post-content"> + {{ article.summary }} + </div> + <footer class="post-footer"> + <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">Lire la suite...</a> + </footer> + </article> + {% endfor %} + + {%- if articles_page %} + <nav id="pagination"> + {%- if articles_page.has_previous() %} + <a id="first_page" href="{{ SITEURL }}/{{ page_name }}.html"><<</a> + <a id="prev_page" href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() if articles_page.previous_page_number() != 1 else "" }}.html"><</a> + {% else %} + <!-- <span id="first_page" class="a inactive"><<</span> + <span id="first_page" class="a inactive"><</span> --> + {% endif -%} + + {%- for i in range(1,articles_paginator.num_pages+1) %} + {%- if articles_page.number - 5 < i < articles_page.number + 5 %} + {%- if i == articles_page.number %} + <span class="a active">{{loop.index}}</span> + {% else %} + <a href="{{SITEURL}}/{{ page_name }}{{ ( i if i != 1 else "" ) }}.html">{{loop.index}}</a> + {% endif -%} + {% endif -%} + {% endfor -%} + + {%- if articles_page.has_next() %} + <a id="next_page" href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html">></a> + <a id="last_page" href="{{ SITEURL }}/{{ page_name }}{{ articles_paginator.num_pages }}.html">>></a> + {% else %} + <!-- <span id="next_page" class="a inactive">></span> + <span id="next_page" class="a inactive">>></span> --> + {% endif -%} + </nav> + {%- endif%} + </section> +{% endblock content -%} diff --git a/dev-random/templates/page.html b/dev-random/templates/page.html new file mode 100644 index 0000000..f0bc3c9 --- /dev/null +++ b/dev-random/templates/page.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} + +{% block title %}{{ super() }} — {{ page.url }}{% endblock title %} + +{%- block content %} + <section class="content"> + <h1>{{ page.title }}</h1> + {{ page.content }} + </section> +{% endblock content -%} diff --git a/dev-random/templates/tag.html b/dev-random/templates/tag.html new file mode 100644 index 0000000..ca4fc94 --- /dev/null +++ b/dev-random/templates/tag.html @@ -0,0 +1,6 @@ +{% extends "index.html" %} + +{% block title %}{{ super() }} — Articles avec le mot clé « {{ tag }} »{% endblock %} + +{% block index_title %}Articles avec le mot clé « {{ tag }} » :{% endblock %} + diff --git a/dev-random/templates/tags.html b/dev-random/templates/tags.html new file mode 100644 index 0000000..5d8a8c7 --- /dev/null +++ b/dev-random/templates/tags.html @@ -0,0 +1,14 @@ +{% extends "base.html" %} + +{% block title %}{{ super() }} — Mots-clés{% endblock title %} + +{%- block content %} + <section class="content"> + <h1>Mots-clés</h1> + <ul id="tagslist"> + {% for tag in tag_cloud %} + <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li> + {% endfor %} + </ul> + </section> +{% endblock content -%} 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 @@ <details class="meta"> 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 %} + {% if article.author %} par {{ article.author }}{% endif %} dans «<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>». + {% if article.tags %}Mots-clés: {% for tag in article.tags %}{%if loop.index > 1%}, {%endif%}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}</p>{% endif %} </details> 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 @@ <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> @@ -16,7 +16,7 @@ <h2>Mots-clés:</h2> <ul> {% for tag in article.tags %} - <li><a href="{{SITEURL}}/tag/{{tag}}.html">{{ tag }}</a></li> + <li><a href="{{SITEURL}}/{{tag.url}}">{{ tag }}</a></li> {% endfor %} <li><a class="more" href="{{SITEURL}}/tags.html">Plus...</a></li> </ul> 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 @@ <h2 class="page_title">Liste des mots-clés</h2> <ul id="tag_list"> {% for tag, articles in tags %} - <li><h3><a href="{{SITEURL}}/tag/{{tag}}.html">{{ tag }}</a></h3></li> + <li><h3><a href="{{SITEURL}}/{{tag.url}}">{{ tag }}</a></h3></li> {% endfor %} </ul> {% 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 <a class="url fn" href="#">{{ article.author }}</a> {% endif %} on <a>{{ article.date.locale_date }}</a> - about <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a> + about <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a> </div> {{ 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 %} <ul> {% for category, articles in categories %} - <li><a href="{{ SITEURL }}/category/{{ category }}.html">{{ category }}</a></li> + <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li> {% endfor %} </ul> {% 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 %}<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 %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a></p>{% 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 %} <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> {% 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 <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> 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 %} <address class="vcard author"> - By <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a> + By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a> </address> {% endif %} -<p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p> +<p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p> {% include 'taglist.html' %} {% include 'translations.html' %} </footer><!-- /.post-info --> 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 %} - <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 --> @@ -50,7 +50,7 @@ <h2>Categories</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/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 %}<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">get the pdf</a>{% endif %}</p> 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 %} <address class="vcard author"> - By <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a> + By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a> </address> {% endif %} -<p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p> +<p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p> {% include 'taglist.html' %} {{ translations.translate(article) }} </footer><!-- /.post-info --> 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 %} - <li {% if cat == category and not article %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li> + <li {% if cat == category and not article %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li> {% endfor %} {% for title, link in MENUITEMS %} <li><a href="{{ SITEURL }}/{{ link }}">{{ title }}</a></li> 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 %}<p>There are <a href="{{ SITEURL }}/{{ article.slug }}.html#disqus_thread">comments</a>.</p>{% endif %} +{% if DISQUS_SITENAME %}<p>There are <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread">comments</a>.</p>{% 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 %}<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">get the pdf</a>{% endif %}</p> 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 @@ <h1 class="entry-title">Tags</h1> <ul id="cloud"> {% for tag in tag_cloud %} - <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/tag/{{ - tag.0 }}.html">{{ tag.0 }}</a></li> + <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ + tag.0.url }}">{{ tag.0 }}</a></li> {% endfor %} </ul> </section> diff --git a/tuxlite_tbs/static/pygments.css b/tuxlite_tbs/static/pygments.css index 6f68ad4..48406b6 100644 --- a/tuxlite_tbs/static/pygments.css +++ b/tuxlite_tbs/static/pygments.css @@ -1,62 +1,62 @@ /*Syntax highlighting for pygments*/ -.codehilite .hll { background-color: #ffffcc } -.codehilite .c { color: #60a0b0; font-style: italic } /* Comment */ -.codehilite .err { border: 1px solid #FF0000 } /* Error */ -.codehilite .k { color: #007020; font-weight: bold } /* Keyword */ -.codehilite .o { color: #666666 } /* Operator */ -.codehilite .cm { color: #60a0b0; font-style: italic } /* Comment.Multiline */ -.codehilite .cp { color: #007020 } /* Comment.Preproc */ -.codehilite .c1 { color: #60a0b0; font-style: italic } /* Comment.Single */ -.codehilite .cs { color: #60a0b0; background-color: #fff0f0 } /* Comment.Special */ -.codehilite .gd { color: #A00000 } /* Generic.Deleted */ -.codehilite .ge { font-style: italic } /* Generic.Emph */ -.codehilite .gr { color: #FF0000 } /* Generic.Error */ -.codehilite .gh { color: #000080; font-weight: bold } /* Generic.Heading */ -.codehilite .gi { color: #00A000 } /* Generic.Inserted */ -.codehilite .go { color: #808080 } /* Generic.Output */ -.codehilite .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */ -.codehilite .gs { font-weight: bold } /* Generic.Strong */ -.codehilite .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ -.codehilite .gt { color: #0040D0 } /* Generic.Traceback */ -.codehilite .kc { color: #007020; font-weight: bold } /* Keyword.Constant */ -.codehilite .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */ -.codehilite .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */ -.codehilite .kp { color: #007020 } /* Keyword.Pseudo */ -.codehilite .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */ -.codehilite .kt { color: #902000 } /* Keyword.Type */ -.codehilite .m { color: #40a070 } /* Literal.Number */ -.codehilite .s { color: #4070a0 } /* Literal.String */ -.codehilite .na { color: #4070a0 } /* Name.Attribute */ -.codehilite .nb { color: #007020 } /* Name.Builtin */ -.codehilite .nc { color: #0e84b5; font-weight: bold } /* Name.Class */ -.codehilite .no { color: #60add5 } /* Name.Constant */ -.codehilite .nd { color: #555555; font-weight: bold } /* Name.Decorator */ -.codehilite .ni { color: #d55537; font-weight: bold } /* Name.Entity */ -.codehilite .ne { color: #007020 } /* Name.Exception */ -.codehilite .nf { color: #06287e } /* Name.Function */ -.codehilite .nl { color: #002070; font-weight: bold } /* Name.Label */ -.codehilite .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */ -.codehilite .nt { color: #062873; font-weight: bold } /* Name.Tag */ -.codehilite .nv { color: #bb60d5 } /* Name.Variable */ -.codehilite .ow { color: #007020; font-weight: bold } /* Operator.Word */ -.codehilite .w { color: #bbbbbb } /* Text.Whitespace */ -.codehilite .mf { color: #40a070 } /* Literal.Number.Float */ -.codehilite .mh { color: #40a070 } /* Literal.Number.Hex */ -.codehilite .mi { color: #40a070 } /* Literal.Number.Integer */ -.codehilite .mo { color: #40a070 } /* Literal.Number.Oct */ -.codehilite .sb { color: #4070a0 } /* Literal.String.Backtick */ -.codehilite .sc { color: #4070a0 } /* Literal.String.Char */ -.codehilite .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */ -.codehilite .s2 { color: #4070a0 } /* Literal.String.Double */ -.codehilite .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */ -.codehilite .sh { color: #4070a0 } /* Literal.String.Heredoc */ -.codehilite .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */ -.codehilite .sx { color: #c65d09 } /* Literal.String.Other */ -.codehilite .sr { color: #235388 } /* Literal.String.Regex */ -.codehilite .s1 { color: #4070a0 } /* Literal.String.Single */ -.codehilite .ss { color: #517918 } /* Literal.String.Symbol */ -.codehilite .bp { color: #007020 } /* Name.Builtin.Pseudo */ -.codehilite .vc { color: #bb60d5 } /* Name.Variable.Class */ -.codehilite .vg { color: #bb60d5 } /* Name.Variable.Global */ -.codehilite .vi { color: #bb60d5 } /* Name.Variable.Instance */ -.codehilite .il { color: #40a070 } /* Literal.Number.Integer.Long */
\ No newline at end of file +.highlight .hll { background-color: #ffffcc } +.highlight .c { color: #60a0b0; font-style: italic } /* Comment */ +.highlight .err { border: 1px solid #FF0000 } /* Error */ +.highlight .k { color: #007020; font-weight: bold } /* Keyword */ +.highlight .o { color: #666666 } /* Operator */ +.highlight .cm { color: #60a0b0; font-style: italic } /* Comment.Multiline */ +.highlight .cp { color: #007020 } /* Comment.Preproc */ +.highlight .c1 { color: #60a0b0; font-style: italic } /* Comment.Single */ +.highlight .cs { color: #60a0b0; background-color: #fff0f0 } /* Comment.Special */ +.highlight .gd { color: #A00000 } /* Generic.Deleted */ +.highlight .ge { font-style: italic } /* Generic.Emph */ +.highlight .gr { color: #FF0000 } /* Generic.Error */ +.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.highlight .gi { color: #00A000 } /* Generic.Inserted */ +.highlight .go { color: #808080 } /* Generic.Output */ +.highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */ +.highlight .gs { font-weight: bold } /* Generic.Strong */ +.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.highlight .gt { color: #0040D0 } /* Generic.Traceback */ +.highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */ +.highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */ +.highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */ +.highlight .kp { color: #007020 } /* Keyword.Pseudo */ +.highlight .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */ +.highlight .kt { color: #902000 } /* Keyword.Type */ +.highlight .m { color: #40a070 } /* Literal.Number */ +.highlight .s { color: #4070a0 } /* Literal.String */ +.highlight .na { color: #4070a0 } /* Name.Attribute */ +.highlight .nb { color: #007020 } /* Name.Builtin */ +.highlight .nc { color: #0e84b5; font-weight: bold } /* Name.Class */ +.highlight .no { color: #60add5 } /* Name.Constant */ +.highlight .nd { color: #555555; font-weight: bold } /* Name.Decorator */ +.highlight .ni { color: #d55537; font-weight: bold } /* Name.Entity */ +.highlight .ne { color: #007020 } /* Name.Exception */ +.highlight .nf { color: #06287e } /* Name.Function */ +.highlight .nl { color: #002070; font-weight: bold } /* Name.Label */ +.highlight .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */ +.highlight .nt { color: #062873; font-weight: bold } /* Name.Tag */ +.highlight .nv { color: #bb60d5 } /* Name.Variable */ +.highlight .ow { color: #007020; font-weight: bold } /* Operator.Word */ +.highlight .w { color: #bbbbbb } /* Text.Whitespace */ +.highlight .mf { color: #40a070 } /* Literal.Number.Float */ +.highlight .mh { color: #40a070 } /* Literal.Number.Hex */ +.highlight .mi { color: #40a070 } /* Literal.Number.Integer */ +.highlight .mo { color: #40a070 } /* Literal.Number.Oct */ +.highlight .sb { color: #4070a0 } /* Literal.String.Backtick */ +.highlight .sc { color: #4070a0 } /* Literal.String.Char */ +.highlight .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */ +.highlight .s2 { color: #4070a0 } /* Literal.String.Double */ +.highlight .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */ +.highlight .sh { color: #4070a0 } /* Literal.String.Heredoc */ +.highlight .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */ +.highlight .sx { color: #c65d09 } /* Literal.String.Other */ +.highlight .sr { color: #235388 } /* Literal.String.Regex */ +.highlight .s1 { color: #4070a0 } /* Literal.String.Single */ +.highlight .ss { color: #517918 } /* Literal.String.Symbol */ +.highlight .bp { color: #007020 } /* Name.Builtin.Pseudo */ +.highlight .vc { color: #bb60d5 } /* Name.Variable.Class */ +.highlight .vg { color: #bb60d5 } /* Name.Variable.Global */ +.highlight .vi { color: #bb60d5 } /* Name.Variable.Instance */ +.highlight .il { color: #40a070 } /* Literal.Number.Integer.Long */ 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 @@ </li> {% for cat, null in categories %} - <li><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li> + <li><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li> {% endfor %} </ul> </div> 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 %} <ul> {% for category, articles in categories %} - <li><a href="{{ SITEURL }}/category/{{ category }}.html">{{ category }}</li> + <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</li> {% endfor %} </ul> 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 <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a> +by <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a> {% endif %} -{# Filed under <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a> #} +{# Filed under <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a> #} {# {% if article.tags %} - Tags {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> {% endfor %} + Tags {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% 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 %} <ul> {% for tag, articles in tags %} - <li><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</li> + <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</li> {% endfor %} </ul> {% 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' %} - <h3 class="blogMeta">Par <a href="#">{{ article.author }}</a>, Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></h3> + <h3 class="blogMeta">Par <a href="#">{{ article.author }}</a>, Catégorie : <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></h3> <h3 class="blogMeta">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 %}</h3> </div><!-- end #blogItem --> 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 @@ <h3>Categories</h3> <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> {% if LINKS %} @@ -84,7 +84,7 @@ <h3>Tags</h3> <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/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 }} - <h3 class="blogMeta">Par <a href="#">{{ article.author }}</a>, Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></h3> + <h3 class="blogMeta">Par <a href="#">{{ article.author }}</a>, Catégorie : <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></h3> <h3 class="blogMeta">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 %}</h3> </div><!-- end #blogItem --> @@ -31,7 +31,7 @@ <h3>Le {{ article.locale_date }}</h3> {{ article.summary }} -<h3 class="blogMeta">Par <a href="#">{{ article.author }}</a>, Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></h3> +<h3 class="blogMeta">Par <a href="#">{{ article.author }}</a>, Catégorie : <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></h3> <a href="{{ SITEURL }}/{{ article.url }}">Lire la suite …</a> |
