Use jquery.cookie

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

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 9b4405feb23dd776b669fe575548c42730fffab3..9d502432674991d853b950c88f22926168d1550c 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -10,7 +10,7 @@
   <% end -%>
 <% end -%>
 
-<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'sidebar' %>
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 
@@ -38,11 +38,7 @@
       <td class="attribution_project"><%= t'site.index.license.project_url' %></td>
     </tr>
     <tr>
-      <td colspan="2" class="attribution_notice"><%=
-        t'site.index.license.notice',
-          :license_name => t('site.index.license.license_name'),
-          :project_name => t('site.index.license.project_name')
-        %></td>
+      <td colspan="2" class="attribution_notice"><%= t'site.index.license.copyright' %></td>
     </tr>
   </table>
 </div>
@@ -125,10 +121,6 @@ else
 end
 %>
 
-<%= javascript_include_tag 'map.js' %>
-
-<%= render :partial => 'resize' %>
-
 <script type="text/javascript">
   var marker;
   var map;
@@ -136,14 +128,6 @@ end
   function mapInit(){
     map = createMap("map");
 
-    <% unless STATUS == :api_offline or STATUS == :database_offline %>
-      map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", {
-          visibility: false,
-          displayInLayerSwitcher: false
-      });
-      map.addLayer(map.dataLayer);
-    <% end %>
-
     <% unless object_zoom %>
       <% if bbox %>
         var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
@@ -243,7 +227,7 @@ end
     updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, objtype, objid);
 
     expiry.setYear(expiry.getFullYear() + 10);
-    document.cookie = "_osm_location=" + lonlat.lon + "|" + lonlat.lat + "|" + zoom + "|" + layers + "; expires=" + expiry.toGMTString();
+    $.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
   }
 
   function remoteEditHandler(event) {
@@ -293,7 +277,7 @@ end
       e.preventDefault();
     });
 
-    <% if params[:action] == 'export' -%>
+    <% if params[:export] -%>
     $("#exportanchor").click();
     <% end -%>