X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/59a8f93bc615402cbb14d9763a0f2f17c4ad05dc..5dda4196d50774e8a44e9e137d45141d4151764b:/app/views/site/index.html.erb

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 657db8474..3efdd9289 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -1,17 +1,13 @@
-<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
-  <% content_for :greeting do %>
-    <%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> |
-  <% end %>
+<% content_for :head do %>
+  <%= javascript_include_tag "index" %>
 <% end %>
 
-<% unless STATUS == :api_offline or STATUS == :database_offline -%>
-  <% content_for :editmenu do -%>
-    <li><%= link_to t("browse.start_rjs.data_layer_name"), { :controller => :browse, :action => :start }, :id => "show_data" %></li>
-  <% end -%>
-<% end -%>
+<% content_for :left_menu do %>
+  <li><h4><%= link_to t("site.key.map_key"), {:action => :key}, :id => "open_map_key", :title => t("site.key.map_key_tooltip") %></h4></li>
+<% end %>
 
+<%= render :partial => 'home_link' %>
 <%= render :partial => 'sidebar' %>
-<%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 
 <noscript>
@@ -23,8 +19,16 @@
 
 <div id="map">
   <div id="permalink">
-    <a href="/" id="permalinkanchor" class="geolink llz layers object"><%= t 'site.index.permalink' %></a>
-    <a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a>
+    <ul class="secondary-actions">
+      <li><a href="/" id="permalinkanchor" class="geolink llz layers object"><%= t 'site.index.permalink' %></a></li>
+      <li><a href="/" id="shortlinkanchor"><%= t 'site.index.shortlink' %></a></li>
+      <li><%= link_to t("site.index.createnote"), notes_url(:format => :json),
+          :id => "createnoteanchor",
+          :data => { :minzoom => 12 },
+          :title => "javascripts.site.createnote_tooltip",
+          :class => "geolink"
+      %></li>
+    </ul>
   </div>
 </div>
 
@@ -42,151 +46,4 @@
     </tr>
   </table>
 </div>
-
-<script type="text/javascript">
-  var marker;
-  var map;
-  var params = OSM.mapParams();
-
-  function mapInit(){
-    map = createMap("map");
-
-    if (!params.object_zoom) {
-      if (params.bbox) {
-        var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
-
-        map.zoomToExtent(proj(bbox));
-
-        if (params.box) {
-          $(window).load(function() { addBoxToMap(bbox) });
-        }
-      } else {
-        setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
-      }
-    }
-
-    if (params.layers) {
-      setMapLayers(params.layers);
-    }
-
-    if (params.marker) {
-      marker = addMarkerToMap(new OpenLayers.LonLat(params.mlon, params.mlat));
-    }
-
-    if (params.object) {
-      var url = "/api/" + OSM.API_VERSION + "/" + params.object_type + "/" + params.object_id;
-
-      if (params.object_type != "node") {
-        url += "/full";
-      }
-
-      $(window).load(function() { addObjectToMap(url, params.object_zoom) });
-    }
-
-    map.events.register("moveend", map, updateLocation);
-    map.events.register("changelayer", map, updateLocation);
-
-    updateLocation();
-    handleResize();
-  }
-
-  $(document).ready(function () {
-    $("#show_data").click(function (e) {
-      $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
-        startBrowse(sidebarHtml);
-      }});
-      e.preventDefault();
-    });
-
-    $("body").on("click", "a.set_position", function () {
-      var data = $(this).data();
-      var centre = new OpenLayers.LonLat(data.lon, data.lat);
-
-      if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
-        var bbox = new OpenLayers.Bounds(data.minLon, data.minLat, data.maxLon, data.maxLat);
-
-        map.zoomToExtent(proj(bbox));
-      } else {
-        setMapCenter(centre, data.zoom);
-      }
-
-      if (marker) {
-        removeMarkerFromMap(marker);
-      }
-
-      marker = addMarkerToMap(centre, getArrowIcon());
-
-      return false;
-    });
-  });
-
-  function updateLocation() {
-    var lonlat = unproj(map.getCenter());
-    var zoom = map.getZoom();
-    var layers = getMapLayers();
-    var extents = unproj(map.getExtent());
-    var expiry = new Date();
-
-    updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object_type, params.object_id);
-
-    expiry.setYear(expiry.getFullYear() + 10);
-    $.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
-  }
-
-  function remoteEditHandler(event) {
-    var extent = unproj(map.getExtent());
-    var loaded = false;
-
-    $("#linkloader").load(function () { loaded = true; });
-    $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom);
-
-    setTimeout(function () {
-      if (!loaded) alert("<%=j t('site.index.remote_failed') %>");
-    }, 1000);
-
-    return false;
-  }
-
-  function installEditHandler() {
-    $("#remoteanchor").click(remoteEditHandler);
-
-    <% if preferred_editor == "remote" %>
-      $("#editanchor").click(remoteEditHandler);
-
-      <% if params[:action] == "edit" %>
-        remoteEditHandler();
-      <% end %>
-    <% end %>
-  }
-
-  $(document).ready(mapInit);
-  $(document).ready(installEditHandler);
-  $(document).ready(handleResize);
-
-  $(window).resize(function() {
-    var centre = map.getCenter();
-    var zoom = map.getZoom();
-
-    handleResize();
-
-    map.setCenter(centre, zoom);
-  });
-
-  $(document).ready(function () {
-    $("#exportanchor").click(function (e) {
-      $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>", success: function (sidebarHtml) {
-        startExport(sidebarHtml);
-      }});
-      e.preventDefault();
-    });
-
-    <% if params[:export] -%>
-    $("#exportanchor").click();
-    <% end -%>
-
-    <% if params[:query] -%>
-    doSearch("<%= params[:query] %>");
-    <% end %>
-  });
-// -->
-</script>
+