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

Rename edit grid class (#414)

Browse Source 
Fix chrome gridbug
This commit is contained in:
Benjamin Trenkle 2019-08-01 16:27:54 +02:00 committed by GitHub
parent 9871bc6adb
commit 7f5caff99c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
57 changed files with 305 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,24 +60,28 @@ 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-fieldset">
<fieldset id="fieldset-otherparams" class="form-no-margin options-grid-form">
<legend><?php echo Text::_('COM_BANNERS_GROUP_LABEL_BANNER_DETAILS'); ?></legend>
<div>
<?php echo $this->form->renderFieldset('otherparams'); ?>
</div>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?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-fieldset option-fieldset-full">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
</fieldset>
</div>
<div class="col-md-6">
<fieldset id="fieldset-metadata" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo $this->form->renderFieldset('metadata'); ?>
</div>
</fieldset>
</div>
</div>

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

@ -58,9 +58,11 @@ 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-fieldset option-fieldset-full">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo $this->form->renderFieldset('metadata'); ?>
</div>
</fieldset>
</div>
</div>

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

@ -71,15 +71,19 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
</div>
</fieldset>
</div>
<div class="col-12 col-lg-6">
<fieldset id="fieldset-metadata" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
</div>
</fieldset>
</div>
</div>
@ -89,11 +93,11 @@ $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')); ?>
<?php if ($hasAssoc) : ?>
<fieldset id="fieldset-associations" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-associations" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
<?php endif; ?>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
<?php if ($hasAssoc) : ?>
<div>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
</div>
</fieldset>
<?php endif; ?>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
@ -104,9 +108,11 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_CATEGORIES_FIELDSET_RULES'); ?></legend>
<div>
<?php echo $this->form->getInput('rules'); ?>
</div>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>

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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

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

@ -12,27 +12,29 @@ defined('_JEXEC') or die;
use Joomla\CMS\Language\Text;
?>
<fieldset class="options-fieldset option-fieldset-half">
<fieldset class="options-grid-form options-grid-form-half">
<legend><?php echo Text::_('COM_CONFIG_FTP_DETAILS'); ?></legend>
<?php echo Text::_('COM_CONFIG_FTP_DETAILS_TIP'); ?>
<p><?php echo Text::_('COM_CONFIG_FTP_DETAILS_TIP'); ?></p>
<?php if ($this->ftp instanceof Exception) : ?>
<?php /** @var Exception $this */ ?>
<p><?php echo Text::_($this->ftp->message); ?></p>
<?php endif; ?>
<div class="control-group">
<div class="control-label">
<label for="username"><?php echo Text::_('JGLOBAL_USERNAME'); ?></label>
<div>
<div class="control-group">
<div class="control-label">
<label for="username"><?php echo Text::_('JGLOBAL_USERNAME'); ?></label>
</div>
<div class="controls">
<input type="text" id="username" name="username" class="form-control" size="70" value="">
</div>
</div>
<div class="control-group">
<div class="control-label">
<label for="password"><?php echo Text::_('JGLOBAL_PASSWORD'); ?></label>
</div>
<div class="controls">
<input type="password" id="password" name="password" class="form-control" size="70" value="">
</div>
</div>
</div>
<div class="controls">
<input type="text" id="username" name="username" class="form-control" size="70" value="">
</div>
</div>
<div class="control-group">
<div class="control-label">
<label for="password"><?php echo Text::_('JGLOBAL_PASSWORD'); ?></label>
</div>
<div class="controls">
<input type="password" id="password" name="password" class="form-control" size="70" value="">
</div>
</div>
</fieldset>

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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

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

@ -36,7 +36,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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
?>

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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
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-fieldset option-fieldset-half';
$this->formclass = 'form-no-margin options-grid-form options-grid-form-half';
$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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
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-fieldset option-fieldset-half';
$this->formclass = 'options-grid-form options-grid-form-half';
echo LayoutHelper::render('joomla.content.options_default', $this);

10
administrator/components/com_config/tmpl/component/default.php
View File

@ -85,12 +85,14 @@ $xml = $this->form->getXml();
?>
<?php if (!$isGrandchild && $hasParent) : ?>
<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-fieldset option-fieldset-half">
<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-grid-form options-grid-form-half">
<legend><?php echo Text::_($fieldSet->label); ?></legend>
<div>
<?php elseif (!$hasParent) : ?>
<?php if ($opentab) : ?>
<?php if ($opentab > 1) : ?>
</div>
</fieldset>
<?php endif; ?>
@ -104,9 +106,9 @@ $xml = $this->form->getXml();
<?php if (!$hasChildren) : ?>
<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-fieldset option-fieldset-half">
<fieldset id="fieldset-<?php echo $this->escape($name); ?>" class="options-grid-form options-grid-form-half">
<legend><?php echo Text::_($fieldSet->label); ?></legend>
<div>
<?php $opentab = 2; ?>
<?php endif; ?>
<?php endif; ?>
@ -123,6 +125,7 @@ $xml = $this->form->getXml();
<?php endif; ?>
<?php if (!$isGrandchild && $hasParent) : ?>
</div>
</fieldset>
<?php endif; ?>
<?php endforeach; ?>
@ -130,6 +133,7 @@ $xml = $this->form->getXml();
<?php if ($opentab) : ?>
<?php if ($opentab > 1) : ?>
</div>
</fieldset>
<?php endif; ?>
</div>

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

@ -87,9 +87,11 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-misc" class="options-grid-form options-grid-form-full">
<legend><?php echo $this->form->getField('misc')->title; ?></legend>
<div>
<?php echo $this->form->getInput('misc'); ?>
</div>
</fieldset>
</div>
</div>
@ -100,15 +102,19 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
</div>
</fieldset>
</div>
<div class="col-md-6">
<fieldset id="fieldset-metadata" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
</div>
</fieldset>
</div>
</div>
@ -117,11 +123,11 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if (!$isModal && $assoc) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'associations', Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
<?php if ($hasAssoc) : ?>
<fieldset id="fieldset-associations" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-associations" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
<?php endif; ?>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
<?php if ($hasAssoc) : ?>
<div>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>>
</div>
</fieldset>
<?php endif; ?>
<?php echo HTMLHelper::_('uitab.endTab'); ?>

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

@ -81,17 +81,21 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-<?php echo $fieldset; ?>" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_($this->form->getFieldsets()[$fieldset]->label); ?></legend>
<div>
<?php echo $this->form->renderFieldset($fieldset); ?>
</div>
</fieldset>
<?php endforeach; ?>
</div>
<div class="col-12 col-lg-6">
<?php foreach ($fieldsetsInLinks as $fieldset) : ?>
<fieldset id="fieldset-<?php echo $fieldset; ?>" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-<?php echo $fieldset; ?>" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_($this->form->getFieldsets()[$fieldset]->label); ?></legend>
<div>
<?php echo $this->form->renderFieldset($fieldset); ?>
</div>
</fieldset>
<?php endforeach; ?>
</div>
@ -108,15 +112,19 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
</div>
</fieldset>
</div>
<div class="col-12 col-lg-6">
<fieldset id="fieldset-metadata" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
</div>
</fieldset>
</div>
</div>
@ -126,11 +134,11 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if (!$isModal && $assoc) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'associations', Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
<?php if ($hasAssoc) : ?>
<fieldset id="fieldset-associations" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-associations" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
<?php endif; ?>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
<?php if ($hasAssoc) : ?>
<div>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
</div>
</fieldset>
<?php endif; ?>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
@ -140,18 +148,22 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if ($this->canDo->get('core.admin')) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'editor', Text::_('COM_CONTENT_SLIDER_EDITOR_CONFIG')); ?>
<fieldset id="fieldset-editor" class="form-no-margin options-fieldset">
<fieldset id="fieldset-editor" class="form-no-margin options-grid-form">
<legend><?php echo Text::_('COM_CONTENT_SLIDER_EDITOR_CONFIG'); ?></legend>
<div>
<?php echo $this->form->renderFieldset('editorConfig'); ?>
</div>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>
<?php if ($this->canDo->get('core.admin')) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'permissions', Text::_('COM_CONTENT_FIELDSET_RULES')); ?>
<fieldset id="fieldset-rules" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_CONTENT_FIELDSET_RULES'); ?></legend>
<div>
<?php echo $this->form->getInput('rules'); ?>
</div>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>

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

