Encore de la mise en page…

diff --git a/local.css b/local.css
index cefb2de2340ad8636ab21325ccfee74db71a09fb..de4b4295747815336729a433bb3fd6e23b0d91a3 100644 (file)
--- a/local.css
+++ b/local.css
@@ -104,10 +104,6 @@ pre {
        display: none;
 }
 
-.pageheader .actions ul {
-       border-bottom: none;
-}
-
 .parentlinks > a {
        width: 394px; /* same as .pageheader .header:margin-left */
        height: 100px;
@@ -144,29 +140,10 @@ pre {
 
 /* {{{ .actions */
 .actions {
-       display: block;
-       position: fixed;
-       z-index: 300;
-       top: 35em;
-       left: 0;
-       width: 100%;
-}
-.actions ul {
-       width: 54em; /* same as .page:width */
-       margin: auto;
-}
-
-.actions ul li {
-       display: block;
-       width: 11.44em; /* same as .sidebar:width */
-       background: transparent;
-       padding: 0;
-}
-
-.actions ul li > a {
        font-size: 80%;
-       padding: 0.2em;
+       text-align: right;
 }
+
 /* .actions }}} */
 /* {{{ #otherlanguages */
 #otherlanguages,
@@ -213,23 +190,23 @@ pre {
        margin: 0;
        padding: 0;
        border: none;
-       z-index: 100;
+       z-index: 200;
        background: #f5f5f5;
        border-top: solid 1px #ccc;
-       padding-top: 88px; /* same as #logo-home:height - .header:height */
+       padding-top: 30px;
 }
 
 .sidebar ul {
        margin: 0;
 }
 
-.sidebar ul, .actions ul {
+.sidebar ul {
        padding: 0;
        list-style: none;
        background: transparent;
 }
 
-.sidebar li, .actions li {
+.sidebar li {
        text-align: left;
 }
 
@@ -239,10 +216,9 @@ pre {
 }
 
 .sidebar ul li > span,
-.sidebar ul li > a,
-.actions ul li > a {
+.sidebar ul li > a {
        display: block;
-       padding: 0.5em;
+       padding: 0.3em 0.5em;
        text-decoration: none;
        border: 1px solid #f5f5f5;
        color: #a756af;
@@ -261,7 +237,7 @@ pre {
        background: #eeeeee;
 }
 
-.sidebar a:hover, .actions a:hover {
+.sidebar a:hover {
        border-top: 1px dotted #57075f;
        border-bottom: 1px dotted #57075f;
        color: #57075f;
@@ -403,6 +379,7 @@ pre {
        background: -webkit-linear-gradient(#001030, #57075f);
        background:    -moz-linear-gradient(#001030, #57075f);
        background:         linear-gradient(#001030, #57075f);
+       z-index: 400;
 }
 
 #footer #pageinfo {

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 9e0d8c7e9afaf3cd06870faf430b7c7cdad0175e..3d554e53bf4b6d914fc8f5c3dd06694de807db02 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -61,40 +61,6 @@
 </TMPL_IF>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
-<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>
-
 <TMPL_IF OTHERLANGUAGES>
 <TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF>
 <ul>
@@ -153,31 +119,13 @@
 
 <TMPL_IF TAGS>
 <TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
-Tags:
+Tags :
 <TMPL_LOOP TAGS>
 <TMPL_VAR LINK>
 </TMPL_LOOP>
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF BACKLINKS>
-<TMPL_IF HTML5><nav id="backlinks"><TMPL_ELSE><div id="backlinks"></TMPL_IF>
-Links:
-<TMPL_LOOP BACKLINKS>
-<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
-</TMPL_LOOP>
-<TMPL_IF MORE_BACKLINKS>
-<span class="popup">...
-<span class="balloon">
-<TMPL_LOOP MORE_BACKLINKS>
-<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
-</TMPL_LOOP>
-</span>
-</span>
-</TMPL_IF>
-<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
-
 <TMPL_IF COPYRIGHT>
 <div class="pagecopyright">
 <a name="pagecopyright"></a>
@@ -188,18 +136,52 @@ Links:
 <TMPL_IF LICENSE>
 <div class="pagelicense">
 <a name="pagelicense"></a>
-License: <TMPL_VAR LICENSE>
+Licence : <TMPL_VAR LICENSE>
 </div>
 </TMPL_IF>
 
 <div class="pagedate">
-Last edited <TMPL_VAR MTIME>
+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>