From: Steve Coast <steve@asklater.com>
Date: Thu, 30 Nov 2006 15:24:38 +0000 (+0000)
Subject: edit page plus tabs working
X-Git-Tag: live~8559
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d6ebc3f5c183f021db1d05b03ecb1c728bb8ed73?ds=sidebyside

edit page plus tabs working
---

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index e8e825153..75bac67ab 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -31,16 +31,16 @@
   
   <div>
     <ul id="tabnav">
-      <!-- FIXME, these links need help -->
-      <% if @user %>
-        <li><%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps' } %></li>
-        <li><%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps' } %></li>
-        <li><%= link_to 'GPS traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces' } %></li>
-      <% else %>
-        <li><a id="viewanchor" href="/index.html" title="view maps">View</a></li>
-        <li><a style="font-style:italic" href="/login.html" title="edit maps">Edit</a></li>
-        <li><%= link_to 'GPS traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces'} %></li>
-      <% end %>
+        <% viewclass = ''
+           editclass = ''
+           traceclass = ''
+           viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index' 
+           editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit' 
+           traceclass = 'active' if params['controller'] == 'trace'
+           %>
+         <li><%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass  } %></li>
+         <li><%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass } %></li>
+         <li><%= link_to 'GPS traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass } %></li>
     </ul>
   </div>
 
diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
new file mode 100644
index 000000000..1dfeea792
--- /dev/null
+++ b/app/views/site/edit.rhtml
@@ -0,0 +1,27 @@
+<div id="mapImage">
+
+  <div style="position: absolute; left: 0px; top: 0px; height: 500px; width: 700px; padding: 1em;">
+
+    <applet
+    code="org/openstreetmap/processing/OsmApplet.class"
+    archive="OSMApplet.jar, commons-codec-1.3.jar, core.jar, commons-logging.jar, commons-httpclient-3.0-rc3.jar, MinML2.jar, plugin.jar, thinlet.jar"
+    width="700"
+    height="500"
+    MAYSCRIPT="true"
+    >
+    <param name="clat" value="51.2571016392693">
+    <param name="clon" value="-0.219934772136611">
+    <param name="zoom" value="15">
+    <param name="user" value="token">
+    <param name="pass" value="TntWIq03F8lqCF9JhOrTyZ0Y0lrQ9r">
+    <param name="wmsurl" value="http://www.openstreetmap.org/tile/0.2/gpx?;http://www.openstreetmap.org/api/wms/0.2/landsat/?request=GetMap&layers=modis,global_mosaic&styles=&srs=EPSG:4326&FORMAT=image/jpeg">
+    <param name="apiurl" value="http://www.openstreetmap.org/api/0.3/">
+    Your browser needs to support Java to edit maps.<br>
+    <a href="http://java.com/en/download/index.jsp">Download Java here</a>
+    </applet>
+    <br /><a href="http://www.openstreetmap.org/wiki/index.php/Editing" target="_blank">Need help editing?</a>
+
+  </div>
+
+</div>
+