correcting some markup in [#30157]

joomla · Feb 27, 2013 · c5268a6 · c5268a6
1 parent 7f9b3c5
commit c5268a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
@@ -108,15 +108,7 @@
 				<?php endif; ?>
 			<?php echo JHtml::_('bootstrap.endPanel'); ?>
 
-			<?php if (count($this->fieldsets)) : ?>
-				<?php foreach ($this->fieldsets as $fieldset) : ?>
-					<?php $label = !empty($fieldset->label) ? JText::_($fieldset->label) : JText::_('COM_PLUGINS_'.$fieldset->name.'_FIELDSET_LABEL');?>
-					<?php $optionsname = 'options-' . $fieldset->name; ?>
-					<?php echo JHtml::_('bootstrap.addPanel', 'myTab', $optionsname,  $label); ?>
-						<?php echo $this->loadTemplate('options'); ?>
-					<?php echo JHtml::_('bootstrap.endPanel'); ?>
-				<?php endforeach; ?>
-			<?php endif; ?>
+			<?php echo $this->loadTemplate('options'); ?>
 
 		<?php echo JHtml::_('bootstrap.endPane'); ?>
 	</fieldset>

diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php b/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php
@@ -9,9 +9,10 @@
 
 defined('_JEXEC') or die;
 
-foreach ($this->fieldsets as $name => $fieldset) :
-	echo '<div class="tab-pane" id="options-'.$name.'">';
-	$label = !empty($fieldset->label) ? $fieldset->label : 'COM_PLUGINS_'.$name.'_FIELDSET_LABEL';
+foreach ($this->fieldsets  as $name => $fieldset) :
+	$label = !empty($fieldset->label) ? JText::_($fieldset->label) : JText::_('COM_PLUGINS_'.$fieldset->name.'_FIELDSET_LABEL');
+	$optionsname = 'options-' . $fieldset->name;
+	echo JHtml::_('bootstrap.addPanel', 'myTab', $optionsname,  $label);
 	if (isset($fieldset->description) && trim($fieldset->description)) :
 		echo '<p class="tip">'.$this->escape(JText::_($fieldset->description)).'</p>';
 	endif;
@@ -32,5 +33,6 @@
 	<?php endforeach; ?>
 	<?php echo $hidden_fields; ?>
 
-	<?php echo '</div>'; // .tab-pane div ?>
+<?php echo JHtml::_('bootstrap.endPanel'); ?>
+
 <?php endforeach; ?>