X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=3996fa04e8e6c5c4adfc7de65293b0627c382cbf;hb=dfdbbefb4b79dd3d04123ccf3128172684721371;hp=77153c11488bc8bff703c98cb92161e54ac3ff90;hpb=d6940ce6e0ae4424d32efd66edc743d337dc3cf8;p=syj.git diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php index 77153c1..3996fa0 100644 --- a/application/controllers/IdxController.php +++ b/application/controllers/IdxController.php @@ -7,14 +7,14 @@ class IdxController extends Zend_Controller_Action public function init() { $this->_helper->SyjMedias->addScripts('idx'); - $this->view->headLink()->appendStylesheet('css/openlayers/style.css', "all"); + $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('syjraw'); + $this->_helper->SyjMedias->addScripts('rawidx'); $this->view->headLink()->appendStylesheet('css/generic.css', 'all'); $this->view->headLink()->appendStylesheet('css/syjraw.css', 'all'); @@ -66,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"; }