reindent idx/index.phtml

[syj.git] / application / controllers / IdxController.php

diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 527f77e9a7a555956daa2f865eb0d7ef8229a37f..d3c4bcb20238c6f7727d6b1392cdb806fb3f4664 100644 (file)
--- 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 <a href='http://openstreetmap.org/'>OpenStreetMap</a>")
+            'osmAttribution' => __("Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"),
+            'pseudoChecking' => __("checking availibilty"),
+            'availablePseudo' => __("available pseudo"),
+            'unavailablePseudo' => __("unavailable pseudo"),
+            'editAction' => __("edit"),
+            'createAction' => __("create"),
+            'cloneAction' => __("duplicate"),
+            'unsavedConfirmExit' => __("You have an unsaved route"),
             );
     }