@ -80,9 +80,11 @@ 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-fieldset option-fieldset-full">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
</div>
</fieldset>
</div>
<div class="col-md-6">
@ -91,9 +93,11 @@ 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-fieldset option-fieldset-full">
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_ACTION_PERMISSIONS_LABEL'); ?></legend>
<div>
<?php echo $this->form->getInput('rules'); ?>
</div>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>

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

@ -64,9 +64,11 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
</div>
</fieldset>
</div>
<div class="col-md-6">
@ -77,9 +79,11 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_ACTION_PERMISSIONS_LABEL'); ?></legend>
<div>
<?php echo $this->form->getInput('rules'); ?>
</div>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>

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

@ -69,15 +69,19 @@ 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-fieldset option-fieldset-full">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
</div>
</fieldset>
</div>
<div class="col-md-6">
<fieldset id="fieldset-filter" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-filter" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_FINDER_FILTER_FIELDSET_PARAMS'); ?></legend>
<div>
<?php echo $this->form->renderFieldset('jbasic'); ?>
</div>
</fieldset>
</div>
</div>

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

@ -42,7 +42,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 option-fieldset-full">
<fieldset class="uploadform option-fieldset options-grid-form-full">
<?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 option-fieldset-full">
<fieldset class="option-fieldset options-grid-form-full">
<legend><?php echo Text::_('COM_INSTALLER_MSG_DESCFTPTITLE'); ?></legend>
<?php echo Text::_('COM_INSTALLER_MSG_DESCFTP'); ?>

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

