Responsive, 1ere passe.

diff --git a/Services.mdwn b/Services.mdwn
index 7339fa4d20f52ba7c581f5beb8291fb654454b5c..9d59bd47634ba7b98169d8cccfd60bc84511c3f9 100644 (file)
--- a/Services.mdwn
+++ b/Services.mdwn
@@ -10,20 +10,14 @@
 
 var content = d3.select("#content");
 var consensus_figure = content.append("figure")
-  .style("margin", "0")
-  .style("width", "45%")
-  .style("float", "left")
-  .style("text-align", "center");
+  .attr('class', 'graph graph-consensus')
 consensus_figure.append("span")
   .attr("id", "consensus-pie");
 consensus_figure.append("figcaption")
   .text(L10n.consensus_weight);
 
 var exit_figure = content.append("figure")
-  .style("margin", "0 5% 0 0")
-  .style("width", "44%")
-  .style("float", "left")
-  .style("text-align", "center");
+  .attr('class', 'graph graph-exit')
 exit_figure.append("span")
   .attr("id", "exit-pie");
 exit_figure.append("figcaption")

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 7e81546b32302503b4b845c72fbd5da8ed451780..ad61bef742d0d408ddf46600ee63b3ea9d251c4d 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -1,10 +1,10 @@
 # IkiWiki::Setup::Yaml - YAML formatted setup file
 #
 # Setup file for ikiwiki.
-# 
+#
 # Passing this to ikiwiki --setup will make ikiwiki generate
 # wrappers and build the wiki.
-# 
+#
 # Remember to re-run ikiwiki --setup any time you edit this file.
 #
 # name of the wiki
@@ -61,7 +61,7 @@ discussion: '0'
 # name of Discussion pages
 discussionpage: Discussion
 # generate HTML5?
-html5: '0'
+html5: '1'
 # only send cookies over SSL connections?
 sslcookie: '0'
 # extension to use for new pages

diff --git a/index.mdwn b/index.mdwn
index 6f94cf128fddf473e3427464b43b8f3850ea2b3d..d9756aecd2deeaf909feb39d02a5aece68a2e80d 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,9 +1,5 @@
 [[!meta title="Nos oignons : nœuds de sortie Tor financés par la communauté"]]
-[[!meta stylesheet="assets/home" rel="stylesheet"]]
 
-<div id="logo-container">
-  <div id="logo-home"></div>
-</div>
 <div id="logo-subtexts">
   <div id="logo-home-subtext-fr">Nœuds de sortie Tor financés par la communauté. [[En savoir plus…|À_propos]]</div>
   <div id="logo-home-subtext-en">Tor exit nodes funded by the community. [[Learn more…|À_propos.en]]</div>

diff --git a/local.css b/local.css
index e36a4d92c7ce901917f8af7bf18d96f205eab04f..c3c3c901cb0f85a888a6e0db7d9e97dcfbaa9c37 100644 (file)
--- a/local.css
+++ b/local.css
@@ -31,16 +31,32 @@
   src: local('Inconsolata'), local('Inconsolata-Regular'), url(assets/Inconsolata/Inconsolata.otf) format('opentype');
 }
 
+/* http://www.paulirish.com/2012/box-sizing-border-box-ftw/ */
+/* apply a natural box layout model to all elements, but allowing components to change */
 html {
-       overflow: auto;
+  box-sizing: border-box;
+}
+*, *:before, *:after {
+  box-sizing: inherit;
+}
+
+img,
+table {
+  max-width: 100%;
+  height: auto;
+}
+
+
+html {
+       /*overflow: auto;*/
 }
 
 body {
        margin: 0;
        padding: 0;
        font-family: "Open Sans", sans-serif;
-       color: #b3b3b3;
-       background: url(assets/tile.png) fixed;
+       color: #111;
+       background: #fff url(assets/tile.png) fixed;
 }
 
 code,
@@ -57,175 +73,138 @@ thead td {
        text-decoration: underline;
 }
 
