diff --git a/administrator/components/com_menus/controllers/item.php b/administrator/components/com_menus/controllers/item.php index 02781fb537c55..48d6df694331d 100644 --- a/administrator/components/com_menus/controllers/item.php +++ b/administrator/components/com_menus/controllers/item.php @@ -86,6 +86,14 @@ public function cancel($key = null) // Clear the ancillary data from the session. $app->setUserState($context . '.type', null); $app->setUserState($context . '.link', null); + + // Redirect to the list screen. + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend() + . '&menutype=' . $app->getUserState('com_menus.items.menutype'), false + ) + ); } return $result; @@ -326,7 +334,12 @@ public function save($key = null, $urlVar = null) $app->setUserState('com_menus.edit.item.link', null); // Redirect to the list screen. - $this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false)); + $this->setRedirect( + JRoute::_( + 'index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend() + . '&menutype=' . $app->getUserState('com_menus.items.menutype'), false + ) + ); break; } diff --git a/administrator/components/com_menus/models/forms/filter_items.xml b/administrator/components/com_menus/models/forms/filter_items.xml index 8f4ec675b1fdd..0acc10b889546 100644 --- a/administrator/components/com_menus/models/forms/filter_items.xml +++ b/administrator/components/com_menus/models/forms/filter_items.xml @@ -6,7 +6,9 @@ label="COM_MENUS_FILTER_CATEGORY" description="JOPTION_FILTER_CATEGORY_DESC" onchange="this.form.submit();" - /> + > + + JSTATUS_DESC + + diff --git a/administrator/components/com_menus/models/forms/item.xml b/administrator/components/com_menus/models/forms/item.xml index 8ba474d827bdb..290acb27a6c8d 100644 --- a/administrator/components/com_menus/models/forms/item.xml +++ b/administrator/components/com_menus/models/forms/item.xml @@ -56,7 +56,10 @@ label="COM_MENUS_ITEM_FIELD_ASSIGNED_LABEL" description="COM_MENUS_ITEM_FIELD_ASSIGNED_DESC" required="true" - size="1" /> + size="1" + > + + getUserState($this->context . '.menutype'); - - if (!$menuType) - { - $menuType = $this->getDefaultMenuType(); - } + $app->setUserState($this->context . '.menutype', ''); } $this->setState('filter.menutype', $menuType); @@ -152,29 +147,6 @@ protected function getStoreId($id = '') return parent::getStoreId($id); } - /** - * Finds the default menu type. - * - * In the absence of better information, this is the first menu ordered by title. - * - * @return string The default menu type - * - * @since 1.6 - */ - protected function getDefaultMenuType() - { - // Create a new query object. - $db = $this->getDbo(); - $query = $db->getQuery(true) - ->select('menutype') - ->from('#__menu_types') - ->order('title'); - $db->setQuery($query, 0, 1); - $menuType = $db->loadResult(); - - return $menuType; - } - /** * Builds an SQL query to load the list data. * diff --git a/administrator/components/com_menus/views/items/tmpl/default.php b/administrator/components/com_menus/views/items/tmpl/default.php index 48f0d9076dbee..eed69494aca13 100644 --- a/administrator/components/com_menus/views/items/tmpl/default.php +++ b/administrator/components/com_menus/views/items/tmpl/default.php @@ -24,8 +24,9 @@ $ordering = ($listOrder == 'a.lft'); $canOrder = $user->authorise('core.edit.state', 'com_menus'); $saveOrder = ($listOrder == 'a.lft' && strtolower($listDirn) == 'asc'); +$menuType = (array) $app->getUserState('com_menus.items.menutype'); -if ($saveOrder) +if ($saveOrder && !empty($menuType)) { $saveOrderingUrl = 'index.php?option=com_menus&task=items.saveOrderAjax&tmpl=component'; JHtml::_('sortablelist.sortable', 'itemList', 'adminForm', strtolower($listDirn), $saveOrderingUrl, false, true); @@ -56,9 +57,11 @@ - + + + @@ -68,6 +71,9 @@ + @@ -133,26 +139,28 @@ } ?> - + if (!$canChange) + { + $iconClass = ' inactive'; + } + elseif (!$saveOrder) + { + $iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED'); + } + ?> + + + + + + + + @@ -187,6 +195,9 @@ escape($item->item_type); ?> +
- - + + + +
- + + - - - - - - - id); ?> + escape($item->menutype); ?> + type == 'component') : ?> language == '*' || $item->home == '0') : ?> diff --git a/administrator/components/com_menus/views/items/tmpl/default_batch_body.php b/administrator/components/com_menus/views/items/tmpl/default_batch_body.php index ee54115349e77..3155711b300f7 100644 --- a/administrator/components/com_menus/views/items/tmpl/default_batch_body.php +++ b/administrator/components/com_menus/views/items/tmpl/default_batch_body.php @@ -13,36 +13,42 @@ JHtml::_('select.option', 'm', JText::_('JLIB_HTML_BATCH_MOVE')) ); $published = $this->state->get('filter.published'); +$menuType = (array) JFactory::getApplication()->getUserState('com_menus.items.menutype'); ?> - -
-
-
- -
-
-
-
- -
-
-
-
- = 0) : ?> -
- + +
+
- +
-
- - +
+
+ +
- -
\ No newline at end of file +
+
+ = 0) : ?> +
+ +
+ +
+
+
+ + +
+ +
+ +
+

