Skip to content

[4.0] Remove references to JHtmlSidebar #25244

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

Closed
travisrisner wants to merge 1 commit into from
Closed

[4.0] Remove references to JHtmlSidebar #25244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions administrator/components/com_associations/View/Association/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
}
1 change: 0 additions & 1 deletion administrator/components/com_categories/View/Categories/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
26 changes: 1 addition & 25 deletions administrator/components/com_contact/Helper/ContactHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
);
}
}

}
1 change: 0 additions & 1 deletion administrator/components/com_contact/View/Contacts/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_content/View/Articles/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_content/View/Featured/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_fields/View/Fields/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_fields/View/Groups/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
33 changes: 0 additions & 33 deletions administrator/components/com_finder/Helper/FinderHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_finder/View/Filters/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ public function display($tpl = null)

// Configure the toolbar.
$this->addToolbar();
$this->sidebar = \JHtmlSidebar::render();

return parent::display($tpl);
}
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_finder/View/Index/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ public function display($tpl = null)

// Configure the toolbar.
$this->addToolbar();
$this->sidebar = \JHtmlSidebar::render();

return parent::display($tpl);
}
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_finder/View/Maps/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ public function display($tpl = null)

// Prepare the view.
$this->addToolbar();
$this->sidebar = \JHtmlSidebar::render();

return parent::display($tpl);
}
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_finder/View/Searches/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ public function display($tpl = null)

// Prepare the view.
$this->addToolbar();
$this->sidebar = \JHtmlSidebar::render();

return parent::display($tpl);
}
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_menus/View/Items/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_menus/View/Menus/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ public function display($tpl = null)
}

$this->addToolbar();
$this->sidebar = \JHtmlSidebar::render();

parent::display($tpl);
}
Expand Down
23 changes: 0 additions & 23 deletions administrator/components/com_messages/Helper/MessagesHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 0 additions & 5 deletions administrator/components/com_modules/View/Modules/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,6 @@ protected function addToolbar()
}

$toolbar->help('JHELP_EXTENSIONS_MODULE_MANAGER');

if (\JHtmlSidebar::getEntries())
{
$this->sidebar = \JHtmlSidebar::render();
}
}

/**
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
20 changes: 0 additions & 20 deletions administrator/components/com_templates/Helper/TemplatesHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions administrator/components/com_workflow/View/Stages/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 0 additions & 2 deletions administrator/components/com_workflow/View/Transitions/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@ public function display($tpl = null)

WorkflowHelper::addSubmenu('transitions');

$this->sidebar = \JHtmlSidebar::render();

$this->addToolbar();

return parent::display($tpl);
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_workflow/View/Workflows/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down