X-Git-Url: https://dev.renevier.net/gitweb.cgi?a=blobdiff_plain;ds=inline;f=application%2Fcontrollers%2FIdxController.php;h=790c8c766348edd0f88205b23670ee96db772c3d;hb=c091d2057c28c6df46e08e7a08681ef47ac292bf;hp=f85989ccb7d716b1805cea478560aed8bf35953a;hpb=a8006c98d15c04f86427ef6b2f5537005978e7e5;p=syj.git
diff --git a/application/controllers/IdxController.php b/application/controllers/IdxController.php
index f85989c..790c8c7 100644
--- a/application/controllers/IdxController.php
+++ b/application/controllers/IdxController.php
@@ -6,15 +6,30 @@ class IdxController extends Zend_Controller_Action
{
public function init() {
- $this->view->headScript()->appendFile('js/OpenLayers.js');
- $this->view->headScript()->appendFile('js/ModifiablePath.js');
- $this->view->headScript()->appendFile('js/prototype.js');
- $this->view->headScript()->appendFile('js/simplebox.js');
- $this->view->headScript()->appendFile('js/utils.js');
- $this->view->headScript()->appendFile('js/syj.js');
- $this->view->headLink()->appendStylesheet('css/openlayers/style.css');
- $this->view->headLink()->appendStylesheet('css/generic.css');
- $this->view->headLink()->appendStylesheet('css/syj.css');
+ $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");
+ }
+
+ 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->headTitle($path->displayTitle);
+
+ $this->_jsRawLocaleStrings();
+ if ($path->creator) {
+ $this->view->jslocales['geomAttribution'] =
+ $this->view->translate('route by %s', (string)$path->creator->pseudo);
+ }
+ $jsgeom = new phptojs\JsObject('gInitialGeom', array('data' => (string) $path->geom));
+ $this->view->headScript()->prependScript((string) $jsgeom);
+
+ $this->view->rawmode = true;
+ $this->_helper->ViewRenderer->setViewScriptPathSpec(':controller/raw.:suffix');
}
public function indexAction() {
@@ -30,27 +45,49 @@ class IdxController extends Zend_Controller_Action
$path = new Syj_Model_Path();
if (!$pathMapper->findByUrl($url, $path)) {
if (is_numeric($url) and $pathMapper->hasexisted($url)) {
+ $this->view->message = $this->view->translate("route has been deleted");
throw new Syj_Exception_NotFound('Gone', 410);
} else {
+ $this->view->message = $this->view->translate("route does not exist");
throw new Syj_Exception_NotFound('Not Found', 404);
}
}
- $geomform->setAction('path/' . (string)$path->id . '/update');
+
+ if ($this->getRequest()->getQuery('format') == 'raw') {
+ $this->rawmode($path);
+ return;
+ }
+
$title = $path->displayTitle;
$this->view->path = $path;
- $geomform->geom_title->setValue($path->title);
- $geomform->geom_data->setValue((string)$path->geom);
+ $jsgeom = new phptojs\JsObject('gInitialGeom', array('data' => (string) $path->geom));
+ $this->view->headScript()->prependScript((string) $jsgeom);
$loginform->login_geom_id->setValue((string)$path->id);
+ $geomform->geom_title->setValue($path->title);
} else {
$geomform->setAction('path');
- $extent = new phptojs\JsObject('gMaxExtent', $this->_helper->syjGeoip($this->getRequest()->getClientIp(true)));
- $this->view->headScript()->prependScript((string) $extent);
+
+ $lat = $this->getRequest()->getQuery('lat');
+ $lon = $this->getRequest()->getQuery('lon');
+ $zoom = $this->getRequest()->getQuery('zoom');
+ if (is_numeric ($lat) and is_numeric ($lon) and is_numeric ($zoom)) {
+ $initialpos = array('lat' => (float)$lat, 'lon' => (float)$lon, 'zoom' => (int)$zoom);
+ } else {
+ $initialpos = $this->_helper->syjGeoip($this->getRequest()->getClientIp(true));
+ }
+
+ $this->view->headScript()->prependScript((string) new phptojs\JsObject('gInitialPos', $initialpos));
$title = "Show your journey";
}
$this->_jsLoggedInfo(isset($url) ? $path: null);
$this->_jsLocaleStrings();
+ if (isset ($url) and $path->creator) {
+ $this->view->jslocales['geomAttribution'] =
+ $this->view->translate('route by %s', (string)$path->creator->pseudo);
+ }
$this->view->headTitle($title);
+ $this->view->headMeta()->appendName('description', $this->view->translate('website to share routes'));
$this->view->geomform = $geomform;
$this->view->loginform = $loginform;
$this->view->userform = $userform;
@@ -70,9 +107,6 @@ class IdxController extends Zend_Controller_Action
if (isset($path)) {
$loggedinfo->iscreator = $path->isCreator($user);
- if ($path->creator) {
- $loggedinfo->creatorname = $this->view->escape((string)$path->creator->pseudo);
- }
$loggedinfo->pathid = (string)$path->id;
} else {
$loggedinfo->iscreator = true;
@@ -81,6 +115,12 @@ class IdxController extends Zend_Controller_Action
$this->view->headScript()->prependScript((string) $loggedinfo);
}
+ protected function _jsRawLocaleStrings() {
+ $this->view->jslocales = array(
+ 'osmAttribution' => __("Map by OpenStreetMap"),
+ );
+ }
+
protected function _jsLocaleStrings() {
$this->view->jslocales = array(
'saveSuccess' => __("save took place successfully"),
@@ -111,6 +151,9 @@ class IdxController extends Zend_Controller_Action
'createAction' => __("create"),
'cloneAction' => __("duplicate"),
'unsavedConfirmExit' => __("You have an unsaved route"),
+ 'notEmptyField' => __("Value is required"),
+ 'noResult' => __("no result"),
+ 'dragFileError' => __("could not analyze file content"),
);
}