X-Git-Url: https://dev.renevier.net/?p=syj.git;a=blobdiff_plain;f=application%2Fviews%2Fscripts%2Fidx%2Findex.phtml;h=b69bf38d99e14f30fb9c3516e13c276315737e13;hp=7d0fe87fddc5c1064194ce970b664b819432c947;hb=591799b685ba18b84ad5230a5d84a11daa380136;hpb=a64d41557a62ec6051d7fa08d1ba941e089aa5c2

diff --git a/application/views/scripts/idx/index.phtml b/application/views/scripts/idx/index.phtml
index 7d0fe87..b69bf38 100644
--- a/application/views/scripts/idx/index.phtml
+++ b/application/views/scripts/idx/index.phtml
@@ -1,76 +1,175 @@
-    <noscript>
-        <style type="text/css">
-            #map, #message, #data_controls, #login_controls, #user_area, #login_area, #newpwd_area {
-                display: none;
-            }
-        </style>
-
-        <p><?php echo $this->translate('SYJ needs javascript. Please activate scripts in your browser.');?></p>
-    </noscript>
-
-    <div id="map"></div>
-
-    <div id="message" class="message info">
-    <?php if (!$this->path and !$this->loggedUser) {?>
-    <?php echo $this->translate('Welcome on Syj.')?>
-    <br/>
-    <?php echo $this->translate('To create a journey, just click on the map to add points to your route. You can zoom and move map with controls upper left.')?>
-    <br/>
-    <?php echo $this->translate('When you have finished a path, press "save", button.')?>
-    <?php }?>
-    </div>
+<noscript>
+    <style type="text/css">
+        #map, #message, #data_controls, #login_controls, #user_area, #login_area, #newpwd_area {
+            display: none;
+        }
+    </style>
 
-    <div id="data_controls">
-    <input id="edit-btn" name="edit-btn" type="button" value="<?php echo $this->translate('edit')?>">
+    <p><?php echo $this->translate('SYJ needs javascript. Please activate scripts in your browser.');?></p>
+</noscript>
 
-    <?php
-        print $this->geomform;
-    ?>
+<div id="map"></div>
+<div id="map-overlay"></div>
+
+<?php
+$message = "";
+$msgclass = "";
+if ($this->errorMsg) {
+    $message .= $this->errorMsg;
+    $msgclass = "error";
+} else if (!$this->path and !$this->loggedUser) {
+    $message .= $this->translate('To create a journey, press <strong>"start a route"</strong> button, then click on the map to add points. To delete a point, hold shift pressed while clicking on it.');
+    $message .= "<br>";
+    $message .= $this->translate('You can zoom and move the map with the controls in the top left corner.');
+    $message .= "<br>";
+    $message .= $this->translate('When you have finished a path, press "create", button.');
+    $msgclass = "info optional";
+}
+?>
+
+<div id="message" class="message <?php echo $msgclass?>">
+    <?php echo $message ?>
+</div>
 
+
+<div id="path-length" class="menu-group">
+    <div id="path-length-title" class="info-title"><?php echo $this->translate('route length')?></div>
+    <div id="path-length-content">
     </div>
+</div>
+
+<div id="menu">
 
-    <div id="login_controls">
+    <?php echo $this->localeSwitcher(); ?>
+
+    <div id="login_controls" class="menu-group">
         <div>
+            <div class="menu-item">
             <?php
