X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;ds=sidebyside;f=application%2Fcontrollers%2FIdxController.php;h=d3c4bcb20238c6f7727d6b1392cdb806fb3f4664;hb=56542f930c6a4d6f48a405a17561d436e1d8f9b9;hp=527f77e9a7a555956daa2f865eb0d7ef8229a37f;hpb=2d66d0fe742edb3d91af7f76154619ecbcf75c6d;p=syj.git
diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 527f77e..d3c4bcb 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -39,8 +39,9 @@ class IdxController extends Zend_Controller_Action
$title = $path->displayTitle;
$this->view->path = $path;
$geomform->geom_title->setValue($path->title);
- $geomform->geom_data->setValue((string)$path->geom);
$loginform->login_geom_id->setValue((string)$path->id);
+ $jsgeom = new phptojs\JsObject('gInitialGeom', array('data' => (string) $path->geom));
+ $this->view->headScript()->prependScript((string) $jsgeom);
} else {
$geomform->setAction('path');
$extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($this->getRequest()->getClientIp(true)));
@@ -73,6 +74,7 @@ class IdxController extends Zend_Controller_Action
if ($path->creator) {
$loggedinfo->creatorname = $this->view->escape((string)$path->creator->pseudo);
}
+ $loggedinfo->pathid = (string)$path->id;
} else {
$loggedinfo->iscreator = true;
}
@@ -97,14 +99,19 @@ 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"),
);
}