Changes in [3080:4afa4b38a042:3081:2d7b794a32c3]

Files:

• inc/admin/class.dc.favorites.php (modified) (1 diff)
• inc/admin/class.dc.menu.php (modified) (3 diffs)
• inc/admin/lib.dc.page.php (modified) (2 diffs)
• inc/admin/prepend.php (modified) (1 diff)
• inc/core/class.dc.error.php (modified) (1 diff)
• inc/prepend.php (modified) (1 diff)
• plugins/maintenance/index.php (modified) (2 diffs)

inc/admin/class.dc.favorites.php

@@ -315 +315 @@
                     true,
                     $v['id'],
-                    $v['class']
+                    $v['class'],
+                    true
                );
           }

inc/admin/class.dc.menu.php

@@ -22 +22 @@
           $this->title = $title;
           $this->itemSpace = $itemSpace;
+          $this->pinned = array();
           $this->items = array();
      }
 
-     public function addItem($title,$url,$img,$active,$show=true,$id=null,$class=null)
+     public function addItem($title,$url,$img,$active,$show=true,$id=null,$class=null,$pinned=false)
      {
           if($show) {
-               $this->items[] = $this->itemDef($title,$url,$img,$active,$id,$class);
+               $item = $this->itemDef($title,$url,$img,$active,$id,$class);
+               if ($pinned) {
+                    $this->pinned[] = $item;
+               } else {
+                    $this->items[$title] = $item;
+               }
           }
      }
 
-     public function prependItem($title,$url,$img,$active,$show=true,$id=null,$class=null)
+     public function prependItem($title,$url,$img,$active,$show=true,$id=null,$class=null,$pinned=false)
      {
           if ($show) {
-               array_unshift($this->items,$this->itemDef($title,$url,$img,$active,$id,$class));
+               $item = $this->itemDef($title,$url,$img,$active,$id,$class);
+               if ($pinned) {
+                    array_unshift($this->pinned,$item);
+               } else {
+                    $this->items[$title] = $item;
+               }
           }
      }
@@ -41 +52 @@
      public function draw()
      {
-          if (count($this->items) == 0) {
+          if (count($this->items) + count($this->pinned) == 0) {
                return '';
           }
@@ -50 +61 @@
           '<ul>'."\n";
 
-          for ($i=0; $i<count($this->items); $i++)
+          // 1. Display pinned items (unsorted)
+          for ($i=0; $i<count($this->pinned); $i++)
+          {
+               if ($i+1 < count($this->pinned) && $this->itemSpace != '') {
+                    $res .= preg_replace('|</li>$|',$this->itemSpace.'</li>',$this->pinned[$i]);
+                    $res .= "\n";
+               } else {
+                    $res .= $this->pinned[$i]."\n";
+               }
+          }
+
+          // 2. Display unpinned itmes (sorted)
+          $i = 0;
+          dcUtils::lexicalKeySort($this->items);
+          foreach ($this->items as $title => $item)
           {
                if ($i+1 < count($this->items) && $this->itemSpace != '') {
-                    $res .= preg_replace('|</li>$|',$this->itemSpace.'</li>',$this->items[$i]);
+                    $res .= preg_replace('|</li>$|',$this->itemSpace.'</li>',$item);
                     $res .= "\n";
                } else {
-                    $res .= $this->items[$i]."\n";
+                    $res .= $item."\n";
                }
+               $i++;
           }
 

inc/admin/lib.dc.page.php

@@ -177 +177 @@
           }
 
-          // Display breadcrumb (if given) before any error message
+          // Display breadcrumb (if given) before any error messages
           echo $breadcrumb;
 
-          if ($core->error->flag()) {
-               echo
-               '<div class="error"><p><strong>'.(count($core->error->getErrors()) > 1 ? __('Errors:') : __('Error:')).'</strong></p>'.
+          // Display notices and errors
+          echo self::notices();
+     }
+
+     public static function notices()
+     {
+          global $core;
+          static $error_displayed = false;
+          $res = '';
+
+          // return error messages if any
+          if ($core->error->flag() && !$error_displayed) {
+               $res .= '<div class="error"><p><strong>'.(count($core->error->getErrors()) > 1 ? __('Errors:') : __('Error:')).'</strong></p>'.
                $core->error->toHTML().
                '</div>';
-          }
-
-          // Display notices
-          echo self::notices();
-     }
-
-     public static function notices()
-     {
+               $error_displayed = true;
+          }
+
           // return notices if any
-          $res = '';
           if (isset($_SESSION['notifications'])) {
-               $notifications = $_SESSION['notifications'];
                foreach ($_SESSION['notifications'] as $notification) {
                     $res .= self::getNotification($notification);
@@ -366 +369 @@
           echo $breadcrumb;
 
-          if ($core->error->flag()) {
-               echo
-               '<div class="error" role="alert"><strong>'.__('Errors:').'</strong>'.
-               $core->error->toHTML().
-               '</div>';
-          }
+          // Display notices and errors
+          echo self::notices();
      }
 

inc/admin/prepend.php

@@ -69 +69 @@
 
      $url = $core->adminurl->get($adminurl);
-     $_menu[$section]->prependItem($desc,$url,$icon,preg_match('/'.preg_quote($url).'(\?.*)?$/',$_SERVER['REQUEST_URI']),$perm);
+     $_menu[$section]->prependItem($desc,$url,$icon,
+          preg_match('/'.preg_quote($url).'(\?.*)?$/',$_SERVER['REQUEST_URI']),$perm,null,null,true);
 }
 

inc/core/class.dc.error.php

@@ -30 +30 @@
      /** @var string HTML error item pattern */
      protected $html_item = "<li>%s</li>\n";
-
-     /**
-     * Object constructor.
-     */
-     public function __construct()
-     {
-          $this->code = 0;
-          $this->msg = '';
-     }
 
      /**

inc/prepend.php

@@ -140 +140 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.8.1');
+define('DC_VERSION','2.9-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');

plugins/maintenance/index.php

@@ -158 +158 @@
                html::escapeHTML($task->name())=> ''
           )
-     );
+     ).dcPage::notices();
 
      // content
@@ -193 +193 @@
                __('Maintenance') => ''
           )
-     );
+     ).dcPage::notices();
 
      // Simple task (with only a button to start it)