path-infos simplification

diff --git a/application/views/scripts/idx/index.phtml b/application/views/scripts/idx/index.phtml
index da47129aee588b2f9470c1a354731aff3601bb98..1e34d35f8791c35b93e02c0f3d6247633366f2fa 100644 (file)
--- a/application/views/scripts/idx/index.phtml
+++ b/application/views/scripts/idx/index.phtml
@@ -71,12 +71,9 @@ if ($this->errorMsg) {
                 <div id="path-infos-content" class="menu-item">
 
                     <div id="path-directlink-title" class="info-title"><?php echo $this->translate("direct link")?></div>
-                    <div id="path-directlink-content"><?php
-                            $serverUrl = rtrim($this->serverUrl(), '/');
-                            $baseUrl = trim($this->baseUrl(), '/');
-                            $fullBaseUrl = $serverUrl . '/' . ($baseUrl ? ($baseUrl . '/'): '');
+                    <div id="path-directlink-content" class="info-content"><?php
                             $urlcomp = urlencode($this->path->urlcomp ?: $this->path->id);
-                            $href = $fullBaseUrl . 'idx/' . $urlcomp . '?format=raw';
+                            $href = $this->baseUrl() . '/idx/' . $urlcomp . '?format=raw';
                             printf('<a href="%s" title="%s">%s</a>',
                                         $href,
                                         $this->translate('direct link'),
@@ -84,16 +81,16 @@ if ($this->errorMsg) {
                         ?></div>
 
                     <div id="path-export-title" class="info-title"><?php echo $this->translate("export")?></div>
-                    <div id="path-export-content"><?php
+                    <div id="path-export-content" class="info-content"><?php
                        $fileName = $this->path->title ?: $this->path->id;
-                       $href = $fullBaseUrl . 'geom/' . rawurlencode($fileName) . '.kml';
+                       $href = $this->baseUrl() . '/geom/' . rawurlencode($fileName) . '.kml';
                        printf('<a href="%s" title="%s">%s</a>',
                                         $href,
                                         $this->translate('kml export'),
                                         $this->translate('kml export'));
 
                         print '<br>';
-                       $href = $fullBaseUrl . 'geom/' . rawurlencode($fileName) . '.gpx';
+                       $href = $this->baseUrl() . '/geom/' . rawurlencode($fileName) . '.gpx';
                        printf('<a href="%s" title="%s">%s</a>',
                                         $href,
                                         $this->translate('gpx export'),

diff --git a/public/css/syj.css b/public/css/syj.css
index e88f3da2ff3d68f7222a8b3a6d8ed28983ec6d00..8e29c424d7b779ed54ae5d73b783f0ec43892a82 100644 (file)
--- a/public/css/syj.css
+++ b/public/css/syj.css
@@ -117,17 +117,17 @@ body, html {
 .info-title {
     text-decoration: underline;
 }
+.info-content a {
+    text-decoration: none;
+}
 
 #path-infos-content {
     text-align: center;
     padding: 4px 15px 15px 15px;
 }
 
-#path-export-title {
-    margin-top: 1em;
-}
-#path-export-content a {
-    text-decoration: none;
+.info-content {
+    margin-bottom: 0.5em;
 }
 
 #path-length {