joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-26 07:13:21 +00:00
Code Packages Releases Activity

[4.0] Switch remaining options from grid to column layout (#27153)

Browse Source
This commit is contained in:
Ciaran Walsh 2020-01-18 12:23:29 +00:00 committed by George Wilson
parent abfd8bac91
commit c99193ea45
63 changed files with 111 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
administrator/components/com_banners/tmpl/banner/edit.php
View File

@ -60,7 +60,7 @@ HTMLHelper::_('script', 'com_contenthistory/admin-history-versions.js', ['versio
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'otherparams', Text::_('COM_BANNERS_GROUP_LABEL_BANNER_DETAILS')); ?>
<fieldset id="fieldset-otherparams" class="form-no-margin options-grid-form">
<fieldset id="fieldset-otherparams" class="form-no-margin options-form">
<legend><?php echo Text::_('COM_BANNERS_GROUP_LABEL_BANNER_DETAILS'); ?></legend>
<div>
<?php echo $this->form->renderFieldset('otherparams'); ?>
@ -71,7 +71,7 @@ HTMLHelper::_('script', 'com_contenthistory/admin-history-versions.js', ['versio
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
<div class="row">
<div class="col-md-6">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-publishingdata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
@ -79,7 +79,7 @@ HTMLHelper::_('script', 'com_contenthistory/admin-history-versions.js', ['versio
</fieldset>
</div>
<div class="col-md-6">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-metadata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo $this->form->renderFieldset('metadata'); ?>

2
administrator/components/com_banners/tmpl/client/edit.php
View File

@ -58,7 +58,7 @@ HTMLHelper::_('script', 'com_contenthistory/admin-history-versions.js', ['versio
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'metadata', Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS')); ?>
<div class="row">
<div class="col-12 col-lg-6">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-metadata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo $this->form->renderFieldset('metadata'); ?>

8
administrator/components/com_categories/tmpl/category/edit.php
View File

@ -70,7 +70,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
<div class="row">
<div class="col-12 col-lg-6">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-publishingdata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
@ -78,7 +78,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
</fieldset>
</div>
<div class="col-12 col-lg-6">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-metadata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
@ -91,7 +91,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if (!$isModal && $assoc && $extensionassoc) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'associations', Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
<fieldset id="fieldset-associations" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-associations" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
@ -105,7 +105,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if ($this->canDo->get('core.admin')) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'rules', Text::_('COM_CATEGORIES_FIELDSET_RULES')); ?>
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-rules" class="options-form">
<legend><?php echo Text::_('COM_CATEGORIES_FIELDSET_RULES'); ?></legend>
<div>
<?php echo $this->form->getInput('rules'); ?>

24
administrator/components/com_config/forms/application.xml
View File

@ -306,18 +306,6 @@
<option value="1">JYES</option>
</field>
<field
name="debug_lang"
type="radio"
label="COM_CONFIG_FIELD_DEBUG_LANG_LABEL"
class="switcher"
default="0"
filter="boolean"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
<field
name="debug_lang_const"
type="radio"
@ -332,6 +320,18 @@
<option value="1">COM_CONFIG_FIELD_DEBUG_VALUE</option>
</field>
<field
name="debug_lang"
type="radio"
label="COM_CONFIG_FIELD_DEBUG_LANG_LABEL"
class="switcher"
default="0"
filter="boolean"
>
<option value="0">JNO</option>
<option value="1">JYES</option>
</field>
</fieldset>
<fieldset name="ftp" label="CONFIG_FTP_SETTINGS_LABEL">

2
administrator/components/com_config/tmpl/application/default_cache.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_CACHE_SETTINGS');
$this->fieldsname = 'cache';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_cookie.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_COOKIE_SETTINGS');
$this->fieldsname = 'cookie';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_database.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_DATABASE_SETTINGS');
$this->fieldsname = 'database';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_debug.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_DEBUG_SETTINGS');
$this->fieldsname = 'debug';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_filters.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_TEXT_FILTER_SETTINGS');
$this->fieldsname = 'filters';
$this->formclass = 'options-grid-form options-grid-form-full';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.text_filters', $this);

2
administrator/components/com_config/tmpl/application/default_ftp.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_FTP_SETTINGS');
$this->fieldsname = 'ftp';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_ftplogin.php
View File

@ -12,7 +12,7 @@ defined('_JEXEC') or die;
use Joomla\CMS\Language\Text;
?>
<fieldset class="options-grid-form options-grid-form-half">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_CONFIG_FTP_DETAILS'); ?></legend>
<p><?php echo Text::_('COM_CONFIG_FTP_DETAILS_TIP'); ?></p>
<?php if ($this->ftp instanceof Exception) : ?>

2
administrator/components/com_config/tmpl/application/default_locale.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_LOCATION_SETTINGS');
$this->fieldsname = 'locale';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_mail.php
View File

@ -37,7 +37,7 @@ $ajaxUri = Route::_('index.php?option=com_config&task=application.sendtestmail&f
$this->name = Text::_('COM_CONFIG_MAIL_SETTINGS');
$this->fieldsname = 'mail';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
?>

2
administrator/components/com_config/tmpl/application/default_metadata.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_METADATA_SETTINGS');
$this->fieldsname = 'metadata';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_permissions.php
View File

@ -15,7 +15,7 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_PERMISSION_SETTINGS');
$this->description = '';
$this->fieldsname = 'permissions';
$this->formclass = 'form-no-margin options-grid-form options-grid-form-full';
$this->formclass = 'form-no-margin form-no-columns options-form';
$this->showlabel = false;
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_proxy.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_PROXY_SETTINGS');
$this->fieldsname = 'proxy';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_seo.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_SEO_SETTINGS');
$this->fieldsname = 'seo';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_server.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_SERVER_SETTINGS');
$this->fieldsname = 'server';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_session.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_SESSION_SETTINGS');
$this->fieldsname = 'session';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_site.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_SITE_SETTINGS');
$this->fieldsname = 'site';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.options_default', $this);

2
administrator/components/com_config/tmpl/application/default_system.php
View File

@ -14,6 +14,6 @@ defined('_JEXEC') or die;
$this->name = Text::_('COM_CONFIG_SYSTEM_SETTINGS');
$this->fieldsname = 'system';
$this->formclass = 'options-grid-form options-grid-form-half';
$this->formclass = 'options-form';
echo LayoutHelper::render('joomla.content.options_default', $this);

8
administrator/components/com_contact/tmpl/contact/edit.php
View File

@ -86,7 +86,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'misc', Text::_('JGLOBAL_FIELDSET_MISCELLANEOUS')); ?>
<div class="row">
<div class="col-md-12">
<fieldset id="fieldset-misc" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-misc" class="options-form">
<legend><?php echo $this->form->getField('misc')->title; ?></legend>
<div>
<?php echo $this->form->getInput('misc'); ?>
@ -101,7 +101,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
<div class="row">
<div class="col-md-6">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-publishingdata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
@ -109,7 +109,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
</fieldset>
</div>
<div class="col-md-6">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-metadata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
@ -121,7 +121,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if (!$isModal && $assoc) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'associations', Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
<fieldset id="fieldset-associations" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-associations" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>

16
administrator/components/com_content/tmpl/article/edit.php
View File

@ -85,7 +85,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<div class="row">
<div class="col-12 col-lg-6">
<?php foreach ($fieldsetsInImages as $fieldset) : ?>
<fieldset id="fieldset-<?php echo $fieldset; ?>" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-<?php echo $fieldset; ?>" class="options-form">
<legend><?php echo Text::_($this->form->getFieldsets()[$fieldset]->label); ?></legend>
<div>
<?php echo $this->form->renderFieldset($fieldset); ?>
@ -95,7 +95,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
</div>
<div class="col-12 col-lg-6">
<?php foreach ($fieldsetsInLinks as $fieldset) : ?>
<fieldset id="fieldset-<?php echo $fieldset; ?>" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-<?php echo $fieldset; ?>" class="options-form">
<legend><?php echo Text::_($this->form->getFieldsets()[$fieldset]->label); ?></legend>
<div>
<?php echo $this->form->renderFieldset($fieldset); ?>
@ -117,7 +117,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('COM_CONTENT_FIELDSET_PUBLISHING')); ?>
<div class="row">
<div class="col-12 col-lg-6">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-publishingdata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
@ -125,7 +125,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
</fieldset>
</div>
<div class="col-12 col-lg-6">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-metadata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
@ -138,7 +138,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if (!$isModal && $assoc && $params->get('show_associations_edit', 1) == 1) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'associations', Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
<fieldset id="fieldset-associations" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-associations" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
@ -151,9 +151,9 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if ($this->canDo->get('core.admin') && $params->get('show_configure_edit_options', 1) == 1) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'editor', Text::_('COM_CONTENT_SLIDER_EDITOR_CONFIG')); ?>
<fieldset id="fieldset-editor" class="form-no-margin options-grid-form">
<fieldset id="fieldset-editor" class="form-no-margin options-form">
<legend><?php echo Text::_('COM_CONTENT_SLIDER_EDITOR_CONFIG'); ?></legend>
<div>
<div class="column-count-md-2 column-count-lg-3">
<?php echo $this->form->renderFieldset('editorConfig'); ?>
</div>
</fieldset>
@ -162,7 +162,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if ($this->canDo->get('core.admin') && $params->get('show_permissions', 1) == 1) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'permissions', Text::_('COM_CONTENT_FIELDSET_RULES')); ?>
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-rules" class="options-form">
<legend><?php echo Text::_('COM_CONTENT_FIELDSET_RULES'); ?></legend>
<div>
<?php echo $this->form->getInput('rules'); ?>

4
administrator/components/com_fields/tmpl/field/edit.php
View File

@ -79,7 +79,7 @@ HTMLHelper::_('script', 'com_fields/admin-field-edit.js', ['version' => 'auto',
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_PUBLISHING', true)); ?>
<div class="row">
<div class="col-md-6">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-publishingdata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
@ -92,7 +92,7 @@ HTMLHelper::_('script', 'com_fields/admin-field-edit.js', ['version' => 'auto',
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php if ($this->canDo->get('core.admin')) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'rules', Text::_('JGLOBAL_ACTION_PERMISSIONS_LABEL', true)); ?>
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-rules" class="options-form">
<legend><?php echo Text::_('JGLOBAL_ACTION_PERMISSIONS_LABEL'); ?></legend>
<div>
<?php echo $this->form->getInput('rules'); ?>

4
administrator/components/com_fields/tmpl/group/edit.php
View File

@ -63,7 +63,7 @@ $this->useCoreUI = true;
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_PUBLISHING', true)); ?>
<div class="row form-horizontal-desktop">
<div class="col-md-6">
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-rules" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
@ -78,7 +78,7 @@ $this->useCoreUI = true;
<?php echo LayoutHelper::render('joomla.edit.params', $this); ?>
<?php if ($this->canDo->get('core.admin')) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'rules', Text::_('JGLOBAL_ACTION_PERMISSIONS_LABEL', true)); ?>
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-rules" class="options-form">
<legend><?php echo Text::_('JGLOBAL_ACTION_PERMISSIONS_LABEL'); ?></legend>
<div>
<?php echo $this->form->getInput('rules'); ?>

4
administrator/components/com_finder/tmpl/filter/edit.php
View File

@ -68,7 +68,7 @@ HTMLHelper::_('script', 'com_finder/finder-edit.min.js', array('version' => 'aut
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_OPTIONS')); ?>
<div class="row">
<div class="col-md-6">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-publishingdata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
@ -76,7 +76,7 @@ HTMLHelper::_('script', 'com_finder/finder-edit.min.js', array('version' => 'aut
</fieldset>
</div>
<div class="col-md-6">
<fieldset id="fieldset-filter" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-filter" class="options-form">
<legend><?php echo Text::_('COM_FINDER_FILTER_FIELDSET_PARAMS'); ?></legend>
<div>
<?php echo $this->form->renderFieldset('jbasic'); ?>

2
administrator/components/com_installer/tmpl/install/default.php
View File

@ -41,7 +41,7 @@ $app = Factory::getApplication();
<?php // Show installation tabs ?>
<?php foreach ($tabs as $tab) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', $tab['name'], $tab['label']); ?>
<fieldset class="uploadform option-fieldset options-grid-form-full">
<fieldset class="uploadform option-fieldset options-form">
<?php echo $tab['content']; ?>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>

2
administrator/components/com_installer/tmpl/installer/default_ftp.php
View File

@ -12,7 +12,7 @@ defined('_JEXEC') or die;
use Joomla\CMS\Language\Text;
?>
<fieldset class="option-fieldset options-grid-form-full">
<fieldset class="option-fieldset options-form">
<legend><?php echo Text::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?></legend>
<?php echo Text::_('COM_INSTALLER_MSG_DESCFTP'); ?>

2
administrator/components/com_joomlaupdate/tmpl/joomlaupdate/complete.php
View File

@ -15,7 +15,7 @@ use Joomla\CMS\Router\Route;
?>
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend>
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_COMPLETE_HEADING'); ?>
</legend>

2
administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_nodownload.php
View File

@ -14,7 +14,7 @@ use Joomla\CMS\Language\Text;
/** @var \Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\Html $this */
?>
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend>
<?php echo Text::_('COM_JOOMLAUPDATE_SYSTEM_CHECK'); ?>
</legend>

8
administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php
View File

@ -20,7 +20,7 @@ use Joomla\CMS\Language\Text;
<div class="row">
<div class="col-md-6">
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend>
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS'); ?>
</legend>
@ -60,7 +60,7 @@ use Joomla\CMS\Language\Text;
</div>
<div class="col-md-6">
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend>
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS'); ?>
</legend>
@ -105,7 +105,7 @@ use Joomla\CMS\Language\Text;
<div class="row">
<?php if (!empty($this->nonCoreExtensions)) : ?>
<div class="col-md-6">
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend>
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS'); ?>
</legend>
@ -148,7 +148,7 @@ use Joomla\CMS\Language\Text;
</div>
<?php endif; ?>
<div class="col-md-6">
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend>
<?php echo Text::_('NOTICE'); ?>
</legend>

2
administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_reinstall.php
View File

@ -14,7 +14,7 @@ use Joomla\CMS\Updater\Update;
/** @var \Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\HtmlView $this */
?>
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend>
<?php echo Text::_('COM_JOOMLAUPDATE_UPDATE_CHECK'); ?>
</legend>

2
administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_update.php
View File

@ -14,7 +14,7 @@ use Joomla\CMS\Language\Text;
/** @var \Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\Html $this */
?>
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend>
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATEFOUND'); ?>
</legend>

2
administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_updatemefirst.php
View File

@ -13,7 +13,7 @@ use Joomla\CMS\Language\Text;
/** @var JoomlaupdateViewDefault $this */
?>
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend>
<?php echo Text::_('COM_JOOMLAUPDATE_LIVE_UPDATE'); ?>
</legend>

2
administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_upload.php
View File

@ -39,7 +39,7 @@ Text::script('COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE', true);
<?php endif; ?>
<form enctype="multipart/form-data" action="index.php" method="post" id="uploadForm">
<fieldset class="uploadform options-grid-form options-grid-form-full">
<fieldset class="uploadform options-form">
<legend><?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_UPLOAD'); ?></legend>
<table class="table">
<tbody>

6
administrator/components/com_languages/tmpl/language/edit.php
View File

@ -26,7 +26,7 @@ HTMLHelper::_('script', 'com_languages/admin-language-edit-change-flag.js', ['ve
<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', array('active' => 'details')); ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'details', Text::_('JDETAILS')); ?>
<fieldset id="fieldset-details" class="options-grid-form">
<fieldset id="fieldset-details" class="options-form">
<legend><?php echo Text::_('JDETAILS'); ?></legend>
<div>
<?php echo $this->form->renderField('title'); ?>
@ -58,7 +58,7 @@ HTMLHelper::_('script', 'com_languages/admin-language-edit-change-flag.js', ['ve
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'metadata', Text::_('JGLOBAL_FIELDSET_OPTIONS')); ?>
<div class="row">
<div class="col-md-6 mb-3">
<fieldset id="fieldset-sitename" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-sitename" class="options-form">
<legend><?php echo Text::_('COM_LANGUAGES_FIELDSET_SITE_NAME_LABEL'); ?></legend>
<div>
<?php echo $this->form->renderFieldset('site_name'); ?>
@ -66,7 +66,7 @@ HTMLHelper::_('script', 'com_languages/admin-language-edit-change-flag.js', ['ve
</fieldset>
</div>
<div class="col-md-6 mb-3">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-metadata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo $this->form->renderFieldset('metadata'); ?>

4
administrator/components/com_languages/tmpl/override/edit.php
View File

@ -28,7 +28,7 @@ HTMLHelper::_('script', 'com_languages/admin-override-edit-refresh-searchstring.
<form action="<?php echo Route::_('index.php?option=com_languages&id=' . $this->item->key); ?>" method="post" name="adminForm" id="override-form" class="form-validate">
<div class="row mt-3">
<div class="col-md-6">
<fieldset id="fieldset-override" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-override" class="options-form">
<legend><?php echo empty($this->item->key) ? Text::_('COM_LANGUAGES_VIEW_OVERRIDE_EDIT_NEW_OVERRIDE_LEGEND') : Text::_('COM_LANGUAGES_VIEW_OVERRIDE_EDIT_EDIT_OVERRIDE_LEGEND'); ?></legend>
<div>
<?php echo $this->form->renderField('language'); ?>
@ -47,7 +47,7 @@ HTMLHelper::_('script', 'com_languages/admin-override-edit-refresh-searchstring.
</div>
<div class="col-md-6">
<fieldset id="fieldset-override-search" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-override-search" class="options-form">
<legend><?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_LEGEND'); ?></legend>
<div>
<div class="alert alert-info">

1
administrator/components/com_menus/forms/item_alias.xml
View File

@ -32,7 +32,6 @@
<fieldset name="menu-options"
label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
class="options-grid-form-half"
>
<field

4
administrator/components/com_menus/forms/item_component.xml
View File

@ -2,7 +2,7 @@
<form>
<fields name="params" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
>
<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL" class="options-grid-form-half">
<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL">
<field
name="menu-anchor_title"
@ -87,7 +87,7 @@
</fieldset>
<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS" class="options-grid-form-half">
<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
<field
name="menu-meta_description"
type="textarea"

1
administrator/components/com_menus/forms/item_heading.xml
View File

@ -3,7 +3,6 @@
<fields name="params">
<fieldset name="menu-options"
label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
class="options-grid-form-half"
>
<field
name="menu-anchor_title"

1
administrator/components/com_menus/forms/item_separator.xml
View File

@ -3,7 +3,6 @@
<fields name="params">
<fieldset name="menu-options"
label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
class="options-grid-form-half"
>
<field

1
administrator/components/com_menus/forms/item_url.xml
View File

@ -2,7 +2,6 @@
<form>
<fields name="params">
<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
class="options-grid-form-half"
>
<field

1
administrator/components/com_menus/forms/itemadmin_alias.xml
View File

@ -19,7 +19,6 @@
<fieldset
name="menu-options"
label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
class="options-grid-form-half"
>
<field

1
administrator/components/com_menus/forms/itemadmin_component.xml
View File

@ -3,7 +3,6 @@
<fields name="params" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL">
<fieldset name="menu-options"
label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
class="options-grid-form-half"
>
<field

1
administrator/components/com_menus/forms/itemadmin_container.xml
View File

@ -17,7 +17,6 @@
<fields name="params">
<fieldset name="menu-options"
label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
class="options-grid-form-half"
>
<field
name="menu-anchor_title"

1
administrator/components/com_menus/forms/itemadmin_heading.xml
View File

@ -17,7 +17,6 @@
<fields name="params">
<fieldset name="menu-options"
label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
class="options-grid-form-half"
>
<field
name="menu-anchor_title"

1
administrator/components/com_menus/forms/itemadmin_url.xml
View File

@ -3,7 +3,6 @@
<fields name="params">
<fieldset name="menu-options"
label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
class="options-grid-form-half"
>
<field
name="menu-anchor_title"

4
administrator/components/com_menus/tmpl/item/edit.php
View File

@ -154,7 +154,7 @@ if ($clientId === 1)
<?php if (!$isModal && $assoc && $this->state->get('item.client_id') != 1) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'associations', Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
<fieldset id="fieldset-associations" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-associations" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
@ -167,7 +167,7 @@ if ($clientId === 1)
<?php if (!empty($this->modules)) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'modules', Text::_('COM_MENUS_ITEM_MODULE_ASSIGNMENT')); ?>
<fieldset id="fieldset-modules" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-modules" class="options-form">
<legend><?php echo Text::_('COM_MENUS_ITEM_MODULE_ASSIGNMENT'); ?></legend>
<div>
<?php echo $this->loadTemplate('modules'); ?>

4
administrator/components/com_menus/tmpl/menu/edit.php
View File

@ -29,7 +29,7 @@ Text::script('ERROR');
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'details', Text::_('COM_MENUS_MENU_DETAILS')); ?>
<fieldset id="fieldset-details" class="options-grid-form">
<fieldset id="fieldset-details" class="options-form">
<legend><?php echo Text::_('COM_MENUS_MENU_DETAILS'); ?></legend>
<div>
@ -51,7 +51,7 @@ Text::script('ERROR');
<?php if ($this->canDo->get('core.admin')) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'permissions', Text::_('COM_MENUS_FIELDSET_RULES')); ?>
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-rules" class="options-form">
<legend><?php echo Text::_('COM_MENUS_FIELDSET_RULES'); ?></legend>
<div>
<?php echo $this->form->getInput('rules'); ?>

4
administrator/components/com_modules/tmpl/module/edit.php
View File

@ -173,7 +173,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if ($this->item->client_id == 0) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'assignment', Text::_('COM_MODULES_MENU_ASSIGNMENT')); ?>
<fieldset id="fieldset-assignment" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-assignment" class="options-form">
<legend><?php echo Text::_('COM_MODULES_MENU_ASSIGNMENT'); ?></legend>
<div>
<?php echo $this->loadTemplate('assignment'); ?>
@ -190,7 +190,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if ($this->canDo->get('core.admin')) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'permissions', Text::_('COM_MODULES_FIELDSET_RULES')); ?>
<fieldset id="fieldset-permissions" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-permissions" class="options-form">
<legend><?php echo Text::_('COM_MODULES_FIELDSET_RULES'); ?></legend>
<div>
<?php echo $this->form->getInput('rules'); ?>

8
administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php
View File

@ -67,7 +67,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'images', Text::_('JGLOBAL_FIELDSET_OPTIONS')); ?>
<div class="row">
<div class="col-md-6">
<fieldset id="fieldset-image" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-image" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_IMAGE_OPTIONS'); ?></legend>
<div>
<?php foreach ($this->form->getGroup('images') as $field) : ?>
@ -87,7 +87,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
<div class="row">
<div class="col-md-6">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-publishingdata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
@ -95,7 +95,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
</fieldset>
</div>
<div class="col-md-6">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-metadata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
@ -107,7 +107,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if (!$isModal && $assoc) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'associations', Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
<fieldset id="fieldset-associations" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-associations" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>

2
administrator/components/com_newsfeeds/tmpl/newsfeed/edit_display.php
View File

@ -15,7 +15,7 @@ use Joomla\CMS\Layout\LayoutHelper;
$this->fieldset = 'jbasic';
?>
<fieldset id="fieldset-display" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-display" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_DISPLAY_OPTIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.fieldset', $this); ?>

4
administrator/components/com_tags/tmpl/tag/edit.php
View File

@ -59,7 +59,7 @@ $this->useCoreUI = true;
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
<div class="row">
<div class="col-12 col-lg-6">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-publishingdata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
@ -67,7 +67,7 @@ $this->useCoreUI = true;
</fieldset>
</div>
<div class="col-12 col-lg-6">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-metadata" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>

4
administrator/components/com_templates/tmpl/style/edit.php
View File

@ -86,7 +86,7 @@ $user = Factory::getUser();
<?php if ($description) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'description', Text::_('JGLOBAL_FIELDSET_DESCRIPTION')); ?>
<fieldset id="fieldset-description" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-description" class="options-form">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_DESCRIPTION'); ?></legend>
<div>
<?php echo $description; ?>
@ -103,7 +103,7 @@ $user = Factory::getUser();
<?php if ($user->authorise('core.edit', 'com_menus') && $this->item->client_id == 0 && $this->canDo->get('core.edit.state')) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'assignment', Text::_('COM_TEMPLATES_MENUS_ASSIGNMENT')); ?>
<fieldset id="fieldset-assignment" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-assignment" class="options-form">
<legend><?php echo Text::_('COM_TEMPLATES_MENUS_ASSIGNMENT'); ?></legend>
<div>
<?php echo $this->loadTemplate('assignment'); ?>

10
administrator/components/com_templates/tmpl/template/default.php
View File

@ -89,7 +89,7 @@ if ($this->type == 'font')
</div>
</div>
<div class="col-md-9">
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<?php if ($this->type == 'home') : ?>
<legend><?php echo Text::_('COM_TEMPLATES_HOME_HEADING'); ?></legend>
<form action="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
@ -235,7 +235,7 @@ if ($this->type == 'font')
<div class="card-body">
<div class="row">
<div class="col-md-3">
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_TEMPLATES_OVERRIDES_MODULES'); ?></legend>
<ul class="list-unstyled">
<?php $token = Session::getFormToken() . '=' . 1; ?>
@ -254,7 +254,7 @@ if ($this->type == 'font')
</fieldset>
</div>
<div class="col-md-3">
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_TEMPLATES_OVERRIDES_COMPONENTS'); ?></legend>
<ul class="list-unstyled">
<?php $token = Session::getFormToken() . '=' . 1; ?>
@ -282,7 +282,7 @@ if ($this->type == 'font')
</fieldset>
</div>
<div class="col-md-3">
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_TEMPLATES_OVERRIDES_PLUGINS'); ?></legend>
<ul class="list-unstyled">
<?php $token = Session::getFormToken() . '=' . 1; ?>
@ -310,7 +310,7 @@ if ($this->type == 'font')
</fieldset>
</div>
<div class="col-md-3">
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_TEMPLATES_OVERRIDES_LAYOUTS'); ?></legend>
<ul class="list-unstyled">
<?php $token = Session::getFormToken() . '=' . 1; ?>

4
administrator/components/com_users/tmpl/level/edit.php
View File

@ -19,7 +19,7 @@ HTMLHelper::_('behavior.keepalive');
?>
<form action="<?php echo Route::_('index.php?option=com_users&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="level-form" class="form-validate">
<fieldset class="options-grid-form options-grid-form-half mt-4">
<fieldset class="options-form mt-4">
<legend><?php echo Text::_('COM_USERS_LEVEL_DETAILS'); ?></legend>
<div>
<div class="control-group">
@ -33,7 +33,7 @@ HTMLHelper::_('behavior.keepalive');
</div>
</fieldset>
<fieldset class="options-grid-form options-grid-form-full">
<fieldset class="options-form">
<legend><?php echo Text::_('COM_USERS_USER_GROUPS_HAVING_ACCESS'); ?></legend>
<div>
<?php echo HTMLHelper::_('access.usergroups', 'jform[rules]', $this->item->rules, true); ?>

2
administrator/components/com_users/tmpl/user/edit.php
View File

@ -48,7 +48,7 @@ $this->useCoreUI = true;
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php if ($this->grouplist) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'groups', Text::_('COM_USERS_ASSIGNED_GROUPS')); ?>
<fieldset id="fieldset-groups" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-groups" class="options-form">
<legend><?php echo Text::_('COM_USERS_ASSIGNED_GROUPS'); ?></legend>
<div>
<?php echo $this->loadTemplate('groups'); ?>

2
administrator/components/com_workflow/tmpl/transition/edit.php
View File

@ -52,7 +52,7 @@ $tmpl = $isModal || $this->input->get('tmpl', '', 'cmd') === 'component' ? '&
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'permissions', Text::_('COM_WORKFLOW_RULES_TAB')); ?>
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-rules" class="options-form">
<legend><?php echo Text::_('COM_WORKFLOW_RULES_TAB'); ?></legend>
<?php echo $this->form->getInput('rules'); ?>
</fieldset>

2
administrator/components/com_workflow/tmpl/workflow/edit.php
View File

@ -58,7 +58,7 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'permissions', Text::_('COM_WORKFLOW_RULES_TAB')); ?>
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<fieldset id="fieldset-rules" class="options-form">
<legend><?php echo Text::_('COM_WORKFLOW_RULES_TAB'); ?></legend>
<?php echo $this->form->getInput('rules'); ?>
</fieldset>

34
administrator/templates/atum/scss/blocks/_layout.scss
View File

@ -32,7 +32,7 @@
}
}
.options-grid-form {
.options-form {
background-color: var(--white);
color: var(--atum-text-dark);
padding: 1rem;
@ -47,36 +47,4 @@
color: var(--atum-text-light);
width: auto;
}
> div {
display: grid;
grid-template-columns: 1fr;
grid-column-gap: 2rem;
}
@include media-breakpoint-up(md) {
> div {
grid-template-columns: 1fr 1fr;
}
&.options-grid-form-half,
&.options-grid-form-full {
> div {
grid-template-columns: 1fr;
}
}
}
@include media-breakpoint-up(lg) {
> div {
grid-template-columns: 1fr 1fr 1fr;
}
&.options-grid-form-full {
> div {
grid-template-columns: 1fr;
}
}
&.options-grid-form-half {
> div {
grid-template-columns: 1fr 1fr;
}
}
}
}

9
administrator/templates/atum/scss/blocks/_utilities.scss
View File

@ -26,7 +26,6 @@
[class^='column-'],
[class*=' column-'] {
display: block !important; // This can be removed if grid forms removed globally
column-gap: 2rem;
padding-bottom: 1rem;
@ -34,6 +33,14 @@
display: inline-block;
break-inside: avoid;
width: 100%;
&.hidden {
display: none;
}
}
.form-no-columns & {
column-count: auto;
}
}

2
layouts/joomla/content/options_default.php
View File

@ -20,7 +20,7 @@ use Joomla\CMS\HTML\HTMLHelper;
<p><?php echo $displayData->description; ?></p>
<?php endif; ?>
<?php $fieldsnames = explode(',', $displayData->fieldsname); ?>
<div>
<div class="column-count-lg-2">
<?php foreach ($fieldsnames as $fieldname) : ?>
<?php foreach ($displayData->form->getFieldset($fieldname) as $field) : ?>
<?php $datashowon = ''; ?>

4
layouts/joomla/edit/params.php
View File

@ -116,7 +116,7 @@ foreach ($fieldSets as $name => $fieldSet)
if (!$isGrandchild && $hasParent)
{
echo '<fieldset id="fieldset-' . $name . '" class="form-no-margin options-grid-form ' . (!empty($fieldSet->class) ? $fieldSet->class : '') . '">';
echo '<fieldset id="fieldset-' . $name . '" class="form-no-margin options-form ' . (!empty($fieldSet->class) ? $fieldSet->class : '') . '">';
echo '<legend>' . $label . '</legend>';
echo '<div class="column-count-md-2 column-count-lg-3">';
}
@ -143,7 +143,7 @@ foreach ($fieldSets as $name => $fieldSet)
// Directly add a fieldset if we have no children
if (!$hasChildren)
{
echo '<fieldset id="fieldset-' . $name . '" class="form-no-margin options-grid-form ' . (!empty($fieldSet->class) ? $fieldSet->class : '') . '">';
echo '<fieldset id="fieldset-' . $name . '" class="form-no-margin options-form ' . (!empty($fieldSet->class) ? $fieldSet->class : '') . '">';
echo '<legend>' . $label . '</legend>';
echo '<div class="column-count-md-2 column-count-lg-3">';