Changeset 1064:0c887ef58692

Timestamp:

12/13/12 08:48:15 (13 years ago)

Author:

JcDenis

Branch:

twig

Message:

• dcMenu is now "Twig compliant"

Location:

inc/admin

Files:

• class.dc.admincontext.php (modified) (4 diffs)
• class.dc.menu.php (modified) (4 diffs)
• default-templates/layout.html.twig (modified) (1 diff)

inc/admin/class.dc.admincontext.php

@@ -117 +117 @@
      {
           return array(
-               '__'           => new Twig_Function_Function("__", array('is_safe' => array('html'))),
-               'page_menu' => new Twig_Function_Method($this, 'pageMenu', array('is_safe' => array('html')))
+               '__'           => new Twig_Function_Function("__", array('is_safe' => array('html')))
+               //,'page_menu' => new Twig_Function_Method($this, 'pageMenu', array('is_safe' => array('html')))
           );
      }
@@ -134 +134 @@
           $this->getCurrentBlog();
           $this->getCurrentUser();
+          $this->getMenus();
           
           # Additional globals
@@ -200 +201 @@
      {
           $this->protected_globals['page_title'] = $title;
-     }
-     
-     /**
-     pageMenu
-     */
-     public function pageMenu()
-     {
-          $menu =& $GLOBALS['_menu'];
-          foreach ($menu as $k => $v) {
-               echo $menu[$k]->draw();
-          }
      }
      
@@ -308 +298 @@
                );
      }
+     
+     protected function getMenus()
+     {
+          global $_menu;
+          
+          $this->protected_globals['menus'] = array();
+          
+          if (!isset($_menu)) {
+               return;
+          }
+          
+          foreach($_menu as $m) {
+               $this->protected_globals['menus'][] = array(
+                    'id'           => $m->getID(),
+                    'title'        => $m->getTitle(),
+                    'separator'    => $m->getSeparator(),
+                    'items'        => $m->getItems()
+               );
+          }
+     }
 }
 ?>

inc/admin/class.dc.menu.php

@@ -14 +14 @@
 class dcMenu
 {
+     private $items;
      private $id;
      public $title;
+     public $separator;
      
-     public function __construct($id,$title,$itemSpace='')
+     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;
      }
      
@@ -39 +61 @@
      }
      
+     protected function itemDef($title,$url,$img,$active,$id=null,$class=null)
+     {
+          if (is_array($url)) {
+               $link = $url[0];
+               $ahtml = (!empty($url[1])) ? ' '.$url[1] : '';
+          } else {
+               $link = $url;
+               $ahtml = '';
+          }
+          
+          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()
      {
@@ -52 +98 @@
           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]);
+               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->items[$i]."\n";
+                    $res .= $this->drawItem($this->items[$i])."\n";
                }
           }
@@ -65 +111 @@
      }
      
-     protected function itemDef($title,$url,$img,$active,$id=null,$class=null)
+     /**
+     @deprecated Use Template engine instead
+     */
+     protected function drawItem($item)
      {
-          if (is_array($url)) {
-               $link = $url[0];
-               $ahtml = (!empty($url[1])) ? ' '.$url[1] : '';
-          } else {
-               $link = $url;
-               $ahtml = '';
-          }
-          
-          $img = dc_admin_icon_url($img);
-          
           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";
      }
 }

inc/admin/default-templates/layout.html.twig

@@ -68 +68 @@
           </div>
           <div id="main-menu">
-               {{ page_menu() }}
+               {% block menus %}
+               {% for menu in menus %}
+               {% if menu.items is not empty %}
+               <div id="{{menu.id}}">
+                    {% if menu.title is not empty %}<h3>{{menu.title}}</h3>{% endif %}
+                    <ul>
+                    {% for item in menu.items %}
+                    {% spaceless %}
+                    <li {% if item.active or item.class is not empty %} class="{% if item.active %}active {% endif %}{{item.class}}"{% endif %}
+                    {% if item.id is not empty %}id="{{item.id}}" {% endif %}
+                    {% if item.img is not empty %} style="background-image: url({{item.img}});"{% endif %}
+                    ><a href="{{item.link}}"{{item.ahtml}}>{{item.title}}</a>
+                    {% if loop.last %}{{menu.separator}}{% endif %}</li>
+                    {% endspaceless %}
+                    {% endfor %}
+                    </ul>
+               </div>
+               {% endif %}
+               {% endfor %}
+               {% endblock %}
           </div>
           <div id="footer">