Skip to content

Commit dfed642

Browse files
mastervanleeuwenmastervanleeuwen
committed
Improve track update form styles
1 parent dc83ac8 commit dfed642

File tree

8 files changed

+53
-108
lines changed

8 files changed

+53
-108
lines changed

‎administrator/components/com_jtg/models/files.php‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -677,14 +677,7 @@ function getLevelList($selected = 0)
677677
}
678678
}
679679

680-
$size = count($levels);
681-
682-
if ( $size > 6)
683-
{
684-
$size = 6;
685-
}
686-
687-
return JHtml::_('select.genericlist', $levels, 'level', 'size="' . $size . '"', 'id', 'title', $selected);
680+
return JHtml::_('select.genericlist', $levels, 'level', 'class="form-select"', 'id', 'title', $selected);
688681
}
689682

690683
/**

‎administrator/components/com_jtg/views/files/tmpl/default.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
</tfoot>
7878
<tbody>
7979
<?php
80-
$k = 0;
8180
$missingcat = array();
8281
$missingterrain = false;
8382
$cfg = $this->cfg;
@@ -189,8 +188,7 @@
189188
$terrain = implode(", ", $terrain);
190189
}
191190
?>
192-
<tr class="<?php echo "row$k ";
193-
echo $k? 'row-odd':'row-even'; ?>">
191+
<tr>
194192
<!-- <td align="center"><?php echo $this->pagination->getRowOffset($i); ?></td>-->
195193
<td align="center"><?php echo $row->id; ?></td>
196194
<td align="center"><?php echo $checked; ?></td>
@@ -208,7 +206,6 @@
208206
<td align="center"><?php echo $user->username;?></td>
209207
</tr>
210208
<?php
211-
$k = 1 - $k;
212209
}
213210
?>
214211
</tbody>

‎administrator/components/com_jtg/views/files/tmpl/form.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@
117117

118118
<form action="" method="post" name="adminForm" id="adminForm"
119119
class="adminForm" enctype="multipart/form-data">
120-
<table class="adminlist">
120+
<table class="table table-striped">
121121
<thead>
122122
<tr>
123123
<th colspan="2" align="center"><h1><?php echo $title; ?></h1></th><th></th>
124124
</tr>
125125
</thead>
126126
<tbody>
127-
<tr class="row1 row-odd">
127+
<tr>
128128
<td>
129129
<?php
130130
echo JText::_('COM_JTG_GPS_FILE') . ":";
@@ -150,35 +150,35 @@ class="adminForm" enctype="multipart/form-data">
150150
if ($this->id >= 1)
151151
{
152152
?>
153-
<tr class="row0 row-even">
153+
<tr>
154154
<td>Id:</td>
155155
<td><?php echo $this->id; ?></td>
156156
</tr>
157157
<?php
158158
}
159159
?>
160-
<tr class="row1 row-odd">
160+
<tr>
161161
<td><?php echo JText::_('COM_JTG_PUBLISHED'); ?>:*</td>
162162
<td><?php echo $this->lists['published']; ?></td>
163163
</tr>
164-
<tr class="row0 row-even">
164+
<tr>
165165
<td><?php echo JText::_('COM_JTG_TITLE'); ?>:*</td>
166-
<td><input id="title" type="text" name="title"
166+
<td><input id="title" class="inputbox form-control" type="text" name="title"
167167
value="<?php echo (isset($this->id) AND ($this->id != 0))? $this->track->title: ''; ?>"
168168
size="30" /></td>
169169
</tr>
170-
<tr class="row1 row-odd">
170+
<tr>
171171
<td><?php echo JText::_('COM_JTG_DATE'); ?>:*</td>
172-
<td><input id="date" type="text" name="date"
172+
<td><input id="date" class="inputbox form-control" type="text" name="date"
173173
value="<?php echo (isset($this->id) AND ($this->id != 0))? $this->track->date: ''; ?>"
174174
size="10" /></td>
175175
</tr>
176-
<tr class="row0 row-even">
176+
<tr>
177177
<td><?php echo JText::_('COM_JTG_INFO_AUTHOR'); ?>:*<br />
178178
</td>
179179
<td><?php echo $this->lists['uid']; ?></td>
180180
</tr>
181-
<tr class="row1 row-odd">
181+
<tr>
182182
<td>
183183
<?php
184184
echo JText::_('COM_JTG_LEVEL').':*';
@@ -187,31 +187,31 @@ class="adminForm" enctype="multipart/form-data">
187187
</td>
188188
<td><?php echo $this->lists['level']; ?></td>
189189
</tr>
190-
<tr class="row0 row-even">
190+
<tr>
191191
<td><?php echo JText::_('COM_JTG_CAT'); ?>:</td>
192192
<td><?php echo $this->lists['cats']; ?></td>
193193
</tr>
194-
<tr class="row1 row-odd">
194+
<tr>
195195
<td><?php echo JText::_('COM_JTG_ACCESS_LEVEL'); ?>:</td>
196196
<td><?php echo $this->lists['access']; ?></td>
197197
</tr>
198-
<tr class="row0 row-even">
198+
<tr>
199199
<td><?php echo JText::_('COM_JTG_HIDDEN'); ?>:</td>
200200
<td><?php echo $this->lists['hidden']; ?></td>
201201
</tr>
202-
<tr class="row0 row-odd">
202+
<tr>
203203
<td><?php echo JText::_('COM_JTG_FILE_DEFAULT_MAP'); ?></td>
204204
<td><?php echo $this->lists['default_map']; ?></td>
205205
</tr>
206-
<tr class="row1 row-odd">
206+
<tr>
207207
<td><?php echo JText::_('COM_JTG_TERRAIN'); ?>:</td>
208208
<td><?php echo $this->lists['terrain']; ?></td>
209209
</tr>
210-
<tr class="row0 row-even">
210+
<tr>
211211
<td><?php echo JText::_('COM_JTG_CALCULATED_VALUES'); ?>:</td>
212212
<td><?php echo $this->lists['values']; ?></td>
213213
</tr>
214-
<tr class="row1 row-odd">
214+
<tr>
215215
<td colspan="3"><?php echo JText::_('COM_JTG_DESCRIPTION'); ?>:*
216216
<?php
217217
if ( isset($this->track->description) )
@@ -240,7 +240,7 @@ class="adminForm" enctype="multipart/form-data">
240240
";
241241
*/
242242
?>
243-
<tr class="row0 row-even">
243+
<tr>
244244
<td valign="top" colspan="3"><?php echo JText::_('COM_JTG_IMAGES'); ?>
245245
(max. 10): <input type="file" name="images[]" class="multi"
246246
maxlength="10"><br clear="all" /> <br /> <?php echo isset($this->images)? $this->images: ''; ?>

