Move base layer UI above overlay layer UI

[rails.git] / app / views / site / _potlatch2.html.erb

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index e7a2564f916eb97118ffba9433147f9f752b2b7a..51c9aa905e01ae3212fc221d956a23082e40add9 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -10,7 +10,7 @@
 <script type="text/javascript">alert("<%= t 'site.edit.potlatch2_not_configured' %>")</script>
 <% end %>
 
 <script type="text/javascript">alert("<%= t 'site.edit.potlatch2_not_configured' %>")</script>
 <% end %>
 

-<% locale = request.compatible_language_from(Potlatch2::LOCALES.keys) || "en" %>
+<% locale = select_locale(Potlatch2::LOCALES.keys).to_s %>

 
 <script type="text/javascript" defer="defer">
   var changesaved=true;
 
 <script type="text/javascript" defer="defer">
   var changesaved=true;


@@ -28,7 +28,10 @@
     if (lat) { flashvars.lat = lat; }
     if (lon) { flashvars.lon = lon; }
     flashvars.zoom = zoom;
     if (lat) { flashvars.lat = lat; }
     if (lon) { flashvars.lon = lon; }
     flashvars.zoom = zoom;

+    flashvars.assets = "<%= asset_path "potlatch2/assets.zip" %>";
+    flashvars.font_library = "<%= asset_path "potlatch2/FontLibrary.swf" %>";

     flashvars.locale = "<%= Potlatch2::LOCALES[locale] %>";
     flashvars.locale = "<%= Potlatch2::LOCALES[locale] %>";

+    flashvars.locale_paths = "<%= Potlatch2::LOCALES[locale] %>=<%= asset_path("potlatch2/locales/#{Potlatch2::LOCALES[locale]}.swf") %>";

     <% if params['gpx'] %>
     flashvars.gpx = '<%= h(params['gpx']) %>';
     <% end %>
     <% if params['gpx'] %>
     flashvars.gpx = '<%= h(params['gpx']) %>';
     <% end %>


@@ -39,6 +42,7 @@
     flashvars.policy = "<%= request.protocol + request.host_with_port %>/api/crossdomain.xml";
     flashvars.connection = "XML";
     flashvars.show_help = "once";
     flashvars.policy = "<%= request.protocol + request.host_with_port %>/api/crossdomain.xml";
     flashvars.connection = "XML";
     flashvars.show_help = "once";

+    flashvars.user_check = "warn";

     <% if token %>
     flashvars.oauth_token = "<%= token.token %>";
     flashvars.oauth_token_secret = "<%= token.secret %>";
     <% if token %>
     flashvars.oauth_token = "<%= token.token %>";
     flashvars.oauth_token_secret = "<%= token.secret %>";


@@ -56,19 +60,32 @@
     attributes.id = "potlatch";
     attributes.bgcolor = "#FFFFFF";
 
     attributes.id = "potlatch";
     attributes.bgcolor = "#FFFFFF";
 

-    swfobject.embedSWF("<%= asset_path("/potlatch2/potlatch2.swf") %>", "potlatch", "100%", "100%", "10.1.85","<%= asset_path("expressInstall.swf") %>", flashvars, params, attributes);
+    swfobject.embedSWF("<%= asset_path("potlatch2.swf") %>", "potlatch", "100%", "100%", "10.1.102","<%= asset_path("expressInstall.swf") %>", flashvars, params, attributes);

     // 700,600 for fixed size, 100%,100% for resizable
     // 700,600 for fixed size, 100%,100% for resizable

+
+    if (lat && lon) {
+      updatelinks({ lon: lon, lat: lat }, zoom);
+    }

   }
 
   }
 

-  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
+  <% if @lat && @lon -%>
+  doSWF(<%= @lat %>,<%= @lon %>,16);
+  <% else -%>
+  var params = OSM.mapParams();
+  doSWF(params.lat, params.lon, params.zoom || 17);
+  <% end -%>
+
+  $("body").on("click", "a.set_position", function (e) {
+    e.preventDefault();
+
+    var data = $(this).data();

 
 

-  function setPosition(lat, lon, zoom) {

     $("#potlatch").each(function () {
     $("#potlatch").each(function () {

-      this.setPosition(lat, lon, Math.max(zoom || 15, 13));
+      this.setPosition(data.lat, data.lon, Math.max(data.zoom || 15, 13));

     });
     });

-  }
+  });

 
   function mapMoved(lon, lat, zoom, minlon, minlat, maxlon, maxlat) {
 
   function mapMoved(lon, lat, zoom, minlon, minlat, maxlon, maxlat) {

-    updatelinks(lon, lat, zoom, null, minlon, minlat, maxlon, maxlat);
+    updatelinks({ lon: lon, lat: lat }, zoom, null, [[minlat, minlon], [maxlat, maxlon]]);

   }
 </script>
   }
 </script>