Changeset 1933:839c2fe2196c

Timestamp:

09/17/13 21:03:30 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add access to global help when no contextual help is available, addresses #1244

Files:

• admin/help.php (modified) (1 diff)
• inc/admin/lib.dc.page.php (modified) (3 diffs)
• inc/admin/prepend.php (modified) (1 diff)
• locales/fr/main.po (modified) (1 diff)

admin/help.php

@@ -97 +97 @@
 echo $content_array['content'];
 
+// Prevents global help link display
+$GLOBALS['__resources']['ctxhelp'] = true;
+
 dcPage::close();
 ?>

inc/admin/lib.dc.page.php

@@ -182 +182 @@
           global $core;
 
+          if (!$GLOBALS['__resources']['ctxhelp']) {
+               // Displau global help link in any contextual help displayed
+               echo
+               '<p id="help-button"><a href="help.php">'.__('Need help?').'</a></p>';
+          }
+
           $menu =& $GLOBALS['_menu'];
 
@@ -438 +444 @@
           }
 
+          // Set contextual help global flag
+          $GLOBALS['__resources']['ctxhelp'] = true;
+
           echo
           '<div id="help"><hr /><div class="help-content clear"><h3>'.__('Help about this page').'</h3>'.
@@ -516 +525 @@
 
           self::jsVar('dotclear.msg.help',
-               __('Help about this page')).
+               __('Need help?')).
           self::jsVar('dotclear.msg.help_hide',
                __('Hide')).

inc/admin/prepend.php

@@ -216 +216 @@
      }
      unset($hfiles,$locales_root);
+     // Contextual help flag
+     $GLOBALS['__resources']['ctxhelp'] = false;
 
      $core->auth->user_prefs->addWorkspace('interface');

locales/fr/main.po

@@ -3390 +3390 @@
 msgid "Page %s / %s"
 msgstr "Page %s / %s"
+
+msgid "Need help?"
+msgstr "Besoin d'aide ?"