Fixes conflicts. Merge branch 'master' into ancestry

app/views/debates/_form.html.erb

@@ -4,14 +4,12 @@
   <div class="row">
     <div class="small-12 column">
       <%= f.label :title, t("debates.form.debate_title") %>
-      <span class="note"><%= t("debates.form.title_instructions") %></span>
-      <%= f.text_field :title, maxlength: Debate::TITLE_LENGTH, placeholder: t("debates.form.debate_title") %>
+      <%= f.text_field :title, maxlength: Debate::TITLE_LENGTH, placeholder: t("debates.form.debate_title"), label: false %>
     </div>
 
     <div class="ckeditor small-12 column">
       <%= f.label :description, t("debates.form.debate_text") %>
-      <span class="note"><%= t("debates.form.text_instructions") %></span>
-      <%= f.cktext_area :description, ckeditor: { language: I18n.locale } %>
+      <%= f.cktext_area :description, ckeditor: { language: I18n.locale }, label: false %>
     </div>
 
     <div class="small-12 column">
@@ -22,7 +20,7 @@
           <a class="js-add-tag-link"><%= tag.name %></a>
         <% end %>
       </span>
-      <%= f.text_field :tag_list, value: @debate.tag_list.to_s %>
+      <%= f.text_field :tag_list, value: @debate.tag_list.to_s, label: false %>
     </div>
 
     <div class="small-12 column">
@@ -36,7 +34,7 @@
     </div>
 
     <div class="actions small-12 column">
-      <%= f.submit(class: "button radius") %>
+      <%= f.submit(class: "button radius", value: t("debates.form.start_debate")) %>
     </div>
   </div>
 <% end %>

app/views/debates/index.html.erb

@@ -3,30 +3,24 @@
   <div class="filters row">
     <div class="small-9 column">
 
-      <div class="inline-block" >
-        <% if @tag_filter %>
-          <h2>
-            <%= t("debates.index.filter_topic",
-                   number: @debates.size,
-                   topic: @tag_filter) %>
-          </h2>
-        <% else %>
-          <h2><%= t("debates.index.select_topic") %></h2>
-          <form class="inline-block">
-             <select class="js-location-changer" name="tag-filter">
-               <option value="/" selected="selected"><%= t("debates.index.all") %></option>
-               <% @tags.each do |tag| %>
-                 <option value='<%= current_path_with_query_params(tag: tag.name) %>'>
-                   <%= tag.name %>
-                 </option>
-               <% end %>
-             </select>
-          </form>
-        <% end %>
-      </div>
+      <% if @tag_filter %>
+        <div class="inline-block small-8" >
+            <h2>
+              <%= t("debates.index.filter_topic",
+                     count: @debates.size,
+                     topic: @tag_filter) %>
+            </h2>
+        </div>
+      <% end %>
 
-      <div class="inline-block right">
-        <h6 class="inline-block"><%= t("debates.index.select_order") %></h6>
+      <div class="inline-block <%= 'right' if @tag_filter %>">
+        <h6 class="inline-block">
+          <% if @tag_filter %>
+            <%= t("debates.index.select_order") %>
+          <% else %>
+            <%= t("debates.index.select_order_long") %>
+          <% end %>
+        </h6>
         <form class="inline-block">
            <select class="js-location-changer" name="order-selector">
              <% @valid_orders.each do |order| %>
@@ -48,7 +42,7 @@
     </div>
     <div class="small-12 medium-3 column">
       <aside class="sidebar" role="complementary">
-        <%= link_to t("debates.index.create_debate"), new_debate_path, class: 'button radius expand' %>
+        <%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button radius expand' %>
         <%= render "shared/tag_cloud" %>
       </aside>
     </div>

app/views/debates/new.html.erb

@@ -5,7 +5,7 @@
       <i class="icon-angle-left left"></i>
       <%= t("debates.new.back_link") %>
     <% end %>
-    <h1><%= t("debates.new.publish_new") %></h1>
+    <h1><%= t("debates.new.start_new") %></h1>
     <%= render "form" %>
   </div>