Let bootstrap and CE live happily (#448)

* boom * loop da loop * better grouping * patch it * Inline
joomla · Jul 1, 2018 · 0426c1d · 0426c1d
1 parent 1607a8c
commit 0426c1d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/administrator/components/com_content/tmpl/article/edit.php b/administrator/components/com_content/tmpl/article/edit.php
@@ -18,6 +18,7 @@
 $this->configFieldsets  = array('editorConfig');
 $this->hiddenFieldsets  = array('basic-limited');
 $this->ignore_fieldsets = array('jmetadata', 'item_associations');
+$this->useCoreUI = true;
 
 // Create shortcut to parameters.
 $params = clone $this->state->get('params');

diff --git a/administrator/components/com_media/tmpl/file/default.php b/administrator/components/com_media/tmpl/file/default.php
@@ -54,6 +54,7 @@
 
 Factory::getDocument()->addScriptOptions('com_media', $config);
 
+$this->useCoreUI = true;
 ?>
 <div class="row">
 	<form action="#" method="post" name="adminForm" id="media-form" class="form-validate col-md-12">

diff --git a/layouts/joomla/edit/params.php b/layouts/joomla/edit/params.php
@@ -109,8 +109,10 @@
 		$label = Text::_($label);
 	}
 
+	$helper = $displayData->get('useCoreUI', false) ? 'uitab' : 'bootstrap';
+
 	// Start the tab
-	echo HTMLHelper::_('uitab.addTab', $tabName, 'attrib-' . $name, $label);
+	echo HTMLHelper::_($helper . '.addTab', $tabName, 'attrib-' . $name, $label);
 
 	// Include the description when available
 	if (isset($fieldSet->description) && trim($fieldSet->description))
@@ -128,5 +130,5 @@
 	echo LayoutHelper::render('joomla.edit.fieldset', $displayData);
 
 	// End the tab
-	echo HTMLHelper::_('uitab.endTab');
+	echo HTMLHelper::_($helper . '.endTab');
 }