diff --git a/administrator/components/com_associations/View/Association/HtmlView.php b/administrator/components/com_associations/View/Association/HtmlView.php index c59abab1a6fb0..52815a0092ed5 100644 --- a/administrator/components/com_associations/View/Association/HtmlView.php +++ b/administrator/components/com_associations/View/Association/HtmlView.php @@ -227,7 +227,5 @@ protected function addToolbar() ToolbarHelper::cancel('association.cancel', 'JTOOLBAR_CLOSE'); ToolbarHelper::help('JHELP_COMPONENTS_ASSOCIATIONS_EDIT'); - - \JHtmlSidebar::setAction('index.php?option=com_associations'); } } diff --git a/administrator/components/com_categories/View/Categories/HtmlView.php b/administrator/components/com_categories/View/Categories/HtmlView.php index 0c706ac43dace..6e97d70adde12 100644 --- a/administrator/components/com_categories/View/Categories/HtmlView.php +++ b/administrator/components/com_categories/View/Categories/HtmlView.php @@ -112,7 +112,6 @@ public function display($tpl = null) if ($this->getLayout() !== 'modal') { $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); // We do not need to filter by language when multilingual is disabled if (!Multilanguage::isEnabled()) diff --git a/administrator/components/com_contact/Helper/ContactHelper.php b/administrator/components/com_contact/Helper/ContactHelper.php index 7f869e1e4e8ce..7626bcea34ced 100644 --- a/administrator/components/com_contact/Helper/ContactHelper.php +++ b/administrator/components/com_contact/Helper/ContactHelper.php @@ -22,29 +22,5 @@ */ class ContactHelper extends ContentHelper { - /** - * Configure the Linkbar. - * - * @param string $vName The name of the active view. - * - * @return void - * - * @since 1.6 - */ - public static function addSubmenu($vName) - { - if (ComponentHelper::isEnabled('com_fields') && ComponentHelper::getParams('com_contact')->get('custom_fields_enable', '1')) - { - \JHtmlSidebar::addEntry( - Text::_('JGLOBAL_FIELDS'), - 'index.php?option=com_fields&context=com_contact.contact', - $vName == 'fields.fields' - ); - \JHtmlSidebar::addEntry( - Text::_('JGLOBAL_FIELD_GROUPS'), - 'index.php?option=com_fields&view=groups&context=com_contact.contact', - $vName == 'fields.groups' - ); - } - } + } diff --git a/administrator/components/com_contact/View/Contacts/HtmlView.php b/administrator/components/com_contact/View/Contacts/HtmlView.php index 2f19f48d09b7a..808d7923e87d7 100644 --- a/administrator/components/com_contact/View/Contacts/HtmlView.php +++ b/administrator/components/com_contact/View/Contacts/HtmlView.php @@ -110,7 +110,6 @@ public function display($tpl = null) if ($this->getLayout() !== 'modal') { $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); // We do not need to filter by language when multilingual is disabled if (!Multilanguage::isEnabled()) diff --git a/administrator/components/com_content/View/Articles/HtmlView.php b/administrator/components/com_content/View/Articles/HtmlView.php index c97861db6e703..f8438e550354f 100644 --- a/administrator/components/com_content/View/Articles/HtmlView.php +++ b/administrator/components/com_content/View/Articles/HtmlView.php @@ -111,7 +111,6 @@ public function display($tpl = null) if ($this->getLayout() !== 'modal') { $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); // We do not need to filter by language when multilingual is disabled if (!Multilanguage::isEnabled()) diff --git a/administrator/components/com_content/View/Featured/HtmlView.php b/administrator/components/com_content/View/Featured/HtmlView.php index 5fd310bf5c7c9..212803f87b4b8 100644 --- a/administrator/components/com_content/View/Featured/HtmlView.php +++ b/administrator/components/com_content/View/Featured/HtmlView.php @@ -105,7 +105,6 @@ public function display($tpl = null) } $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); // We do not need to filter by language when multilingual is disabled if (!Multilanguage::isEnabled()) diff --git a/administrator/components/com_fields/View/Fields/HtmlView.php b/administrator/components/com_fields/View/Fields/HtmlView.php index c7211b0f85206..d9cef47c1aeda 100644 --- a/administrator/components/com_fields/View/Fields/HtmlView.php +++ b/administrator/components/com_fields/View/Fields/HtmlView.php @@ -119,7 +119,6 @@ public function display($tpl = null) } FieldsHelper::addSubmenu($this->state->get('filter.context'), 'fields'); - $this->sidebar = \JHtmlSidebar::render(); return parent::display($tpl); } diff --git a/administrator/components/com_fields/View/Groups/HtmlView.php b/administrator/components/com_fields/View/Groups/HtmlView.php index 07bd3d558341c..dd657e6187bdf 100644 --- a/administrator/components/com_fields/View/Groups/HtmlView.php +++ b/administrator/components/com_fields/View/Groups/HtmlView.php @@ -115,7 +115,6 @@ public function display($tpl = null) } FieldsHelper::addSubmenu($this->state->get('filter.context'), 'groups'); - $this->sidebar = \JHtmlSidebar::render(); return parent::display($tpl); } diff --git a/administrator/components/com_finder/Helper/FinderHelper.php b/administrator/components/com_finder/Helper/FinderHelper.php index 7f6f3e5e8abcb..8152cb66b2f26 100644 --- a/administrator/components/com_finder/Helper/FinderHelper.php +++ b/administrator/components/com_finder/Helper/FinderHelper.php @@ -29,39 +29,6 @@ class FinderHelper */ public static $extension = 'com_finder'; - /** - * Configure the Linkbar. - * - * @param string $vName The name of the active view. - * - * @return void - * - * @since 2.5 - */ - public static function addSubmenu($vName) - { - \JHtmlSidebar::addEntry( - Text::_('COM_FINDER_SUBMENU_INDEX'), - 'index.php?option=com_finder&view=index', - $vName === 'index' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_FINDER_SUBMENU_MAPS'), - 'index.php?option=com_finder&view=maps', - $vName === 'maps' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_FINDER_SUBMENU_FILTERS'), - 'index.php?option=com_finder&view=filters', - $vName === 'filters' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_FINDER_SUBMENU_SEARCHES'), - 'index.php?option=com_finder&view=searches', - $vName === 'searches' - ); - } - /** * Gets the finder system plugin extension id. * diff --git a/administrator/components/com_finder/View/Filters/HtmlView.php b/administrator/components/com_finder/View/Filters/HtmlView.php index 287835340410c..815fac0b3e4db 100644 --- a/administrator/components/com_finder/View/Filters/HtmlView.php +++ b/administrator/components/com_finder/View/Filters/HtmlView.php @@ -119,7 +119,6 @@ public function display($tpl = null) // Configure the toolbar. $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); return parent::display($tpl); } diff --git a/administrator/components/com_finder/View/Index/HtmlView.php b/administrator/components/com_finder/View/Index/HtmlView.php index ca1667a92af11..10edd27d0fff5 100644 --- a/administrator/components/com_finder/View/Index/HtmlView.php +++ b/administrator/components/com_finder/View/Index/HtmlView.php @@ -159,7 +159,6 @@ public function display($tpl = null) // Configure the toolbar. $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); return parent::display($tpl); } diff --git a/administrator/components/com_finder/View/Maps/HtmlView.php b/administrator/components/com_finder/View/Maps/HtmlView.php index 064586b13bd21..91b8a72e7de3d 100644 --- a/administrator/components/com_finder/View/Maps/HtmlView.php +++ b/administrator/components/com_finder/View/Maps/HtmlView.php @@ -123,7 +123,6 @@ public function display($tpl = null) // Prepare the view. $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); return parent::display($tpl); } diff --git a/administrator/components/com_finder/View/Searches/HtmlView.php b/administrator/components/com_finder/View/Searches/HtmlView.php index 7d0635a390289..4521d7d7d24ff 100644 --- a/administrator/components/com_finder/View/Searches/HtmlView.php +++ b/administrator/components/com_finder/View/Searches/HtmlView.php @@ -112,7 +112,6 @@ public function display($tpl = null) // Prepare the view. $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); return parent::display($tpl); } diff --git a/administrator/components/com_menus/View/Items/HtmlView.php b/administrator/components/com_menus/View/Items/HtmlView.php index f89643e6baf0f..432eae83df3ce 100644 --- a/administrator/components/com_menus/View/Items/HtmlView.php +++ b/administrator/components/com_menus/View/Items/HtmlView.php @@ -293,7 +293,6 @@ public function display($tpl = null) if ($this->getLayout() !== 'modal') { $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); // We do not need to filter by language when multilingual is disabled if (!Multilanguage::isEnabled()) diff --git a/administrator/components/com_menus/View/Menus/HtmlView.php b/administrator/components/com_menus/View/Menus/HtmlView.php index dd3991be3a70e..7f35ff7a1149a 100644 --- a/administrator/components/com_menus/View/Menus/HtmlView.php +++ b/administrator/components/com_menus/View/Menus/HtmlView.php @@ -108,7 +108,6 @@ public function display($tpl = null) } $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); parent::display($tpl); } diff --git a/administrator/components/com_messages/Helper/MessagesHelper.php b/administrator/components/com_messages/Helper/MessagesHelper.php index 395bda8dc6ea1..84a55fd150b03 100644 --- a/administrator/components/com_messages/Helper/MessagesHelper.php +++ b/administrator/components/com_messages/Helper/MessagesHelper.php @@ -21,29 +21,6 @@ */ class MessagesHelper { - /** - * Configure the Linkbar. - * - * @param string $vName The name of the active view. - * - * @return void - * - * @since 1.6 - */ - public static function addSubmenu($vName) - { - \JHtmlSidebar::addEntry( - Text::_('COM_MESSAGES_ADD'), - 'index.php?option=com_messages&view=message&layout=edit', - $vName == 'message' - ); - - \JHtmlSidebar::addEntry( - Text::_('COM_MESSAGES_READ'), - 'index.php?option=com_messages', - $vName == 'messages' - ); - } /** * Get a list of filter options for the state of a module. diff --git a/administrator/components/com_modules/View/Modules/HtmlView.php b/administrator/components/com_modules/View/Modules/HtmlView.php index 48a0d104db961..69c699c8ceaaa 100644 --- a/administrator/components/com_modules/View/Modules/HtmlView.php +++ b/administrator/components/com_modules/View/Modules/HtmlView.php @@ -227,11 +227,6 @@ protected function addToolbar() } $toolbar->help('JHELP_EXTENSIONS_MODULE_MANAGER'); - - if (\JHtmlSidebar::getEntries()) - { - $this->sidebar = \JHtmlSidebar::render(); - } } /** diff --git a/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php b/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php index 558ddbbd444c9..0b05132f7856e 100644 --- a/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php +++ b/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php @@ -86,7 +86,6 @@ public function display($tpl = null) if ($this->getLayout() !== 'modal') { $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); // We do not need to filter by language when multilingual is disabled if (!Multilanguage::isEnabled()) diff --git a/administrator/components/com_templates/Helper/TemplatesHelper.php b/administrator/components/com_templates/Helper/TemplatesHelper.php index f9d3d43513f42..ea76c63ae78a2 100644 --- a/administrator/components/com_templates/Helper/TemplatesHelper.php +++ b/administrator/components/com_templates/Helper/TemplatesHelper.php @@ -25,26 +25,6 @@ */ class TemplatesHelper { - /** - * Configure the Linkbar. - * - * @param string $vName The name of the active view. - * - * @return void - */ - public static function addSubmenu($vName) - { - \JHtmlSidebar::addEntry( - Text::_('COM_TEMPLATES_SUBMENU_STYLES'), - 'index.php?option=com_templates&view=styles', - $vName == 'styles' - ); - \JHtmlSidebar::addEntry( - Text::_('COM_TEMPLATES_SUBMENU_TEMPLATES'), - 'index.php?option=com_templates&view=templates', - $vName == 'templates' - ); - } /** * Get a list of filter options for the application clients. diff --git a/administrator/components/com_workflow/View/Stages/HtmlView.php b/administrator/components/com_workflow/View/Stages/HtmlView.php index aa78300a36d9e..4baefbe54dfc4 100644 --- a/administrator/components/com_workflow/View/Stages/HtmlView.php +++ b/administrator/components/com_workflow/View/Stages/HtmlView.php @@ -129,8 +129,6 @@ public function display($tpl = null) WorkflowHelper::addSubmenu('stages'); - $this->sidebar = \JHtmlSidebar::render(); - if (!empty($this->stages)) { $extension = Factory::getApplication()->input->getCmd('extension'); diff --git a/administrator/components/com_workflow/View/Transitions/HtmlView.php b/administrator/components/com_workflow/View/Transitions/HtmlView.php index ce16a8abdcd7e..778428aeaf5ec 100644 --- a/administrator/components/com_workflow/View/Transitions/HtmlView.php +++ b/administrator/components/com_workflow/View/Transitions/HtmlView.php @@ -128,8 +128,6 @@ public function display($tpl = null) WorkflowHelper::addSubmenu('transitions'); - $this->sidebar = \JHtmlSidebar::render(); - $this->addToolbar(); return parent::display($tpl); diff --git a/administrator/components/com_workflow/View/Workflows/HtmlView.php b/administrator/components/com_workflow/View/Workflows/HtmlView.php index 61d263203ab61..93527cb13392d 100644 --- a/administrator/components/com_workflow/View/Workflows/HtmlView.php +++ b/administrator/components/com_workflow/View/Workflows/HtmlView.php @@ -107,7 +107,6 @@ public function display($tpl = null) $this->extension = $this->state->get('filter.extension'); WorkflowHelper::addSubmenu($this->state->get('filter.extension')); - $this->sidebar = \JHtmlSidebar::render(); $this->addToolbar();