Changes in [1792:3ad2e47ed52d:1793:a25f8d0fd400]

Files:

• admin/_charte.html (modified) (1 diff)
• admin/help.php (added)
• admin/images/menu/help-b.png (added)
• admin/images/menu/help.png (added)
• admin/style/default.css (modified) (2 diffs)
• inc/admin/lib.dc.page.php (modified) (2 diffs)
• inc/admin/prepend.php (modified) (1 diff)
• locales/en/help/main.html (added)
• locales/en/resources.php (modified) (1 diff)
• locales/fr/help/core_main.html (added)
• locales/fr/main.po (modified) (1 diff)

admin/_charte.html

@@ -56 +56 @@
                <li><a href="#qx">Aller à la recherche</a></li>
           </ul>
-          <div id="top"><h1><a href="./_charte.html">Bibliothèque de styles - Dotclear - 2.6+</a></h1></div>
+          <div id="top"><h1><a href="./index.php">Bibliothèque de styles - Dotclear - 2.6+</a></h1></div>
           <div id="info-boxes">
                <div id="info-box1">

admin/style/default.css

@@ -2048 +2048 @@
 */
 
-
 /* ------------------------------------------------------------------------------------
                                                                            UN POIL DE MEDIA QUERIES
@@ -2121 +2120 @@
      #info-box1 p.nomobile, label.nomobile { display: none; }
      }
+
+/* Globalhelp */
+
+/* 1. inside help block */
+#helplink p {
+     padding: 0 0 0 .5em;
 }
 
+/* 2. in footer */
+span.helplink {
+     display: block;
+     float: left;
+     padding: 0 1.5em 0 30px;
+     background: transparent url(../images/page_help.png) no-repeat 6px center;
+}
+span.helplink a {
+     border-bottom: 1px solid #2373A8;
+}

inc/admin/lib.dc.page.php

@@ -206 +206 @@
           echo
           '</div>'."\n".      // End of #main-menu
-          '<div id="footer"><a href="http://dotclear.org/" title="'.$text.'"><img src="style/dc_logos/w-dotclear90.png" alt="'.$text.'" /></a></div>'."\n".
+          '<div id="footer">'.
+          '<span class="helplink"><a href="help.php">'.__('Global help').'</a></span> '.
+          '<a href="http://dotclear.org/" title="'.$text.'"><img src="style/dc_logos/w-dotclear90.png" alt="'.$text.'" /></a></div>'."\n".
           '<!-- '."\n".
 '                  .'."\n".
@@ -434 +436 @@
           '<div id="help"><hr /><div class="help-content clear"><h3>'.__('Help about this page').'</h3>'.
           $content.
+          '</div>'.
+          '<div id="helplink"><hr />'.
+          '<p>'.
+          sprintf(__('See also %s'),sprintf('<a href="help.php">%s</a>',__('the global help'))).
+          '</p>'.
           '</div></div>';
      }

inc/admin/prepend.php

@@ -267 +267 @@
           'images/menu/langs.png','images/menu/langs-b.png',
           null,null,null));
+
+     $_fav['help'] = new ArrayObject(array('help','Global help','help.php',
+          'images/menu/help.png','images/menu/help-b.png',
+          '*',null,null));
      
      # Menus creation

locales/en/resources.php

@@ -23 +23 @@
 
 $__resources['help'] = array(
+     'core_main' => dirname(__FILE__).'/help/main.html',
      'core_blog_pref' => dirname(__FILE__).'/help/blog_pref.html',
      'core_categories' => dirname(__FILE__).'/help/categories.html',

locales/fr/main.po

@@ -843 +843 @@
 msgstr "Nouveau billet"
 
+msgid "Global help"
+msgstr "Aide générale"
+
+msgid "See also %s"
+msgstr "Voir également %s"
+
+msgid "the global help"
+msgstr "l'aide générale"
+
+msgid "My dashboard"
+msgstr "Mon tableau de bord"
+
 msgid "My preferences"
 msgstr "Mes préférences"