Skip to content

[4.0] Remove sidebar from com_installer #24080

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

Merged
wilsonge merged 6 commits into from
Mar 21, 2019
Merged

[4.0] Remove sidebar from com_installer #24080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f204c2c
[4.0] Remove sidebar from com_installer
brianteeman Mar 4, 2019
0c9ae75
remove unused strings
brianteeman Mar 4, 2019
673c791
Update administrator/components/com_installer/View/Installer/HtmlView…
Mar 4, 2019
c4427c8
Update InstallerHelper.php
brianteeman Mar 18, 2019
70b6a36
Merge branch '4.0-dev' into extensions_sidebar
brianteeman Mar 18, 2019
25b93bc
Merge branch '4.0-dev' into extensions_sidebar
brianteeman Mar 20, 2019
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
53 changes: 0 additions & 53 deletions administrator/components/com_installer/Helper/InstallerHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
2 changes: 0 additions & 2 deletions administrator/components/com_installer/View/Discover/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
3 changes: 0 additions & 3 deletions administrator/components/com_installer/View/Installer/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,5 @@ protected function addToolbar()
ToolbarHelper::preferences('com_installer');
ToolbarHelper::divider();
}

// Render side bar.
$this->sidebar = \JHtmlSidebar::render();
}
}
2 changes: 0 additions & 2 deletions administrator/components/com_installer/View/Manage/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
2 changes: 0 additions & 2 deletions administrator/components/com_installer/View/Update/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
2 changes: 0 additions & 2 deletions administrator/components/com_installer/View/Updatesites/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_installer/tmpl/database/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
<div id="installer-database" class="clearfix">
<form action="<?php echo Route::_('index.php?option=com_installer&view=database'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
<div class="col-md-10">
<div class="col-md-12">
<div id="j-main-container" class="j-main-container">
<div class="control-group">
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_installer/tmpl/discover/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
<div id="installer-discover" class="clearfix">
<form action="<?php echo Route::_('index.php?option=com_installer&view=discover'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
<div class="col-md-10">
<div class="col-md-12">
<div id="j-main-container" class="j-main-container">
<?php if ($this->showMessage) : ?>
<?php echo $this->loadTemplate('message'); ?>
Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_installer/tmpl/install/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@

<form enctype="multipart/form-data" action="<?php echo Route::_('index.php?option=com_installer&view=install'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
<div class="col-md-10">
<div class="col-md-12">
<div id="j-main-container" class="j-main-container">
<?php // Render messages set by extension install scripts here ?>
<?php if ($this->showMessage) : ?>
Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_installer/tmpl/languages/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
<div id="installer-languages" class="clearfix">
<form action="<?php echo Route::_('index.php?option=com_installer&view=languages'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
<div class="col-md-10">
<div class="col-md-12">
<div id="j-main-container" class="j-main-container">
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
<?php if (empty($this->items)) : ?>
Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_installer/tmpl/manage/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
<div id="installer-manage" class="clearfix">
<form action="<?php echo Route::_('index.php?option=com_installer&view=manage'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
<div class="col-md-10">
<div class="col-md-12">
<div id="j-main-container" class="j-main-container">
<?php if ($this->showMessage) : ?>
<?php echo $this->loadTemplate('message'); ?>
Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_installer/tmpl/update/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
<div id="installer-update" class="clearfix">
<form action="<?php echo Route::_('index.php?option=com_installer&view=update'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
<div class="col-md-10">
<div class="col-md-12">
<div id="j-main-container" class="j-main-container">
<?php if ($this->showMessage) : ?>
<?php echo $this->loadTemplate('message'); ?>
Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_installer/tmpl/updatesites/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
<div id="installer-manage" class="clearfix">
<form action="<?php echo Route::_('index.php?option=com_installer&view=updatesites'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
<div class="col-md-10">
<div class="col-md-12">
<div id="j-main-container" class="j-main-container">
<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
<?php if (empty($this->items)) : ?>
Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_installer/tmpl/warnings/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
<div id="installer-warnings" class="clearfix">
<form action="<?php echo Route::_('index.php?option=com_installer&view=warnings'); ?>" method="post" name="adminForm" id="adminForm">
<div class="row">
<div id="j-sidebar-container" class="col-md-2">
<?php echo $this->sidebar; ?>
</div>
<div class="col-md-10">
<div class="col-md-12">
<div id="j-main-container" class="j-main-container">
<?php if (count($this->messages)) : ?>
<?php foreach ($this->messages as $message) : ?>
Expand Down
7 changes: 0 additions & 7 deletions administrator/language/en-GB/en-GB.com_installer.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down