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 1f82a92f0d4008fcc4f006f56b68ea47c5aba9a2..7603bb1bdd0c26fbcb3c9fa0e0e9d9f8a94a2574 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -1,16 +1,4 @@
-<h2>
-  <% if !@user %>
-    <%= t 'layouts.intro_header' %>
-  <% else %>
-    <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-  <% end %>
-</h2>
-
-<% if !@user %>
-  <p class="inner12 large-text"><%= t 'layouts.intro_text' %></p>
-
-  <div class="inner12">
-    <a class="button" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>
-    <a class="button" href="<%= user_new_path %>"><%= t('layouts.sign_up') %></a>
-  </div>
-<% end %>
+<%
+   set_title()
+   content_for(:content_class) { "overlay-sidebar" }
+%>