Skip to content

[4.0] com_templates sidebar #24092

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 4 commits into from
Mar 21, 2019
Merged

[4.0] com_templates sidebar #24092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7bdd60
[4.0] com_templates sidebar
brianteeman Mar 4, 2019
190bf01
remove sidebar
brianteeman Mar 5, 2019
4f60f73
Merge branch '4.0-dev' into template_sidebar
wilsonge Mar 6, 2019
5b725b0
Merge branch '4.0-dev' into template_sidebar
wilsonge Mar 21, 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
3 changes: 0 additions & 3 deletions administrator/components/com_templates/View/Styles/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ public function display($tpl = null)
}

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

return parent::display($tpl);
}
Expand Down Expand Up @@ -147,7 +146,5 @@ protected function addToolbar()
}

ToolbarHelper::help('JHELP_EXTENSIONS_TEMPLATE_MANAGER_STYLES');

\JHtmlSidebar::setAction('index.php?option=com_templates&view=styles');
}
}
4 changes: 0 additions & 4 deletions administrator/components/com_templates/View/Templates/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,5 @@ protected function addToolbar()
}

ToolbarHelper::help('JHELP_EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES');

\JHtmlSidebar::setAction('index.php?option=com_templates&view=templates');

$this->sidebar = \JHtmlSidebar::render();
}
}
5 changes: 1 addition & 4 deletions administrator/components/com_templates/tmpl/styles/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@
?>
<form action="<?php echo Route::_('index.php?option=com_templates&view=styles'); ?>" 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('selectorFieldName' => 'client_id'))); ?>
<?php if ($this->total > 0) : ?>
Expand Down
5 changes: 1 addition & 4 deletions administrator/components/com_templates/tmpl/templates/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@

<form action="<?php echo Route::_('index.php?option=com_templates&view=templates'); ?>" 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('selectorFieldName' => 'client_id'))); ?>
<?php if ($this->total > 0) : ?>
Expand Down