Resolved gh-363 so that showon will function as expected in the full width layout. Resolved gh-367 by adding a wrapper class around each field in the edit view.

README.md

@@ -144,11 +144,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 21st January, 2019
++ *Last Build*: 23rd January, 2019
 + *Version*: 2.9.8
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **195813**
++ *Line count*: **194592**
 + *Field count*: **1087**
 + *File count*: **1275**
 + *Folder count*: **201**

admin/README.txt

@@ -144,11 +144,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 21st January, 2019
++ *Last Build*: 23rd January, 2019
 + *Version*: 2.9.8
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **195813**
++ *Line count*: **194592**
 + *Field count*: **1087**
 + *File count*: **1275**
 + *Folder count*: **201**

admin/compiler/joomla_3/layout.php

@@ -29,7 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -38,20 +37,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/compiler/joomla_3/layoutfull.php

@@ -23,16 +23,14 @@ $fields = $displayData->get('fields') ?: array(
 	###LAYOUTITEMS###
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/compiler/joomla_3/layoutitems.php

@@ -25,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/compiler/joomla_3/layoutpublished.php

@@ -17,7 +17,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/compiler/joomla_3/layouttitle.php

@@ -19,13 +19,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	###LAYOUTITEMS###
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/admin_custom_tabs/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_custom_tabs/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_custom_tabs/tabs_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'admin_view'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/admin_custom_tabs/tabs_fullwidth.php

@@ -18,16 +18,14 @@ $fields = $displayData->get('fields') ?: array(
 	'tabs'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/admin_fields/fields_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'admin_view'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/admin_fields/fields_fullwidth.php

@@ -19,16 +19,14 @@ $fields = $displayData->get('fields') ?: array(
 	'addfields'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/admin_fields/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_fields/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_fields_conditions/conditions_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'admin_view'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/admin_fields_conditions/conditions_fullwidth.php

@@ -19,16 +19,14 @@ $fields = $displayData->get('fields') ?: array(
 	'addconditions'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/admin_fields_conditions/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_fields_conditions/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_fields_relations/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_fields_relations/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_fields_relations/relations_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'admin_view'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/admin_fields_relations/relations_fullwidth.php

@@ -19,16 +19,14 @@ $fields = $displayData->get('fields') ?: array(
 	'addrelations'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/admin_view/css_fullwidth.php

@@ -21,16 +21,14 @@ $fields = $displayData->get('fields') ?: array(
 	'css_views'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/admin_view/custom_buttons_fullwidth.php

@@ -21,16 +21,14 @@ $fields = $displayData->get('fields') ?: array(
 	'php_model_list'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/admin_view/custom_buttons_left.php

@@ -21,20 +21,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_view/custom_import_fullwidth.php

@@ -27,16 +27,14 @@ $fields = $displayData->get('fields') ?: array(
 	'php_import_ext'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/admin_view/details_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'system_name'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/admin_view/details_fullwidth.php

@@ -18,16 +18,14 @@ $fields = $displayData->get('fields') ?: array(
 	'note_linked_to_notice'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/admin_view/details_left.php

@@ -25,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_view/details_right.php

@@ -22,20 +22,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_view/details_under.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'not_required'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/admin_view/fields_fullwidth.php

@@ -18,16 +18,14 @@ $fields = $displayData->get('fields') ?: array(
 	'note_create_edit_display'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/admin_view/fields_left.php

@@ -24,20 +24,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_view/fields_right.php

@@ -20,20 +20,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_view/javascript_fullwidth.php

@@ -25,16 +25,14 @@ $fields = $displayData->get('fields') ?: array(
 	'javascript_views_footer'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/admin_view/mysql_fullwidth.php

@@ -18,16 +18,14 @@ $fields = $displayData->get('fields') ?: array(
 	'sql'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/admin_view/mysql_left.php

@@ -25,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_view/php_fullwidth.php

@@ -54,16 +54,14 @@ $fields = $displayData->get('fields') ?: array(
 	'php_document'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/admin_view/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_view/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/admin_view/settings_fullwidth.php

@@ -24,16 +24,14 @@ $fields = $displayData->get('fields') ?: array(
 	'addlinked_views'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/component_admin_views/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_admin_views/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_admin_views/views_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'joomla_component'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/component_admin_views/views_fullwidth.php

@@ -19,16 +19,14 @@ $fields = $displayData->get('fields') ?: array(
 	'addadmin_views'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/component_config/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_config/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_config/tweaks_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'joomla_component'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/component_config/tweaks_fullwidth.php

@@ -18,16 +18,14 @@ $fields = $displayData->get('fields') ?: array(
 	'addconfig'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/component_custom_admin_menus/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_custom_admin_menus/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_custom_admin_menus/tweaks_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'joomla_component'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/component_custom_admin_menus/tweaks_fullwidth.php

@@ -18,16 +18,14 @@ $fields = $displayData->get('fields') ?: array(
 	'addcustommenus'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/component_custom_admin_views/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_custom_admin_views/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_custom_admin_views/views_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'joomla_component'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/component_custom_admin_views/views_fullwidth.php

@@ -19,16 +19,14 @@ $fields = $displayData->get('fields') ?: array(
 	'addcustom_admin_views'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/component_dashboard/dashboard_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'joomla_component'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/component_dashboard/dashboard_fullwidth.php

@@ -19,16 +19,14 @@ $fields = $displayData->get('fields') ?: array(
 	'dashboard_tab'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/component_dashboard/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_dashboard/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_files_folders/advance_fullwidth.php

@@ -22,16 +22,14 @@ $fields = $displayData->get('fields') ?: array(
 	'note_constant_paths'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/component_files_folders/basic_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'joomla_component'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/component_files_folders/basic_fullwidth.php

@@ -21,16 +21,14 @@ $fields = $displayData->get('fields') ?: array(
 	'addfolders'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/component_files_folders/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_files_folders/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_mysql_tweaks/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_mysql_tweaks/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_mysql_tweaks/tweaks_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'joomla_component'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/component_mysql_tweaks/tweaks_fullwidth.php

@@ -18,16 +18,14 @@ $fields = $displayData->get('fields') ?: array(
 	'sql_tweak'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/component_site_views/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_site_views/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_site_views/views_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'joomla_component'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/component_site_views/views_fullwidth.php

@@ -19,16 +19,14 @@ $fields = $displayData->get('fields') ?: array(
 	'addsite_views'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/component_updates/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_updates/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/component_updates/updates_above.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'joomla_component'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/component_updates/updates_fullwidth.php

@@ -18,16 +18,14 @@ $fields = $displayData->get('fields') ?: array(
 	'version_update'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/custom_admin_view/custom_buttons_fullwidth.php

@@ -19,16 +19,14 @@ $fields = $displayData->get('fields') ?: array(
 	'php_model'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/custom_admin_view/custom_buttons_left.php

@@ -21,20 +21,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/custom_admin_view/details_above.php

@@ -14,14 +14,19 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'system_name',
 	'context'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/custom_admin_view/details_fullwidth.php

@@ -18,16 +18,14 @@ $fields = $displayData->get('fields') ?: array(
 	'default'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/custom_admin_view/details_left.php

@@ -25,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/custom_admin_view/details_right.php

@@ -23,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/custom_admin_view/details_rightside.php

@@ -23,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/custom_admin_view/details_under.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'not_required'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/custom_admin_view/javascript_css_fullwidth.php

@@ -25,16 +25,14 @@ $fields = $displayData->get('fields') ?: array(
 	'css'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/custom_admin_view/linked_components_fullwidth.php

@@ -18,16 +18,14 @@ $fields = $displayData->get('fields') ?: array(
 	'note_linked_to_notice'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/custom_admin_view/php_fullwidth.php

@@ -28,16 +28,14 @@ $fields = $displayData->get('fields') ?: array(
 	'php_jview'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/custom_admin_view/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/custom_admin_view/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/custom_code/details_above.php

@@ -14,15 +14,20 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'target',
 	'system_name',
 	'function_name'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/custom_code/details_fullwidth.php

@@ -21,16 +21,14 @@ $fields = $displayData->get('fields') ?: array(
 	'note_placeholders_explained'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>

admin/layouts/custom_code/details_left.php

@@ -23,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/custom_code/details_right.php

@@ -22,20 +22,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/custom_code/details_under.php

@@ -14,13 +14,18 @@ defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
 
-$fields = array(
+$fields = $displayData->get('fields') ?: array(
 	'not_required'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-inline form-inline-header">
-	<?php foreach($fields as $field){
+	<?php foreach($fields as $field): ?>
-		echo $form->renderField($field);
+		<?php if (in_array($field, $hiddenFields)) : ?>
-	} ?>
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
+		<?php endif; ?>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+	<?php endforeach; ?>
 </div>

admin/layouts/custom_code/publishing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -24,20 +23,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/custom_code/publlshing.php

@@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-$app = JFactory::getApplication();
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
@@ -26,20 +25,10 @@ $fields = $displayData->get('fields') ?: array(
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
-foreach ($fields as $field)
+?>
-{
+<?php foreach($fields as $field): ?>
-	$field = is_array($field) ? $field : array($field);
+	<?php if (in_array($field, $hiddenFields)) : ?>
-	foreach ($field as $f)
+		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-	{
+	<?php endif; ?>
-		if ($form->getField($f))
+	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-		{
+<?php endforeach; ?>
-			if (in_array($f, $hiddenFields))
-			{
-				$form->setFieldAttribute($f, 'type', 'hidden');
-			}
-
-			echo $form->renderField($f);
-			break;
-		}
-	}
-}

admin/layouts/dynamic_get/abacus_fullwidth.php

@@ -20,16 +20,14 @@ $fields = $displayData->get('fields') ?: array(
 	'php_calculation'
 );
 
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
 ?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
-    <div class="control-group">
+		<?php if (in_array($field, $hiddenFields)) : ?>
-        <div class="control-label">
+			<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
-            <?php echo $form->getLabel($field); ?>
+		<?php endif; ?>
-        </div>
+		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
-        <div class="controls">
-            <?php echo $form->getInput($field); ?>
-        </div>
-    </div>
 	<?php endforeach; ?>
 </div>