Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[4.0] Reorganise administrator menu items - extensions manager #10657

Closed
wants to merge 8 commits into from
Closed

[4.0] Reorganise administrator menu items - extensions manager #10657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
34aae48
Reorganise menu items to make Joomla core update and extensions updat…
izharaazmi May 28, 2016
a2bfff3
Fix menu nesting issue
izharaazmi Jun 14, 2016
1b0008c
Changes in favour of the J3.6 beta release and language freeze status.
izharaazmi Jun 19, 2016
967145d
Make first level menu clickable
izharaazmi Jun 19, 2016
07ba501
Changes to allow easy mobile view navigation. Reorganised further to …
izharaazmi Jul 29, 2016
7002fd3
Implement the same in hathor template.
izharaazmi Jul 29, 2016
a7bf0d4
Merge joomla-cms/staging into adminmenu
izharaazmi Oct 5, 2016
740cfec
Merge staging into adminmenu
izharaazmi Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions administrator/modules/mod_menu/preset/disabled.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,24 +49,34 @@
// Get the authorised components and sub-menus.
$components = ModMenuHelper::getComponents(true);

// Check if there are any components, otherwise, don't display the components menu item
if ($components)
{
$this->addChild(new JMenuNode(JText::_('MOD_MENU_COMPONENTS'), null, 'disabled'));
foreach ($components as &$component)
{
// Check if there are any components, otherwise, don't display the components menu item
if ($component->title != 'com_postinstall' && $component->title != 'com_joomlaupdate')
{
$this->addChild(new JMenuNode(JText::_('MOD_MENU_COMPONENTS'), null, 'disabled'));

break;
}
}
}

/**
* Extensions Submenu
*/
$ju = $user->authorise('core.manage', 'com_joomlaupdate');
$pi = $user->authorise('core.manage', 'com_postinstall');
$im = $user->authorise('core.manage', 'com_installer');
$mm = $user->authorise('core.manage', 'com_modules');
$pm = $user->authorise('core.manage', 'com_plugins');
$tm = $user->authorise('core.manage', 'com_templates');
$lm = $user->authorise('core.manage', 'com_languages');

if ($im || $mm || $pm || $tm || $lm)
if ($ju || $pi || $im || $mm || $pm || $tm || $lm)
{
$this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSIONS'), null, 'disabled'));
$this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSION_MANAGER'), null, 'disabled'));
}

/**
Expand Down
54 changes: 38 additions & 16 deletions administrator/modules/mod_menu/preset/enabled.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,11 @@

foreach ($components as &$component)
{
if (!empty($component->submenu))
if ($component->title == 'com_postinstall' || $component->title == 'com_joomlaupdate')
{
// Skip these as included later
}
elseif (!empty($component->submenu))
{
// This component has a db driven submenu.
$this->addChild(new JMenuNode($component->text, $component->link, $component->img), true);
Expand All @@ -323,34 +327,52 @@
/**
* Extensions Submenu
*/
$ju = $user->authorise('core.manage', 'com_joomlaupdate');
$pi = $user->authorise('core.manage', 'com_postinstall');
$im = $user->authorise('core.manage', 'com_installer');
$mm = $user->authorise('core.manage', 'com_modules');
$pm = $user->authorise('core.manage', 'com_plugins');
$tm = $user->authorise('core.manage', 'com_templates');
$lm = $user->authorise('core.manage', 'com_languages');

if ($im || $mm || $pm || $tm || $lm)
if ($ju || $pi || $im || $mm || $pm || $tm || $lm)
{
$this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSIONS'), '#', $rootClass), true);
$this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSION_MANAGER'), '#', $rootClass), true);

if ($ju)
{
$this->addChild(new JMenuNode(JText::_('COM_JOOMLAUPDATE'), 'index.php?option=com_joomlaupdate', 'class:install'));
}

if ($pi)
{
$this->addChild(new JMenuNode(JText::_('COM_POSTINSTALL'), 'index.php?option=com_postinstall', 'class:install'));
}

if ($im)
{
$cls = 'class:install';

$this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSION_MANAGER'), 'index.php?option=com_installer', $cls), $im);

$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_INSTALL'), 'index.php?option=com_installer', $cls));
$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_UPDATE'), 'index.php?option=com_installer&view=update', $cls));
$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_MANAGE'), 'index.php?option=com_installer&view=manage', $cls));
$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_DISCOVER'), 'index.php?option=com_installer&view=discover', $cls));
$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_DATABASE'), 'index.php?option=com_installer&view=database', $cls));
$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_WARNINGS'), 'index.php?option=com_installer&view=warnings', $cls));
$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_LANGUAGES'), 'index.php?option=com_installer&view=languages', $cls));
$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_UPDATESITES'), 'index.php?option=com_installer&view=updatesites', $cls));
$this->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM'), 'index.php?option=com_installer&view=database', 'class:install'), true);

$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_DATABASE'), 'index.php?option=com_installer&view=database', 'class:install'));
$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_WARNINGS'), 'index.php?option=com_installer&view=warnings', 'class:install'));
$this->addChild(
new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_UPDATESITES'), 'index.php?option=com_installer&view=updatesites', 'class:install')
);
$this->getParent();

$this->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSIONS'), 'index.php?option=com_installer', 'class:install'), true);

$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_INSTALL'), 'index.php?option=com_installer', 'class:install'));
$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_UPDATE'), 'index.php?option=com_installer&view=update', 'class:install'));
$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_MANAGE'), 'index.php?option=com_installer&view=manage', 'class:install'));
$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_DISCOVER'), 'index.php?option=com_installer&view=discover', 'class:install'));
$this->addSeparator();

$this->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_LANGUAGES'), 'index.php?option=com_installer&view=languages', 'class:install'));
$this->getParent();
}

if ($im && ($mm || $pm || $tm || $lm))
if (($ju || $pi || $im) && ($mm || $pm || $tm || $lm))
{
$this->addSeparator();
}
Expand Down