-                echo $this->anchor('login', $this->translate('login'), array('id' => 'login_control_anchor', 'class' => 'login-anchor'));
-                $anchortext = sprintf("%s<img id=\"account-info-bullet\" src=\"icons/bullet_arrow_right.png\"><span id=\"account-info\"><br>%s</span>",
+                echo $this->anchor('login', $this->translate('login'), array('id' => 'login_control_anchor'));
+                $anchortext = sprintf("<span id=\"account-create-anchor\">%s</span><span id=\"account-info\"><br>%s</span>",
                                       $this->translate('create an account'),
                                       $this->translate('Whith an account, you can manage and modify your routes'));
-                echo $this->anchor('', $anchortext, array('id' => 'user_control_anchor', 'class' => 'login-anchor'), false);
+                ?>
+               </div>
+               <div class="menu-item">
+               <?php
+                echo $this->anchor('', $anchortext, array('id' => 'user_control_anchor'), false);
             ?>
+            </div>
         </div>
         <div>
             <?php echo $this->logoutLink(); ?>
         </div>
     </div>
 
-    <div id="newpwd_area" class="modal">
-        <div id="newpwd_message" class="message"></div>
-        <?php
-            print $this->newpwdform;
-        ?>
-    </div>
+    <?php if (isset($this->path)) { ?>
+        <div id="path-infos" class="menu-group">
+            <div class="menu-item">
+                <div id="path-infos-toggler"><a href="" id="path-infos-anchor"><?php echo $this->translate("route infos")?></a></div>
+             </div>
+                <div id="path-infos-content" class="menu-item">
 
-    <div id="user_area" class="modal">
-        <div id="user_message" class="message"></div>
-        <?php
-            print $this->userform;
-        ?>
-    </div>
+                    <div id="path-directlink-title" class="info-title"><?php echo $this->translate("direct link")?></div>
+                    <div id="path-directlink-content"><?php
+                            $serverUrl = rtrim($this->serverUrl(), '/');
+                            $baseUrl = trim($this->baseUrl(), '/');
+                            $fullBaseUrl = $serverUrl . '/' . ($baseUrl ? ($baseUrl . '/'): '');
+                            $urlcomp = urlencode($this->path->urlcomp ?: $this->path->id);
+                            $href = $fullBaseUrl . 'idx/' . $urlcomp . '?format=raw';
+                            printf('<a href="%s" title="%s">%s</a>',
+                                        $href,
+                                        $this->translate('direct link'),
+                                        $this->escape($href));
+                        ?></div>
+
+                    <div id="path-export-title" class="info-title"><?php echo $this->translate("export")?></div>
+                    <div id="path-export-content"><?php
+                       $href = $fullBaseUrl . 'geom/' . urlencode($this->path->id) . '.kml';
+                       printf('<a href="%s" title="%s">%s</a>',
+                                        $href,
+                                        $this->translate('kml export'),
+                                        $this->translate('kml export'));
+
+                        print '<br>';
+                       $href = $fullBaseUrl . 'geom/' . urlencode($this->path->id) . '.gpx';
+                       printf('<a href="%s" title="%s">%s</a>',
+                                        $href,
+                                        $this->translate('gpx export'),
+                                        $this->translate('gpx export'));
+                       ?>
 
-      <div id="login_area" class="modal">
-         <div id="login_message" class="message"></div>
 
-      <?php
-        print $this->loginform;
-      ?>
+                </div>
+            </div>
+        </div>
+    <?php }?>
+
+    <div id="data_controls">
+        <div id="data_controls_btns">
+
+    <?php if (isset($this->path)) { ?>
+        <input id="clone-btn" name="clone-btn" type="button" value="<?php echo $this->translate('duplicate');?>">
+        <br>
+        <input id="edit-btn" name="edit-btn" type="button" value="<?php echo $this->translate('edit');?>">
+    <?php } else {?>
+
+        <form id="nominatim-form" action="nominatim" method="get">
+            <div><a id="nominatim-label" href=""><?php echo $this->translate('Search a place')?></a></div>
+            <div id="nominatim-message" class="message"></div>
+            <div id="nominatim-controls">
+            <input name="nominatim-search" id="nominatim-search">
+            <input type="submit" id="nominatim-submit" name="nominatim-submit" value="<?php echo $this->translate('Ok')?>">
+            <img id="nominatim-throbber" src="icons/throbber.gif">
+            </div>
+
+        </form>
+
+        <input id="create-btn" name="create-btn" type="button" value="<?php echo $this->translate('start a route');?>">
+    <?php } ?>
+        </div>
+
+    <?php
+        print $this->geomform;
+    ?>
+
+</div>
+
+<?php if (!isset($this->path)) {?>
+            <div id="nominatim-suggestions">
+            <div id="nominatim-suggestions-title"><?php echo $this->translate('more results')?></div>
+            <ul id="nominatim-suggestions-list"></ul>
+            </div>
+<?php }?>
+
+
+</div>
+
+<div id="newpwd_area" class="modal">
+    <div id="newpwd_message" class="message"></div>
+    <?php
+        print $this->newpwdform;
+    ?>
+</div>
+
+<div id="user_area" class="modal">
+    <div id="user_message" class="message"></div>
+    <?php
+        print $this->userform;
+    ?>
+</div>
+
+<div id="login_area" class="modal">
+   <div id="login_message" class="message"></div>
 
-      <p id="login_area_create"><a id="login_area_create_anchor" href=""><?php echo $this->translate('create an account')?></a></p>
+<?php
+  print $this->loginform;
+?>
 
-      </div>
+<p id="login_area_create"><a id="login_area_create_anchor" href=""><?php echo $this->translate('create an account')?></a></p>
 
-      <div id="termsofusearea" class="modal">
-        <iframe id="termsofuseiframe" width="100%" height="100%" frameborder="0"></iframe>
-      </div>
+</div>
 
-<?php echo $this->localeSwitcher(); ?>
+<div id="termsofusearea" class="modal">
+  <iframe id="termsofuseiframe" width="100%" height="100%" frameborder="0"></iframe>
+</div>