From 8ef6d82c8bdd0175ef8b69fa6bc5d2c7625902cd Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Thu, 15 Nov 2012 23:24:20 +0200
Subject: [PATCH] Menu Plugin: general improvements

---
 plugins/box/menu/menu.admin.php              | 59 +++++++++++++++++++-
 plugins/box/menu/views/backend/add.view.php  |  2 +-
 plugins/box/menu/views/backend/edit.view.php |  2 +-
 3 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/plugins/box/menu/menu.admin.php b/plugins/box/menu/menu.admin.php
index 00d1dee..738b91a 100644
--- a/plugins/box/menu/menu.admin.php
+++ b/plugins/box/menu/menu.admin.php
@@ -105,7 +105,7 @@
                                 ->assign('menu_item_order_array', $menu_item_order_array)
                                 ->assign('errors', $errors)
                                 ->assign('categories', MenuAdmin::getCategories())
-                                ->assign('pages_list', $pages->select('[slug!="error404"]'))
+                                ->assign('pages_list', MenuAdmin::getPages())
                                 ->assign('components_list', MenuAdmin::getComponents())
                                 ->display();
 
@@ -165,7 +165,7 @@
                                 ->assign('menu_item_order_array', $menu_item_order_array)
                                 ->assign('errors', $errors)
                                 ->assign('categories', MenuAdmin::getCategories())
-                                ->assign('pages_list', $pages->select('[slug!="error404"]'))
+                                ->assign('pages_list', MenuAdmin::getPages())
                                 ->assign('components_list', MenuAdmin::getComponents())
                                 ->display();
 
@@ -207,6 +207,59 @@
         }
 
 
+        /**
+         * Get pages
+         */
+        protected static function getPages() {
+
+            // Init vars
+            $pages_array = array();
+            $count = 0;
+            
+            // Get pages table
+            $pages = new Table('pages');
+
+            // Get Pages List
+            $pages_list = $pages->select('[slug!="error404" and status="published"]');
+            
+            foreach ($pages_list as $page) {
+
+                $pages_array[$count]['title']   = Html::toText($page['title']);
+                $pages_array[$count]['parent']  = $page['parent'];
+                $pages_array[$count]['date']    = $page['date'];
+                $pages_array[$count]['author']  = $page['author'];
+                $pages_array[$count]['slug']    = ($page['slug'] == Option::get('defaultpage')) ? '' : $page['slug'] ;
+
+                if (isset($page['parent'])) {
+                    $c_p = $page['parent'];
+                } else {
+                    $c_p = '';
+                }
+
+                if ($c_p != '') {
+                    $_page = $pages->select('[slug="'.$page['parent'].'"]', null);
+
+                    if (isset($_page['title'])) {
+                        $_title = $_page['title'];
+                    } else {
+                        $_title = '';
+                    }
+                    $pages_array[$count]['sort'] = $_title . ' ' . $page['title'];                
+                } else {
+                    $pages_array[$count]['sort'] = $page['title'];     
+                }
+                $_title = '';                     
+                $count++;                    
+            }
+
+            // Sort pages
+            $_pages_list = Arr::subvalSort($pages_array, 'sort');
+
+            // return
+            return $_pages_list;
+        }
+
+
         /**
          * Get components
          */
@@ -216,7 +269,7 @@
             
             if (count(Plugin::$components) > 0)  {
                 foreach (Plugin::$components as $component) {
-                    if ($component !== 'pages' && $component !== 'sitemap') $components[] = ucfirst($component);
+                    if ($component !== 'pages' && $component !== 'sitemap') $components[] = Text::lowercase($component);
                 }
             }
 
diff --git a/plugins/box/menu/views/backend/add.view.php b/plugins/box/menu/views/backend/add.view.php
index e4ccf38..6b58992 100644
--- a/plugins/box/menu/views/backend/add.view.php
+++ b/plugins/box/menu/views/backend/add.view.php
@@ -61,7 +61,7 @@
                 <li><?php echo (!empty($page['parent'])) ? Html::nbsp().Html::arrow('right').Html::nbsp(2) : '' ; ?><a href="javascript:;" onclick="selectPage('<?php echo (empty($page['parent'])) ? $page['slug'] : $page['parent'].'/'.$page['slug'] ; ?>', '<?php echo $page['title']; ?>');"><?php echo $page['title']; ?></a></li>
             <?php } ?>
             <?php if (count($components_list) > 0) foreach($components_list as $component) { ?>
-                <li><a href="javascript:;" onclick="$.monstra.menu.selectPage('<?php echo Text::lowercase($component); ?>', '<?php echo __($component); ?>');"><?php echo __($component); ?></a></li>
+                <li><a href="javascript:;" onclick="$.monstra.menu.selectPage('<?php echo $component; ?>', '<?php echo __(ucfirst($component), $component); ?>');"><?php echo __(ucfirst($component), $component); ?></a></li>
             <?php } ?>
             </ul>
         </p>
diff --git a/plugins/box/menu/views/backend/edit.view.php b/plugins/box/menu/views/backend/edit.view.php
index 177cb8d..01acc76 100644
--- a/plugins/box/menu/views/backend/edit.view.php
+++ b/plugins/box/menu/views/backend/edit.view.php
@@ -61,7 +61,7 @@
                 <li><?php echo (!empty($page['parent'])) ? Html::nbsp().Html::arrow('right').Html::nbsp(2) : '' ; ?><a href="javascript:;" onclick="selectPage('<?php echo (empty($page['parent'])) ? $page['slug'] : $page['parent'].'/'.$page['slug'] ; ?>', '<?php echo $page['title']; ?>');"><?php echo $page['title']; ?></a></li>
             <?php } ?>
             <?php if (count($components_list) > 0) foreach($components_list as $component) { ?>
-                <li><a href="javascript:;" onclick="$.monstra.menu.selectPage('<?php echo Text::lowercase($component); ?>', '<?php echo __($component); ?>');"><?php echo __($component); ?></a></li>
+                <li><a href="javascript:;" onclick="$.monstra.menu.selectPage('<?php echo $component; ?>', '<?php echo __(ucfirst($component), $component); ?>');"><?php echo __(ucfirst($component), $component); ?></a></li>
             <?php } ?>
             </ul>
         </p>