@ -15,13 +15,15 @@ use Joomla\CMS\Router\Route;
?>
<fieldset class="options-fieldset option-fieldset-full">
<fieldset class="options-grid-form options-grid-form-full">
<legend>
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_COMPLETE_HEADING'); ?>
</legend>
<div class="alert alert-success">
<span class="fa fa-check-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('NOTICE'); ?></span>
<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_COMPLETE_MESSAGE', JVERSION); ?>
<div>
<div class="alert alert-success">
<span class="fa fa-check-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('NOTICE'); ?></span>
<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_COMPLETE_MESSAGE', JVERSION); ?>
</div>
</div>
</fieldset>
<form action="<?php echo Route::_('index.php?option=com_joomlaupdate'); ?>" method="post" id="adminForm">

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

@ -14,10 +14,11 @@ use Joomla\CMS\Language\Text;
/** @var \Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\Html $this */
?>
<fieldset class="options-fieldset option-fieldset-full">
<fieldset class="options-grid-form options-grid-form-full">
<legend>
<?php echo Text::_('COM_JOOMLAUPDATE_SYSTEM_CHECK'); ?>
</legend>
<div>
<?php if ( !$this->getModel()->isDatabaseTypeSupported()) : ?>
<p class="alert alert-warning">
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_DB_NOT_SUPPORTED'); ?>
@ -42,4 +43,5 @@ use Joomla\CMS\Language\Text;
<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_NO_DOWNLOAD_URL_DESC', $this->updateInfo['latest']); ?>
</p>
<?php endif; ?>
</div>
</fieldset>

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

@ -20,41 +20,43 @@ use Joomla\CMS\Language\Text;
<div class="row">
<div class="col-12 col-lg-6">
<fieldset class="options-fieldset option-fieldset-full">
<fieldset class="options-grid-form options-grid-form-full">
<legend>
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_PREUPDATE_CHECK'); ?>
</legend>
<table class="table">
<tbody>
<?php foreach ($this->phpOptions as $option) : ?>
<tr>
<td>
<?php echo $option->label; ?>
</td>
<td>
<span class="badge badge-<?php echo $option->state ? 'success' : 'danger'; ?>">
<?php echo Text::_($option->state ? 'JYES' : 'JNO'); ?>
<?php if ($option->notice) : ?>
<span class="icon-info icon-white" title="<?php echo $option->notice; ?>"></span>
<?php endif; ?>
</span>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<div>
<table class="table">
<tbody>
<?php foreach ($this->phpOptions as $option) : ?>
<tr>
<td>
<?php echo $option->label; ?>
</td>
<td>
<span class="badge badge-<?php echo $option->state ? 'success' : 'danger'; ?>">
<?php echo Text::_($option->state ? 'JYES' : 'JNO'); ?>
<?php if ($option->notice) : ?>
<span class="icon-info icon-white" title="<?php echo $option->notice; ?>"></span>
<?php endif; ?>
</span>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
</fieldset>
</div>
<div class="col-12 col-lg-6">
<fieldset class="options-fieldset option-fieldset-full">
<fieldset class="options-grid-form options-grid-form-full">
<legend>
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS'); ?>
</legend>
<p>
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_DESC'); ?>
</p>
<p>
<div>
<table class="table">
<thead>
<tr>
@ -87,10 +89,11 @@ use Joomla\CMS\Language\Text;
<?php endforeach; ?>
</tbody>
</table>
</div>
</fieldset>
</div>
</div>
<fieldset class="options-fieldset option-fieldset-full mt-3 mb-3">
<fieldset class="options-grid-form options-grid-form-full mt-3 mb-3">
<legend>
<?php echo Text::_('NOTICE'); ?>
</legend>

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