+
+ diff --git a/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php b/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php index f5f004c133320..5c5c146100520 100644 --- a/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php +++ b/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php @@ -8,10 +8,13 @@ */ defined('_JEXEC') or die; +$menuType = (array) JFactory::getApplication()->getUserState('com_menus.items.menutype'); ?> - \ No newline at end of file + + + diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini index 99e63b6aee29e..8a13c72afbe0a 100644 --- a/administrator/language/en-GB/en-GB.com_menus.ini +++ b/administrator/language/en-GB/en-GB.com_menus.ini @@ -37,6 +37,9 @@ COM_MENUS_HEADING_HOME_ASC="Home ascending" COM_MENUS_HEADING_HOME_DESC="Home descending" COM_MENUS_HEADING_LEVELS="View level" COM_MENUS_HEADING_LINKED_MODULES="Linked Modules" +COM_MENUS_HEADING_MENU="Menu" +COM_MENUS_HEADING_MENU_ASC="Menu ascending" +COM_MENUS_HEADING_MENU_DESC="Menu descending" COM_MENUS_HEADING_NUMBER_MENU_ITEMS="Number of Menu Items" COM_MENUS_HEADING_POSITION="Position" COM_MENUS_HEADING_PUBLISHED_ITEMS="Published" @@ -158,6 +161,8 @@ COM_MENUS_NO_MENUS_SELECTED="No menu selected." COM_MENUS_OPTION_SELECT_LEVEL="- Select Max Levels -" COM_MENUS_REQUEST_FIELDSET_LABEL="Required Settings" COM_MENUS_SAVE_SUCCESS="Menu item successfully saved." +COM_MENUS_SELECT_MENU="- Select Menu -" +COM_MENUS_SELECT_MENU_FIRST="To use batch processing, please first select a Menu in the manager." COM_MENUS_SUBMENU_ITEMS="Menu Items" COM_MENUS_SUBMENU_MENUS="Menus" COM_MENUS_SUCCESS_REORDERED="Menu item successfully reordered." diff --git a/administrator/language/en-GB/en-GB.mod_menu.ini b/administrator/language/en-GB/en-GB.mod_menu.ini index a11697888da71..64d77dc5c40a6 100644 --- a/administrator/language/en-GB/en-GB.mod_menu.ini +++ b/administrator/language/en-GB/en-GB.mod_menu.ini @@ -71,6 +71,7 @@ MOD_MENU_LOGOUT="Logout" MOD_MENU_MASS_MAIL_USERS="Mass Mail Users" MOD_MENU_MEDIA_MANAGER="Media" MOD_MENU_MENUS="Menus" +MOD_MENU_MENUS_ALL_ITEMS="All Menu Items" MOD_MENU_MENU_MANAGER="Manage" MOD_MENU_MENU_MANAGER_NEW_MENU="Add New Menu" MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM="Add New Menu Item" diff --git a/administrator/modules/mod_menu/tmpl/default_enabled.php b/administrator/modules/mod_menu/tmpl/default_enabled.php index 976052c51ceab..4c1b037eef5c4 100644 --- a/administrator/modules/mod_menu/tmpl/default_enabled.php +++ b/administrator/modules/mod_menu/tmpl/default_enabled.php @@ -137,6 +137,10 @@ $menu->addSeparator(); + $menu->addChild(new JMenuNode(JText::_('MOD_MENU_MENUS_ALL_ITEMS'), 'index.php?option=com_menus&view=items', 'class:menumgr'), $createMenu); + $menu->getParent(); + $menu->addSeparator(); + // Menu Types $menuTypes = ModMenuHelper::getMenus(); $menuTypes = JArrayHelper::sortObjects($menuTypes, 'title', 1, false);