X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e3d5e3da52ffdf10445f2d9cdcc8c67633f2dd82..6adcce4:/app/views/site/index.html.erb?ds=sidebyside

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index ab1eaa1dc..1f975e38d 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -2,54 +2,28 @@
   <%= javascript_include_tag "index" %>
 <% end %>
 
-<% unless STATUS == :api_offline or STATUS == :database_offline -%>
-  <% content_for :editmenu do -%>
-    <li><%= link_to t("browse.start_rjs.notes_layer_name"), notes_url(:format => :json), :id => "show_notes" %></li>
-    <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><%= link_to t("site.key.map_key"), {:action => :key}, :id => "open_map_key", :title => t("site.key.map_key_tooltip") %></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>
+<% content_for :sidebar do %>
+  <h2>
+    <%= t 'layouts.intro_header' %>
+    <span class="icon close"></span>
+  </h2>
+
+  <p><%= t 'layouts.intro_text' %></p>
+
+  <div class='footer'>
+    <a title="<%= t('layouts.make_a_donation.title') %>" href="http://donate.openstreetmap.org/" class="donate">
+      <span class='icon donate'></span>
+      <span><%= t('layouts.make_a_donation.text') %></span>
+    </a>
+
+    <p class='credits'>
+      <%= t 'layouts.partners_html',
+            :ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"),
+            :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
+            :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
+            :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %>
+    </p>
   </div>
-</noscript>
-
-<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>
-    <%= link_to t("site.index.createnote"), notes_url,
-        :id => "createnoteanchor",
-        :data => { :minzoom => 12 },
-        :title => "javascripts.site.createnote_tooltip",
-        :class => "geolink"
-    %>	
-  </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>
+<% end %>
 
-<div id="new-note" class="hidden"><%= render :partial => "notes/new" %></div>
+<%= render :template => 'layouts/map' %>