diff --git a/administrator/components/com_cache/Controller/DisplayController.php b/administrator/components/com_cache/Controller/DisplayController.php index 65d3152bb0c5d..07dd644e7d977 100644 --- a/administrator/components/com_cache/Controller/DisplayController.php +++ b/administrator/components/com_cache/Controller/DisplayController.php @@ -62,9 +62,6 @@ public function display($cachable = false, $urlparams = false) // Push document object into the view. $view->document = $document; - // Load the submenu. - CacheHelper::addSubmenu($this->input->get('view', 'cache')); - $view->display(); } } diff --git a/administrator/components/com_cache/Helper/CacheHelper.php b/administrator/components/com_cache/Helper/CacheHelper.php index bad1253cc1dec..7966d034b3388 100644 --- a/administrator/components/com_cache/Helper/CacheHelper.php +++ b/administrator/components/com_cache/Helper/CacheHelper.php @@ -20,32 +20,5 @@ */ class CacheHelper { - /** - * 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::_('JGLOBAL_SUBMENU_CHECKIN'), - 'index.php?option=com_checkin', - $vName == 'com_checkin' - ); - \JHtmlSidebar::addEntry( - Text::_('JGLOBAL_SUBMENU_CLEAR_CACHE'), - 'index.php?option=com_cache', - $vName == 'cache' - ); - \JHtmlSidebar::addEntry( - Text::_('JGLOBAL_SUBMENU_PURGE_EXPIRED_CACHE'), - 'index.php?option=com_cache&view=purge', - $vName == 'purge' - ); - } } diff --git a/administrator/components/com_cache/View/Cache/HtmlView.php b/administrator/components/com_cache/View/Cache/HtmlView.php index 651a27ed28455..38329dab5696c 100644 --- a/administrator/components/com_cache/View/Cache/HtmlView.php +++ b/administrator/components/com_cache/View/Cache/HtmlView.php @@ -52,7 +52,6 @@ public function display($tpl = null) } $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); parent::display($tpl); } diff --git a/administrator/components/com_cache/View/Purge/HtmlView.php b/administrator/components/com_cache/View/Purge/HtmlView.php index f160be5d72f8e..f6b640ce3e695 100644 --- a/administrator/components/com_cache/View/Purge/HtmlView.php +++ b/administrator/components/com_cache/View/Purge/HtmlView.php @@ -33,7 +33,6 @@ class HtmlView extends BaseHtmlView public function display($tpl = null) { $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); parent::display($tpl); } diff --git a/administrator/components/com_cache/tmpl/cache/default.php b/administrator/components/com_cache/tmpl/cache/default.php index 57ebb1fbede60..169576262d66f 100644 --- a/administrator/components/com_cache/tmpl/cache/default.php +++ b/administrator/components/com_cache/tmpl/cache/default.php @@ -21,10 +21,7 @@ ?>
-
- sidebar; ?> -
-
+
$this)); ?> data) > 0) : ?> diff --git a/administrator/components/com_cache/tmpl/purge/default.php b/administrator/components/com_cache/tmpl/purge/default.php index 00e4f9d05b801..7b0e26d3e459d 100644 --- a/administrator/components/com_cache/tmpl/purge/default.php +++ b/administrator/components/com_cache/tmpl/purge/default.php @@ -17,10 +17,7 @@
-
- sidebar; ?> -
-
+

diff --git a/administrator/components/com_checkin/Controller/DisplayController.php b/administrator/components/com_checkin/Controller/DisplayController.php index bf67681cce8cf..2e89ffc7d3365 100644 --- a/administrator/components/com_checkin/Controller/DisplayController.php +++ b/administrator/components/com_checkin/Controller/DisplayController.php @@ -39,9 +39,6 @@ class DisplayController extends BaseController */ public function display($cachable = false, $urlparams = array()) { - // Load the submenu. - $this->addSubmenu($this->input->getWord('option', 'com_checkin')); - return parent::display(); } @@ -73,33 +70,4 @@ public function checkin() $this->setRedirect('index.php?option=com_checkin'); } - - /** - * Configure the Linkbar. - * - * @param string $vName The name of the active view. - * - * @return void - * - * @since 1.6 - */ - protected function addSubmenu($vName) - { - \JHtmlSidebar::addEntry( - Text::_('JGLOBAL_SUBMENU_CHECKIN'), - 'index.php?option=com_checkin', - $vName == 'com_checkin' - ); - - \JHtmlSidebar::addEntry( - Text::_('JGLOBAL_SUBMENU_CLEAR_CACHE'), - 'index.php?option=com_cache', - $vName == 'cache' - ); - \JHtmlSidebar::addEntry( - Text::_('JGLOBAL_SUBMENU_PURGE_EXPIRED_CACHE'), - 'index.php?option=com_cache&view=purge', - $vName == 'purge' - ); - } } diff --git a/administrator/components/com_checkin/View/Checkin/HtmlView.php b/administrator/components/com_checkin/View/Checkin/HtmlView.php index 73987d8e3bc4f..ef5613fa8eaf6 100644 --- a/administrator/components/com_checkin/View/Checkin/HtmlView.php +++ b/administrator/components/com_checkin/View/Checkin/HtmlView.php @@ -44,13 +44,6 @@ class HtmlView extends BaseHtmlView */ protected $state; - /** - * The sidebar markup - * - * @var string - */ - protected $sidebar; - /** * Form object for search filters * @@ -90,7 +83,6 @@ public function display($tpl = null) } $this->addToolbar(); - $this->sidebar = \JHtmlSidebar::render(); return parent::display($tpl); } diff --git a/administrator/components/com_checkin/tmpl/checkin/default.php b/administrator/components/com_checkin/tmpl/checkin/default.php index bf114f8d07abf..00bf5b222cda5 100644 --- a/administrator/components/com_checkin/tmpl/checkin/default.php +++ b/administrator/components/com_checkin/tmpl/checkin/default.php @@ -21,10 +21,7 @@ ?>
-
- sidebar; ?> -
-
+
$this)); ?> total > 0) : ?> diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index 1e47068bb4f0c..6b3135b3c4da5 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -602,9 +602,6 @@ JGLOBAL_STAGE_PROCESS="Process" JGLOBAL_START_PUBLISH_AFTER_FINISH="Item start publishing date must be before finish publishing date" JGLOBAL_SUBHEADING_DESC="Optional text to show as a subheading." JGLOBAL_SUBHEADING_LABEL="Page Subheading" -JGLOBAL_SUBMENU_CHECKIN="Check-in" -JGLOBAL_SUBMENU_CLEAR_CACHE="Clear Cache" -JGLOBAL_SUBMENU_PURGE_EXPIRED_CACHE="Clear Expired Cache" JGLOBAL_SUBSLIDER_BLOG_EXTENDED_LABEL="The option below gives the ability to include articles from subcategories in the Blog layout." JGLOBAL_SUBSLIDER_BLOG_LAYOUT_LABEL="If a field is left blank, global settings will be used." JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL="These options are also used when you select
one of the category links, on the first page and/or thereafter,
unless they are changed for a specific menu item."