]> git.openstreetmap.org Git - nominatim.git/commitdiff
projects / nominatim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 4058848 c2b68c3)
Merge pull request #361 from mtmail/detail-page-big-table2
authorSarah Hoffmann <lonvia@denofr.de>
Sat, 6 Feb 2016 11:51:47 +0000 (12:51 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Sat, 6 Feb 2016 11:51:47 +0000 (12:51 +0100)
UI: columns nicer aligned in details table(s)

1  2 
lib/template/details-html.php patch | diff1 | diff2 | blob | history

diff --combined lib/template/details-html.php
index ec4a21086c67ec855e54a7c1f1fb351dfd350652,d5c1825207f65396c0ad1b1d27995da1705a4bfd..6845cbb22821df791093d0ce3b5d4a187faa2ec5
--- 1/lib/template/details-html.php
--- 2/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@@ -6,13 -6,19 +6,18 @@@
        <link href="css/details.css" rel="stylesheet" type="text/css" />
  </head>
  
 -<?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
  
  
  <?php
  
        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 -102,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";
        }
  
@@@ -113,7 -119,6 +118,7 @@@
  
  
  <body id="details-page">
 +      <?php include(CONST_BasePath.'/lib/template/includes/html-top-navigation.php'); ?>
        <div class="container">
                <div class="row">
                        <div class="col-sm-10">
@@@ -184,8 -189,6 +189,6 @@@
                                        }
                                ?>
        
-                               </tbody>
-                       </table>
  
  
  <?php
@@@ -193,12 -196,10 +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 +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 +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 +253,8 @@@
  
        // headline('Other Parts');
        // headline('Linked To');
+ 
+       echo "</table>\n";
  ?>
  
                        </div>
@@@ -261,23 -262,13 +262,23 @@@
        </div>
  
        <script type="text/javascript">
 +      <?php
  
 -              var nominatim_result = {
 -                      outlinestring: '<?php echo $aPointDetails['outlinestring'];?>',
 -                      lon: <?php echo $aPointDetails['lon'];?>,
 -                      lat: <?php echo $aPointDetails['lat'];?>,
 -              };
 +    $aNominatimMapInit = [
 +      'tile_url' => $sTileURL,
 +      'tile_attribution' => $sTileAttribution
 +    ];
 +    echo 'var nominatim_map_init = ' . json_encode($aNominatimMapInit, JSON_PRETTY_PRINT) . ';';
  
 +    $aPlace = [
 +                      'outlinestring' => $aPointDetails['outlinestring'],
 +                      'lon' => $aPointDetails['lon'],
 +                      'lat' => $aPointDetails['lat'],
 +    ];
 +        echo 'var nominatim_result = ' . json_encode($aPlace, JSON_PRETTY_PRINT) . ';'; 
 +
 +
 +  ?>
        </script>
  
  
Open Source search based on OpenStreetMap data