Sidebar close reverts to 'view' state

[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 31e15f09df707d0501c9c15769d82171d8296033..faff8de1e56749a7c70e9d1f7d61a187c5ac8a3f 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;


@@ -32,6 +32,8 @@
     flashvars.font_library = "<%= asset_path "potlatch2/FontLibrary.swf" %>";
     flashvars.locale = "<%= Potlatch2::LOCALES[locale] %>";
     flashvars.locale_paths = "<%= Potlatch2::LOCALES[locale] %>=<%= asset_path("potlatch2/locales/#{Potlatch2::LOCALES[locale]}.swf") %>";
     flashvars.font_library = "<%= asset_path "potlatch2/FontLibrary.swf" %>";
     flashvars.locale = "<%= Potlatch2::LOCALES[locale] %>";
     flashvars.locale_paths = "<%= Potlatch2::LOCALES[locale] %>=<%= asset_path("potlatch2/locales/#{Potlatch2::LOCALES[locale]}.swf") %>";

+    flashvars.intro_image = "<%= asset_path "help/introduction.jpg" %>";
+    flashvars.intro_video = "<%= asset_path "help/introduction.mp4" %>";

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


@@ -42,6 +44,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 %>";


@@ -61,35 +64,35 @@
 
     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
 
     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

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

   }
 
   }
 

-  <% if params[:node] -%>
-  <% bbox = Node.find(params[:node]).bbox.to_unscaled -%>
-  doSWF(<%= bbox.centre_lat %>,<%= bbox.centre_lon %>,16);
-  <% elsif params[:way] -%>
-  <% bbox = Way.find(params[:way]).bbox.to_unscaled -%>
-  doSWF(<%= bbox.centre_lat %>,<%= bbox.centre_lon %>,16);
-  <% elsif params[:gpx] -%>
-  <% trace = Trace.find(params[:gpx]) -%>
-  doSWF(<%= trace.latitude %>,<%= trace.longitude %>,16);
+  <% if @lat && @lon -%>
+  doSWF(<%= @lat %>,<%= @lon %>,16);

   <% else -%>
   var params = OSM.mapParams();
   doSWF(params.lat, params.lon, params.zoom || 17);
   <% end -%>
 
   <% else -%>
   var params = OSM.mapParams();
   doSWF(params.lat, params.lon, params.zoom || 17);
   <% end -%>
 

-  $(document).ready(function () {
-    $("body").on("click", "a.set_position", function () {
-      var lat = parseFloat($(this).attr("data-lat"));
-      var lon = parseFloat($(this).attr("data-lon"));
-      var zoom = parseInt($(this).attr("data-zoom"));
+  $("body").on("click", "a.set_position", function (e) {
+    e.preventDefault();

 
 

-      $("#potlatch").each(function () {
-        this.setPosition(lat, lon, Math.max(zoom || 15, 13));
-      });
+    var data = $(this).data();
+
+    $("#potlatch").each(function () {
+      this.setPosition(data.lat, data.lon, Math.max(data.zoom || 15, 13));

     });
   });
 
     });
   });
 

-  function mapMoved(lon, lat, zoom, minlon, minlat, maxlon, maxlat) {
-    updatelinks(lon, lat, zoom, null, minlon, minlat, maxlon, maxlat);
-  }
+  var mapMoved = $.throttle(250, function(lon, lat, zoom) {
+    updatelinks({ lon: lon, lat: lat }, zoom);
+
+    var hash = OSM.formatHash({ lon: lon, lat: lat, zoom: zoom });
+    if (hash !== location.hash) {
+      location.replace(hash);
+    }
+  });

 </script>
 </script>