-.page {
-       overflow: hidden;
-       max-width: 54em;
+
+.body-wrapper {
+       max-width: 70em;
        margin: 0 auto 0 auto;
        box-shadow: 0 0 0.6em 0 #333366;
-       background: #f5f5f5;
-}
-
-/* {{{ .pageheader */
-.pageheader {
-       position: fixed;
-       width: 54em; /* same as .page:max-width */
-       height: 100px;
-       padding: 0;
-       background: white url(assets/filet.png) no-repeat 99% 90px;
-       box-shadow: 0 10px 15px 0px white;
-       z-index: 120;
-}
-
-.pageheader .header {
-       font-size: 120%;
-       margin-left: 394px;
-}
-
-.pageheader .header > span {
-       display: block;
-       height: 100px;
-       padding-top: 22px;
+       background: white;
 }
-
-.pageheader .parentlinks {
-       display: block;
-}
-
-.pageheader a,
-.pageheader .parentlinks a {
-       color: #ffa430; /* was: #eeeeaa */
-       text-decoration: none;
-}
-
-.pageheader a:hover {
-       text-decoration: underline;
+@media screen and (min-width: 45em) {
+  .menu,
+  .main {
+    display: table-cell;
+  }
+  .menu {
+    width: 20%;
+    max-width: 15em;
+    min-width: 11em;
+  }
+  .main {
+  }
 }
 
-.pageheader .title {
-       position: absolute;
-       bottom: 27px;
-       left: 392px;
-       font-size: 160%;
-       color: black;
-}
 
-.pageheader .title .translationstatus {
-       display: none;
+header {
+    padding: 1em 0;
+      border-bottom: solid 1px #ccc;
 }
 
-.parentlinks > a {
+#logo {
+    display: block;
        width: 394px; /* same as .pageheader .header:margin-left */
        height: 100px;
+  max-width: 100%;
        background: url(assets/logo-nos-oignons-blanc.png) no-repeat top left;
-       position: absolute;
-       left: 0;
-       top: 0;
+  background-size: 100%;
 }
 
-.parentlinks > a span {
+#logo span {
        display: none;
 }
 
-.parentlinks .parentlinksep + a {
-       width: auto;
-       height: auto;
-       background: transparent;
-       display: inline;
-       position: static;
+/* {{{ .actions */
+.actions {
+       font-size: 80%;
+       text-align: right;
 }
-
-.parentlinks .parentlinksep + a + .parentlinksep + a {
-       background: url(assets/ariane-sep.png) no-repeat 0% 50%;
-       padding-left: 20px;
+.actions ul {
+  height: auto;
 }
 
-.parentlinks .parentlinksep + a span {
-       display: inline;
+.breadcrumb,
+.breadcrumb  a {
+  text-decoration: none;
+  color: #b3b3b3;
 }
-
-.parentlinks .parentlinksep {
-       display: none;
+.breadcrumb a:hover {
+  text-decoration: none;
+  color: #57075f;
 }
-
-/* {{{ .actions */
-.actions {
-       font-size: 80%;
-       text-align: right;
+.breadcrumb  a + a:before {
+  content:"▸";
+  display: inline-block;
+  vertical-align: top;
+  margin: -1px 0.5em 0;
+  color: #b3b3b3;
 }
+.breadcrumb  a + a:hover:before {}
 
 /* .actions }}} */
 /* {{{ #otherlanguages */
+#otherlanguages {
+  float: right;
+  font-size: 0.9em;
+}
 #otherlanguages,
-#otherlanguages ul li a {
-       color: #57075f;
-       background: white;
+#otherlanguages a {
+       color: #b3b3b3;
+       /*background: white;*/
+}
+#otherlanguages a:hover {
+  color: #57075f;
 }
 
+#otherlanguages ul {
+  padding: 0;
+}
 #otherlanguages ul li {
-       margin-left: 1em;
+       /*margin-left: 1em;*/
 }
 #otherlanguages .langstatus {
-       display: none;
+       /*display: none;*/
 }
 
-.pageheader #otherlanguages {
-       border: none;
-       position: absolute;
-       bottom: 1.2em;
-       right: 0;
-       z-index: 300;
-       font-size: 80%;
-}
-/* #otherlanguages }}} */
-/* .pageheader }}} */
 
-#pagebody {
-       position: relative;
-       min-height: 756px;
-       margin: 0 0 0 11.44em; /* same as .sidebar:width */
-       padding: 100px 2em 1em 2em;
-       z-index: 110;
+main {
        background: white url(assets/background.png) no-repeat bottom center;
-       color: black;
-       border-left: solid 1px #ccc;
+      background-size: 50%;
+       color: #111;
 }
 
-/* {{{ .sidebar */
-.sidebar {
-       position: fixed;
-       overflow: hidden;
-       top: 100px; /* same as .header:height */
-       width: 11.44em;
-       margin: 0;
-       padding: 0;
+
+.menu {
+       padding: 1em 0;
        border: none;
-       z-index: 200;
        background: #f5f5f5;
-       border-top: solid 1px #ccc;
-       padding-top: 30px;
+}
+@media screen and (max-width: 45em) {
+  .menu {
+       border-bottom: solid 1px #ccc;
+  }
 }
 
-.sidebar ul {
+.menu ul {
        margin: 0;
 }
 
-.sidebar ul {
+.menu ul {
        padding: 0;
        list-style: none;
        background: transparent;
 }
 
-.sidebar li {
+.menu li {
        text-align: left;
 }
 
-.sidebar ul li .selflink {
+.menu ul li .selflink {
        color: #57075f;
        font-weight: bold;
 }
 
-.sidebar ul li > span,
-.sidebar ul li > a {
+.menu ul li > span,
+.menu ul li > a {
        display: block;
        padding: 0.3em 0.5em;
        text-decoration: none;
@@ -236,71 +215,62 @@ thead td {
        font-size: 100%;
 }
 
-.sidebar ul li .selflink:hover {
-       border-top: 1px dotted #57075f;
-       border-bottom: 1px dotted #57075f;
-       background: #eeeeee;
-}
 
-.sidebar a:hover {
-       border-top: 1px dotted #57075f;
-       border-bottom: 1px dotted #57075f;
+.menu a:hover {
        color: #57075f;
        background: #eeeeee;
        text-decoration: none;
 }
-/* .sidebar }}} */
-/* {{{ #content */
-#content {
-       padding-top: 1em;
-       overflow: auto;
+
+
+main {
+       padding: 1em;
 }
 
-#content a {
+main a {
        color: #57075f;
        text-decoration: underline;
 }
 
-#content a:hover {
+main a:hover {
        text-decoration: underline;
 }
 
-#content p {
-       text-align: justify;
+main p {
        margin: 1em 0 1em 0;
 }
 
-#content hr {
+main hr {
        border: none;
        border-bottom: dotted 2px #bbbbbb;
        margin: 2em auto;
 }
 
-#content h1 {
+main h1 {
        font-size: 180%;
        font-weight: bold;
        color: #ffa430;
        text-shadow: 2px 2px 1px #444;
 }
 
-#content h2,
-#content .header {
+main h2,
+main .header {
        font-size: 140%;
        font-weight: bold;
 }
 
-#content h2 + p {
+main h2 + p {
        margin-top: 0.75em;
 }
 
-#content h3 {
+main h3 {
        font-size: 120%;
        font-weight: bold;
        margin-bottom: 0;
        padding-bottom: 0;
 }
 
-#content h3 + p {
+main h3 + p {
        margin-top: 0.5em;
 }
 h2 sup,
@@ -308,58 +278,59 @@ h3 sup {
   font-weight: normal;
 }
 
-#content blockquote {
+main blockquote {
   border-left: 2px solid #A756AF;
   margin: 0.5em 0;
   padding: 0.5em 0 0.5em 1em;
 }
-#content blockquote p {margin: 0;}
-#content blockquote p + p {margin-top: 1em;}
+main blockquote p {margin: 0;}
+main blockquote p + p {margin-top: 1em;}
 
-#content table {
+
+main table {
        border-top: solid 1px #aaa;
        border-bottom: solid 1px #aaa;
        border-collapse: collapse;
 }
 
-#content table th {
+main table th {
        background: #fafafa;
        padding: 0.1em 0.5em;
        border-bottom: solid 1px #aaaaaa;
        color: #555555;
 }
 
-#content table td {
+main table td {
        padding: 0.1em 0.5em;
        border-top: solid 1px #ccc;
 }
 
-#content .header a {
+main .header a {
        text-decoration: none;
 }
 
-#content .feedlink a {
+main .feedlink a {
        text-decoration: none;
 }
 
-#content .feedlink {
+main .feedlink {
        text-align: right;
        margin-top: -2.8em;
        min-height: 2.8em;
 }
-#content .feedlink .feedbutton {
+main .feedlink .feedbutton {
        font-size: 80%;
        color: #57075f !important;
        background: transparent;
        border: none;
 }
-#content .feedlink .feedbutton:hover {
+main .feedlink .feedbutton:hover {
        color: #57075f !important;
        background: transparent;
        text-decoration: underline;
 }
 
-#content .footnotes {
+main .footnotes {
        font-size: 80%;
 }
 
@@ -369,7 +340,17 @@ h3 sup {
   width: 49.5%;
 }
 
-/* #content }}} */
+/* main }}} */
+
+
+.graph {
+  display: inline-block;
+  vertical-align: top;
+  width: 45%;
+  margin: 1em 1%;
+  min-width: 20em;
+  text-align: center;
+}
 
 /* Paypal donation forms */
 .paypal-donation {
@@ -377,6 +358,7 @@ h3 sup {
        vertical-align: top;
        width:45%;
        padding-right: 4%;
+      min-width: 20em;
 }
 .paypal-donation h4 {
        margin: 0 0 0.5em 0;
@@ -539,24 +521,20 @@ h3 sup {
 
 /* {{{ #footer */
 #footer {
-       position: relative;
        margin: 0;
        padding: 0.5em 0;
        text-align: center;
        color: white;
        background: #57075f;
-       z-index: 400;
 }
-
-#footer #pageinfo {
-       position: relative;
-       margin: auto;
-       padding: 0.1em 2em;
-       border-top: none;
+#footer > div {
+    margin-top: 1em;
 }
 
+
 #footer a {
        color: white;
+  text-decoration: none;
 }
 
 #footer a:hover {
@@ -577,7 +555,7 @@ h3 sup {
 
 /* {{{ @media print */
 @media print {
-       .sidebar,
+       .menu,
        .actions,
        .feedlink,
        #backlinks,
@@ -620,7 +598,7 @@ h3 sup {
 
        .pageheader a,
        .pageheader .parentlinks a {
-               color: black;
+               color: #111;
        }
 
        .pageheader,
@@ -642,14 +620,14 @@ h3 sup {
                display: inline;
        }
 
-       #content h1 {
-               color: black;
+       main h1 {
+               color: #111;
                text-shadow: none;
                border-bottom: solid #ccc 1px;
        }
 
-       #content a:link:after,
-       #content a:visited:after {
+       main a:link:after,
+       main a:visited:after {
                content:" [" attr(href) "] ";
        }
 

diff --git a/templates/page.tmpl b/templates/page.tmpl
index a28b9f05bdcc39e65523c084750f03082c9b02e1..5c185a0f7908ac6401b46bf3c737079d1befabaf 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -11,184 +11,208 @@
 </TMPL_IF>
 </TMPL_IF>
 <TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
-<title><TMPL_VAR TITLE></title>
+    <title><TMPL_VAR TITLE></title>
 <TMPL_IF FAVICON>
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
+    <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
 </TMPL_IF>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
+    <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
 <TMPL_IF LOCAL_CSS>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
+    <link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
 <TMPL_ELSE>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+    <link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
 </TMPL_IF>
 <TMPL_IF EDITURL>
-<link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
+    <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
 </TMPL_IF>
 <TMPL_IF FEEDLINKS><TMPL_VAR FEEDLINKS></TMPL_IF>
 <TMPL_IF RELVCS><TMPL_VAR RELVCS></TMPL_IF>
 <TMPL_IF META><TMPL_VAR META></TMPL_IF>
 <TMPL_LOOP TRAILLOOP>
 <TMPL_IF PREVPAGE>
-<link rel="prev" href="<TMPL_VAR PREVURL>" title="<TMPL_VAR PREVTITLE>" />
+    <link rel="prev" href="<TMPL_VAR PREVURL>" title="<TMPL_VAR PREVTITLE>" />
 </TMPL_IF>
-<link rel="up" href="<TMPL_VAR TRAILURL>" title="<TMPL_VAR TRAILTITLE>" />
+    <link rel="up" href="<TMPL_VAR TRAILURL>" title="<TMPL_VAR TRAILTITLE>" />
 <TMPL_IF NEXTPAGE>
-<link rel="next" href="<TMPL_VAR NEXTURL>" title="<TMPL_VAR NEXTTITLE>" />
+    <link rel="next" href="<TMPL_VAR NEXTURL>" title="<TMPL_VAR NEXTTITLE>" />
 </TMPL_IF>
 </TMPL_LOOP>
 </head>
-<body>
-
-<TMPL_IF HTML5><article class="page"><TMPL_ELSE><div class="page"></TMPL_IF>
-
-<TMPL_IF HTML5><section class="pageheader"><TMPL_ELSE><div class="pageheader"></TMPL_IF>
-<TMPL_IF HTML5><header class="header"><TMPL_ELSE><div class="header"></TMPL_IF>
-<span>
-<span class="parentlinks">
-<TMPL_LOOP PARENTLINKS>
-<a href="<TMPL_VAR URL>"><span><TMPL_VAR PAGE></span></a><span class="parentlinksep"> ▸</span>
-</TMPL_LOOP>
-</span>
-<span class="title">
-<TMPL_VAR TITLE>
-<TMPL_IF ISTRANSLATION>
-<span class="translationstatus">&nbsp;(<TMPL_VAR PERCENTTRANSLATED>%)</span>
-</TMPL_IF>
-</span>
-</span>
-<TMPL_IF SEARCHFORM>
-<TMPL_VAR SEARCHFORM>
-</TMPL_IF>
-<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
-
-<TMPL_IF OTHERLANGUAGES>
-<TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF>
-<ul>
-<TMPL_LOOP OTHERLANGUAGES>
-<li>
-<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a><span class="langstatus">
-<TMPL_IF MASTER>
-(master)
-<TMPL_ELSE>
-&nbsp;(<TMPL_VAR PERCENT>%)
-</TMPL_IF>
-</span></li>
-</TMPL_LOOP>
-</ul>
-<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
-
-<TMPL_VAR TRAILS>
-
-<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
-
-<div id="pagebody">
-
-<TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
-<TMPL_VAR CONTENT>
-<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
-
-<TMPL_UNLESS DYNAMIC>
-<TMPL_IF COMMENTS>
-<TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
-<TMPL_VAR COMMENTS>
-<TMPL_IF ADDCOMMENTURL>
-<div class="addcomment">
-<a href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a>
-</div>
-<TMPL_ELSE>
-<div class="addcomment">Comments on this page are closed.</div>
-</TMPL_IF>
-<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
-</TMPL_UNLESS>
-
-</div>
-
-<TMPL_IF SIDEBAR>
-<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
-<TMPL_VAR SIDEBAR>
-<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
-
-<TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
-<TMPL_UNLESS DYNAMIC>
-<TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
-
-<TMPL_VAR TRAILS>
-
-<TMPL_IF TAGS>
-<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
-Tags :
-<TMPL_LOOP TAGS>
-<TMPL_VAR LINK>
-</TMPL_LOOP>
-<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
-
-<div class="pagecopyright">
-<a name="page_copyright"></a>
-Contenu <TMPL_IF COPYRIGHT><TMPL_VAR COPYRIGHT><TMPL_ELSE>© 2013 Nos oignons</TMPL_IF>.
-Logo © 2013 <a href="http://www.lutopiquant.fr/">lutopiquant</a>.
-<a name="page_license"></a>
-<TMPL_IF LICENSE>
-Licence : <TMPL_VAR LICENSE>.
-<TMPL_ELSE>
-Licence : <a href="https://creativecommons.org/licenses/by-sa/3.0/fr/deed.fr_FR">CC BY-SA 3.0 FR</a>.
-</TMPL_IF>
-</div>
-
-<div class="pagedate">
-Dernière modification : <TMPL_VAR MTIME>
-<!-- Created <TMPL_VAR CTIME> -->
-</div>
-
-<div class="disclaimer">
-<em>Nos oignons</em> est une initiative indépendante du project <em>Tor</em>.<br />
-<em>Tor</em> et le <em>Onion Logo</em> sont des marques déposées par <em>The Tor Project, Inc.</em>
-</div>
-
-<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-<TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
-</TMPL_UNLESS>
-<TMPL_IF HAVE_ACTIONS>
-<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
-<ul>
-<TMPL_IF EDITURL>
-<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Modifier</a></li>
-</TMPL_IF>
-<TMPL_IF RECENTCHANGESURL>
-<li><a href="<TMPL_VAR RECENTCHANGESURL>">Dernières modifications</a></li>
-</TMPL_IF>
-<TMPL_IF HISTORYURL>
-<li><a href="<TMPL_VAR HISTORYURL>">Historique</a></li>
-</TMPL_IF>
-<TMPL_IF GETSOURCEURL>
-<li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li>
-</TMPL_IF>
-<TMPL_IF PREFSURL>
-<li><a href="<TMPL_VAR PREFSURL>">Préferences</a></li>
-</TMPL_IF>
-<TMPL_IF ACTIONS>
-<TMPL_LOOP ACTIONS>
-<li><TMPL_VAR ACTION></li>
-</TMPL_LOOP>
-</TMPL_IF>
-<TMPL_IF COMMENTSLINK>
-<li><TMPL_VAR COMMENTSLINK></li>
-<TMPL_ELSE>
-<TMPL_IF DISCUSSIONLINK>
-<li><TMPL_VAR DISCUSSIONLINK></li>
-</TMPL_IF>
-</TMPL_IF>
-</ul>
-<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
-
-<!-- from <TMPL_VAR WIKINAME> -->
-<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
-
-<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
-
+<body class="">
+<div class="body-wrapper">
+    <!-- HEADER -->
+    <TMPL_IF HTML5><header class="header"><TMPL_ELSE><div class="header"></TMPL_IF>
+        <a id="logo" href="/"><span>Nos oignons</span></a>
+        <!-- <span> -->
+<!--             <nav class="parentlinks">
+                <TMPL_LOOP PARENTLINKS>
+                <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
+                </TMPL_LOOP>
+            </nav> -->
+<!--             <span class="title">
+                <TMPL_VAR TITLE>
+                <TMPL_IF ISTRANSLATION>
+                <span class="translationstatus">&nbsp;(<TMPL_VAR PERCENTTRANSLATED>%)</span>
+                </TMPL_IF>
+            </span> -->
+        <!-- </span> -->
+<!--         <TMPL_IF SEARCHFORM>
+        <TMPL_VAR SEARCHFORM>
+        </TMPL_IF> -->
+    <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
+
+    <!-- MENU -->
+    <TMPL_IF SIDEBAR>
+    <TMPL_IF HTML5><nav class="menu"><TMPL_ELSE><div class="menu"></TMPL_IF>
+    <TMPL_VAR SIDEBAR>
+    <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+    </TMPL_IF>
+
+    <TMPL_IF HTML5><main class="main"><TMPL_ELSE><div class="main"></TMPL_IF>
+
+        <!-- LANGUAGE LINKS -->
+        <TMPL_IF OTHERLANGUAGES>
+        <TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF>
+        <ul>
+            <TMPL_LOOP OTHERLANGUAGES>
+            <li>
+                <a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
+                <span class="langstatus">
+                <TMPL_IF MASTER>(master)<TMPL_ELSE>&nbsp;(<TMPL_VAR PERCENT>%)</TMPL_IF>
+                </span>
+            </li>
+            </TMPL_LOOP>
+        </ul>
+        <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+        </TMPL_IF>
+
+        <!-- breadcrumb -->
+        <nav class="breadcrumb">
+            <TMPL_LOOP PARENTLINKS>
+            <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
+            </TMPL_LOOP>
+        </nav>
+
+        <!-- Page title -->
+        <h1 class="title">
+            <TMPL_VAR TITLE>
+            <TMPL_IF ISTRANSLATION>
+            <span class="translationstatus">&nbsp;(<TMPL_VAR PERCENTTRANSLATED>%)</span>
+            </TMPL_IF>
+        </h1>
+        <!-- <TMPL_IF HTML5><article class="page"><TMPL_ELSE><div class="page"></TMPL_IF> -->
+
+        <!-- <TMPL_IF HTML5><section class="pageheader"><TMPL_ELSE><div class="pageheader"></TMPL_IF> -->
+
+        <TMPL_VAR TRAILS>
+
+        <!-- <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> -->
+
+        <!-- <div id="pagebody"> -->
+
+        <TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
+        <TMPL_VAR CONTENT>
+        <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+
+            <!-- <TMPL_UNLESS DYNAMIC>
+            <TMPL_IF COMMENTS>
+            <TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
+            <TMPL_VAR COMMENTS>
+            <TMPL_IF ADDCOMMENTURL>
+            <div class="addcomment">
+            <a href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a>
+            </div>
+            <TMPL_ELSE>
+            <div class="addcomment">Comments on this page are closed.</div>
+            </TMPL_IF>
+            <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+            </TMPL_IF>
+            </TMPL_UNLESS> -->
+
+        <!-- </div> -->
+
+    <TMPL_IF HTML5></main><TMPL_ELSE></div></TMPL_IF><!-- main -->
+
+    <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
+    <TMPL_UNLESS DYNAMIC>
+    <!-- <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF> -->
+
+        <TMPL_VAR TRAILS>
+
+        <TMPL_IF TAGS>
+        <TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
+        Tags :
+        <TMPL_LOOP TAGS>
+        <TMPL_VAR LINK>
+        </TMPL_LOOP>
+        <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+        </TMPL_IF>
+
+        <div class="pagecopyright">
+        <!-- <a name="page_copyright"></a> -->
+        Contenu <TMPL_IF COPYRIGHT><TMPL_VAR COPYRIGHT><TMPL_ELSE>&copy; 2013 Nos oignons</TMPL_IF>.
+        Logo &copy; 2013 <a href="http://www.lutopiquant.fr/">lutopiquant</a>.
+        <a name="page_license"></a>
+        <TMPL_IF LICENSE>
+        Licence : <TMPL_VAR LICENSE>.
+        <TMPL_ELSE>
+        Licence : <a href="https://creativecommons.org/licenses/by-sa/3.0/fr/deed.fr_FR">CC BY-SA 3.0 FR</a>.
+        </TMPL_IF>
+        </div>
+
+        <div class="disclaimer">
+            <em>Nos oignons</em> est une initiative indépendante du project <em>Tor</em>.<br />
+            <em>Tor</em> et le <em>Onion Logo</em> sont des marques déposées par <em>The Tor Project, Inc.</em>
+        </div>
+
+        <div class="pagedate">
+        Dernière modification : <TMPL_VAR MTIME>
+        <!-- Created <TMPL_VAR CTIME> -->
+        </div>
+
+        <!-- <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> -->
+
+        <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
+        </TMPL_UNLESS>
+        <TMPL_IF HAVE_ACTIONS>
+        <TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
+        <ul>
+            <TMPL_IF EDITURL>
+            <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Modifier</a></li>
+            </TMPL_IF>
+            <TMPL_IF RECENTCHANGESURL>
+            <li><a href="<TMPL_VAR RECENTCHANGESURL>">Dernières modifications</a></li>
+            </TMPL_IF>
+            <TMPL_IF HISTORYURL>
+            <li><a href="<TMPL_VAR HISTORYURL>">Historique</a></li>
+            </TMPL_IF>
+            <TMPL_IF GETSOURCEURL>
+            <li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li>
+            </TMPL_IF>
+            <TMPL_IF PREFSURL>
+            <li><a href="<TMPL_VAR PREFSURL>">Préferences</a></li>
+            </TMPL_IF>
+            <TMPL_IF ACTIONS>
+            <TMPL_LOOP ACTIONS>
+            <li><TMPL_VAR ACTION></li>
+            </TMPL_LOOP>
+            </TMPL_IF>
+            <TMPL_IF COMMENTSLINK>
+            <li><TMPL_VAR COMMENTSLINK></li>
+            <TMPL_ELSE>
+            <TMPL_IF DISCUSSIONLINK>
+            <li><TMPL_VAR DISCUSSIONLINK></li>
+            </TMPL_IF>
+            </TMPL_IF>
+        </ul>
+        <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+        </TMPL_IF>
+
+        <!-- from <TMPL_VAR WIKINAME> -->
+
+    <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
+
+    <!-- <TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF> -->
+
+</div><!-- body-wrapper -->
 </body>
 </html>