Changeset 2175:44a940977175 for inc/admin

Timestamp:

09/30/13 21:16:20 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

dcRepo

Parents:

2174:6ed25e45a14e (diff), 2173:94520262a1b8 (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 from default

Files:

• inc/admin/lib.dc.page.php (modified) (1 diff)
• inc/admin/lib.dc.page.php (modified) (3 diffs)

inc/admin/lib.dc.page.php

@@ -611 +611 @@
           self::jsVar('dotclear.msg.load_enhanced_uploader',
                __('Loading enhanced uploader, please wait.')).
+
+          self::jsVar('dotclear.msg.module_author',
+               __('Author:')).
+          self::jsVar('dotclear.msg.module_details',
+               __('Details')).
+          self::jsVar('dotclear.msg.module_support',
+               __('Support')).
+          self::jsVar('dotclear.msg.module_help',
+               __('Help:')).
+          self::jsVar('dotclear.msg.module_section',
+               __('Section:')).
+          self::jsVar('dotclear.msg.module_tags',
+               __('Tags:')).
                "\n//]]>\n".
           "</script>\n";

inc/admin/lib.dc.page.php

@@ -304 +304 @@
      }
 
-     public static function breadcrumb($elements=null,$with_home_link=true,$echo=false)
-     {
+     public static function breadcrumb($elements=null,$options=array())
+     {
+          $with_home_link = isset($options['home_link'])?$options['home_link']:true;
+          $hl = isset($options['hl'])?$options['hl']:true;
+          $hl_pos = isset($options['hl_pos'])?$options['hl_pos']:-1;
           // First item of array elements should be blog's name, System or Plugins
           $res = '<h2>'.($with_home_link ?
@@ -311 +314 @@
                '<img src="style/dashboard-alt.png" alt="" />');
           $index = 0;
+          if ($hl_pos < 0) {
+               $hl_pos = count($elements)+$hl_pos;
+          }
           foreach ($elements as $element => $url) {
+               if ($hl && $index == $hl_pos) {
+                    $element = sprintf('<span class="page-title">%s</span>',$element);
+               }
                $res .= ($with_home_link ? ($index == 1 ? ' : ' : ' &rsaquo; ') : ($index == 0 ? ' ' : ' &rsaquo; ')).
                     ($url ? '<a href="'.$url.'">' : '').$element.($url ? '</a>' : '');
@@ -317 +326 @@
           }
           $res .= '</h2>';
-          if ($echo) {
-               echo $res;
-          }
           return $res;
      }