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

adds naming consistency

Browse Source
This commit is contained in:
rgarcia
2016-01-13 15:05:20 +01:00
parent 66b704b3b9
commit 33cfd92b09
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/concerns/commentable_actions.rb
View File

@@ -84,7 +84,7 @@ module CommentableActions
end end
def parse_advanced_search_terms def parse_advanced_search_terms
@advanced_search_present = @advanced_search_terms = params[:advanced_search] if params[:advanced_search].present? @advanced_search_terms = params[:advanced_search] if params[:advanced_search].present?
parse_search_date parse_search_date
end end

2
app/controllers/proposals_controller.rb
View File

@@ -15,7 +15,7 @@ class ProposalsController < ApplicationController
respond_to :html, :js respond_to :html, :js
def index_customization def index_customization
@featured_proposals = Proposal.all.sort_by_confidence_score.limit(3) if (!@advanced_search_present && @search_terms.blank? && @tag_filter.blank?) @featured_proposals = Proposal.all.sort_by_confidence_score.limit(3) if (!@advanced_search_terms && @search_terms.blank? && @tag_filter.blank?)
if @featured_proposals.present? if @featured_proposals.present?
set_featured_proposal_votes(@featured_proposals) set_featured_proposal_votes(@featured_proposals)
@resources = @resources.where('proposals.id NOT IN (?)', @featured_proposals.map(&:id)) @resources = @resources.where('proposals.id NOT IN (?)', @featured_proposals.map(&:id))

6
app/views/debates/index.html.erb
View File

@@ -11,10 +11,10 @@
<div class="filters"> <div class="filters">
<div class="small-12 medium-7 left"> <div class="small-12 medium-7 left">
<% if @search_terms || @advanced_search_present %> <% if @search_terms || @advanced_search_terms %>
<h2 class="margin-top"> <h2 class="margin-top">
<%= page_entries_info @debates %> <%= page_entries_info @debates %>
<% if !@advanced_search_present %> <% if !@advanced_search_terms %>
<%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %> <%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %>
<% end %> <% end %>
</h2> </h2>
@@ -32,7 +32,7 @@
<%= render 'shared/order_links', i18n_namespace: "debates.index" %> <%= render 'shared/order_links', i18n_namespace: "debates.index" %>
<% if @tag_filter || @search_terms || @advanced_search_present %> <% if @tag_filter || @search_terms || @advanced_search_terms %>
<div class="small-12 medium-5 margin-top inline-block debates-order"> <div class="small-12 medium-5 margin-top inline-block debates-order">
<h6 class="inline-block"> <h6 class="inline-block">
<%= t("debates.index.select_order") %> <%= t("debates.index.select_order") %>

6
app/views/proposals/index.html.erb
View File

@@ -11,10 +11,10 @@
<div class="filters"> <div class="filters">
<div class="small-12 medium-7 left"> <div class="small-12 medium-7 left">
<% if @search_terms || @advanced_search_present %> <% if @search_terms || @advanced_search_terms %>
<h2 class="margin-top"> <h2 class="margin-top">
<%= page_entries_info @proposals %> <%= page_entries_info @proposals %>
<% if !@advanced_search_present %> <% if !@advanced_search_terms %>
<%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %> <%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %>
<% end %> <% end %>
</h2> </h2>
@@ -26,7 +26,7 @@
<% end %> <% end %>
</div> </div>
<% if @tag_filter || @search_terms || @advanced_search_present %> <% if @tag_filter || @search_terms || @advanced_search_terms %>
<div class="small-12 medium-5 margin-top margin-top inline-block proposals-order"> <div class="small-12 medium-5 margin-top margin-top inline-block proposals-order">
<h6 class="inline-block"> <h6 class="inline-block">
<%= t("proposals.index.select_order") %> <%= t("proposals.index.select_order") %>

2
app/views/shared/_advanced_search.html.erb
View File

@@ -57,7 +57,7 @@
//open advantage options menu //open advantage options menu
var open = <%= raw @advanced_search_present.to_json.html_safe %>; var open = <%= raw @advanced_search_terms.to_json.html_safe %>;
if(!open) $('#advanced-search').hide(); if(!open) $('#advanced-search').hide();