Merge pull request #23 from C-Lodder/grid

Dashboard and Installation - BS4 integration
joomla · Oct 1, 2016 · a699437 · a699437
2 parents c781cfa + 9c5becb
commit a699437
Show file tree

Hide file tree

Showing 195 changed files with 1,581 additions and 1,280 deletions.
diff --git a/administrator/components/com_admin/views/help/tmpl/default.php b/administrator/components/com_admin/views/help/tmpl/default.php
@@ -12,8 +12,8 @@
 JHtml::_('bootstrap.tooltip');
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_admin&amp;view=help'); ?>" method="post" name="adminForm" id="adminForm">
-	<div class="row-fluid">
-		<div id="sidebar" class="span3">
+	<div class="row">
+		<div id="sidebar" class="col-md-3">
 			<div class="clearfix"></div>
 			<div class="sidebar-nav">
 				<ul class="nav nav-list">
@@ -32,7 +32,7 @@
 				</ul>
 			</div>
 		</div>
-		<div class="span9">
+		<div class="col-md-9">
 			<iframe name="helpFrame" height="2100px" src="<?php echo $this->page; ?>" class="helpFrame table table-bordered"></iframe>
 		</div>
 	</div>

diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default.php b/administrator/components/com_admin/views/sysinfo/tmpl/default.php
@@ -14,9 +14,9 @@
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_admin&view=sysinfo'); ?>" method="post" name="adminForm" id="adminForm">
-	<div class="row-fluid">
+	<div class="row">
 		<!-- Begin Content -->
-		<div class="span12">
+		<div class="col-md-12">
 			<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'site')); ?>
 
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'site', JText::_('COM_ADMIN_SYSTEM_INFORMATION')); ?>

diff --git a/administrator/components/com_banners/models/forms/banner.xml b/administrator/components/com_banners/models/forms/banner.xml
@@ -80,7 +80,7 @@
 			label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
 			description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
 			maxlength="255"
-			class="span12"
+			class="col-md-12"
 			size="45"
 			labelclass="control-label"
 		/>

diff --git a/administrator/components/com_banners/models/forms/client.xml b/administrator/components/com_banners/models/forms/client.xml
@@ -144,7 +144,7 @@
 			type="textarea"
 			label="COM_BANNERS_FIELD_EXTRAINFO_LABEL"
 			description="COM_BANNERS_FIELD_EXTRAINFO_DESC"
-			class="span12"
+			class="col-md-12"
 			rows="5"
 			cols="80"
 		/>

diff --git a/administrator/components/com_banners/views/banner/tmpl/edit.php b/administrator/components/com_banners/views/banner/tmpl/edit.php
@@ -54,8 +54,8 @@
 		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
 
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('COM_BANNERS_BANNER_DETAILS')); ?>
-		<div class="row-fluid">
-			<div class="span9">
+		<div class="row">
+			<div class="col-md-9">
 				<?php echo $this->form->renderField('type'); ?>
 				<div id="image">
 					<?php echo $this->form->renderFieldset('image'); ?>
@@ -68,7 +68,7 @@
 				echo $this->form->renderField('description');
 				?>
 			</div>
-			<div class="span3">
+			<div class="col-md-3">
 				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
 			</div>
 		</div>
@@ -79,11 +79,11 @@
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
-		<div class="row-fluid form-horizontal-desktop">
-			<div class="span6">
+		<div class="row form-horizontal-desktop">
+			<div class="col-md-6">
 				<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
 			</div>
-			<div class="span6">
+			<div class="col-md-6">
 				<?php echo $this->form->renderFieldset('metadata'); ?>
 			</div>
 		</div>

diff --git a/administrator/components/com_banners/views/banners/tmpl/default.php b/administrator/components/com_banners/views/banners/tmpl/default.php
@@ -29,10 +29,10 @@
 }
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_banners&view=banners'); ?>" method="post" name="adminForm" id="adminForm">
-	<div id="j-sidebar-container" class="span2">
+	<div id="j-sidebar-container" class="col-md-2">
 		<?php echo $this->sidebar; ?>
 	</div>
