X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;ds=sidebyside;f=application%2Fviews%2Fscripts%2Fidx%2Findex.phtml;h=1e34d35f8791c35b93e02c0f3d6247633366f2fa;hb=556c960d0d6dc38ad3de6267936a4ab69a322eb0;hp=03355a2a817799b132cbbcc502db1286ff3e7cbb;hpb=9f80d909c85ea324ed3337348b6e83ec39b70a78;p=syj.git

diff --git a/application/views/scripts/idx/index.phtml b/application/views/scripts/idx/index.phtml
index 03355a2..1e34d35 100644
--- 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,15 +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
-                       $href = $fullBaseUrl . 'geom/' . rawurlencode($this->path->displayTitle) . '.kml';
+                    <div id="path-export-content" class="info-content"><?php
+                       $fileName = $this->path->title ?: $this->path->id;
+                       $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($this->path->displayTitle) . '.gpx';
+                       $href = $this->baseUrl() . '/geom/' . rawurlencode($fileName) . '.gpx';
                        printf('<a href="%s" title="%s">%s</a>',
                                         $href,
                                         $this->translate('gpx export'),