Resolve conflict

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

diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index 91dc227e99ab56918d6f121d3960613a4e889d20..a1b1adb9227949f6a2c0af3c89443d260acc70c3 100644 (file)
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -1,11 +1,12 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= t "help_page.title" %></h2>
+  <h1><%= t "help_page.title" %></h1>

 <% end %>
 
 <% end %>
 

-<p class='introduction inner22'><%= t "help_page.introduction" %></p>
+<p class='introduction'><%= t "help_page.introduction" %></p>

 
 

-<% ['welcome', 'learnosm', 'help', 'wiki'].each do |site| %>
-  <div class='<%= site %> inner02 help-item'>
+<% ['welcome', 'help', 'wiki'].each do |site| %>
+  <% unless site == 'welcome' && !@user %>
+  <div class='<%= site %> help-item'>

   <h3>
     <a href='<%= t "help_page.#{site}.url" %>'>
       <%= t "help_page.#{site}.title" %>
   <h3>
     <a href='<%= t "help_page.#{site}.url" %>'>
       <%= t "help_page.#{site}.title" %>


@@ -13,4 +14,5 @@
   </h3>
   <p><%= t "help_page.#{site}.description" %></p>
   </div>
   </h3>
   <p><%= t "help_page.#{site}.description" %></p>
   </div>

-<% end %>
\ No newline at end of file
+  <% end %>
+<% end %>