-	<div id="j-main-container" class="span10">
+	<div id="j-main-container" class="col-md-10">
 		<?php
 		// Search tools bar
 		echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));

diff --git a/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php b/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php
@@ -12,21 +12,21 @@
 $published = $this->state->get('filter.published');
 ?>
 
-<div class="row-fluid">
-	<div class="control-group span6">
+<div class="row">
+	<div class="control-group col-md-6">
 		<div class="controls">
 			<?php echo JHtml::_('batch.language'); ?>
 		</div>
 	</div>
-	<div class="control-group span6">
+	<div class="control-group col-md-6">
 		<div class="controls">
 			<?php echo JHtml::_('banner.clients'); ?>
 		</div>
 	</div>
 </div>
-<div class="row-fluid">
+<div class="row">
 	<?php if ($published >= 0) : ?>
-		<div class="control-group span6">
+		<div class="control-group col-md-6">
 			<div class="controls">
 				<?php echo JHtml::_('batch.item', 'com_banners'); ?>
 			</div>

diff --git a/administrator/components/com_banners/views/client/tmpl/edit.php b/administrator/components/com_banners/views/client/tmpl/edit.php
@@ -32,8 +32,8 @@
 		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
 
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'general', empty($this->item->id) ? JText::_('COM_BANNERS_NEW_CLIENT') : JText::_('COM_BANNERS_EDIT_CLIENT')); ?>
-		<div class="row-fluid">
-			<div class="span9">
+		<div class="row">
+			<div class="col-md-9">
 				<?php
 				echo $this->form->renderField('contact');
 				echo $this->form->renderField('email');
@@ -43,7 +43,7 @@
 				echo $this->form->renderFieldset('extra');
 				?>
 			</div>
-			<div class="span3">
+			<div class="col-md-3">
 				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
 			</div>
 		</div>

diff --git a/administrator/components/com_banners/views/clients/tmpl/default.php b/administrator/components/com_banners/views/clients/tmpl/default.php
@@ -22,10 +22,10 @@
 $params     = (isset($this->state->params)) ? $this->state->params : new JObject;
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_banners&view=clients'); ?>" method="post" name="adminForm" id="adminForm">
-	<div id="j-sidebar-container" class="span2">
+	<div id="j-sidebar-container" class="col-md-2">
 		<?php echo $this->sidebar; ?>
 	</div>
-	<div id="j-main-container" class="span10">
+	<div id="j-main-container" class="col-md-10">
 		<?php
 		// Search tools bar
 		echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));

diff --git a/administrator/components/com_banners/views/tracks/tmpl/default.php b/administrator/components/com_banners/views/tracks/tmpl/default.php
@@ -17,10 +17,10 @@
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_banners&view=tracks'); ?>" method="post" name="adminForm" id="adminForm">
 <?php if (!empty( $this->sidebar)) : ?>
-	<div id="j-sidebar-container" class="span2">
+	<div id="j-sidebar-container" class="col-md-2">
 		<?php echo $this->sidebar; ?>
 	</div>
-	<div id="j-main-container" class="span10">
+	<div id="j-main-container" class="col-md-10">
 <?php else : ?>
 	<div id="j-main-container">
 <?php endif;?>

diff --git a/administrator/components/com_cache/views/cache/tmpl/default.php b/administrator/components/com_cache/views/cache/tmpl/default.php
@@ -17,10 +17,10 @@
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_cache'); ?>" method="post" name="adminForm" id="adminForm">
 	<?php if (!empty($this->sidebar)) : ?>
-	<div id="j-sidebar-container" class="span2">
+	<div id="j-sidebar-container" class="col-md-2">
 		<?php echo $this->sidebar; ?>
 	</div>
-	<div id="j-main-container" class="span10">
+	<div id="j-main-container" class="col-md-10">
 	<?php else : ?>
 	<div id="j-main-container">
 	<?php endif; ?>

