Ignore any files in an __MACOSX folder in a zip file, as these are

[rails.git] / app / views / diary_entry / new.rhtml

diff --git a/app/views/diary_entry/new.rhtml b/app/views/diary_entry/new.rhtml
index 8daf769c4d266ed3265dbc82943fdd0ca6f07321..0a5203a66053ce49f2e5c8eaf9f62974c6efa982 100644 (file)
--- a/app/views/diary_entry/new.rhtml
+++ b/app/views/diary_entry/new.rhtml
@@ -8,13 +8,16 @@
     </tr>
     <tr valign="top">
       <th>Body</th>
     </tr>
     <tr valign="top">
       <th>Body</th>

-      <td><%= f.text_area :body, :cols => 80, :rows => 10 %></td>
+      <td><%= f.text_area :body, :cols => 80 %></td>

     </tr>
     <tr valign="top">
     </tr>
     <tr valign="top">

-           <th>Location</th>
-           <td><div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 250px;"></div><br/>
-                 <span class="location">Latitude: <%= f.text_field :latitude, :size => 20, :id => "latitude" %> Longitude <%= f.text_field :longitude, :size => 20, :id => "longitude" %></span></td>
-         </tr>
+      <th>Location</th>
+      <td>
+        <div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 400px; display: none;"></div>
+        <span class="location">Latitude: <%= f.text_field :latitude, :size => 20, :id => "latitude" %> Longitude: <%= f.text_field :longitude, :size => 20, :id => "longitude" %></span>
+        <a href="javascript:openMap()" id="usemap">use map</a>
+      </td>
+    </tr>

     <tr>
       <th></th>
       <td><%= submit_tag 'Save' %></td>
     <tr>
       <th></th>
       <td><%= submit_tag 'Save' %></td>


@@ -23,29 +26,30 @@
 <% end %>
 
 <% if @user.home_lat.nil? or @user.home_lon.nil? %>
 <% end %>
 
 <% if @user.home_lat.nil? or @user.home_lon.nil? %>

-  <% lon =  params['lon'] || '-0.1' %>
-  <% lat =  params['lat'] || '51.5' %>
-  <% zoom =  params['zoom'] || '4' %> 
+  <% lon = h(params['lon'] || '-0.1') %>
+  <% lat = h(params['lat'] || '51.5') %>
+  <% zoom = h(params['zoom'] || '4') %> 

 <% else %>
 <% else %>

-  <% lon =  @user.home_lon %>
-  <% lat =  @user.home_lat %>
-  <% zoom =  '12' %>
+  <% lon = @user.home_lon %>
+  <% lat = @user.home_lat %>
+  <% zoom = '12' %>

 <% end %>
 
 <% end %>
 

-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>

 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
   <!--
   var marker;
 
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
   <!--
   var marker;
 

-  function init(){
-    var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
+  function init() {
+    var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);

     var zoom = <%= zoom %>;
 
     var map = createMap("map");
 
     var zoom = <%= zoom %>;
 
     var map = createMap("map");
 

-    map.setCenter(centre, zoom);
+    setMapCenter(centre, zoom);

 
     map.events.register("click", map, setLocation);
   }        
 
     map.events.register("click", map, setLocation);
   }        


@@ -53,8 +57,7 @@
   function setLocation( e ) { 
     closeMapPopup();
 
   function setLocation( e ) { 
     closeMapPopup();
 

-    var merc = map.getLonLatFromViewPortPx(e.xy);
-    var lonlat = mercatorToLonLat(merc);
+    var lonlat = getEventPosition(e);

 
     document.getElementById('latitude').value = lonlat.lat;
     document.getElementById('longitude').value = lonlat.lon;
 
     document.getElementById('latitude').value = lonlat.lat;
     document.getElementById('longitude').value = lonlat.lon;


@@ -63,9 +66,14 @@
       removeMarkerFromMap(marker);
     }
 
       removeMarkerFromMap(marker);
     }
 

-    marker = addMarkerToMap(merc, null, "Diary entry location");
+    marker = addMarkerToMap(lonlat, null, "Diary entry location");
+  }
+
+  function openMap() {
+    $("map").style.display = "block";
+    $("usemap").style.display = "none";

   }
 
   window.onload = init;
 // -->
   }
 
   window.onload = init;
 // -->

-</script>
\ No newline at end of file
+</script>