Merge 16070:16110 from trunk.

app/controllers/site_controller.rb

@@ -1,4 +1,6 @@
 class SiteController < ApplicationController
+  layout 'site',:except => [:key]
+
   before_filter :authorize_web
   before_filter :set_locale
   before_filter :require_user, :only => [:edit]
@@ -6,4 +8,8 @@ class SiteController < ApplicationController
   def export
     render :action => 'index'
   end
+
+  def key
+    expires_in 7.days, :public => true
+  end
 end

app/views/site/_key.html.erb

@@ -1,26 +1,33 @@
-<% content_for :left_menu do %>
-<%= link_to_function t('site.key.map_key'), "showKey();", { :title => t('site.key.map_key_tooltip') } %>
-<% end %>
-
 <script type="text/javascript">
-<!--
-  function showKey() {
-    var zoomlevel = map.getZoom();
+  function openMapKey() {
+    updateMapKey();
 
-    if (zoomlevel<7 )      { var imgname = 'keymapnik6.png'; }
-    else if (zoomlevel<13) { var imgname = 'keymapnik'+zoomlevel+'.png'; }
-    else if (zoomlevel<15) { var imgname = 'keymapnik13.png'; }
-    else                   { var imgname = 'keymapnik15.png'; }
+    openSidebar({ 
+      title: "<%= t('site.key.map_key') %>",
+      onclose: closeMapKey
+    });
 
-    updateSidebar("<%= t('site.key.map_key') %>", "<p><img src='images/"+imgname+"' /><\/p>");
-    openSidebar({ width: "210px" });
+    map.events.register("zoomend", map, updateMapKey);
+    map.events.register("changelayer", map, updateMapKey);
   }
 
-  function updateKey() {
-    if (sidebarOpen("<%= t('site.key.map_key') %>")) 
-    {
-      showKey();
-    }
+  function closeMapKey() {
+    map.events.unregister("zoomend", map, updateMapKey);
+    map.events.unregister("changelayer", map, updateMapKey);
+  }
+
+  function updateMapKey() {
+    var layer = map.baseLayer.name.toLowerCase().replace(/\s+/g, "_");
+    var zoom = map.getZoom();
+
+    <%= remote_function :update => "sidebar_content",
+                        :url => { :action => "key" },
+                        :with => "'layer=' + layer + '&zoom=' + zoom",
+                        :method => :get
+    %>
   }
-// -->
 </script>
+
+<% content_for :left_menu do %>
+  <%= link_to_function t('site.key.map_key'), "openMapKey()", :title => t('site.key.map_key_tooltip') %>
+<% end %>

app/views/site/_sidebar.html.erb

@@ -21,6 +21,8 @@
        onclose = null;
     }
 
+    if (options.title) { $("sidebar_title").innerHTML = options.title; }
+
     if (options.width) { $("sidebar").style.width = options.width; }
     else { $("sidebar").style.width = "30%"; }
 
@@ -46,10 +48,5 @@
     $("sidebar_title").innerHTML = title;
     $("sidebar_content").innerHTML = content;
   }
-
-  function sidebarOpen(title) {
-    return $("sidebar").style.display == "block" &&
-           $("sidebar_title").innerHTML == title;
-  }
 // -->
 </script>

app/views/site/index.html.erb

@@ -139,8 +139,6 @@ end
     marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>));
     <% end %>
 
-    map.events.register("zoomend", map, updateKey);
-
     map.events.register("moveend", map, updateLocation);
     map.events.register("changelayer", map, updateLocation);
     updateLocation();

app/views/site/key.html.erb

@@ -0,0 +1,21 @@
+<div id="mapkey">
+  <h3><%= t "site.key.table.heading", :zoom_level => params[:zoom] %></h3>
+  <table class="mapkey-table">
+    <% YAML.load_file("#{RAILS_ROOT}/config/key.yml").each do |name,data| %>
+      <% if params[:layer] == name %>
+        <% data.each do |entry| %>
+          <% if params[:zoom].to_i >= entry['min_zoom'] && params[:zoom].to_i <= entry['max_zoom'] %>
+            <tr>
+              <td class="mapkey-table-key" align="center">
+                <%= image_tag "key/#{name}/#{entry['image']}" %>
+              </td>
+              <td class="mapkey-table-value">
+                <%= t "site.key.table.entry.#{entry['name']}" %>
+              </td>
+            </tr>
+          <% end %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </table>
+</div>

app/views/trace/_trace_form.html.erb

@@ -3,7 +3,7 @@
   <tr><td align="right"><%= t'trace.trace_form.upload_gpx' %></td><td><%= f.file_field :gpx_file, :size => 50, :maxlength => 255 %></td></tr>
   <tr><td align="right"><%= t'trace.trace_form.description' %></td><td><%= f.text_field :description, :size => 50, :maxlength => 255 %></td></tr>
   <tr><td align="right"><%= t'trace.trace_form.tags' %></td><td><%= f.text_field :tagstring, :size => 50, :maxlength => 255 %></td></tr>
-  <tr><td align="right"><%= t'trace.trace_form.public' %></td><td><%= f.check_box :public %> | <a href="<%= t'trace.trace_form.public_help_url' %>"><%= t'trace.trace_form.public_help' %></a></td></tr>
+  <tr><td align="right"><%= t'trace.trace_form.public' %></td><td><%= f.check_box :public %> <span class="minorNote">(<a href="<%= t'trace.trace_form.public_help_url' %>"><%= t'trace.trace_form.public_help' %></a>)</span></td></tr>
   <tr><td></td><td><%= submit_tag t('trace.trace_form.upload_button') %> | <a href="<%= t'trace.trace_form.help_url' %>"><%= t'trace.trace_form.help' %></a></td></tr>
 </table>
 <% end %>

app/views/trace/edit.html.erb

@@ -1,4 +1,4 @@
-<h2><%= t 'trace.edit.heading', :name => @trace.name %></h2>
+<h2><%= t 'trace.edit.heading', :name => h(@trace.name) %></h2>
 
 <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
 

app/views/trace/view.html.erb

@@ -1,4 +1,4 @@
-<h2><%= t 'trace.view.heading', :name => @trace.name %></h2>
+<h2><%= t 'trace.view.heading', :name => h(@trace.name) %></h2>
 
   <% if @trace.inserted %>
     <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">