Changeset 2593:6741802596a0 for inc/admin/class.dc.menu.php

Timestamp:

11/27/13 16:32:38 (12 years ago)

Author:

Dsls

Branch:

twig

Children:

2612:1537212bd291, 2613:014098e27ea0

Parents:

2468:d7fda5a0bd39 (diff), 2589:3d427735ca70 (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:

Fusion avec default

File:

• inc/admin/class.dc.menu.php (modified) (5 diffs)

inc/admin/class.dc.menu.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -14 +14 @@
 class dcMenu
 {
+     private $items;
      private $id;
      public $title;
-
-     public function __construct($id,$title,$itemSpace='')
+     public $separator;
+     
+     public function __construct($id,$title,$separator='')
      {
           $this->id = $id;
           $this->title = $title;
-          $this->itemSpace = $itemSpace;
+          $this->separator = $separator;
           $this->items = array();
      }
-
+     
+     public function getID()
+     {
+          return $this->id;
+     }
+     
+     public function getTitle()
+     {
+          return $this->title;
+     }
+     
+     public function getSeparator()
+     {
+          return $this->separator;
+     }
+     
+     public function getItems()
+     {
+          return $this->items;
+     }
+     
      public function addItem($title,$url,$img,$active,$show=true,$id=null,$class=null)
      {
@@ -31 +53 @@
           }
      }
-
+     
      public function prependItem($title,$url,$img,$active,$show=true,$id=null,$class=null)
      {
@@ -38 +60 @@
           }
      }
-
-     public function draw()
-     {
-          if (count($this->items) == 0) {
-               return '';
-          }
-
-          $res =
-          '<div id="'.$this->id.'">'.
-          ($this->title ? '<h3>'.$this->title.'</h3>' : '').
-          '<ul>'."\n";
-
-          for ($i=0; $i<count($this->items); $i++)
-          {
-               if ($i+1 < count($this->items) && $this->itemSpace != '') {
-                    $res .= preg_replace('|</li>$|',$this->itemSpace.'</li>',$this->items[$i]);
-                    $res .= "\n";
-               } else {
-                    $res .= $this->items[$i]."\n";
-               }
-          }
-
-          $res .= '</ul></div>'."\n";
-
-          return $res;
-     }
-
+     
      protected function itemDef($title,$url,$img,$active,$id=null,$class=null)
      {
@@ -74 +70 @@
                $ahtml = '';
           }
-
-          $img = dc_admin_icon_url($img);
-
+          
+          return array(
+               'title' => $title,
+               'link' => $link,
+               'ahtml' => $ahtml,
+               'img' => dc_admin_icon_url($img),
+               'active' => (boolean) $active,
+               'id' => $id,
+               'class' => $class
+          );
+     }
+     
+     /**
+     @deprecated Use Template engine instead
+     */
+     public function draw()
+     {
+          if (count($this->items) == 0) {
+               return '';
+          }
+          
+          $res =
+          '<div id="'.$this->id.'">'.
+          ($this->title ? '<h3>'.$this->title.'</h3>' : '').
+          '<ul>'."\n";
+          
+          for ($i=0; $i<count($this->items); $i++)
+          {
+               if ($i+1 < count($this->items) && $this->separator != '') {
+                    $res .= preg_replace('|</li>$|',$this->separator.'</li>',$this->drawItem($this->items[$i]));
+                    $res .= "\n";
+               } else {
+                    $res .= $this->drawItem($this->items[$i])."\n";
+               }
+          }
+          
+          $res .= '</ul></div>'."\n";
+          
+          return $res;
+     }
+     
+     /**
+     @deprecated Use Template engine instead
+     */
+     protected function drawItem($item)
+     {
           return
-          '<li'.(($active || $class) ? ' class="'.(($active) ? 'active ' : '').(($class) ? $class : '').'"' : '').
-          (($id) ? ' id="'.$id.'"' : '').
-          (($img) ? ' style="background-image: url('.$img.');"' : '').
+          '<li'.(($item['active'] || $item['class']) ? ' class="'.(($item['active']) ? 'active ' : '').(($item['class']) ? $item['class'] : '').'"' : '').
+          (($item['id']) ? ' id="'.$item['id'].'"' : '').
+          (($item['img']) ? ' style="background-image: url('.$item['img'].');"' : '').
           '>'.
-
-          '<a href="'.$link.'"'.$ahtml.'>'.$title.'</a></li>'."\n";
+          
+          '<a href="'.$item['link'].'"'.$item['ahtml'].'>'.$item['title'].'</a></li>'."\n";
      }
 }
+?>