Skip to content
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

[4.0] Wrap all buttons in btn-group to improve styling #30761

Merged
merged 2 commits into from
Sep 26, 2020
Merged

[4.0] Wrap all buttons in btn-group to improve styling #30761

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7fc1bd
wrap all buttons in btn-group to improve styling
hans2103 Sep 25, 2020
f74fdb1
add if-then statement to hide button if not needed
hans2103 Sep 25, 2020
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
39 changes: 21 additions & 18 deletions components/com_content/tmpl/category/default_articles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<?php if ($this->params->get('filter_field') !== 'hide' || $this->params->get('show_pagination_limit')) : ?>
<fieldset class="com-content-category__filters filters btn-toolbar clearfix">
<legend class="hidden-xs-up"><?php echo Text::_('COM_CONTENT_FORM_FILTER_LEGEND'); ?></legend>
<?php if ($this->params->get('filter_field') !== 'hide') : ?>
<div class="btn-group">
<div class="btn-group">
<?php if ($this->params->get('filter_field') !== 'hide') : ?>
<?php if ($this->params->get('filter_field') === 'tag') : ?>
<select name="filter_tag" id="filter_tag" onchange="document.adminForm.submit();" >
<option value=""><?php echo Text::_('JOPTION_SELECT_TAG'); ?></option>
Expand All @@ -86,28 +86,31 @@
</label>
<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo Text::_('COM_CONTENT_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo Text::_('COM_CONTENT_' . $this->params->get('filter_field') . '_FILTER_LABEL'); ?>">
<?php endif; ?>
</div>
<?php endif; ?>
<?php if ($this->params->get('show_pagination_limit')) : ?>
<div class="com-content-category__pagination btn-group float-right">
<label for="limit" class="sr-only">
<?php echo Text::_('JGLOBAL_DISPLAY_NUM'); ?>
</label>
<?php echo $this->pagination->getLimitBox(); ?>
</div>
<?php endif; ?>
<?php endif; ?>

<?php if ($this->params->get('show_pagination_limit')) : ?>
<div class="com-content-category__pagination btn-group float-right">
<label for="limit" class="sr-only">
<?php echo Text::_('JGLOBAL_DISPLAY_NUM'); ?>
</label>
<?php echo $this->pagination->getLimitBox(); ?>
</div>
<?php endif; ?>

<?php if ($this->params->get('filter_field') !== 'hide') : ?>
<div class="com-content-category__filter-submit control-group hidden-xs-up float-right">
<div class="controls">
<button type="submit" name="filter_submit" class="btn btn-primary"><?php echo Text::_('COM_CONTENT_FORM_FILTER_SUBMIT'); ?></button>
</div>
</div>
<?php endif; ?>
</div>

<input type="hidden" name="filter_order" value="">
<input type="hidden" name="filter_order_Dir" value="">
<input type="hidden" name="limitstart" value="">
<input type="hidden" name="task" value="">
</fieldset>

<div class="com-content-category__filter-submit control-group hidden-xs-up float-right">
<div class="controls">
<button type="submit" name="filter_submit" class="btn btn-primary"><?php echo Text::_('COM_CONTENT_FORM_FILTER_SUBMIT'); ?></button>
</div>
</div>
<?php endif; ?>

<?php if (empty($this->items)) : ?>
Expand Down