hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: columns nicer aligned in details table(s)

Browse Source
This commit is contained in:
marc tobias
2016-02-06 12:39:51 +01:00
parent 4cade95b24
commit 634d04068d
2 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/template/details-html.php
View File

@@ -13,7 +13,14 @@
function headline($sTitle) function headline($sTitle)
{ {
echo "<h2>".$sTitle."</h2>\n"; // echo "<h2>".$sTitle."</h2>\n";
echo "<tr class='all-columns'><td colspan='6'><h2>".$sTitle."</h2></td></tr>\n";
}
function headline3($sTitle)
{
// echo "<h2>".$sTitle."</h2>\n";
echo "<tr class='all-columns'><td colspan='6'><h3>".$sTitle."</h3></td></tr>\n";
} }
function osm_link($aFeature) function osm_link($aFeature)
@@ -97,15 +104,15 @@
function _one_row($aAddressLine){ function _one_row($aAddressLine){
$bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f'); $bNotUsed = (isset($aAddressLine['isaddress']) && $aAddressLine['isaddress'] == 'f');
echo '<tr class="' . ($bNotUsed?'notused':'') . '">'; echo '<tr class="' . ($bNotUsed?'notused':'') . '">'."\n";
echo ' <td class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>').'</td>'; echo ' <td class="name">'.(trim($aAddressLine['localname'])?$aAddressLine['localname']:'<span class="noname">No Name</span>')."</td>\n";
echo ' <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . '</td>'; echo ' <td>' . $aAddressLine['class'].':'.$aAddressLine['type'] . "</td>\n";
echo ' <td>' . osm_link($aAddressLine) . '</td>'; echo ' <td>' . osm_link($aAddressLine) . "</td>\n";
echo ' <td>' . (isset($aAddressLine['admin_level']) ? $aAddressLine['admin_level'] : '') . '</td>'; echo ' <td>' . (isset($aAddressLine['admin_level']) ? $aAddressLine['admin_level'] : '') . "</td>\n";
// echo '<td>' . (isset($aAddressLine['rank_search_label']) ? $aAddressLine['rank_search_label'] : '') .'</td>'; // echo '<td>' . (isset($aAddressLine['rank_search_label']) ? $aAddressLine['rank_search_label'] : '') ."</td>\n";
// echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>'; // echo ', <span class="area">'.($aAddressLine['fromarea']=='t'?'Polygon':'Point').'</span>';
echo ' <td>' . format_distance($aAddressLine['distance']).'</td>';; echo ' <td>' . format_distance($aAddressLine['distance'])."</td>\n";
echo ' <td>' . nominatim_link($aAddressLine,'details &gt;') . '</td>';; echo ' <td>' . nominatim_link($aAddressLine,'details &gt;') . "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
} }
@@ -184,8 +191,6 @@
} }
?> ?>
</tbody>
</table>
<?php <?php
@@ -193,12 +198,10 @@
if ($aLinkedLines) if ($aLinkedLines)
{ {
headline('Linked Places'); headline('Linked Places');
echo '<table id="linked" class="table table-striped table-responsive">';
foreach($aLinkedLines as $aAddressLine) foreach($aLinkedLines as $aAddressLine)
{ {
_one_row($aAddressLine); _one_row($aAddressLine);
} }
echo '</table>';
} }
@@ -220,7 +223,7 @@
echo '<div>'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'."</div>\n"; echo '<div>'.($aRow['word_token'][0]==' '?'*':'').$aRow['word_token'].'('.$aRow['word_id'].')'."</div>\n";
} }
} }
if (sizeof($aParentOfLines)) if (sizeof($aParentOfLines))
{ {
headline('Parent Of'); headline('Parent Of');
@@ -238,14 +241,12 @@
foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines) foreach($aGroupedAddressLines as $sGroupHeading => $aParentOfLines)
{ {
$sGroupHeading = ucwords($sGroupHeading); $sGroupHeading = ucwords($sGroupHeading);
echo "<h3>$sGroupHeading</h3>\n"; headline3($sGroupHeading);
echo '<table id="linked" class="table table-striped table-responsive">';
foreach($aParentOfLines as $aAddressLine) foreach($aParentOfLines as $aAddressLine)
{ {
_one_row($aAddressLine); _one_row($aAddressLine);
} }
echo '</table>';
} }
if (sizeof($aParentOfLines) >= 500) { if (sizeof($aParentOfLines) >= 500) {
echo '<p>There are more child objects which are not shown.</p>'; echo '<p>There are more child objects which are not shown.</p>';
@@ -254,6 +255,8 @@
// headline('Other Parts'); // headline('Other Parts');
// headline('Linked To'); // headline('Linked To');
echo "</table>\n";
?> ?>
</div> </div>

11
website/css/details.css
View File

@@ -5,11 +5,22 @@ h1 {
h2 { h2 {
font-size: 2em; font-size: 2em;
padding-left: 8px; padding-left: 8px;
background-color: white;
} }
h3 { h3 {
font-size: 1.5em; font-size: 1.5em;
padding-left: 8px; padding-left: 8px;
} }
tr.all-columns {
background-color: white !important;
border: none;
}
tr.all-columns td {
border-top: none !important;
padding-left: 0 !important;
}
.table { .table {
width: 100%; width: 100%;
} }