Changeset 1793:a25f8d0fd400 for admin/help.php

Timestamp:

09/11/13 17:10:01 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

1795:5c5c52124ab4, 1796:ef72fa20ed9d

Parents:

1792:3ad2e47ed52d (diff), 514:5cacbd2e1fa9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge globalhelp into default

File:

• admin/help.php (modified) (3 diffs)

admin/help.php

@@ -17 +17 @@
 function helpPage()
 {
+     $ret = array('content' => '', 'title' => '');
+
      $args = func_get_args();
      if (empty($args)) {
-          return;
+          return $ret;
      };
      
      global $__resources;
      if (empty($__resources['help'])) {
-          return;
+          return $ret;
      }
      
@@ -56 +58 @@
      
      if (trim($content) == '') {
-          return '';
+          return $ret;
      }
      
+     $ret['content'] = $content;
      if ($title != '') {
-          $title = '<a href="help.php">'.__('Global help').'</a> &rsaquo; <span class="page-title">'.$title.'</span>';
-     } else {
-          $title = '<span class="page-title">'.__('Global help').'</span>';
+          $ret['title'] = $title;
      }
-     return '<h2>'.$title.'</h2>'."\n".'<div id="mainhelp">'.$content.'</div>';
+     return $ret;
 }
 
 $help_page = !empty($_GET['page']) ? html::escapeHTML($_GET['page']) : 'core_main';
-$content = helpPage($help_page);
+$content_array = helpPage($help_page);
+if (($content_array['content'] == '') || ($help_page == 'core_main')) {
+     $content_array = helpPage('core_main');
+}
+if ($content_array['title'] != '') {
+     $breadcrumb = dcPage::breadcrumb(
+          array(
+               __('Global help') => 'help.php',
+               '<span class="page-title">'.$content_array['title'].'</span>' => ''
+          ));
+} else {
+     $breadcrumb = dcPage::breadcrumb(
+          array(
+               '<span class="page-title">'.__('Global help').'</span>' => ''
+          ));
+}
 
 /* DISPLAY
@@ -74 +90 @@
 dcPage::open(__('Global help'),
      # --BEHAVIOR-- adminPostHeaders
-     $core->callBehavior('adminPostHeaders')
+     $core->callBehavior('adminPostHeaders'),
+     $breadcrumb
 );
 
-if (($content == '') || ($help_page == 'core_main')) {
-     $content = helpPage('core_main');
-}
-echo $content;
+echo $content_array['content'];
 
 dcPage::close();