diff --git a/administrator/components/com_installer/Helper/InstallerHelper.php b/administrator/components/com_installer/Helper/InstallerHelper.php index 3d287872ae3b3..e14d5305185a0 100644 --- a/administrator/components/com_installer/Helper/InstallerHelper.php +++ b/administrator/components/com_installer/Helper/InstallerHelper.php @@ -22,59 +22,6 @@ */ class InstallerHelper { - /** - * Configure the Linkbar. - * - * @param string $vName The name of the active view. - * - * @return void - * - * @since 1.6 - */ - public static function addSubmenu($vName = 'install') - { - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_INSTALL'), - 'index.php?option=com_installer', - $vName == 'install' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_UPDATE'), - 'index.php?option=com_installer&view=update', - $vName == 'update' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_MANAGE'), - 'index.php?option=com_installer&view=manage', - $vName == 'manage' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_DISCOVER'), - 'index.php?option=com_installer&view=discover', - $vName == 'discover' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_DATABASE'), - 'index.php?option=com_installer&view=database', - $vName == 'database' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_WARNINGS'), - 'index.php?option=com_installer&view=warnings', - $vName == 'warnings' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_LANGUAGES'), - 'index.php?option=com_installer&view=languages', - $vName == 'languages' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_INSTALLER_SUBMENU_UPDATESITES'), - 'index.php?option=com_installer&view=updatesites', - $vName == 'updatesites' - ); - } - /** * Get a list of filter options for the extension types. * diff --git a/administrator/components/com_installer/View/Discover/HtmlView.php b/administrator/components/com_installer/View/Discover/HtmlView.php index 6aeed8489370d..6171fb6c364ce 100644 --- a/administrator/components/com_installer/View/Discover/HtmlView.php +++ b/administrator/components/com_installer/View/Discover/HtmlView.php @@ -70,8 +70,6 @@ protected function addToolbar() ToolbarHelper::custom('discover.refresh', 'refresh', 'refresh', 'COM_INSTALLER_TOOLBAR_DISCOVER', false); ToolbarHelper::divider(); - \JHtmlSidebar::setAction('index.php?option=com_installer&view=discover'); - parent::addToolbar(); ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_DISCOVER'); diff --git a/administrator/components/com_installer/View/Installer/HtmlView.php b/administrator/components/com_installer/View/Installer/HtmlView.php index 9ceb0729d2c2c..e385693dd7adf 100644 --- a/administrator/components/com_installer/View/Installer/HtmlView.php +++ b/administrator/components/com_installer/View/Installer/HtmlView.php @@ -111,8 +111,5 @@ protected function addToolbar() ToolbarHelper::preferences('com_installer'); ToolbarHelper::divider(); } - - // Render side bar. - $this->sidebar = \JHtmlSidebar::render(); } } diff --git a/administrator/components/com_installer/View/Manage/HtmlView.php b/administrator/components/com_installer/View/Manage/HtmlView.php index d7cef4c956a19..c94de5562bfb3 100644 --- a/administrator/components/com_installer/View/Manage/HtmlView.php +++ b/administrator/components/com_installer/View/Manage/HtmlView.php @@ -82,8 +82,6 @@ protected function addToolbar() ToolbarHelper::divider(); } - \JHtmlSidebar::setAction('index.php?option=com_installer&view=manage'); - parent::addToolbar(); ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_MANAGE'); } diff --git a/administrator/components/com_installer/View/Update/HtmlView.php b/administrator/components/com_installer/View/Update/HtmlView.php index 9bd669f756e3e..ed85362446d53 100644 --- a/administrator/components/com_installer/View/Update/HtmlView.php +++ b/administrator/components/com_installer/View/Update/HtmlView.php @@ -81,8 +81,6 @@ protected function addToolbar() ToolbarHelper::custom('update.purge', 'purge', 'purge', 'COM_INSTALLER_TOOLBAR_PURGE', false); ToolbarHelper::divider(); - \JHtmlSidebar::setAction('index.php?option=com_installer&view=manage'); - parent::addToolbar(); ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE'); } diff --git a/administrator/components/com_installer/View/Updatesites/HtmlView.php b/administrator/components/com_installer/View/Updatesites/HtmlView.php index 0af6247b4dc06..dcfe7829136ed 100644 --- a/administrator/components/com_installer/View/Updatesites/HtmlView.php +++ b/administrator/components/com_installer/View/Updatesites/HtmlView.php @@ -88,8 +88,6 @@ protected function addToolbar() ToolbarHelper::custom('updatesites.rebuild', 'refresh.png', 'refresh_f2.png', 'JTOOLBAR_REBUILD', false); } - \JHtmlSidebar::setAction('index.php?option=com_installer&view=updatesites'); - parent::addToolbar(); ToolbarHelper::help('JHELP_EXTENSIONS_EXTENSION_MANAGER_UPDATESITES'); } diff --git a/administrator/components/com_installer/tmpl/database/default.php b/administrator/components/com_installer/tmpl/database/default.php index b9f8e37e2b21f..01c3da3de43c5 100644 --- a/administrator/components/com_installer/tmpl/database/default.php +++ b/administrator/components/com_installer/tmpl/database/default.php @@ -24,10 +24,7 @@
-
- sidebar; ?> -
-
+
$this)); ?> diff --git a/administrator/components/com_installer/tmpl/discover/default.php b/administrator/components/com_installer/tmpl/discover/default.php index 4876f1440651b..3fd27d66b140e 100644 --- a/administrator/components/com_installer/tmpl/discover/default.php +++ b/administrator/components/com_installer/tmpl/discover/default.php @@ -22,10 +22,7 @@
-
- sidebar; ?> -
-
+
showMessage) : ?> loadTemplate('message'); ?> diff --git a/administrator/components/com_installer/tmpl/install/default.php b/administrator/components/com_installer/tmpl/install/default.php index ddf90a9269bfb..03b2962e83acc 100644 --- a/administrator/components/com_installer/tmpl/install/default.php +++ b/administrator/components/com_installer/tmpl/install/default.php @@ -31,10 +31,7 @@
-
- sidebar; ?> -
-
+
showMessage) : ?> diff --git a/administrator/components/com_installer/tmpl/languages/default.php b/administrator/components/com_installer/tmpl/languages/default.php index 583e364e375ad..ac3ae2ff108ac 100644 --- a/administrator/components/com_installer/tmpl/languages/default.php +++ b/administrator/components/com_installer/tmpl/languages/default.php @@ -22,10 +22,7 @@
-
- sidebar; ?> -
-
+
$this, 'options' => array('filterButton' => false))); ?> items)) : ?> diff --git a/administrator/components/com_installer/tmpl/manage/default.php b/administrator/components/com_installer/tmpl/manage/default.php index 99e384e987da3..b31e99688a9db 100644 --- a/administrator/components/com_installer/tmpl/manage/default.php +++ b/administrator/components/com_installer/tmpl/manage/default.php @@ -22,10 +22,7 @@
-
- sidebar; ?> -
-
+
showMessage) : ?> loadTemplate('message'); ?> diff --git a/administrator/components/com_installer/tmpl/update/default.php b/administrator/components/com_installer/tmpl/update/default.php index 222ea6bd0ab54..80ca2014605d3 100644 --- a/administrator/components/com_installer/tmpl/update/default.php +++ b/administrator/components/com_installer/tmpl/update/default.php @@ -22,10 +22,7 @@
-
- sidebar; ?> -
-
+
showMessage) : ?> loadTemplate('message'); ?> diff --git a/administrator/components/com_installer/tmpl/updatesites/default.php b/administrator/components/com_installer/tmpl/updatesites/default.php index 5d7517ff25dcc..e295ab7304d09 100644 --- a/administrator/components/com_installer/tmpl/updatesites/default.php +++ b/administrator/components/com_installer/tmpl/updatesites/default.php @@ -22,10 +22,7 @@
-
- sidebar; ?> -
-
+
$this)); ?> items)) : ?> diff --git a/administrator/components/com_installer/tmpl/warnings/default.php b/administrator/components/com_installer/tmpl/warnings/default.php index 1b40eff8060fe..2c90198305349 100644 --- a/administrator/components/com_installer/tmpl/warnings/default.php +++ b/administrator/components/com_installer/tmpl/warnings/default.php @@ -17,10 +17,7 @@
-
- sidebar; ?> -
-
+
messages)) : ?> messages as $message) : ?> diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini index 1b9e9e191d49d..985575ca48742 100644 --- a/administrator/language/en-GB/en-GB.com_installer.ini +++ b/administrator/language/en-GB/en-GB.com_installer.ini @@ -203,13 +203,6 @@ COM_INSTALLER_PACKAGE_FILE="Package File" COM_INSTALLER_PREFERENCES_DESCRIPTION="Fine tune how extensions installation and updates work." COM_INSTALLER_PREFERENCES_LABEL="Preferences" COM_INSTALLER_REINSTALL_BUTTON="Reinstall" -COM_INSTALLER_SUBMENU_DATABASE="Database" -COM_INSTALLER_SUBMENU_DISCOVER="Discover" -COM_INSTALLER_SUBMENU_INSTALL="Install" -COM_INSTALLER_SUBMENU_LANGUAGES="Install Languages" -COM_INSTALLER_SUBMENU_MANAGE="Manage" -COM_INSTALLER_SUBMENU_UPDATE="Update" -COM_INSTALLER_SUBMENU_UPDATESITES="Update Sites" COM_INSTALLER_SUBMENU_WARNINGS="Warnings" COM_INSTALLER_TITLE_DATABASE="Extensions: Database" COM_INSTALLER_TITLE_DISCOVER="Extensions: Discover"