X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=c049809247870a4b9c0828b669d4536b100499b8;hb=6633e95b89c1d1eba9b7b0e612becaf11b085d69;hp=91606e61ebeb7e93898f2e23b69b931f2986037a;hpb=0722c496ca63f30937427e3bf8fbdd5cfee2c83d;p=syj.git diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php index 91606e6..c049809 100644 --- a/application/controllers/IdxController.php +++ b/application/controllers/IdxController.php @@ -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(); @@ -115,10 +118,11 @@ 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; } } @@ -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"),