Merge branch 'master' into user-recomendations

app/views/debates/_flag_actions.html.erb

@@ -3,17 +3,17 @@
     <a id="flag-expand-debate-<%= debate.id %>" data-toggle="flag-drop-debate-<%= debate.id %>" title="<%= t('shared.flag') %>">
       <span class="icon-flag flag-disable"></span>
     </a>
-    <div class="dropdown-pane" id="flag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
+    <span class="dropdown-pane" id="flag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
       <%= link_to t('shared.flag'), flag_debate_path(debate), method: :put, remote: true, id: "flag-debate-#{ debate.id }" %>
-    </div>
+    </span>
   <% end %>
 
   <% if show_unflag_action? debate %>
     <a id="unflag-expand-debate-<%= debate.id %>" data-toggle="unflag-drop-debate-<%= debate.id %>" title="<%= t('shared.unflag') %>">
       <span class="icon-flag flag-active"></span>
     </a>
-    <div class="dropdown-pane" id="unflag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
+    <span class="dropdown-pane" id="unflag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
       <%= link_to t('shared.unflag'), unflag_debate_path(debate), method: :put, remote: true, id: "unflag-debate-#{ debate.id }" %>
-    </div>
+    </span>
   <% end %>
 </span>

app/views/debates/edit.html.erb

@@ -1,7 +1,7 @@
 <div class="debate-form row">
 
   <div class="small-12 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to %>
 
     <div class="float-right">
       <%= link_to t("debates.edit.show_link"), @debate %>

app/views/debates/index.html.erb

@@ -9,8 +9,6 @@
 <% end %>
 
 <main>
-  <h1 class="show-for-sr"><%= t("shared.outline.debates") %></h1>
-
   <% if @search_terms || @advanced_search_terms || @tag_filter %>
     <div class="highlight no-margin-top padding margin-bottom">
       <div class="row">
@@ -33,6 +31,8 @@
         </div>
       </div>
     </div>
+  <% else %>
+    <%= render "shared/section_header", i18n_namespace: "debates.index.section_header", image: "debates" %>
   <% end %>
 
   <div class="row">
@@ -60,6 +60,21 @@
         <%= empty_recommended_debates_message_text(current_user) %>
       <% end %>
       <%= paginate @debates %>
+
+      <% unless @search_terms || @advanced_search_terms || @tag_filter %>
+        <div id="section_help" class="margin" data-magellan-target="section_help">
+          <p class="lead">
+            <strong><%= t("debates.index.section_footer.title") %></strong>
+          </p>
+          <p><%= t("debates.index.section_footer.help_text_1") %></p>
+          <p><%= t("debates.index.section_footer.help_text_2",
+                    org: link_to(setting['org_name'], new_user_registration_path)).html_safe %></p>
+          <p><%= t("debates.index.section_footer.help_text_3",
+                    proposal: link_to(t("debates.index.section_footer.proposals_link"), proposals_path),
+                    budget: link_to(t("debates.index.section_footer.budget_link"), budgets_path)).html_safe %>
+          </p>
+        </div>
+      <% end %>
     </div>
 
     <div class="small-12 medium-3 column">

app/views/debates/new.html.erb

@@ -1,7 +1,7 @@
 <div class="debate-form row">
 
   <div class="small-12 medium-9 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to %>
 
     <h1><%= t("debates.new.start_new") %></h1>
     <div data-alert class="callout primary">

app/views/debates/show.html.erb

@@ -7,7 +7,7 @@
   <div class="debate-show">
     <div id="<%= dom_id(@debate) %>" class="row">
       <div class="small-12 medium-9 column">
-        <%= render "shared/back_link" %>
+        <%= back_link_to %>
 
         <% if current_user && @debate.editable_by?(current_user) %>
           <%= link_to edit_debate_path(@debate), class: 'edit-debate button success small float-right' do %>