Skip to content

Commit a699437

Browse files
C-LodderC-Lodder
authored
Merge pull request #23 from C-Lodder/grid
Dashboard and Installation - BS4 integration
2 parents c781cfa + 9c5becb commit a699437

File tree

195 files changed

+1581
-1280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+1581
-1280
lines changed

‎administrator/components/com_admin/views/help/tmpl/default.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
JHtml::_('bootstrap.tooltip');
1313
?>
1414
<form action="<?php echo JRoute::_('index.php?option=com_admin&amp;view=help'); ?>" method="post" name="adminForm" id="adminForm">
15-
<div class="row-fluid">
16-
<div id="sidebar" class="span3">
15+
<div class="row">
16+
<div id="sidebar" class="col-md-3">
1717
<div class="clearfix"></div>
1818
<div class="sidebar-nav">
1919
<ul class="nav nav-list">
@@ -32,7 +32,7 @@
3232
</ul>
3333
</div>
3434
</div>
35-
<div class="span9">
35+
<div class="col-md-9">
3636
<iframe name="helpFrame" height="2100px" src="<?php echo $this->page; ?>" class="helpFrame table table-bordered"></iframe>
3737
</div>
3838
</div>

‎administrator/components/com_admin/views/sysinfo/tmpl/default.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
?>
1515

1616
<form action="<?php echo JRoute::_('index.php?option=com_admin&view=sysinfo'); ?>" method="post" name="adminForm" id="adminForm">
17-
<div class="row-fluid">
17+
<div class="row">
1818
<!-- Begin Content -->
19-
<div class="span12">
19+
<div class="col-md-12">
2020
<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'site')); ?>
2121

2222
<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'site', JText::_('COM_ADMIN_SYSTEM_INFORMATION')); ?>

‎administrator/components/com_banners/models/forms/banner.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
8181
description="JGLOBAL_FIELD_VERSION_NOTE_DESC"
8282
maxlength="255"
83-
class="span12"
83+
class="col-md-12"
8484
size="45"
8585
labelclass="control-label"
8686
/>

‎administrator/components/com_banners/models/forms/client.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
type="textarea"
145145
label="COM_BANNERS_FIELD_EXTRAINFO_LABEL"
146146
description="COM_BANNERS_FIELD_EXTRAINFO_DESC"
147-
class="span12"
147+
class="col-md-12"
148148
rows="5"
149149
cols="80"
150150
/>

‎administrator/components/com_banners/views/banner/tmpl/edit.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'details')); ?>
5555

5656
<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'details', JText::_('COM_BANNERS_BANNER_DETAILS')); ?>
57-
<div class="row-fluid">
58-
<div class="span9">
57+
<div class="row">
58+
<div class="col-md-9">
5959
<?php echo $this->form->renderField('type'); ?>
6060
<div id="image">
6161
<?php echo $this->form->renderFieldset('image'); ?>
@@ -68,7 +68,7 @@
6868
echo $this->form->renderField('description');
6969
?>
7070
</div>
71-
<div class="span3">
71+
<div class="col-md-3">
7272
<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
7373
</div>
7474
</div>
@@ -79,11 +79,11 @@
7979
<?php echo JHtml::_('bootstrap.endTab'); ?>
8080

8181
<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('JGLOBAL_FIELDSET_PUBLISHING')); ?>
82-
<div class="row-fluid form-horizontal-desktop">
83-
<div class="span6">
82+
<div class="row form-horizontal-desktop">
83+
<div class="col-md-6">
8484
<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
8585
</div>
86-
<div class="span6">
86+
<div class="col-md-6">
8787
<?php echo $this->form->renderFieldset('metadata'); ?>
8888
</div>
8989
</div>

‎administrator/components/com_banners/views/banners/tmpl/default.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
}
3030
?>
3131
<form action="<?php echo JRoute::_('index.php?option=com_banners&view=banners'); ?>" method="post" name="adminForm" id="adminForm">
32-
<div id="j-sidebar-container" class="span2">
32+
<div id="j-sidebar-container" class="col-md-2">
3333
<?php echo $this->sidebar; ?>
3434
</div>
35-
<div id="j-main-container" class="span10">
35+
<div id="j-main-container" class="col-md-10">
3636
<?php
3737
// Search tools bar
3838
echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));

‎administrator/components/com_banners/views/banners/tmpl/default_batch_body.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
$published = $this->state->get('filter.published');
1313
?>
1414

15-
<div class="row-fluid">
16-
<div class="control-group span6">
15+
<div class="row">
16+
<div class="control-group col-md-6">
1717
<div class="controls">
1818
<?php echo JHtml::_('batch.language'); ?>
1919
</div>
2020
</div>
21-
<div class="control-group span6">
21+
<div class="control-group col-md-6">
2222
<div class="controls">
2323
<?php echo JHtml::_('banner.clients'); ?>
2424
</div>
2525
</div>
2626
</div>
27-
<div class="row-fluid">
27+
<div class="row">
2828
<?php if ($published >= 0) : ?>
29-
<div class="control-group span6">
29+
<div class="control-group col-md-6">
3030
<div class="controls">
3131
<?php echo JHtml::_('batch.item', 'com_banners'); ?>
3232
</div>

‎administrator/components/com_banners/views/client/tmpl/edit.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
3333

3434
<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'general', empty($this->item->id) ? JText::_('COM_BANNERS_NEW_CLIENT') : JText::_('COM_BANNERS_EDIT_CLIENT')); ?>
35-
<div class="row-fluid">
36-
<div class="span9">
35+
<div class="row">
36+
<div class="col-md-9">
3737
<?php
3838
echo $this->form->renderField('contact');
3939
echo $this->form->renderField('email');
@@ -43,7 +43,7 @@
4343
echo $this->form->renderFieldset('extra');
4444
?>
4545
</div>
46-
<div class="span3">
46+
<div class="col-md-3">
4747
<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
4848
</div>
4949
</div>

‎administrator/components/com_banners/views/clients/tmpl/default.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
$params = (isset($this->state->params)) ? $this->state->params : new JObject;
2323
?>
2424
<form action="<?php echo JRoute::_('index.php?option=com_banners&view=clients'); ?>" method="post" name="adminForm" id="adminForm">
25-
<div id="j-sidebar-container" class="span2">
25+
<div id="j-sidebar-container" class="col-md-2">
2626
<?php echo $this->sidebar; ?>
2727
</div>
28-
<div id="j-main-container" class="span10">
28+
<div id="j-main-container" class="col-md-10">
2929
<?php
3030
// Search tools bar
3131
echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));

‎administrator/components/com_banners/views/tracks/tmpl/default.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
?>
1818
<form action="<?php echo JRoute::_('index.php?option=com_banners&view=tracks'); ?>" method="post" name="adminForm" id="adminForm">
1919
<?php if (!empty( $this->sidebar)) : ?>
20-
<div id="j-sidebar-container" class="span2">
20+
<div id="j-sidebar-container" class="col-md-2">
2121
<?php echo $this->sidebar; ?>
2222
</div>
23-
<div id="j-main-container" class="span10">
23+
<div id="j-main-container" class="col-md-10">
2424
<?php else : ?>
2525
<div id="j-main-container">
2626
<?php endif;?>

0 commit comments

Comments
 (0)