Load the piwik tracking code asynchronously

[rails.git] / app / views / diary_entry / edit.html.erb

diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index 9e7d5bab83f92eb8b665ecbe685eb541928a01f2..f6273a828a849b0dc3d77fafbe167ee80538b56b 100644 (file)
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -2,8 +2,8 @@
 
 <%= error_messages_for 'diary_entry' %>
 
 
 <%= error_messages_for 'diary_entry' %>
 

-<% form_for :diary_entry do |f| %>
-  <table>
+<%= form_for :diary_entry do |f| %>
+  <table class="diary_entry">

     <tr valign="top">
       <td class="fieldName"><%= t 'diary_entry.edit.subject' -%></td>
       <td><%= f.text_field :title, :size => 60 %></td>
     <tr valign="top">
       <td class="fieldName"><%= t 'diary_entry.edit.subject' -%></td>
       <td><%= f.text_field :title, :size => 60 %></td>


@@ -14,7 +14,7 @@
     </tr>
     <tr valign="top">
       <td class="fieldName"><%= t 'diary_entry.edit.language' -%></td>
     </tr>
     <tr valign="top">
       <td class="fieldName"><%= t 'diary_entry.edit.language' -%></td>

-      <td><%= f.collection_select :language_code, Language.find(:all, :order => :english_name), :code, :name %></td>
+      <td><%= f.collection_select :language_code, Language.order(:english_name), :code, :name %></td>

     </tr>
     <tr valign="top">
       <td class="fieldName"><%= t 'diary_entry.edit.location' -%></td>
     </tr>
     <tr valign="top">
       <td class="fieldName"><%= t 'diary_entry.edit.location' -%></td>


@@ -35,7 +35,11 @@
   </table>
 <% end %>
 
   </table>
 <% end %>
 

-<% if @user.home_lat.nil? or @user.home_lon.nil? %>
+<% if @diary_entry.latitude and @diary_entry.longitude %>
+  <% lon = @diary_entry.longitude %>
+  <% lat = @diary_entry.latitude %>
+  <% zoom = '12' %>
+<% elsif @user.home_lat.nil? or @user.home_lon.nil? %>

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


@@ -45,8 +49,7 @@
   <% zoom = '12' %>
 <% end %>
 
   <% zoom = '12' %>
 <% end %>
 

-<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
-<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
+<%= javascript_include_tag 'openlayers.js' %>

 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">


@@ -60,8 +63,8 @@
 
     var lonlat = getEventPosition(e);
 
 
     var lonlat = getEventPosition(e);
 

-    $("latitude").value = lonlat.lat;
-    $("longitude").value = lonlat.lon;
+    $("#latitude").val(lonlat.lat);
+    $("#longitude").val(lonlat.lon);

 
     if (marker) {
       removeMarkerFromMap(marker);
 
     if (marker) {
       removeMarkerFromMap(marker);


@@ -71,8 +74,8 @@
   }
 
   function openMap() {
   }
 
   function openMap() {

-    $("map").style.display = "block";
-    $("usemap").style.display = "none";
+    $("#map").show();
+    $("#usemap").hide();

 
     var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
     var zoom = <%= zoom %>;
 
     var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
     var zoom = <%= zoom %>;


@@ -81,6 +84,10 @@
 
     setMapCenter(centre, zoom);
 
 
     setMapCenter(centre, zoom);
 

+    <% if @diary_entry.latitude and @diary_entry.longitude %>
+    marker = addMarkerToMap(centre, null, "<%= t 'diary_entry.edit.marker_text' -%>");
+    <% end %>
+

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