Skip to content

Commit

Permalink
[4.0] com_config buttons front end (joomla#29320)
Browse files Browse the repository at this point in the history 
Removes the toolbar markup as it is not needed - they are just buttons.
Bonus this also ensures the buttons are spaced correctly.
  • Loading branch information
@brianteeman
brianteeman authored May 31, 2020
1 parent 19c9832 commit 82eac13
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 42 deletions.
22 changes: 8 additions & 14 deletions components/com_config/tmpl/config/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,14 @@

<form action="<?php echo Route::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate">

<div class="btn-toolbar" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-submit-task="config.apply">
<span class="fas fa-check" aria-hidden="true"></span>
<?php echo Text::_('JSAVE') ?>
</button>
</div>
<div class="btn-group">
<button type="button" class="btn btn-danger" data-submit-task="config.cancel">
<span class="fas fa-times" aria-hidden="true"></span>
<?php echo Text::_('JCANCEL') ?>
</button>
</div>
</div>
<button type="button" class="btn btn-primary" data-submit-task="config.apply">
<span class="fas fa-check" aria-hidden="true"></span>
<?php echo Text::_('JSAVE') ?>
</button>
<button type="button" class="btn btn-danger" data-submit-task="config.cancel">
<span class="fas fa-times" aria-hidden="true"></span>
<?php echo Text::_('JCANCEL') ?>
</button>

<hr>

Expand Down
26 changes: 12 additions & 14 deletions components/com_config/tmpl/modules/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,18 @@
<div class="row">
<div class="col-md-12">

<div role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
<button type="button" class="btn btn-primary" data-submit-task="modules.apply">
<span class="fas fa-check" aria-hidden="true"></span>
<?php echo Text::_('JAPPLY'); ?>
</button>
<button type="button" class="btn btn-secondary" data-submit-task="modules.save">
<span class="fas fa-check" aria-hidden="true"></span>
<?php echo Text::_('JSAVE'); ?>
</button>
<button type="button" class="btn btn-danger" data-submit-task="modules.cancel">
<span class="fas fa-times" aria-hidden="true"></span>
<?php echo Text::_('JCANCEL'); ?>
</button>
</div>
<button type="button" class="btn btn-primary" data-submit-task="modules.apply">
<span class="fas fa-check" aria-hidden="true"></span>
<?php echo Text::_('JAPPLY'); ?>
</button>
<button type="button" class="btn btn-secondary" data-submit-task="modules.save">
<span class="fas fa-check" aria-hidden="true"></span>
<?php echo Text::_('JSAVE'); ?>
</button>
<button type="button" class="btn btn-danger" data-submit-task="modules.cancel">
<span class="fas fa-times" aria-hidden="true"></span>
<?php echo Text::_('JCANCEL'); ?>
</button>

<hr>

Expand Down
22 changes: 8 additions & 14 deletions components/com_config/tmpl/templates/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,14 @@

<form action="<?php echo Route::_('index.php?option=com_config'); ?>" method="post" name="adminForm" id="templates-form" class="form-validate">

<div class="btn-toolbar" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-submit-task="templates.apply">
<span class="fas fa-check" aria-hidden="true"></span>
<?php echo Text::_('JSAVE') ?>
</button>
</div>
<div class="btn-group">
<button type="button" class="btn btn-danger" data-submit-task="templates.cancel">
<span class="fas fa-times" aria-hidden="true"></span>
<?php echo Text::_('JCANCEL') ?>
</button>
</div>
</div>
<button type="button" class="btn btn-primary" data-submit-task="templates.apply">
<span class="fas fa-check" aria-hidden="true"></span>
<?php echo Text::_('JSAVE') ?>
</button>
<button type="button" class="btn btn-danger" data-submit-task="templates.cancel">
<span class="fas fa-times" aria-hidden="true"></span>
<?php echo Text::_('JCANCEL') ?>
</button>

<hr>

Expand Down

0 comments on commit 82eac13

Please sign in to comment.