details page: move permalink next to page title

diff --git a/lib/template/details-html.php b/lib/template/details-html.php
index b7a963738a01e38f01053b0f623be0f244637ecc..00d6ba6385b2d1b7bd26813e82dde58afe6d6192 100644 (file)
--- a/lib/template/details-html.php
+++ b/lib/template/details-html.php
@@ -97,7 +97,10 @@
     <div class="container">
         <div class="row">
             <div class="col-sm-10">
     <div class="container">
         <div class="row">
             <div class="col-sm-10">

-                <h1><?php echo $aPointDetails['localname'] ?></h1>
+                <h1>
+                    <?php echo $aPointDetails['localname'] ?>
+                    <small><?php echo detailsPermaLink($aPointDetails, 'link to this page') ?></small>
+                </h1>

             </div>
             <div class="col-sm-2 text-right">
                 <?php map_icon($aPointDetails['icon']) ?>
             </div>
             <div class="col-sm-2 text-right">
                 <?php map_icon($aPointDetails['icon']) ?>


@@ -119,7 +122,7 @@
                     }
                     kv('Coverage'        , ($aPointDetails['isarea']=='t'?'Polygon':'Point') );
                     kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );
                     }
                     kv('Coverage'        , ($aPointDetails['isarea']=='t'?'Polygon':'Point') );
                     kv('Centre Point'    , $aPointDetails['lat'].','.$aPointDetails['lon'] );

-                    kv('OSM'             , osmLink($aPointDetails) . ' ('.detailsPermaLink($aPointDetails, 'this page').')' );
+                    kv('OSM'             , osmLink($aPointDetails) );

                     if ($aPointDetails['wikipedia'])
                     {
                         kv('Wikipedia Calculated' , wikipediaLink($aPointDetails) );
                     if ($aPointDetails['wikipedia'])
                     {
                         kv('Wikipedia Calculated' , wikipediaLink($aPointDetails) );

diff --git a/website/css/details.css b/website/css/details.css
index f1234295f4d44378e6dfb8958531d9859d53a1db..171de42acaa6ca3694b5619d53510894583133db 100644 (file)
--- a/website/css/details.css
+++ b/website/css/details.css
@@ -2,6 +2,10 @@ h1 {
   margin: 10px 0;
   padding-left: 8px;
 }
   margin: 10px 0;
   padding-left: 8px;
 }

+h1 small a {
+  font-size: 0.5em;
+  white-space: nowrap;
+}

 h2 {
   font-size: 2em;
   padding-left: 8px;
 h2 {
   font-size: 2em;
   padding-left: 8px;

diff --git a/website/details.php b/website/details.php
index 9e8d99a43a9b2863cd6b4af5cced90a2590d2e6e..28df6d5f9cdbe71a08fd45dd6a1b2f6fd4bb799c 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -30,7 +30,7 @@ if ($sOsmType && $iOsmId > 0) {
     if ($sClass) {
         $sSQL .= " AND class='".$sClass."'";
     }
     if ($sClass) {
         $sSQL .= " AND class='".$sClass."'";
     }

-    $sSQL .= " ORDER BY type='postcode', class ASC";
+    $sSQL .= ' ORDER BY class ASC';

     $sPlaceId = chksql($oDB->getOne($sSQL));
 
     // Be nice about our error messages for broken geometry
     $sPlaceId = chksql($oDB->getOne($sSQL));
 
     // Be nice about our error messages for broken geometry