Resolve conflict

[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 3efdd9289fd873fbb9a4697777c2406dc52b50f3..7603bb1bdd0c26fbcb3c9fa0e0e9d9f8a94a2574 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -1,49 +1,4 @@
-<% content_for :head do %>
-  <%= javascript_include_tag "index" %>
-<% 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 => 'search' %>
-
-<noscript>
-  <div id="noscript">
-    <p><%= t 'site.index.js_1' %></p>
-    <p><%= t 'site.index.js_2' %></p>
-  </div>
-</noscript>
-
-<div id="map">
-  <div id="permalink">
-    <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>
-
-<iframe id="linkloader" style="display: none">
-</iframe>
-
-<div id="attribution">
-  <table width="100%">
-    <tr>
-      <td class="attribution_license"><%= t'site.index.license.license_url' %></td>
-      <td class="attribution_project"><%= t'site.index.license.project_url' %></td>
-    </tr>
-    <tr>
-      <td colspan="2" class="attribution_notice"><%= t'site.index.license.copyright' %></td>
-    </tr>
-  </table>
-</div>
- 
+<%
+   set_title()
+   content_for(:content_class) { "overlay-sidebar" }
+%>