safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Merge pull request #361 from mtmail/detail-page-big-table2

Browse Source 
UI: columns nicer aligned in details table(s)
This commit is contained in:
Sarah Hoffmann
2016-02-06 12:51:47 +01:00
parent 40588482a2 c2b68c337b
commit 8b491e8544
2 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

11
website/css/details.css
View File

@@ -5,11 +5,22 @@ h1 {
h2 {
font-size: 2em;
padding-left: 8px;
background-color: white;
}
h3 {
font-size: 1.5em;
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 {
width: 100%;
}