‎administrator/components/com_jtg/views/files/view.html.php‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -616,10 +616,6 @@ protected function _displayForm($tpl)
616616
$terrain = $model->getTerrain("*", true, " WHERE published=1 ");
617617
$user = JFactory::getUser();
618618
$uid = $user->get('id');
619-
$yesnolist = array(
620-
array('id' => 0, 'title' => JText::_('JNO')),
621-
array('id' => 1, 'title' => JText::_('JYES'))
622-
);
623619

624620
if (!isset($id))
625621
{
@@ -635,8 +631,8 @@ protected function _displayForm($tpl)
635631
$lists['terrain'] = JHtml::_('select.genericlist', $terrain, 'terrain[]', 'multiple="multiple" size="' . $size . '"', 'id', 'title', 0);
636632
$row->access = $access;
637633
$lists['uid'] = JHtml::_('list.users', 'uid', $uid, 1, null, 'name', 0);
638-
$lists['hidden'] = JHtml::_('select.genericlist', $yesnolist, 'hidden', 'class="inputbox" size="2"', 'id', 'title', 0);
639-
$lists['published'] = JHtml::_('select.genericlist', $yesnolist, 'published', 'class="inputbox" size="2"', 'id', 'title', 1);
634+
$lists['hidden'] = JHtml::_('select.booleanlist', 'hidden', null, 0);
635+
$lists['published'] = JHtml::_('select.booleanlist', 'published', null, 1);
640636
$lists['default_map'] = JHtml::_('select.genericlist', $default_map, 'default_map', 'size="1"', 'id', 'name', null);
641637

642638
$this->lists = $lists;
@@ -666,17 +662,17 @@ protected function _displayForm($tpl)
666662
*/
667663
$size = min(count($cats), 6);
668664
$trackids = explode(",", $track->catid);
669-
$lists['cats'] = JHtml::_('select.genericlist', $cats, 'catid[]', 'size="' . $size . '" multiple="multiple"', 'id', 'treename', $trackids, '', true);
665+
$lists['cats'] = JHtml::_('select.genericlist', $cats, 'catid[]', 'class="form-select" size="' . $size . '" multiple="multiple"', 'id', 'treename', $trackids, '', true);
670666
$size = min(count($terrain), 6);
671-
$lists['terrain'] = $error . JHtml::_('select.genericlist', $terrain, 'terrain[]', 'multiple="multiple" size="' . $size . '"', 'id', 'title', $terrainlist);
672-
$lists['default_map'] = JHtml::_('select.genericlist', $default_map, 'default_map', 'size="1"', 'id', 'name', $track->default_map);
667+
$lists['terrain'] = $error . JHtml::_('select.genericlist', $terrain, 'terrain[]', 'class="form-select" multiple="multiple" size="' . $size . '"', 'id', 'title', $terrainlist);
668+
$lists['default_map'] = JHtml::_('select.genericlist', $default_map, 'default_map', 'class="form-select" size="1"', 'id', 'name', $track->default_map);
673669

674670
// $row->access = $access;
675671
$lists['access'] = JtgHelper::getAccessList($access);
676672

677673
// $lists['access'] = JHtml::_('list.accesslevel', $row );
678-
$lists['hidden'] = JHtml::_('select.genericlist', $yesnolist, 'hidden', 'class="inputbox" size="2"', 'id', 'title', $track->hidden);
679-
$lists['uid'] = JHtml::_('list.users', 'uid', $track->uid, 1, null, 'name', 0);
674+
$lists['hidden'] = JHtml::_('select.booleanlist', 'hidden', null, $track->hidden);
675+
$lists['uid'] = JHtml::_('list.users', 'uid', $track->uid, 1, 'class="form-select"', 'name', 0);
680676

681677
$imagelist = $model->getImages($id);
682678

@@ -692,7 +688,7 @@ protected function _displayForm($tpl)
692688
}
693689
$images .= "</div>";
694690

