X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=3996fa04e8e6c5c4adfc7de65293b0627c382cbf;hb=dfdbbefb4b79dd3d04123ccf3128172684721371;hp=29e142d27772b8b87364d9cfc57af851936fc07d;hpb=450db0b33b38bcdf1f22eea6cab568d24a14e2c6;p=syj.git

diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 29e142d..3996fa0 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -6,24 +6,18 @@ class IdxController extends Zend_Controller_Action
 {
 
     public function init() {
-        $this->view->headScript()->appendFile('js/OpenLayers.js');
-        $this->view->headScript()->appendFile('js/ModifiablePath.js');
-        $this->view->headScript()->appendFile('js/prototype.js');
-        $this->view->headScript()->appendFile('js/simplebox.js');
-        $this->view->headScript()->appendFile('js/utils.js');
-        $this->view->headScript()->appendFile('js/syj.js');
-        $this->view->headLink()->appendStylesheet('css/openlayers/style.css', "all");
+        $this->_helper->SyjMedias->addScripts('idx');
+        $this->view->headLink()->appendStylesheet('css/olstyle.css', "all");
         $this->view->headLink()->appendStylesheet('css/generic.css', "all");
         $this->view->headLink()->appendStylesheet('css/syj.css', "all");
     }
 
     public function rawmode(Syj_Model_Path $path) {
         $this->_helper->SyjReset->resetPlaceHolders();
+        $this->_helper->SyjMedias->addScripts('rawidx');
 
         $this->view->headLink()->appendStylesheet('css/generic.css', 'all');
         $this->view->headLink()->appendStylesheet('css/syjraw.css', 'all');
-        $this->view->headScript()->appendFile('js/OpenLayers.js');
-        $this->view->headScript()->appendFile('js/syjraw.js');
         $this->view->headTitle($path->displayTitle);
 
         $this->_jsRawLocaleStrings();
@@ -72,7 +66,8 @@ class IdxController extends Zend_Controller_Action
             $geomform->geom_title->setValue($path->title);
         } else {
             $geomform->setAction('path');
-            $extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($this->getRequest()->getClientIp(true)));
+            $clientip = trim(end(split(',', $this->getRequest()->getClientIp(true))));
+            $extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($clientip));
             $this->view->headScript()->prependScript((string) $extent);
             $title = "Show your journey";
         }
@@ -149,7 +144,7 @@ class IdxController extends Zend_Controller_Action
             'unsavedConfirmExit' => __("You have an unsaved route"),
             'notEmptyField' => __("Value is required"),
             'noResult' => __("no result"),
-            'dragFileError' => __("could not read content of file"),
+            'dragFileError' => __("could not analyze file content"),
             );
     }