Merge branch 'master' into redux-polling

app/views/debates/_comments.html.erb

@@ -1,31 +1,29 @@
 <% cache [locale_and_user_status, @current_order, commentable_cache_key(@debate), @comment_tree.comments, @comment_tree.comment_authors, @debate.comments_count, @comment_flags] do %>
-  <section class="row-full comments">
-    <div class="row">
-      <div id="comments" class="small-12 column">
-        <h2>
-          <%= t("debates.show.comments_title") %>
-          <span class="js-comments-count">(<%= @debate.comments_count %>)</span>
-        </h2>
+  <div class="row comments">
+    <div id="comments" class="small-12 column">
+      <h3>
+        <%= t("debates.show.comments_title") %>
+        <span class="js-comments-count">(<%= @debate.comments_count %>)</span>
+      </h3>
 
-        <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %>
+      <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %>
 
-        <% if user_signed_in? %>
-          <%= render 'comments/form', {commentable: @debate, parent_id: nil, toggeable: false} %>
-        <% else %>
-        <br>
+      <% if user_signed_in? %>
+        <%= render 'comments/form', {commentable: @debate, parent_id: nil, toggeable: false} %>
+      <% else %>
+      <br>
 
-        <div data-alert class="callout primary">
-          <%= t("debates.show.login_to_comment",
-              signin: link_to(t("votes.signin"), new_user_session_path),
-              signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-          </div>
-        <% end %>
+      <div data-alert class="callout primary">
+        <%= t("debates.show.login_to_comment",
+            signin: link_to(t("votes.signin"), new_user_session_path),
+            signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+        </div>
+      <% end %>
 
-        <% @comment_tree.root_comments.each do |comment| %>
-          <%= render 'comments/comment', comment: comment  %>
-        <% end %>
-        <%= paginate @comment_tree.root_comments %>
-      </div>
+      <% @comment_tree.root_comments.each do |comment| %>
+        <%= render 'comments/comment', comment: comment  %>
+      <% end %>
+      <%= paginate @comment_tree.root_comments %>
     </div>
-  </section>
+  </div>
 <% end %>

app/views/debates/_debate.html.erb

@@ -41,14 +41,14 @@
 
             </p>
             <div class="debate-description">
-              <%= link_to debate.description, debate %>
+              <%= debate.description %>
               <div class="truncate"></div>
             </div>
             <%= render "shared/tags", taggable: debate, limit: 5 %>
           </div>
         </div>
 
-        <div id="<%= dom_id(debate) %>_votes" class="small-12 medium-3 column text-center">
+        <div id="<%= dom_id(debate) %>_votes" class="small-12 medium-3 column">
             <%= render 'debates/votes', debate: debate %>
         </div>
 

app/views/debates/_form.html.erb

@@ -1,6 +1,5 @@
 <%= form_for(@debate) do |f| %>
 
-
   <%= render 'shared/errors', resource: @debate %>
 
   <div class="row">

app/views/debates/_votes.html.erb

@@ -1,23 +1,41 @@
 <% voted_classes = css_classes_for_vote(@debate_votes, debate) %>
 <div class="votes">
   <div class="in-favor inline-block">
-    <%= link_to vote_debate_path(debate, value: 'yes'),
-        class: "like #{voted_classes[:in_favor]}", title: t('votes.agree'), method: "post", remote: true do %>
-      <span class="icon-like">
-        <span class="sr-only"><%= t('votes.agree') %></span>
-      </span>
-      <span class="percentage"><%= votes_percentage('likes', debate) %></span>
+    <% if user_signed_in? %>
+      <%= link_to vote_debate_path(debate, value: 'yes'),
+          class: "like #{voted_classes[:in_favor]}", title: t('votes.agree'), method: "post", remote: true do %>
+        <span class="icon-like">
+          <span class="sr-only"><%= t('votes.agree') %></span>
+        </span>
+        <span class="percentage"><%= votes_percentage('likes', debate) %></span>
+      <% end %>
+    <% else %>
+      <div class="like">
+        <span class="icon-like">
+          <span class="sr-only"><%= t('votes.agree') %></span>
+        </span>
+        <span class="percentage"><%= votes_percentage('likes', debate) %></span>
+      </div>
     <% end %>
   </div>
 
   <span class="divider"></span>
 
   <div class="against inline-block">
-    <%= link_to vote_debate_path(debate, value: 'no'), class: "unlike #{voted_classes[:against]}", title: t('votes.disagree'), method: "post", remote: true do %>
-      <span class="icon-unlike">
-        <span class="sr-only"><%= t('votes.disagree') %></span>
-      </span>
-      <span class="percentage"><%= votes_percentage('dislikes', debate) %></span>
+    <% if user_signed_in? %>
+      <%= link_to vote_debate_path(debate, value: 'no'), class: "unlike #{voted_classes[:against]}", title: t('votes.disagree'), method: "post", remote: true do %>
+        <span class="icon-unlike">
+          <span class="sr-only"><%= t('votes.disagree') %></span>
+        </span>
+        <span class="percentage"><%= votes_percentage('dislikes', debate) %></span>
+      <% end %>
+    <% else %>
+      <div class="unlike">
+        <span class="icon-unlike">
+          <span class="sr-only"><%= t('votes.disagree') %></span>
+        </span>
+        <span class="percentage"><%= votes_percentage('dislikes', debate) %></span>
+      </div>
     <% end %>
   </div>
 
@@ -39,10 +57,12 @@
       </p>
     </div>
   <% elsif !user_signed_in? %>
-    <div class="participation-not-allowed" style='display:none' aria-hidden="false">
-      <%= t("votes.unauthenticated",
-        signin: link_to(t("votes.signin"), new_user_session_path),
-        signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+    <div tabindex="0">
+      <div class="participation-not-allowed" style='display:none' aria-hidden="false">
+        <%= t("votes.unauthenticated",
+          signin: link_to(t("votes.signin"), new_user_session_path),
+          signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
+      </div>
     </div>
   <% end %>
 </div>

app/views/debates/index.html.erb

@@ -6,6 +6,8 @@
 <% end %>
 
 <main>
+  <h1 class="sr-only"><%= t("shared.outline.debates") %></h1>
+
   <div class="row">
     <div id="debates" class="debates-list small-12 medium-9 column">
 

app/views/debates/show.html.erb

@@ -1,6 +1,6 @@
 <% provide :title do %><%= @debate.title %><% end %>
 <% cache [locale_and_user_status(@debate), @debate, @debate.author, Flag.flagged?(current_user, @debate), @debate_votes] do %>
-  <section class="debate-show">
+  <div class="debate-show">
     <div id="<%= dom_id(@debate) %>" class="row">
       <div class="small-12 medium-9 column">
         <%= render "shared/back_link" %>
@@ -44,14 +44,12 @@
 
       <aside class="small-12 medium-3 column">
         <div class="sidebar-divider"></div>
-        <h3><%= t("votes.supports") %></h3>
-        <div class="text-center">
-          <div id="<%= dom_id(@debate) %>_votes">
-           <%= render 'debates/votes', debate: @debate %>
-          </div>
+        <h2><%= t("votes.supports") %></h2>
+        <div id="<%= dom_id(@debate) %>_votes">
+          <%= render 'debates/votes', debate: @debate %>
         </div>
         <div class="sidebar-divider"></div>
-        <h3><%= t("debates.show.share") %></h3>
+        <h2><%= t("debates.show.share") %></h2>
         <div class="social-share-full">
           <%= social_share_button_tag("#{@debate.title} #{setting['twitter_hashtag']}") %>
           <% if browser.device.mobile? %>
@@ -60,8 +58,9 @@
             </a>
           <% end %>
         </div>
+      </aside>
     </div>
-  </section>
+  </div>
 <% end %>
 
 <%= render "comments" %>