695-
$lists['published'] = JHtml::_('select.genericlist', $yesnolist, 'published', 'class="inputbox" size="2"', 'id', 'title', $track->published);
691+
$lists['published'] = JHtml::_('select.booleanlist', 'published', null, $track->published);
696692
$lists['values'] = JtgHelper::giveGeneratedValues('backend', $this->buildImageFiletypes($track->istrack, $track->iswp, $track->isroute, $track->iscache), $track);
697693
$lists['level'] = $model->getLevelList($track->level);
698694
$this->lists = $lists;

‎components/com_jtg/assets/template/default/jtg_style.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ ul.rating li.ten a:hover {
230230
}
231231

232232
.jtg-photo-input {
233+
width: auto;
233234
margin: 5px;
234235
}
235236

‎components/com_jtg/helpers/helper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ static public function getAccessList($accesslevel=0, $name='access' , $js=null)
537537
)
538538
);
539539

540-
return JHtml::_('select.genericlist', $access, $name, 'class="inputbox" size="4" ' . $js, 'id', 'text', $accesslevel);
540+
return JHtml::_('select.genericlist', $access, $name, 'class="form-select"' . $js, 'id', 'text', $accesslevel);
541541

542542
}
543543

‎components/com_jtg/models/track.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class JtgModelTrack extends ItemModel
4545
*/
4646
function getLevelSelect ($selected)
4747
{
48-
$return = "<select name=\"level\">\n";
48+
$return = "<select name=\"level\" class=\"form-select\">\n";
4949
$cfg = JtgHelper::getConfig();
5050
$levels = explode("\n", $cfg->level);
5151
array_unshift($levels, 'dummy');

0 commit comments

Comments
 (0)