X-Git-Url: https://dev.renevier.net/?p=syj.git;a=blobdiff_plain;f=application%2Fcontrollers%2FIdxController.php;h=9bfc6bf86a7fe7fb2fa62c8420d26d33a483f952;hp=808603db8368247a5be7d8ab024e9699292e6c58;hb=c06c7fd6e6f26d31abb8d7c9a9f9e3f2d5b27d5c;hpb=efd74d3cddbac3cb5d317a5e14ba9d70281531c4
diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index 808603d..9bfc6bf 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -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();
@@ -117,11 +115,7 @@ class IdxController extends Zend_Controller_Action
$this->_strToBytes(ini_get('upload_max_filesize'))));
$errorMsg = __('File too large. File size must not exceed %s', $maxsize);
} else if ($error->exception instanceof Syj_Exception_InvalidGeomUpload) {
- if ($error->exception->getMessage() === 'uniquepath') {
- $errorMsg = __("similar path seems to already exist. Please do not create two exactly identical paths");
- } else {
- $errorMsg = __("Invalid file");
- }
+ $errorMsg = __("Invalid file");
}
$this->view->errorMsg = $errorMsg;
}
@@ -150,6 +144,7 @@ class IdxController extends Zend_Controller_Action
protected function _jsRawLocaleStrings() {
$this->view->jslocales = array(
'osmAttribution' => __("Map by OpenStreetMap"),
+ 'mapquestAttribution' => __("Map by MapQuest, OpenStreetMap and contributors, CC-BY-SA"),
);
}
@@ -158,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"),
@@ -176,6 +170,7 @@ class IdxController extends Zend_Controller_Action
'canResubmit' => __("Now, you can retry to save"),
'routeBy' => __("route by"),
'osmAttribution' => __("Map by OpenStreetMap"),
+ 'mapquestAttribution' => __("Map by MapQuest, OpenStreetMap and contributors, CC-BY-SA"),
'pseudoChecking' => __("checking availibilty"),
'availablePseudo' => __("available pseudo"),
'unavailablePseudo' => __("unavailable pseudo"),