diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index dabe725814dd3..269c69f1f1078 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -521,6 +521,7 @@ JGLOBAL_RECORD_HITS_DESC="Record the number of hits." JGLOBAL_RECORD_HITS_LABEL="Record Hits" JGLOBAL_RECORD_NUMBER="Record ID: %d" JGLOBAL_REMEMBER_ME="Remember Me" +JGLOBAL_REPEATABLE_FIELDS_TABLE_CAPTION="Table of repeatable fields." JGLOBAL_REVERSE_ORDERING="Article Reverse Order" JGLOBAL_RIGHT="Right" JGLOBAL_ROOT="Root" diff --git a/administrator/language/en-GB/en-GB.plg_fields_subfields.ini b/administrator/language/en-GB/en-GB.plg_fields_subfields.ini index 61226fd351508..58579e240b3d5 100644 --- a/administrator/language/en-GB/en-GB.plg_fields_subfields.ini +++ b/administrator/language/en-GB/en-GB.plg_fields_subfields.ini @@ -5,9 +5,8 @@ PLG_FIELDS_SUBFIELDS="Fields - Subfields" PLG_FIELDS_SUBFIELDS_LABEL="Subfields (%s)" -PLG_FIELDS_SUBFIELDS_PARAMS_CUSTOMFIELD_LABEL="Sub field" -PLG_FIELDS_SUBFIELDS_PARAMS_OPTIONS_LABEL="Sub fields" -PLG_FIELDS_SUBFIELDS_PARAMS_RENDER_VALUES_DESC="Whether you want the plugin to pre-render the values of this sub field. Pre-rendering comes at a cost of performance and it might not be necessary, especially if you have a custom layout override where you take care of rendering the raw value." -PLG_FIELDS_SUBFIELDS_PARAMS_RENDER_VALUES_LABEL="Render values" +PLG_FIELDS_SUBFIELDS_PARAMS_CUSTOMFIELD_LABEL="Subfield" +PLG_FIELDS_SUBFIELDS_PARAMS_OPTIONS_LABEL="Subfields" +PLG_FIELDS_SUBFIELDS_PARAMS_RENDER_VALUES_LABEL="Render Values" PLG_FIELDS_SUBFIELDS_PARAMS_REPEAT_LABEL="Repeatable" PLG_FIELDS_SUBFIELDS_XML_DESCRIPTION="This plugin lets you create new fields of type 'subfields' in any extension where custom fields are supported." diff --git a/administrator/templates/atum/scss/blocks/_form.scss b/administrator/templates/atum/scss/blocks/_form.scss index 561814910fb93..bf0de28ed2e2d 100644 --- a/administrator/templates/atum/scss/blocks/_form.scss +++ b/administrator/templates/atum/scss/blocks/_form.scss @@ -45,7 +45,7 @@ margin-left: 0; .switcher__legend { float:none; - margin-left: 0; + margin-left: 0; } } @@ -154,4 +154,4 @@ legend { joomla-field-user [class*=" icon-"]:not(.input-group-text) { margin-right: 0; -} \ No newline at end of file +} diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini index 01d6fc272d0a8..53e44f431d960 100644 --- a/language/en-GB/en-GB.ini +++ b/language/en-GB/en-GB.ini @@ -292,6 +292,7 @@ JGLOBAL_PRINT_TITLE="Print article < %s >" JGLOBAL_RECORD_NUMBER="Record ID: %d" JGLOBAL_REMEMBER_ME="Remember me" JGLOBAL_REMEMBER_MUST_LOGIN="For security reasons you must login before editing your personal information." +JGLOBAL_REPEATABLE_FIELDS_TABLE_CAPTION="Table of repeatable fields." JGLOBAL_RESOURCE_NOT_FOUND="Resource not found" JGLOBAL_RIGHT="Right" JGLOBAL_ROOT="Root" diff --git a/layouts/joomla/form/field/subform/repeatable-table.php b/layouts/joomla/form/field/subform/repeatable-table.php index 738d3d2ad980c..bd67b7866ac51 100644 --- a/layouts/joomla/form/field/subform/repeatable-table.php +++ b/layouts/joomla/form/field/subform/repeatable-table.php @@ -43,11 +43,11 @@ if (!empty($groupByFieldset)) { foreach ($tmpl->getFieldsets() as $fieldset) { - $table_head .= '' . Text::_($fieldset->label); + $table_head .= '' . Text::_($fieldset->label); if ($fieldset->description) { - $table_head .= '
' . Text::_($fieldset->description) . ''; + $table_head .= ''; } $table_head .= ''; @@ -58,11 +58,11 @@ else { foreach ($tmpl->getGroup('') as $field) { - $table_head .= '' . strip_tags($field->label); + $table_head .= '' . strip_tags($field->label); if ($field->description) { - $table_head .= '
' . Text::_($field->description) . ''; + $table_head .= ''; } $table_head .= ''; @@ -82,20 +82,23 @@ button-add=".group-add" button-remove=".group-remove" button-move="" repeatable-element=".subform-repeatable-group" rows-container="tbody.subform-repeatable-container" minimum="" maximum=""> - - +
+ - + @@ -108,9 +111,9 @@
+ +
- -
- - -
- - 		+ +
+ +
+ +
- + diff --git a/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php b/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php index e8c79804aba4e..acb0773c31cab 100644 --- a/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php +++ b/layouts/joomla/form/field/subform/repeatable-table/section-byfieldsets.php @@ -34,9 +34,21 @@
- - - + + + + + + + + +
diff --git a/layouts/joomla/form/field/subform/repeatable-table/section.php b/layouts/joomla/form/field/subform/repeatable-table/section.php index 02193e0161b39..6c9817f7263bf 100644 --- a/layouts/joomla/form/field/subform/repeatable-table/section.php +++ b/layouts/joomla/form/field/subform/repeatable-table/section.php @@ -25,16 +25,28 @@ getGroup('') as $field) : ?> - - renderField(array('hiddenLabel' => true)); ?> - + + renderField(array('hiddenLabel' => true)); ?> +
- - - + + + + + + + + +
diff --git a/plugins/fields/subfields/params/subfields.xml b/plugins/fields/subfields/params/subfields.xml index 902af3e12f165..b203d148d84ce 100644 --- a/plugins/fields/subfields/params/subfields.xml +++ b/plugins/fields/subfields/params/subfields.xml @@ -43,7 +43,6 @@ name="render_values" type="radio" label="PLG_FIELDS_SUBFIELDS_PARAMS_RENDER_VALUES_LABEL" - description="PLG_FIELDS_SUBFIELDS_PARAMS_RENDER_VALUES_DESC" class="switcher" default="1" >