@ -14,7 +14,7 @@ use Joomla\CMS\Updater\Update;
/** @var JoomlaupdateViewDefault $this */
?>
<fieldset class="options-fieldset option-fieldset-full">
<fieldset class="options-grid-form options-grid-form-full">
<legend>
<?php echo Text::_('COM_JOOMLAUPDATE_UPDATE_CHECK'); ?>
</legend>
@ -24,11 +24,12 @@ use Joomla\CMS\Updater\Update;
<?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATES'); ?>
</p>
<p><?php echo Text::sprintf($this->langKey, $this->updateSourceKey); ?></p>
<div class="alert alert-success">
<p class="alert alert-success">
<span class="fa fa-check-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('NOTICE'); ?></span>
<?php echo Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_NOUPDATESNOTICE', '&#x200E;' . JVERSION); ?>
</div>
</p>
<?php if (is_object($this->updateInfo['object']) && ($this->updateInfo['object'] instanceof Update)) : ?>
<div>
<table class="table">
<tbody>
<tr>
@ -114,6 +115,7 @@ use Joomla\CMS\Updater\Update;
</tr>
</tfoot>
</table>
</div>
<?php endif; ?>
</fieldset>

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-fieldset option-fieldset-full">
<fieldset class="options-grid-form options-grid-form-full">
<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-fieldset option-fieldset-full">
<fieldset class="options-grid-form options-grid-form-full">
<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-fieldset option-fieldset-full">
<fieldset class="uploadform options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_UPLOAD'); ?></legend>
<table class="table">
<tbody>

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

@ -27,9 +27,9 @@ 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-fieldset">
<fieldset id="fieldset-details" class="options-grid-form">
<legend><?php echo Text::_('JDETAILS'); ?></legend>
<div>
<?php echo $this->form->renderField('title'); ?>
<?php echo $this->form->renderField('title_native'); ?>
<?php echo $this->form->renderField('lang_code'); ?>
@ -52,22 +52,26 @@ HTMLHelper::_('script', 'com_languages/admin-language-edit-change-flag.js', ['ve
<?php echo $this->form->renderField('access'); ?>
<?php echo $this->form->renderField('description'); ?>
<?php echo $this->form->renderField('lang_id'); ?>
</div>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?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-fieldset option-fieldset-full">
<fieldset id="fieldset-sitename" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_LANGUAGES_FIELDSET_SITE_NAME_LABEL'); ?></legend>
<div>
<?php echo $this->form->renderFieldset('site_name'); ?>
</div>
</fieldset>
</div>
<div class="col-md-6 mb-3">
<fieldset id="fieldset-metadata" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo $this->form->renderFieldset('metadata'); ?>
</div>
</fieldset>
</div>
</div>

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

@ -28,82 +28,33 @@ 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-fieldset option-fieldset-full">
<fieldset id="fieldset-override" class="options-grid-form options-grid-form-full">
<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 class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('language'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('language'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('client'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('client'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('key'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('key'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('override'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('override'); ?>
</div>
</div>
<div>
<?php echo $this->form->renderField('language'); ?>
<?php echo $this->form->renderField('client'); ?>
<?php echo $this->form->renderField('key'); ?>
<?php echo $this->form->renderField('override'); ?>
<?php if ($this->state->get('filter.client') == 'administrator') : ?>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('both'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('both'); ?>
</div>
</div>
<?php echo $this->form->renderField('both'); ?>
<?php endif; ?>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('file'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('file'); ?>
</div>
<?php echo $this->form->renderField('file'); ?>
</div>
</fieldset>
</div>
<div class="col-md-6">
<fieldset id="fieldset-override-search" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-override-search" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_LEGEND'); ?></legend>
<div>
<div class="alert alert-info">
<span class="fa fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDE_SEARCH_TIP'); ?>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('searchtype'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('searchtype'); ?>
</div>
</div>
<?php echo $this->form->renderField('searchtype'); ?>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('searchstring'); ?>
@ -123,6 +74,7 @@ HTMLHelper::_('script', 'com_languages/admin-override-edit-refresh-searchstring.
</div>
</div>
</div>
</div>
</fieldset>
<fieldset id="results-container" class="adminform">

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

@ -32,7 +32,7 @@
<fieldset name="menu-options"
label="COM_MENUS_LINKTYPE_OPTIONS_LABEL"
class="option-fieldset-half"
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="option-fieldset-half">
<fieldset name="menu-options" label="COM_MENUS_LINKTYPE_OPTIONS_LABEL" class="options-grid-form-half">
<field
name="menu-anchor_title"
@ -87,7 +87,7 @@
</fieldset>
<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS" class="option-fieldset-half">
<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS" class="options-grid-form-half">
<field
name="menu-meta_description"
type="textarea"

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

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

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

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

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

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

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

@ -182,11 +182,11 @@ 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')); ?>
<?php if ($hasAssoc) : ?>
<fieldset id="fieldset-associations" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-associations" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
<?php endif; ?>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
<?php if ($hasAssoc) : ?>
<div>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
</div>
</fieldset>
<?php endif; ?>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
@ -196,9 +196,11 @@ 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-fieldset option-fieldset-full">
<fieldset id="fieldset-modules" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_MENUS_ITEM_MODULE_ASSIGNMENT'); ?></legend>
<div>
<?php echo $this->loadTemplate('modules'); ?>
</div>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>

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

@ -30,11 +30,11 @@ Text::script('ERROR');
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'details', Text::_('COM_MENUS_MENU_DETAILS')); ?>
<fieldset id="fieldset-details" class="options-fieldset">
<fieldset id="fieldset-details" class="options-grid-form">
<legend><?php echo Text::_('COM_MENUS_MENU_DETAILS'); ?></legend>
<div class="row">
<div class="col-md-12">
<div>
<div>
<?php
echo $this->form->renderField('menutype');

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

@ -170,9 +170,11 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-assignment" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_MODULES_MENU_ASSIGNMENT'); ?></legend>
<div>
<?php echo $this->loadTemplate('assignment'); ?>
</div>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>
@ -185,9 +187,11 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-permissions" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_MODULES_FIELDSET_RULES'); ?></legend>
<div>
<?php echo $this->form->getInput('rules'); ?>
</div>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>

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

@ -68,16 +68,17 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-image" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_IMAGE_OPTIONS'); ?></legend>
<div>
<?php foreach ($this->form->getGroup('images') as $field) : ?>
<?php echo $field->renderField(); ?>
<?php endforeach; ?>
</div>
</fieldset>
</div>
<div class="col-md-6">
<?php echo $this->loadTemplate('display'); ?>
</fieldset>
</div>
</div>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
@ -87,15 +88,19 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
</div>
</fieldset>
</div>
<div class="col-md-6">
<fieldset id="fieldset-metadata" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-metadata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
</div>
</fieldset>
</div>
</div>
@ -104,11 +109,11 @@ $tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
<?php if (!$isModal && $assoc) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'associations', Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
<?php if ($hasAssoc) : ?>
<fieldset id="fieldset-associations" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-associations" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
<?php endif; ?>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
<?php if ($hasAssoc) : ?>
<div>
<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
</div>
</fieldset>
<?php endif; ?>
<?php echo HTMLHelper::_('uitab.endTab'); ?>

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

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

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

@ -60,9 +60,11 @@ $this->useCoreUI = true;
<?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-fieldset option-fieldset-full">
<fieldset id="fieldset-publishingdata" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
<div>
<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
</div>
</fieldset>
</div>
<div class="col-md-6">

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

@ -87,9 +87,11 @@ $user = Factory::getUser();
<?php if ($description) : ?>
<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'description', Text::_('JGLOBAL_FIELDSET_DESCRIPTION')); ?>
<fieldset id="fieldset-description" class="options-fieldset option-fieldset-full">
<fieldset id="fieldset-description" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('JGLOBAL_FIELDSET_DESCRIPTION'); ?></legend>
<div>
<?php echo $description; ?>
</div>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>
@ -102,9 +104,11 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-assignment" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_TEMPLATES_MENUS_ASSIGNMENT'); ?></legend>
<div>
<?php echo $this->loadTemplate('assignment'); ?>
</div>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>

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

@ -95,7 +95,7 @@ if ($this->type == 'font')
</div>
</div>
<div class="col-md-9">
<fieldset class="options-fieldset option-fieldset-full">
<fieldset class="options-grid-form options-grid-form-full">
<?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">
@ -241,7 +241,7 @@ if ($this->type == 'font')
<div class="card-body">
<div class="row">
<div class="col-md-3">
<fieldset class="options-fieldset option-fieldset-full">
<fieldset class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_TEMPLATES_OVERRIDES_MODULES'); ?></legend>
<ul class="list-unstyled">
<?php $token = Session::getFormToken() . '=' . 1; ?>
@ -260,7 +260,7 @@ if ($this->type == 'font')
</fieldset>
</div>
<div class="col-md-3">
<fieldset class="options-fieldset option-fieldset-full">
<fieldset class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_TEMPLATES_OVERRIDES_COMPONENTS'); ?></legend>
<ul class="list-unstyled">
<?php $token = Session::getFormToken() . '=' . 1; ?>
@ -288,7 +288,7 @@ if ($this->type == 'font')
</fieldset>
</div>
<div class="col-md-3">
<fieldset class="options-fieldset option-fieldset-full">
<fieldset class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_TEMPLATES_OVERRIDES_PLUGINS'); ?></legend>
<ul class="list-unstyled">
<?php $token = Session::getFormToken() . '=' . 1; ?>
@ -316,7 +316,7 @@ if ($this->type == 'font')
</fieldset>
</div>
<div class="col-md-3">
<fieldset class="options-fieldset option-fieldset-full">
<fieldset class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_TEMPLATES_OVERRIDES_LAYOUTS'); ?></legend>
<ul class="list-unstyled">
<?php $token = Session::getFormToken() . '=' . 1; ?>

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

@ -19,8 +19,9 @@ 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-fieldset option-fieldset-half mt-4">
<fieldset class="options-grid-form options-grid-form-half mt-4">
<legend><?php echo Text::_('COM_USERS_LEVEL_DETAILS'); ?></legend>
<div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('title'); ?>
@ -29,11 +30,14 @@ HTMLHelper::_('behavior.keepalive');
<?php echo $this->form->getInput('title'); ?>
</div>
</div>
</div>
</fieldset>
<fieldset class="options-fieldset option-fieldset-full">
<fieldset class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_USERS_USER_GROUPS_HAVING_ACCESS'); ?></legend>
<div>
<?php echo HTMLHelper::_('access.usergroups', 'jform[rules]', $this->item->rules, true); ?>
</div>
</fieldset>
<input type="hidden" name="task" value="">
<?php echo HTMLHelper::_('form.token'); ?>

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

@ -48,9 +48,11 @@ $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-fieldset option-fieldset-full">
<fieldset id="fieldset-groups" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_USERS_ASSIGNED_GROUPS'); ?></legend>
<div>
<?php echo $this->loadTemplate('groups'); ?>
</div>
</fieldset>
<?php echo HTMLHelper::_('uitab.endTab'); ?>
<?php endif; ?>

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-fieldset option-fieldset-full">
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<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-fieldset option-fieldset-full">
<fieldset id="fieldset-rules" class="options-grid-form options-grid-form-full">
<legend><?php echo Text::_('COM_WORKFLOW_RULES_TAB'); ?></legend>
<?php echo $this->form->getInput('rules'); ?>
</fieldset>

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

@ -31,34 +31,14 @@
}
}
.options-fieldset {
.options-grid-form {
background-color: var(--white);
color: var(--atum-text-dark);
padding: 1rem;
display: grid;
grid-template-columns: 1fr;
grid-column-gap: 2rem;
margin-bottom: 1rem;
box-shadow: $atum-box-shadow;
width: 100%;
@include media-breakpoint-up(md) {
grid-template-columns: 1fr 1fr;
&.option-fieldset-half,
&.option-fieldset-full {
grid-template-columns: 1fr;
}
}
@include media-breakpoint-up(lg) {
grid-template-columns: 1fr 1fr 1fr;
&.option-fieldset-full {
grid-template-columns: 1fr;
}
&.option-fieldset-half {
grid-template-columns: 1fr 1fr;
}
}
@include box-shadow($box-shadow-sm);
> legend {
font-weight: bold;
padding: 0 .5rem;
@ -66,4 +46,36 @@
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;
}
}
}
}

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

@ -20,22 +20,24 @@ use Joomla\CMS\HTML\HTMLHelper;
<p><?php echo $displayData->description; ?></p>
<?php endif; ?>
<?php $fieldsnames = explode(',', $displayData->fieldsname); ?>
<?php foreach ($fieldsnames as $fieldname) : ?>
<?php foreach ($displayData->form->getFieldset($fieldname) as $field) : ?>
<?php $datashowon = ''; ?>
<?php $groupClass = $field->type === 'Spacer' ? ' field-spacer' : ''; ?>
<?php if ($field->showon) : ?>
<?php HTMLHelper::_('script', 'system/showon.min.js', array('version' => 'auto', 'relative' => true)); ?>
<?php $datashowon = ' data-showon=\'' . json_encode(FormHelper::parseShowOnConditions($field->showon, $field->formControl, $field->group)) . '\''; ?>
<?php endif; ?>
<?php if (isset($displayData->showlabel)) : ?>
<div class="control-group<?php echo $groupClass; ?>"<?php echo $datashowon; ?>>
<div class="controls"><?php echo $field->input; ?></div>
</div>
<?php else : ?>
<?php echo $field->renderField(); ?>
<div>
<?php foreach ($fieldsnames as $fieldname) : ?>
<?php foreach ($displayData->form->getFieldset($fieldname) as $field) : ?>
<?php $datashowon = ''; ?>
<?php $groupClass = $field->type === 'Spacer' ? ' field-spacer' : ''; ?>
<?php if ($field->showon) : ?>
<?php HTMLHelper::_('script', 'system/showon.min.js', array('version' => 'auto', 'relative' => true)); ?>
<?php $datashowon = ' data-showon=\'' . json_encode(FormHelper::parseShowOnConditions($field->showon, $field->formControl, $field->group)) . '\''; ?>
<?php endif; ?>
<?php if (isset($displayData->showlabel)) : ?>
<div class="control-group<?php echo $groupClass; ?>"<?php echo $datashowon; ?>>
<div class="controls"><?php echo $field->input; ?></div>
</div>
<?php else : ?>
<?php echo $field->renderField(); ?>
<?php endif; ?>
<?php endforeach; ?>
<?php endforeach; ?>
<?php endforeach; ?>
</div>
</fieldset>

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

@ -116,8 +116,9 @@ foreach ($fieldSets as $name => $fieldSet)
if (!$isGrandchild && $hasParent)
{
echo '<fieldset id="fieldset-' . $name . '" class="form-no-margin options-fieldset ' . (!empty($fieldSet->class) ? $fieldSet->class : '') . '">';
echo '<fieldset id="fieldset-' . $name . '" class="form-no-margin options-grid-form ' . (!empty($fieldSet->class) ? $fieldSet->class : '') . '">';
echo '<legend>' . $label . '</legend>';
echo '<div>';
}
// Tabs
elseif (!$hasParent)
@ -141,8 +142,9 @@ 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-fieldset ' . (!empty($fieldSet->class) ? $fieldSet->class : '') . '">';
echo '<fieldset id="fieldset-' . $name . '" class="form-no-margin options-grid-form ' . (!empty($fieldSet->class) ? $fieldSet->class : '') . '">';
echo '<legend>' . $label . '</legend>';
echo '<div>';
$opentab = 2;
}
@ -170,6 +172,7 @@ foreach ($fieldSets as $name => $fieldSet)
// Close open fieldset
if (!$isGrandchild && $hasParent)
{
echo '</div>';
echo '</fieldset>';
}
}
@ -178,6 +181,7 @@ if ($opentab)
{
if ($opentab > 1)
{
echo '</div>';
echo '</fieldset>';
}