Skip to content

Commit 82eac13

Browse files
authoredMay 31, 2020
[4.0] com_config buttons front end (joomla#29320)
Removes the toolbar markup as it is not needed - they are just buttons. Bonus this also ensures the buttons are spaced correctly.
1 parent 19c9832 commit 82eac13

File tree

3 files changed

+28
-42
lines changed

3 files changed

+28
-42
lines changed
 

‎components/com_config/tmpl/config/default.php

+8-14
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,14 @@
2020

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

23-
<div class="btn-toolbar" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
24-
<div class="btn-group">
25-
<button type="button" class="btn btn-primary" data-submit-task="config.apply">
26-
<span class="fas fa-check" aria-hidden="true"></span>
27-
<?php echo Text::_('JSAVE') ?>
28-
</button>
29-
</div>
30-
<div class="btn-group">
31-
<button type="button" class="btn btn-danger" data-submit-task="config.cancel">
32-
<span class="fas fa-times" aria-hidden="true"></span>
33-
<?php echo Text::_('JCANCEL') ?>
34-
</button>
35-
</div>
36-
</div>
23+
<button type="button" class="btn btn-primary" data-submit-task="config.apply">
24+
<span class="fas fa-check" aria-hidden="true"></span>
25+
<?php echo Text::_('JSAVE') ?>
26+
</button>
27+
<button type="button" class="btn btn-danger" data-submit-task="config.cancel">
28+
<span class="fas fa-times" aria-hidden="true"></span>
29+
<?php echo Text::_('JCANCEL') ?>
30+
</button>
3731

3832
<hr>
3933

‎components/com_config/tmpl/modules/default.php

+12-14
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,18 @@
4646
<div class="row">
4747
<div class="col-md-12">
4848

49-
<div role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
50-
<button type="button" class="btn btn-primary" data-submit-task="modules.apply">
51-
<span class="fas fa-check" aria-hidden="true"></span>
52-
<?php echo Text::_('JAPPLY'); ?>
53-
</button>
54-
<button type="button" class="btn btn-secondary" data-submit-task="modules.save">
55-
<span class="fas fa-check" aria-hidden="true"></span>
56-
<?php echo Text::_('JSAVE'); ?>
57-
</button>
58-
<button type="button" class="btn btn-danger" data-submit-task="modules.cancel">
59-
<span class="fas fa-times" aria-hidden="true"></span>
60-
<?php echo Text::_('JCANCEL'); ?>
61-
</button>
62-
</div>
49+
<button type="button" class="btn btn-primary" data-submit-task="modules.apply">
50+
<span class="fas fa-check" aria-hidden="true"></span>
51+
<?php echo Text::_('JAPPLY'); ?>
52+
</button>
53+
<button type="button" class="btn btn-secondary" data-submit-task="modules.save">
54+
<span class="fas fa-check" aria-hidden="true"></span>
55+
<?php echo Text::_('JSAVE'); ?>
56+
</button>
57+
<button type="button" class="btn btn-danger" data-submit-task="modules.cancel">
58+
<span class="fas fa-times" aria-hidden="true"></span>
59+
<?php echo Text::_('JCANCEL'); ?>
60+
</button>
6361

6462
<hr>
6563

‎components/com_config/tmpl/templates/default.php

+8-14
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,14 @@
2323

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

26-
<div class="btn-toolbar" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
27-
<div class="btn-group">
28-
<button type="button" class="btn btn-primary" data-submit-task="templates.apply">
29-
<span class="fas fa-check" aria-hidden="true"></span>
30-
<?php echo Text::_('JSAVE') ?>
31-
</button>
32-
</div>
33-
<div class="btn-group">
34-
<button type="button" class="btn btn-danger" data-submit-task="templates.cancel">
35-
<span class="fas fa-times" aria-hidden="true"></span>
36-
<?php echo Text::_('JCANCEL') ?>
37-
</button>
38-
</div>
39-
</div>
26+
<button type="button" class="btn btn-primary" data-submit-task="templates.apply">
27+
<span class="fas fa-check" aria-hidden="true"></span>
28+
<?php echo Text::_('JSAVE') ?>
29+
</button>
30+
<button type="button" class="btn btn-danger" data-submit-task="templates.cancel">
31+
<span class="fas fa-times" aria-hidden="true"></span>
32+
<?php echo Text::_('JCANCEL') ?>
33+
</button>
4034

4135
<hr>
4236

0 commit comments

Comments
 (0)
Please sign in to comment.