Merge lp:~mcpeter/ubuntu-fr-doc/fix716178 into lp:ubuntu-fr-doc

Proposed by McPeter on 2011-02-13
Status: Merged
Approved by: YoBoY on 2011-02-13
Approved revision: 89
Merged at revision: 85
Proposed branch: lp:~mcpeter/ubuntu-fr-doc/fix716178
Merge into: lp:ubuntu-fr-doc
Diff against target: 32 lines (+2/-4)
1 file modified
lib/tpl/ubuntu-2010/main.php (+2/-4)
To merge this branch: bzr merge lp:~mcpeter/ubuntu-fr-doc/fix716178
Reviewer Review Type Date Requested Status
YoBoY (community) 2011-02-13 Approve on 2011-02-13
Review via email: mp+49527@code.launchpad.net

Description of the change

Ajout de la class 'dokuwiki' à l'élément sous ID 'main' pour la gestion des bulles de notes de bas de page.
Il faut penser aussi à mettre à jour le static. les modifications sur doc-general.css ajoute la gestion de ces bulles.

To post a comment you must log in.
YoBoY (yoboy-leguesh) wrote :

super compliqué ce patch :p

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/tpl/ubuntu-2010/main.php'
2--- lib/tpl/ubuntu-2010/main.php 2011-02-08 09:41:07 +0000
3+++ lib/tpl/ubuntu-2010/main.php 2011-02-13 01:51:10 +0000
4@@ -113,7 +113,7 @@
5
6 <?php flush()?>
7
8- <div id="main">
9+ <div id="main" class="dokuwiki">
10
11 <div id="hidemenu" title="Masquer le menu"></div>
12
13@@ -167,19 +167,17 @@
14 </ul>
15
16 </div>
17-
18 <div id="references">
19 <ul id="legal">
20 <li><a href="#">Contact</a></li><li><a href="#">Ressources</a></li><li><a href="#">Licences</a></li>
21 </ul>
22-
23+
24 <ul id="sponsors">
25 <li><a href="http://www.dokuwiki.org/dokuwiki" id="dokuwiki">Propulsé par Dokuwiki</a></li>
26 </ul>
27 </div>
28
29 </div>
30-
31 <!-- $Id$ -->
32 <div class="no"><?php /* provide DokuWiki housekeeping, required in all templates */ tpl_indexerWebBug()?></div>
33

Subscribers

People subscribed via source and target branches

to all changes: