add mapquest layer back

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

diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 0a327bb1d242bec20a714d486de876eb8a742e9e..9bfc6bf86a7fe7fb2fa62c8420d26d33a483f952 100644 (file)
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -1,5 +1,5 @@
 <?php
-/*  This file is part of Syj, Copyright (c) 2010 Arnaud Renevier,
+/*  This file is part of Syj, Copyright (c) 2010-2011 Arnaud Renevier,
     and is published under the AGPL license. */
 
 class IdxController extends Zend_Controller_Action
@@ -7,17 +7,15 @@ class IdxController extends Zend_Controller_Action
 
     public function init() {
         $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");
+        $this->_helper->SyjMedias->addStyleSheets('idx');
+        $this->view->headMeta()->appendName('viewport', 'width=640');
     }
 
     public function rawmode(Syj_Model_Path $path) {
         $this->_helper->SyjReset->resetPlaceHolders();
         $this->_helper->SyjMedias->addScripts('rawidx');
+        $this->_helper->SyjMedias->addStyleSheets('rawidx');
 
-        $this->view->headLink()->appendStylesheet('css/generic.css', 'all');
-        $this->view->headLink()->appendStylesheet('css/syjraw.css', 'all');
         $this->view->headTitle($path->displayTitle);
 
         $this->_jsRawLocaleStrings();
@@ -75,7 +73,7 @@ class IdxController extends Zend_Controller_Action
         $this->view->headTitle($title);
         $this->view->headMeta()->appendName('description', $this->view->translate('website to share routes'));
 
-        $this->view->loggedUser = $this->_helper->SyjSession->user();
+        $this->view->loggedUser = $this->_helper->SyjUserManager->current();
     }
 
     protected function _initForms() {
@@ -107,7 +105,7 @@ class IdxController extends Zend_Controller_Action
 
         $this->view->headTitle("Show your journey");
         $this->view->headMeta()->appendName('description', $this->view->translate('website to share routes'));
-        $this->view->loggedUser = $this->_helper->SyjSession->user();
+        $this->view->loggedUser = $this->_helper->SyjUserManager->current();
         $this->_helper->ViewRenderer->setViewScriptPathSpec(':controller/index.:suffix');
 
         $error = $this->_getParam('error_handler');
@@ -115,17 +113,18 @@ class IdxController extends Zend_Controller_Action
             if ($error->exception instanceof Syj_Exception_ToolargeGeomUpload) {
                 $maxsize = $this->_bytesToString(min($this->_strToBytes(ini_get('upload_max_filesize')),
                                                     $this->_strToBytes(ini_get('upload_max_filesize'))));
-                $this->view->errorMsg = $this->view->translate('File too large. File size must not exceed %s', $maxsize);
+                $errorMsg = __('File too large. File size must not exceed %s', $maxsize);
             } else if ($error->exception instanceof Syj_Exception_InvalidGeomUpload) {
-                $this->view->errorMsg = $this->view->translate("Invalid file");
+                $errorMsg = __("Invalid file");
             }
+            $this->view->errorMsg = $errorMsg;
         }
     }
 
     protected function _jsLoggedInfo(Syj_Model_Path $path = null) {
         $loggedinfo = new phptojs\JsObject('gLoggedInfo', array('connections' => 0));
 
-        $user = $this->_helper->SyjSession->user();
+        $user = $this->_helper->SyjUserManager->current();
         if ($user) {
             $loggedinfo->logged = true;
         } else {
@@ -145,6 +144,7 @@ class IdxController extends Zend_Controller_Action
     protected function _jsRawLocaleStrings() {
         $this->view->jslocales = array(
             'osmAttribution' => __("Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"),
+            'mapquestAttribution' => __("Map by MapQuest, <a href='http://www.openstreetmap.org/'>OpenStreetMap</a> and contributors, <a href='http://creativecommons.org/licenses/by-sa/2.0/'>CC-BY-SA</a>"),
             );
     }
 
@@ -153,7 +153,6 @@ class IdxController extends Zend_Controller_Action
             'saveSuccess' => __("save took place successfully"),
             'requestError' => __("server did not understood request. That's probably caused by a bug in SYJ"),
             'gonePathError' => __("route not referenced on the server. It has probably been deleted."),
-            'uniquePathError' => __("similar path seems to already exist. Please do not create two exactly identical paths"),
             'notReachedError' => __("server could not be reached"),
             'serverError' => __("there was a server error"),
             'unknownError' => __("there was an unknown error"),
@@ -171,6 +170,7 @@ class IdxController extends Zend_Controller_Action
             'canResubmit' => __("Now, you can retry to save"),
             'routeBy' => __("route by"),
             'osmAttribution' => __("Map by <a href='http://openstreetmap.org/'>OpenStreetMap</a>"),
+            'mapquestAttribution' => __("Map by MapQuest, <a href='http://www.openstreetmap.org/'>OpenStreetMap</a> and contributors, <a href='http://creativecommons.org/licenses/by-sa/2.0/'>CC-BY-SA</a>"),
             'pseudoChecking' => __("checking availibilty"),
             'availablePseudo' => __("available pseudo"),
             'unavailablePseudo' => __("unavailable pseudo"),