Skip to content

Commit 2db4c5f

Browse files
mastervanleeuwenmastervanleeuwen
committed
Import form: improve layout, bug fix for common settings
1 parent 0991acf commit 2db4c5f

File tree

1 file changed

+50
-50
lines changed
  • administrator/components/com_jtg/views/files/tmpl

1 file changed

+50
-50
lines changed

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

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
JToolBarHelper::deleteList('COM_JTG_VALIDATE_DELETE_ITEMS', 'removeFromImport');
3737
JToolBarHelper::help('files/import', true);
3838
$document = JFactory::getDocument();
39-
$style = " .row00 {background-color: #FFFF99;}\n";
39+
$style = " #row00 {--table-bg: #FFFF99;}\n";
40+
$style .= " .table-admin {--table-bg: var(--admin-background);}\n";
4041

4142
if (version_compare(JVERSION, '3.0', 'ge'))
4243
{
@@ -104,7 +105,7 @@ class="adminForm" enctype="multipart/form-data">
104105

105106
$cfg = JtgHelper::getConfig();
106107
$levels = explode("\n", $cfg->level);
107-
$toggle['level'] = "<select name=\"level_all\" size=\"6\" onclick=\"setSelect('level');\">
108+
$toggle['level'] = "<label for=\"level_all\">".JText::_('COM_JTG_LEVEL')."</label>\n<select name=\"level_all\" class=\"form-select\" onchange=\"setSelect('level');\">
108109
<option value=\"0\">" . JText::_('COM_JTG_SELECT') . "</option>";
109110
$i = 1;
110111

@@ -119,38 +120,38 @@ class="adminForm" enctype="multipart/form-data">
119120

120121
$toggle['level'] .= " </select>\n";
121122

122-
// <td colspan=\"2\" align=\"right\"> <b>" . JText::_('COM_JTG_PRESELECTION') . "==></b><br /><br />"
123+
// <td> <b>" . JText::_('COM_JTG_PRESELECTION') . "==></b><br /><br />"
123124
// . JText::_('COM_JTG_PRESELECTION_DESCRIPTION') . "</td>
124125
$trackForm = $this->getModel()->getForm();
125126
$tagField = $trackForm->getField('tags');
126127
$tagField->__set('onchange',"setSelectTags('tags')");
127128
$tagField->__set('name',"tags_all");
128129
$tagField->__set('id',"tags_all");
129130
$table = (" <tbody>\n
130-
<tr class=\"row00\">
131-
<td ><input type=\"checkbox\" onclick=\"Joomla.checkAll(this)\" title=\"" . JText::_('JGLOBAL_CHECK_ALL')
131+
<tr id=\"row00\">
132+
<td style=\"padding-top: 6em;\"><input type=\"checkbox\" onclick=\"Joomla.checkAll(this)\" title=\"" . JText::_('JGLOBAL_CHECK_ALL')
132133
. "\" value=\"\" checked=\"checked\" name=\"checkall-toggle\"></td>
133-
<td> </td> <td>".$tagField->renderField()." </td>
134-
<td>" . $toggle['level'] . "</td>
135-
<td>" . JHtml::_('select.genericlist', $cats, 'catid_all[]', 'size="' . $catssize . '" multiple="multiple" onclick="setSelectMultiple(\'catid\')"', 'id', 'treename')
134+
<td>".$tagField->renderField()."\n"
135+
. $toggle['level'] . "</td>
136+
<td>" . JHtml::_('select.genericlist', $cats, 'catid_all[]', 'size="' . $catssize . '" multiple="multiple" class="form-select" onclick="setSelectMultiple(\'catid\')"', 'id', 'treename')
136137
. "<br /><small>" . JText::_('COM_JTG_MULTIPLE_CHOICE_POSSIBLE') . "</small></td>
137-
<td>" . JHtml::_('select.genericlist', $terrain, 'terrain_all[]', 'size="' . $terrainsize . '" multiple="multiple" onclick="setSelectMultiple(\'terrain\')"', 'id', 'title')
138+
<td>" . JHtml::_('select.genericlist', $terrain, 'terrain_all[]', 'size="' . $terrainsize . '" class="form-select" multiple="multiple" onclick="setSelectMultiple(\'terrain\')"', 'id', 'title')
138139
. "<br /><small>" . JText::_('COM_JTG_MULTIPLE_CHOICE_POSSIBLE') . "</small></td>
139-
<td>" . JHtml::_('select.genericlist', $userslist, 'uid_all', 'class="inputbox" size="' . $userslistsize . '" onclick="setSelect(\'uid\')"', 'id', 'title', $me->id) . "</td>
140-
<td>" . JtgHelper::getAccessList(0, "access_all", "onclick=\"setSelect('access')\"") . "</td>
141-
<td>" . JHtml::_('select.genericlist', $yesnolist, 'hidden_all', 'class="inputbox" size="1" onclick="setSelect(\'hidden\')"', 'id', 'title') . "</td>
140+
<td><label for=\"uid_all\">".JText::_('COM_JTG_INFO_AUTHOR')."</label>" . JHtml::_('select.genericlist', $userslist, 'uid_all', 'class="form-select" size="' . $userslistsize . '" onchange="setSelect(\'uid\')"', 'id', 'title', $me->id) ."\n"
141+
. "<label for=\"access_all\">".JText::_('COM_JTG_ACCESS_LEVEL')."</label>". JtgHelper::getAccessList(0, "access_all", "onchange=\"setSelect('access')\"") . "\n"
142+
. "<label for=\"hidden_all\">".JText::_('COM_JTG_HIDDEN')."</label>" . JHtml::_('select.genericlist', $yesnolist, 'hidden_all', 'class="form-select" size="1" onchange="setSelect(\'hidden\')"', 'id', 'title') . "</td>
142143
</tr>
143144
");
144145

145146
if ( $files !== false )
146147
{
147148
foreach ($files AS $file)
148149
{
149-
$row = (1 - $row);
150-
$lists['cats'] = JHtml::_('select.genericlist',
150+
$lists['cats'] = '<label for="catid_">' . JText::_('COM_JTG_CAT') . "</label>\n" .
151+
JHtml::_('select.genericlist',
151152
$cats,
152153
'catid_' . $count . '[]',
153-
'multiple="multiple" size="' . $catssize . '"',
154+
'multiple="multiple" class="form-select" size="' . $catssize . '"',
154155
'id', 'treename' );
155156
if (version_compare(JVERSION, '4.0', 'ge'))
156157
{
@@ -165,15 +166,18 @@ class="adminForm" enctype="multipart/form-data">
165166
$buttons = array(
166167
"pagebreak",
167168
"readmore");
168-
$lists['access'] = JtgHelper::getAccessList(0, "access_" . $count);
169-
$lists['uid'] = JHtml::_('select.genericlist', $userslist, 'uid_' . $count, ' size="' . $userslistsize . '"', 'id', 'title', $me->id);
169+
$lists['access'] = "<label for=\"access_".$count."\">". JText::_('COM_JTG_ACCESS_LEVEL')."</label>".JtgHelper::getAccessList(0, "access_" . $count);
170+
$lists['uid'] = '<label for="uid_' . $count . '">' . JText::_('COM_JTG_INFO_AUTHOR') . "</label>\n" .
171+
JHtml::_('select.genericlist', $userslist, 'uid_' . $count, ' size="' . $userslistsize . '" class="form-select"', 'id', 'title', $me->id);
170172

171173
// genericlist($arr, $name, $attribs=null, $key= 'value', $text= 'text', $selected = null, $idtag = false, $translate = false)
172-
$lists['hidden'] = JHtml::_('select.genericlist', $yesnolist, 'hidden_' . $count, 'class="inputbox" size="2"', 'id', 'title', 0);
173-
$lists['terrain'] = JHtml::_('select.genericlist',
174+
$lists['hidden'] = '<label for="hidden_' . $count . '">' . JText::_('COM_JTG_HIDDEN') . "</label>\n" .
175+
JHtml::_('select.genericlist', $yesnolist, 'hidden_' . $count, 'class="form-select" size="1"', 'id', 'title', 0);
176+
$lists['terrain'] = '<label for="terrain_' . $count . '">' . JText::_('COM_JTG_TERRAIN') . "</label>\n" .
177+
JHtml::_('select.genericlist',
174178
$terrain,
175179
'terrain_' . $count . '[]',
176-
'multiple="multiple" size="' . $terrainsize . '"',
180+
'multiple="multiple" size="' . $terrainsize . '" class="form-select"',
177181
'id', 'title');
178182

179183
jimport('joomla.filesystem.file');
@@ -277,18 +281,18 @@ class="adminForm" enctype="multipart/form-data">
277281
$color = "lightgrey";
278282
}
279283

280-
$table .= " <tr class=\"row$row " . ($row? "row-odd":"row-even") . "\">\n<td colspan=\"9\">" . JText::_('COM_JTG_GPS_FILE') . ':<b> ' . $filename . '</b>: <b><font color=\"red\">' . $tt . "</font></b><br /></tr>\n";
284+
$table .= " <tr>\n<td colspan=\"5\">" . JText::_('COM_JTG_GPS_FILE') . ':<b> ' . $filename . '</b>: <b><font color=\"red\">' . $tt . "</font></b><br /></tr>\n";
281285
}
282286
else
283287
{
284-
$table .= " <tr class=\"row$row " . ($row? "row-odd":"row-even") . "\">\n<td colspan=\"9\">" . JText::_('COM_JTG_GPS_FILE') . ':<b> ' . $filename . '</b>: ' . JText::_('COM_JTG_TT_FILEOKAY') . "</tr>\n";
288+
$table .= " <tr>\n<td colspan=\"5\">" . JText::_('COM_JTG_GPS_FILE') . ':<b> ' . $filename . '</b>: ' . JText::_('COM_JTG_TT_FILEOKAY') . "</tr>\n";
285289
}
286290

287-
$table .= (" <tr class=\"row$row " . ($row? "row-odd":"row-even") . "\">\n");
291+
$table .= (" <tr>\n");
288292

289293
// Row: Selector + Date
290294
{
291-
$table .= '<td nowrap>' . $filename_exists;
295+
$table .= '<td nowrap style="padding-top:8em;">' . $filename_exists;
292296

293297
/*
294298
* ($check === true) eine Spur mit Punkten an erster Stelle vorhanden
@@ -312,34 +316,34 @@ class="adminForm" enctype="multipart/form-data">
312316
$table .= ("<input type=\"checkbox\" checked=\"checked\" id=\"cb" . $count . "\" value=\"" . $file . "\" name=\"import_" . $count . "\" onclick=\"Joomla.isChecked(this.checked);\" /></td>\n");
313317
}
314318

315-
$table .= (" <td><input id=\"date_" . $count . "\" type=\"text\" name=\"date_" . $count . "\" size=\"10\" value=\"");
316-
317-
if ($date === false)
318-
{
319-
$table .= (date('Y-m-d', time()) . '" /><font color=\"orange\">&nbsp;</font></td>');
320-
}
321-
else
322-
{
323-
$table .= ($date . "\" /></td>");
324-
}
325319
}
326320

327321
// Row: GPS filename / Title
328322
{
329323
$table .= (" <td>");
330324
$table .= ("<input type=\"hidden\" name=\"file_" . $count . "\" value=\"" . $file . "\" />\n");
331-
$table .= "\n <input id=\"title_" . $count . "\" type=\"text\" name=\"title_" . $count . "\" value=\"" . $title . "\" size=\"30\" />\n";
325+
$table .= "\n <label for=\"title_" . $count . "\">".JText::_('COM_JTG_TITLE')."</label>";
326+
$table .= "\n <input id=\"title_" . $count . "\" type=\"text\" class=\"inputbox form-control\" name=\"title_" . $count . "\" value=\"" . $title . "\" size=\"40\" />\n";
327+
328+
if ($date === false)
329+
{
330+
$date = date('Y-m-d', time());
331+
}
332+
$table .= " <label for=\"date_" . $count . "\">" .JText::_('COM_JTG_DATE') . "</label>";
333+
$table .= (" <input id=\"date_" . $count . "\" type=\"text\" class=\"inputbox form-control\" name=\"date_" . $count . "\" size=\"10\" value=\"" . $date . "\" />");
334+
332335
$tagField = $trackForm->getField('tags');
333336
$tagField->__set('name','tags_'.$count);
334337
$tagField->__set('id','tags_'.$count);
335338
$table .= $tagField->renderField();
336-
$table .= "</td>\n";
339+
$table .= "\n";
337340
}
338341

339342
// Row: Difficulty level
340343
{
341-
$table .= " <td>\n";
342-
$table .= " <select id=\"level_" . $count . "\" name=\"level_" . $count . "\" size=\"6\"\n>
344+
$table .= " \n";
345+
$table .= " <label for=\"level_" . $count . "\">" . JText::_('COM_JTG_LEVEL') . "</label>\n";;
346+
$table .= " <select id=\"level_" . $count . "\" name=\"level_" . $count . "\" class=\"form-select\">
343347
<option>" . JText::_('COM_JTG_SELECT') . "</option>\n";
344348
$i = 1;
345349

@@ -363,21 +367,21 @@ class="adminForm" enctype="multipart/form-data">
363367
$table .= (" <td>" . $lists['terrain'] . "</td>\n");
364368

365369
// Row: Author
366-
$table .= (" <td>" . $lists['uid'] . "</td>\n");
370+
$table .= (" <td>" . $lists['uid'] . "\n");
367371

368372
// Row: Acces level
369-
$table .= (" <td>" . $lists['access'] . "</td>\n");
373+
$table .= (" " . $lists['access'] . "\n");
370374

371375
// Row: Hidden
372-
$table .= (" <td>" . $lists['hidden'] . "</td>\n");
376+
$table .= (" " . $lists['hidden'] . "</td>\n");
373377

374378
// Row: NULL
375379
$table .= (" \n");
376380

377-
$table .= (" </tr>\n<tr class=\"row$row " . ($row? "row-odd":"row-even") . "\">\n");
381+
$table .= (" </tr>\n<tr>\n");
378382

379383
// Row: Decription
380-
$table .= (" <td>&nbsp;&nbsp;</td><td colspan='8'>" . JText::_('COM_JTG_DESCRIPTION') . ":<br />\n" . $lists['description'] . "</td>\n");
384+
$table .= (" <td>&nbsp;&nbsp;</td><td colspan='4'>" . JText::_('COM_JTG_DESCRIPTION') . ":<br />\n" . $lists['description'] . "</td>\n");
381385

382386
$table .= (" \n");
383387
$table .= (" </tr>\n");
@@ -393,18 +397,14 @@ class="adminForm" enctype="multipart/form-data">
393397
}
394398
}
395399

396-
$table_header = (" <table class=\"adminlist\" cellpadding=\"1\">
400+
$table_header = (" <table class=\"table table-admin\">
397401
<thead>
398402
<tr>
399403
<th class=\"title\" width=\"1\">&nbsp;</th>
400-
<th class=\"title\" width=\"1\">" . JText::_('COM_JTG_DATE') . "</th>
401-
<th class=\"title\" width=\"1\">" . JText::_('COM_JTG_TITLE') . "</th>
402-
<th class=\"title\" width=\"1\">" . JText::_('COM_JTG_LEVEL') . "</th>
404+
<th class=\"title\" width=\"1\"></th>
403405
<th class=\"title\" width=\"1\">" . JText::_('COM_JTG_CAT') . "</th>
404406
<th class=\"title\" width=\"1\">" . JText::_('COM_JTG_TERRAIN') . "</th>
405-
<th class=\"title\" width=\"1\">" . JText::_('COM_JTG_INFO_AUTHOR') . "</th>
406-
<th class=\"title\" width=\"1\">" . JText::_('COM_JTG_ACCESS_LEVEL') . "</th>
407-
<th class=\"title\" width=\"1\">" . JText::_('COM_JTG_HIDDEN') . "</th>
407+
<th class=\"title\" width=\"1\"></th>
408408
</tr>
409409
</thead>\n");
410410

0 commit comments

Comments
 (0)