joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-20 11:05:08 +00:00
Code Packages Releases Activity

[4.0] com_config buttons front end (#29320)

Browse Source 
Removes the toolbar markup as it is not needed - they are just buttons.
Bonus this also ensures the buttons are spaced correctly.
This commit is contained in:
Brian Teeman 2020-05-31 20:19:40 +01:00 committed by GitHub
parent 19c9832a24
commit 82eac13730
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/com_config/tmpl/config/default.php
View File

@ -20,20 +20,14 @@ HTMLHelper::_('script', 'com_config/config-default.js', ['version' => 'auto', 'r
<form action="<?php echo Route::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate"> <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'); ?>"> <button type="button" class="btn btn-primary" data-submit-task="config.apply">
<div class="btn-group"> <span class="fas fa-check" aria-hidden="true"></span>
<button type="button" class="btn btn-primary" data-submit-task="config.apply"> <?php echo Text::_('JSAVE') ?>
<span class="fas fa-check" aria-hidden="true"></span> </button>
<?php echo Text::_('JSAVE') ?> <button type="button" class="btn btn-danger" data-submit-task="config.cancel">
</button> <span class="fas fa-times" aria-hidden="true"></span>
</div> <?php echo Text::_('JCANCEL') ?>
<div class="btn-group"> </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>
</div>
</div>
<hr> <hr>

26
components/com_config/tmpl/modules/default.php
View File

@ -46,20 +46,18 @@ if (Multilanguage::isEnabled())
<div class="row"> <div class="row">
<div class="col-md-12"> <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">
<button type="button" class="btn btn-primary" data-submit-task="modules.apply"> <span class="fas fa-check" aria-hidden="true"></span>
<span class="fas fa-check" aria-hidden="true"></span> <?php echo Text::_('JAPPLY'); ?>
<?php echo Text::_('JAPPLY'); ?> </button>
</button> <button type="button" class="btn btn-secondary" data-submit-task="modules.save">
<button type="button" class="btn btn-secondary" data-submit-task="modules.save"> <span class="fas fa-check" aria-hidden="true"></span>
<span class="fas fa-check" aria-hidden="true"></span> <?php echo Text::_('JSAVE'); ?>
<?php echo Text::_('JSAVE'); ?> </button>
</button> <button type="button" class="btn btn-danger" data-submit-task="modules.cancel">
<button type="button" class="btn btn-danger" data-submit-task="modules.cancel"> <span class="fas fa-times" aria-hidden="true"></span>
<span class="fas fa-times" aria-hidden="true"></span> <?php echo Text::_('JCANCEL'); ?>
<?php echo Text::_('JCANCEL'); ?> </button>
</button>
</div>
<hr> <hr>

22
components/com_config/tmpl/templates/default.php
View File

@ -23,20 +23,14 @@ HTMLHelper::_('script', 'com_config/templates-default.js', ['version' => 'auto',
<form action="<?php echo Route::_('index.php?option=com_config'); ?>" method="post" name="adminForm" id="templates-form" class="form-validate"> <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'); ?>"> <button type="button" class="btn btn-primary" data-submit-task="templates.apply">
<div class="btn-group"> <span class="fas fa-check" aria-hidden="true"></span>
<button type="button" class="btn btn-primary" data-submit-task="templates.apply"> <?php echo Text::_('JSAVE') ?>
<span class="fas fa-check" aria-hidden="true"></span> </button>
<?php echo Text::_('JSAVE') ?> <button type="button" class="btn btn-danger" data-submit-task="templates.cancel">
</button> <span class="fas fa-times" aria-hidden="true"></span>
</div> <?php echo Text::_('JCANCEL') ?>
<div class="btn-group"> </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>
</div>
</div>
<hr> <hr>