diff --git a/administrator/components/com_cache/views/purge/tmpl/default.php b/administrator/components/com_cache/views/purge/tmpl/default.php
@@ -11,10 +11,10 @@
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_cache&view=purge'); ?>" method="post" name="adminForm" id="adminForm">
-	<div id="j-sidebar-container" class="span2">
+	<div id="j-sidebar-container" class="col-md-2">
 		<?php echo $this->sidebar; ?>
 	</div>
-	<div id="j-main-container" class="span10">
+	<div id="j-main-container" class="col-md-10">
 	<p><?php echo JText::_('COM_CACHE_PURGE_INSTRUCTIONS'); ?></p>
 	<input type="hidden" name="task" value="" />
 	<?php echo JHtml::_('form.token'); ?>

diff --git a/administrator/components/com_categories/models/forms/category.xml b/administrator/components/com_categories/models/forms/category.xml
@@ -91,7 +91,7 @@
 		type="text"
 		label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
 		description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
-		class="span12"
+		class="col-md-12"
 		size="45"
 		maxlength="255"
 	/>
@@ -101,7 +101,7 @@
 		type="text"
 		label="COM_CATEGORIES_FIELD_NOTE_LABEL"
 		description="COM_CATEGORIES_FIELD_NOTE_DESC"
-		class="span12"
+		class="col-md-12"
 		size="40"
 		maxlength="255"
 	/>
@@ -223,7 +223,7 @@
 		type="tag"
 		label="JTAG"
 		description="JTAG_DESC"
-		class="span12"
+		class="col-md-12"
 		multiple="true"
 	/>
 

diff --git a/administrator/components/com_categories/views/categories/tmpl/default.php b/administrator/components/com_categories/views/categories/tmpl/default.php
@@ -49,10 +49,10 @@
 }
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_categories&view=categories'); ?>" method="post" name="adminForm" id="adminForm">
-	<div id="j-sidebar-container" class="span2">
+	<div id="j-sidebar-container" class="col-md-2">
 		<?php echo $this->sidebar; ?>
 	</div>
-	<div id="j-main-container" class="span10">
+	<div id="j-main-container" class="col-md-10">
 		<?php
 		// Search tools bar
 		echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));

diff --git a/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php b/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php
@@ -16,21 +16,21 @@
 $extension = $this->escape($this->state->get('filter.extension'));
 ?>
 
-<div class="row-fluid">
-	<div class="control-group span6">
+<div class="row">
+	<div class="control-group col-md-6">
 		<div class="controls">
 			<?php echo JHtml::_('batch.language'); ?>
 		</div>
 	</div>
-	<div class="control-group span6">
+	<div class="control-group col-md-6">
 		<div class="controls">
 			<?php echo JHtml::_('batch.access'); ?>
 		</div>
 	</div>
 </div>
-<div class="row-fluid">
+<div class="row">
 	<?php if ($published >= 0) : ?>
-		<div class="span6">
+		<div class="col-md-6">
 			<div class="control-group">
 				<label id="batch-choose-action-lbl" for="batch-category-id" class="control-label">
 					<?php echo JText::_('JLIB_HTML_BATCH_MENU_LABEL'); ?>
@@ -48,7 +48,7 @@
 			</div>
 		</div>
 	<?php endif; ?>
-	<div class="control-group span6">
+	<div class="control-group col-md-6">
 		<div class="controls">
 			<?php echo JHtml::_('batch.tag'); ?>
 		</div>

diff --git a/administrator/components/com_categories/views/category/tmpl/edit.php b/administrator/components/com_categories/views/category/tmpl/edit.php
@@ -58,12 +58,12 @@
 		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
 
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'general', JText::_('JCATEGORY')); ?>
-		<div class="row-fluid">
-			<div class="span9">
+		<div class="row">
+			<div class="col-md-9">
 				<?php echo $this->form->getLabel('description'); ?>
 				<?php echo $this->form->getInput('description'); ?>
 			</div>
-			<div class="span3">
+			<div class="col-md-3">
 				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
 			</div>
 		</div>
@@ -72,11 +72,11 @@
 		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
 
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('COM_CATEGORIES_FIELDSET_PUBLISHING')); ?>
-		<div class="row-fluid form-horizontal-desktop">
-			<div class="span6">
+		<div class="row form-horizontal-desktop">
+			<div class="col-md-6">
 				<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
 			</div>
