X-Git-Url: https://dev.renevier.net/?p=syj.git;a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=c049809247870a4b9c0828b669d4536b100499b8;hp=b7d36839f01499feadc193250114259723cfc00e;hb=6633e95b89c1d1eba9b7b0e612becaf11b085d69;hpb=c1aeb7538786d8c9f3b3337c0b71e21ef89d9c77

diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index b7d3683..c049809 100644
--- 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,20 @@ 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->view->headLink()->appendStylesheet('css/olstyle.css', "screen");
+        $this->view->headLink()->appendStylesheet('css/generic.css', "screen");
+        $this->view->headLink()->appendStylesheet('css/syj.css', "screen");
+        $this->view->headLink()->appendStylesheet('css/syjprint.css', "print");
+        $this->view->headMeta()->appendName('viewport', 'width=640px');
     }
 
     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->headLink()->appendStylesheet('css/generic.css', "screen");
+        $this->view->headLink()->appendStylesheet('css/syjraw.css', "screen");
+        $this->view->headLink()->appendStylesheet('css/syjprint.css', "print");
         $this->view->headTitle($path->displayTitle);
 
         $this->_jsRawLocaleStrings();
@@ -75,7 +78,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 +110,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 +118,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 {
@@ -153,7 +157,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"),
@@ -180,7 +183,7 @@ class IdxController extends Zend_Controller_Action
             'unsavedConfirmExit' => __("You have an unsaved route"),
             'notEmptyField' => __("Value is required"),
             'noResult' => __("no result"),
-            'dragFileError' => __("could not analyze file content"),
+            'uploadFileError' => __("could not analyze file content"),
             );
     }