X-Git-Url: https://dev.renevier.net/?a=blobdiff_plain;ds=sidebyside;f=application%2Fcontrollers%2FIdxController.php;h=997be3d5abbde3d8e62782972efe25cb63296aa9;hb=refs%2Fheads%2Fmaster;hp=c049809247870a4b9c0828b669d4536b100499b8;hpb=6633e95b89c1d1eba9b7b0e612becaf11b085d69;p=syj.git
diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index c049809..997be3d 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -7,20 +7,15 @@ class IdxController extends Zend_Controller_Action
public function init() {
$this->_helper->SyjMedias->addScripts('idx');
- $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');
+ $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', "screen");
- $this->view->headLink()->appendStylesheet('css/syjraw.css', "screen");
- $this->view->headLink()->appendStylesheet('css/syjprint.css', "print");
$this->view->headTitle($path->displayTitle);
$this->_jsRawLocaleStrings();
@@ -64,6 +59,7 @@ class IdxController extends Zend_Controller_Action
$this->view->headScript()->prependScript((string) $jsgeom);
$this->view->loginform->login_geom_id->setValue((string)$path->id);
$this->view->geomform->geom_title->setValue($path->title);
+ $this->view->profileActive = $this->_hasAltiProfile($path);
} else {
$this->_setInitialPos();
$title = "Show your journey";
@@ -149,6 +145,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"),
);
}
@@ -174,6 +171,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"),
@@ -218,4 +216,30 @@ class IdxController extends Zend_Controller_Action
return round($size) . $sizes[$c];
}
+ private function _hasAltiProfile($path) {
+ if (!extension_loaded('gd')) {
+ return false;
+ }
+ $cachefile = $path->getProfileCache('small');
+ if (file_exists($cachefile)) {
+ return filesize($cachefile) != 0;
+ }
+
+ try {
+ $service = $this->_helper->SyjAltiService->service();
+ } catch(Exception $e) {
+ return false;
+ }
+
+ try {
+ $path->getAltiProfile($service, 2 / 100);
+ return true;
+ } catch(Syj_Exception_NotImplemented $e) {
+ @touch($cachefile);
+ return false;
+ } catch(Exception $e) {
+ return false;
+ }
+ }
+
}