-			<div class="span6">
+			<div class="col-md-6">
 				<?php echo JLayoutHelper::render('joomla.edit.metadata', $this); ?>
 			</div>
 		</div>

diff --git a/administrator/components/com_checkin/views/checkin/tmpl/default.php b/administrator/components/com_checkin/views/checkin/tmpl/default.php
@@ -18,10 +18,10 @@
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_checkin'); ?>" method="post" name="adminForm" id="adminForm">
 <?php if (!empty( $this->sidebar)) : ?>
-	<div id="j-sidebar-container" class="span2">
+	<div id="j-sidebar-container" class="col-md-2">
 		<?php echo $this->sidebar; ?>
 	</div>
-	<div id="j-main-container" class="span10">
+	<div id="j-main-container" class="col-md-10">
 <?php else : ?>
 	<div id="j-main-container">
 <?php endif;?>

diff --git a/administrator/components/com_config/view/application/tmpl/default.php b/administrator/components/com_config/view/application/tmpl/default.php
@@ -35,9 +35,9 @@
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate">
-	<div class="row-fluid">
+	<div class="row">
 		<!-- Begin Sidebar -->
-		<div id="sidebar" class="span2">
+		<div id="sidebar" class="col-md-2">
 			<div class="sidebar-nav">
 				<?php echo $this->loadTemplate('navigation'); ?>
 				<?php
@@ -55,7 +55,7 @@
 		</div>
 		<!-- End Sidebar -->
 		<!-- Begin Content -->
-		<div class="span10">
+		<div class="col-md-10">
 			<ul class="nav nav-tabs">
 				<li class="active"><a href="#page-site" data-toggle="tab"><?php echo JText::_('JSITE'); ?></a></li>
 				<li><a href="#page-system" data-toggle="tab"><?php echo JText::_('COM_CONFIG_SYSTEM'); ?></a></li>
@@ -68,20 +68,20 @@
 			</ul>
 			<div id="config-document" class="tab-content">
 				<div id="page-site" class="tab-pane active">
-					<div class="row-fluid">
-						<div class="span6">
+					<div class="row">
+						<div class="col-md-6">
 							<?php echo $this->loadTemplate('site'); ?>
 							<?php echo $this->loadTemplate('metadata'); ?>
 						</div>
-						<div class="span6">
+						<div class="col-md-6">
 							<?php echo $this->loadTemplate('seo'); ?>
 							<?php echo $this->loadTemplate('cookie'); ?>
 						</div>
 					</div>
 				</div>
 				<div id="page-system" class="tab-pane">
-					<div class="row-fluid">
-						<div class="span12">
+					<div class="row">
+						<div class="col-md-12">
 							<?php echo $this->loadTemplate('system'); ?>
 							<?php echo $this->loadTemplate('debug'); ?>
 							<?php echo $this->loadTemplate('cache'); ?>
@@ -90,26 +90,26 @@
 					</div>
 				</div>
 				<div id="page-server" class="tab-pane">
-					<div class="row-fluid">
-						<div class="span6">
+					<div class="row">
+						<div class="col-md-6">
 							<?php echo $this->loadTemplate('server'); ?>
 							<?php echo $this->loadTemplate('locale'); ?>
 							<?php echo $this->loadTemplate('ftp'); ?>
 							<?php echo $this->loadTemplate('proxy'); ?>
 						</div>
-						<div class="span6">
+						<div class="col-md-6">
 							<?php echo $this->loadTemplate('database'); ?>
 							<?php echo $this->loadTemplate('mail'); ?>
 						</div>
 					</div>
 				</div>
 				<div id="page-permissions" class="tab-pane">
-					<div class="row-fluid">
+					<div class="row">
 						<?php echo $this->loadTemplate('permissions'); ?>
 					</div>
 				</div>
 				<div id="page-filters" class="tab-pane">
-					<div class="row-fluid">
+					<div class="row">
 						<?php echo $this->loadTemplate('filters'); ?>
 					</div>
 				</div>