X-Git-Url: https://dev.renevier.net/?p=syj.git;a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=0817fe65c973250a0bc04d6bd5d81f8bcd6436aa;hp=d3c4bcb20238c6f7727d6b1392cdb806fb3f4664;hb=26afcb880ff75743abcb627ecf516b6c51a36d08;hpb=ec7db76528badd24d3b1332736c5a6f71d2a0986 diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php index d3c4bcb..0817fe6 100644 --- a/application/controllers/IdxController.php +++ b/application/controllers/IdxController.php @@ -17,6 +17,27 @@ class IdxController extends Zend_Controller_Action $this->view->headLink()->appendStylesheet('css/syj.css'); } + public function rawmode(Syj_Model_Path $path) { + $this->_helper->SyjReset->resetPlaceHolders(); + + $this->view->headLink()->appendStylesheet('css/generic.css'); + $this->view->headLink()->appendStylesheet('css/syjraw.css'); + $this->view->headScript()->appendFile('js/OpenLayers.js'); + $this->view->headScript()->appendFile('js/syjraw.js'); + $this->view->headTitle($path->displayTitle); + + $this->_jsRawLocaleStrings(); + if ($path->creator) { + $this->view->jslocales['geomAttribution'] = + $this->view->translate('route by %s', (string)$path->creator->pseudo); + } + $jsgeom = new phptojs\JsObject('gInitialGeom', array('data' => (string) $path->geom)); + $this->view->headScript()->prependScript((string) $jsgeom); + + $this->view->rawmode = true; + $this->_helper->ViewRenderer->setViewScriptPathSpec(':controller/raw.:suffix'); + } + public function indexAction() { $url = $this->getRequest()->getUserParam('url'); @@ -35,13 +56,18 @@ class IdxController extends Zend_Controller_Action throw new Syj_Exception_NotFound('Not Found', 404); } } - $geomform->setAction('path/' . (string)$path->id . '/update'); + + if ($this->getRequest()->getQuery('format') == 'raw') { + $this->rawmode($path); + return; + } + $title = $path->displayTitle; $this->view->path = $path; - $geomform->geom_title->setValue($path->title); - $loginform->login_geom_id->setValue((string)$path->id); $jsgeom = new phptojs\JsObject('gInitialGeom', array('data' => (string) $path->geom)); $this->view->headScript()->prependScript((string) $jsgeom); + $loginform->login_geom_id->setValue((string)$path->id); + $geomform->geom_title->setValue($path->title); } else { $geomform->setAction('path'); $extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($this->getRequest()->getClientIp(true))); @@ -51,6 +77,10 @@ class IdxController extends Zend_Controller_Action $this->_jsLoggedInfo(isset($url) ? $path: null); $this->_jsLocaleStrings(); + if (isset ($url) and $path->creator) { + $this->view->jslocales['geomAttribution'] = + $this->view->translate('route by %s', (string)$path->creator->pseudo); + } $this->view->headTitle($title); $this->view->geomform = $geomform; $this->view->loginform = $loginform; @@ -71,9 +101,6 @@ class IdxController extends Zend_Controller_Action if (isset($path)) { $loggedinfo->iscreator = $path->isCreator($user); - if ($path->creator) { - $loggedinfo->creatorname = $this->view->escape((string)$path->creator->pseudo); - } $loggedinfo->pathid = (string)$path->id; } else { $loggedinfo->iscreator = true; @@ -82,6 +109,12 @@ class IdxController extends Zend_Controller_Action $this->view->headScript()->prependScript((string) $loggedinfo); } + protected function _jsRawLocaleStrings() { + $this->view->jslocales = array( + 'osmAttribution' => __("Map by OpenStreetMap"), + ); + } + protected function _jsLocaleStrings() { $this->view->jslocales = array( 'saveSuccess' => __("save took place successfully"),