X-Git-Url: https://dev.renevier.net/gitweb.cgi?a=blobdiff_plain;ds=inline;f=application%2Fcontrollers%2FIdxController.php;h=ee1efb06d291453c9dccc14647efc81eb5efbba3;hb=e85f4874bb734d7b84cc2d10955db2065ac4f261;hp=527f77e9a7a555956daa2f865eb0d7ef8229a37f;hpb=2d66d0fe742edb3d91af7f76154619ecbcf75c6d;p=syj.git
diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 527f77e..ee1efb0 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -6,15 +6,30 @@ 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');
- $this->view->headLink()->appendStylesheet('css/generic.css');
- $this->view->headLink()->appendStylesheet('css/syj.css');
+ $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->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() {
@@ -30,17 +45,25 @@ class IdxController extends Zend_Controller_Action
$path = new Syj_Model_Path();
if (!$pathMapper->findByUrl($url, $path)) {
if (is_numeric($url) and $pathMapper->hasexisted($url)) {
+ $this->view->message = $this->view->translate("route has been deleted");
throw new Syj_Exception_NotFound('Gone', 410);
} else {
+ $this->view->message = $this->view->translate("route does not exist");
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);
- $geomform->geom_data->setValue((string)$path->geom);
+ $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)));
@@ -50,6 +73,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;
@@ -70,9 +97,7 @@ 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;
}
@@ -80,6 +105,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"),
@@ -97,14 +128,22 @@ class IdxController extends Zend_Controller_Action
'acceptTermsofuseWarn' => __("You must accept terms of use"),
'emailEmptyWarn' => __("you must enter an email"),
'emailInvalidWarn' => __("invalid email"),
- 'invalidPseudo' => __("pseudo must only contain letters, digits, dots or underscores"),
- 'uniqueUserError' => __("unavailable pseudo"),
'uniqueEmailError' => __("an user is already registered with this email"),
'userSuccess' => __("Account created"),
'newpwdSuccess' => __("A link to reset your password has been emailed to you"),
'canResubmit' => __("Now, you can retry to save"),
'routeBy' => __("route by"),
- 'osmAttribution' => __("Map by OpenStreetMap")
+ 'osmAttribution' => __("Map by OpenStreetMap"),
+ 'pseudoChecking' => __("checking availibilty"),
+ 'availablePseudo' => __("available pseudo"),
+ 'unavailablePseudo' => __("unavailable pseudo"),
+ 'editAction' => __("edit"),
+ 'createAction' => __("create"),
+ 'cloneAction' => __("duplicate"),
+ 'unsavedConfirmExit' => __("You have an unsaved route"),
+ 'notEmptyField' => __("Value is required"),
+ 'noResult' => __("no result"),
+ 'dragFileError' => __("could not analyze file content"),
);
}