consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactors design of comments order selector into a partial with i18n

Browse Source
This commit is contained in:
kikito
2015-10-28 15:48:48 +01:00
parent 82eb0bd902
commit e4bfc72649
9 changed files with 56 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/layout.scss
View File

@@ -1937,7 +1937,7 @@ table {
opacity: 0.4; opacity: 0.4;
} }
.filter-comments { .wide-order-selector {
float: none; float: none;
margin-top: 0; margin-top: 0;

1
app/controllers/debates_controller.rb
View File

@@ -7,6 +7,7 @@ class DebatesController < ApplicationController
before_action :authenticate_user!, except: [:index, :show] before_action :authenticate_user!, except: [:index, :show]
has_orders %w{hot_score confidence_score created_at most_commented random}, only: :index has_orders %w{hot_score confidence_score created_at most_commented random}, only: :index
has_orders %w{most_voted created_at}, only: :show
load_and_authorize_resource load_and_authorize_resource
respond_to :html, :js respond_to :html, :js

1
app/controllers/proposals_controller.rb
View File

@@ -7,6 +7,7 @@ class ProposalsController < ApplicationController
before_action :authenticate_user!, except: [:index, :show] before_action :authenticate_user!, except: [:index, :show]
has_orders %w{hot_score confidence_score created_at most_commented random}, only: :index has_orders %w{hot_score confidence_score created_at most_commented random}, only: :index
has_orders %w{most_voted created_at}, only: :show
load_and_authorize_resource load_and_authorize_resource
respond_to :html, :js respond_to :html, :js

17
app/views/debates/_comments.html.erb
View File

@@ -7,22 +7,7 @@
<span class="js-comments-count">(<%= @debate.comments_count %>)</span> <span class="js-comments-count">(<%= @debate.comments_count %>)</span>
</h2> </h2>
<!-- Filter for comments --> <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %>
<div class="filter-comments small-12 medium-8">
<form>
<div class="small-12 medium-8 left">
<label for="order-selector-participation"><%= t("debates.index.select_order") %></label>
</div>
<div class="small-12 medium-4 left">
<select class="js-location-changer js-order-selector select-order" data-order="<%= @current_order %>" name="order-selector" id="order-selector-participation">
<option>Más votados</option>
<option>Más nuevos</option>
<option>Aleatorios</option>
</select>
</div>
</form>
</div>
<!-- /. Filter for comments -->
<% if user_signed_in? %> <% if user_signed_in? %>
<%= render 'comments/form', {commentable: @debate, parent_id: nil, toggeable: false} %> <%= render 'comments/form', {commentable: @debate, parent_id: nil, toggeable: false} %>

17
app/views/proposals/_comments.html.erb
View File

@@ -8,22 +8,7 @@
<span class="js-comments-count">(<%= @proposal.comments_count %>)</span> <span class="js-comments-count">(<%= @proposal.comments_count %>)</span>
</h2> </h2>
<!-- Filter for comments --> <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %>
<div class="filter-comments small-12 medium-8">
<form>
<div class="small-12 medium-8 left">
<label for="order-selector-participation"><%= t("debates.index.select_order") %></label>
</div>
<div class="small-12 medium-4 left">
<select class="js-location-changer js-order-selector select-order" data-order="<%= @current_order %>" name="order-selector" id="order-selector-participation">
<option>Más votados</option>
<option>Más nuevos</option>
<option>Aleatorios</option>
</select>
</div>
</form>
</div>
<!-- /. Filter for comments -->
<% if user_signed_in? %> <% if user_signed_in? %>
<%= render 'comments/form', {commentable: @proposal, parent_id: nil, toggeable: false} %> <%= render 'comments/form', {commentable: @proposal, parent_id: nil, toggeable: false} %>

24
app/views/shared/_wide_order_selector.html.erb Normal file
View File

@@ -0,0 +1,24 @@
<% # Params:
#
# i18n_namespace: for example "moderation.debates.index"
%>
<div class="wide-order-selector small-12 medium-8">
<form>
<div class="small-12 medium-8 left">
<label for="order-selector-participation">
<%= t("#{i18n_namespace}.select_order") %>
</label>
</div>
<div class="small-12 medium-4 left">
<select class="js-location-changer js-order-selector select-order" data-order="<%= @current_order %>" name="order-selector" id="order-selector-participation">
<% @valid_orders.each do |order| %>
<option <%= 'selected' if order == @current_order %>
value='<%= current_path_with_query_params(order: order, page: 1) %>'>
<%= t("#{i18n_namespace}.orders.#{order}") %>
</option>
<% end %>
</select>
</div>
</form>
</div>

16
app/views/shared/_wide_order_selector.rb Normal file
View File

@@ -0,0 +1,16 @@
<% # Params:
#
# i18n_namespace: for example "moderation.debates.index"
%>
<form class="inline-block">
<label for="order-selector-participation" class="sr-only"><%= t("debates.index.select_order") %></label>
<select class="js-location-changer js-order-selector select-order" data-order="<%= @current_order %>" name="order-selector" id="order-selector-participation">
<% @valid_orders.each do |order| %>
<option <%= 'selected' if order == @current_order %>
value='<%= current_path_with_query_params(order: order, page: 1) %>'>
<%= t("#{i18n_namespace}.orders.#{order}") %>
</option>
<% end %>
</select>
</form>

4
config/locales/en.yml
View File

@@ -243,6 +243,10 @@ en:
form: form:
submit_button: "Save changes" submit_button: "Save changes"
comments: comments:
select_order: "Sort by"
orders:
most_voted: "Most voted"
created_at: "Newest"
form: form:
leave_comment: Write a comment leave_comment: Write a comment
comment_as_moderator: Comment as moderator comment_as_moderator: Comment as moderator

4
config/locales/es.yml
View File

@@ -243,6 +243,10 @@ es:
form: form:
submit_button: "Guardar cambios" submit_button: "Guardar cambios"
comments: comments:
select_order: "Ordenar por"
orders:
most_voted: "Más votados"
created_at: "Más nuevos"
form: form:
leave_comment: Deja tu comentario leave_comment: Deja tu comentario
comment_as_moderator: Comentar como moderador comment_as_moderator: Comentar como moderador