diff --git a/Gemfile b/Gemfile index 49d0076..9663ec7 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,7 @@ gem 'coffee-rails' gem 'uglifier' gem 'bootstrap-sass' -gem 'jquery-rails' +gem 'jquery-rails' #Image manipulation gem "carrierwave" diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3d1a696..e09342f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -6,7 +6,7 @@ class ApplicationController < ActionController::Base rescue_from Tractis::InvalidVerificationError do |exception| render :text => "Access Denied Bitch", :status => 403 end - + helper :all protected diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index df9905f..07f1d1a 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -2,7 +2,7 @@ class ProposalsController < InheritedResources::Base before_filter :check_is_admin, :only => :toggle belongs_to :category, :proposer, :optional => true - + helper_method :parent, :parent_type respond_to :html, :xml diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index bb3502d..ade7522 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -1,6 +1,6 @@ class RegistrationsController < Devise::RegistrationsController before_filter :set_params, only: :create - + private #used to be able to have multiple signin and singnup forms in one page diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index def45fd..cedcf34 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,6 +1,6 @@ class SessionsController < Devise::SessionsController include Tractis::IdentityVerifications - + # Refactor with omniauth_callbacks controller # by creating a custom tractis ominiauth stategy, inspiration: # https://gist.github.com/dira/722793 diff --git a/app/controllers/spokesmen_controller.rb b/app/controllers/spokesmen_controller.rb index e9bfd91..3928379 100644 --- a/app/controllers/spokesmen_controller.rb +++ b/app/controllers/spokesmen_controller.rb @@ -2,7 +2,7 @@ class SpokesmenController < ApplicationController before_filter :authenticate_user! def new - @spokesman = User.find(params[:id]) + @spokesman = User.find(params[:id]) end def edit diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 35582a3..6398484 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,6 +1,6 @@ class UsersController < ApplicationController before_filter :authenticate_user!, :only => :choose_as_spokesman - + def index @users = User.all end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index fcf310b..0d0a8ac 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,7 +1,7 @@ class VotesController < InheritedResources::Base belongs_to :proposal before_filter :authenticate_user! - + def new @proposal = Proposal.find(params[:proposal_id]) @vote = @proposal.votes.new(params[:vote]) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9d15f83..edbf571 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -7,7 +7,7 @@ def home? def import_bootstrap? action_name == "new" and ["votes", "spokesmen"].include?(controller_name) end - + def menu_link(text, path, icon='') content_tag :li, class: current_page_css(path) do link_to path, class: "nav-link" do diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb index 401dced..0a0ca4b 100644 --- a/app/helpers/pages_helper.rb +++ b/app/helpers/pages_helper.rb @@ -1,5 +1,5 @@ module PagesHelper - + def users_page? controller_name == "users" end diff --git a/app/helpers/proposals_helper.rb b/app/helpers/proposals_helper.rb index 71fad8f..1014f67 100644 --- a/app/helpers/proposals_helper.rb +++ b/app/helpers/proposals_helper.rb @@ -1,5 +1,5 @@ module ProposalsHelper - + def proposal_type if parent then parent_type else action_name end diff --git a/app/helpers/share_helper.rb b/app/helpers/share_helper.rb index ffa905e..0ffb03a 100644 --- a/app/helpers/share_helper.rb +++ b/app/helpers/share_helper.rb @@ -6,7 +6,7 @@ def image_url(source) end abs_path end - + def share_text t(:share_text) end diff --git a/app/helpers/spokesman_helper.rb b/app/helpers/spokesman_helper.rb index 94ba3c0..1ecc628 100644 --- a/app/helpers/spokesman_helper.rb +++ b/app/helpers/spokesman_helper.rb @@ -1,5 +1,5 @@ module SpokesmanHelper - + def current_spokesman?(user) current_user && current_user.spokesman == user end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 5190da1..46076c9 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -1,5 +1,5 @@ # coding: utf-8 -module UsersHelper +module UsersHelper def humanize_vote_text(user, proposal) case find_choice user, proposal when "si" then "A favor" diff --git a/app/models/category.rb b/app/models/category.rb index cb345a5..941ca32 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -1,7 +1,7 @@ # coding: utf-8 class Category < ActiveRecord::Base has_many :proposals - + before_create :set_name scope :hot, -> { order("proposals_count DESC").limit(5) } diff --git a/app/models/delegated_vote.rb b/app/models/delegated_vote.rb index bc6f24d..fe5d988 100644 --- a/app/models/delegated_vote.rb +++ b/app/models/delegated_vote.rb @@ -1,6 +1,6 @@ class DelegatedVote < ActiveRecord::Base belongs_to :proposal - + def reset! self.in_favor = 0 self.against = 0 diff --git a/app/models/proposal.rb b/app/models/proposal.rb index c684e57..2b12d8d 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -4,7 +4,7 @@ class Proposal < ActiveRecord::Base has_many :votes belongs_to :category, :counter_cache => true belongs_to :proposer, :counter_cache => true - + scope :open, -> { where("closed_at is null") } scope :hot, -> { open.order("votes_count desc, visits desc").limit(5) } scope :recently_closed, -> { where("closed_at is not null and status is not null").order("closed_at DESC").limit(5) } diff --git a/app/models/scrapper.rb b/app/models/scrapper.rb index ed0e910..cb7e3ce 100644 --- a/app/models/scrapper.rb +++ b/app/models/scrapper.rb @@ -1,6 +1,6 @@ class Scrapper - def initialize + def initialize end def scrape diff --git a/app/models/user.rb b/app/models/user.rb index 9956b9a..731a805 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,6 @@ class User < ActiveRecord::Base default_scope { order('represented_users_count DESC, updated_at DESC') } - + devise :database_authenticatable, :registerable, :omniauthable, :recoverable, :rememberable, :trackable, :validatable diff --git a/app/models/vote.rb b/app/models/vote.rb index 5f75188..f560de0 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,7 +1,7 @@ class Vote < ActiveRecord::Base belongs_to :proposal, touch: true belongs_to :user - + scope :order_by_represented_users, -> { order("users.represented_users_count DESC").includes("user") } validates_uniqueness_of :proposal_id, :scope => :user_id diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index a985be0..b1eb253 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -3,7 +3,7 @@

Entra en Agoraonrails

- +
@@ -22,12 +22,12 @@
<% end %>
- + Entra con tu cuenta de Agoraonrails - +
@@ -50,7 +50,7 @@ <% end %>
- + <% end %> - + Entra a través de Twitter ó Facebook @@ -96,7 +96,7 @@ <% end %> - +
Entra a través de Twitter ó Facebook @@ -114,5 +114,5 @@ - - + + diff --git a/app/views/layouts/pages.html.erb b/app/views/layouts/pages.html.erb index 2f2395a..cf9b59a 100644 --- a/app/views/layouts/pages.html.erb +++ b/app/views/layouts/pages.html.erb @@ -14,7 +14,7 @@
- +
- + <%= javascript_include_tag "application" %> <%= yield :custom_javascript %> <%= render :partial => "shared/google_analytics" if Rails.env == 'production' %> diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb index c2ad6fd..8df7b6c 100644 --- a/app/views/proposals/_proposal.html.erb +++ b/app/views/proposals/_proposal.html.erb @@ -5,7 +5,7 @@

<%= link_to awesome_truncate(proposal.title, 150), proposal %>

- <%= t(:proposed_by_html, :proposer => link_to(proposal.proposer.name, proposal.proposer, :class => "proposer")) %> + <%= t(:proposed_by_html, :proposer => link_to(proposal.proposer.name, proposal.proposer, :class => "proposer")) %> <%= t(:on_html, :date => l(proposal.proposed_at, :format => :long)) %>

@@ -14,7 +14,7 @@ <% if proposal.closed? %>
- +
  • @@ -44,6 +44,6 @@ <% end %>
<% end %> - + <% end %> \ No newline at end of file diff --git a/app/views/proposals/new.html.erb b/app/views/proposals/new.html.erb index ed73f5a..9fe663b 100644 --- a/app/views/proposals/new.html.erb +++ b/app/views/proposals/new.html.erb @@ -23,7 +23,7 @@ <%= f.label :proposer %>
<%= f.select :proposer_id, Proposer.all.map {|proposer| [proposer.name, proposer.id]} %>

- +

<%= f.label :proposed_at %>
<%= f.date_select :proposed_at %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index e652fa3..1c25e08 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -3,15 +3,15 @@ <% @title = "#{awesome_truncate(@proposal.title, 100)}" %>

- +
- +

<%=h @proposal.title %>

- <%=h @proposal.proposal_type %> + <%=h @proposal.proposal_type %> <%= link_to t(:official_link), @proposal.official_url, :class => 'official_url' %>

- -
+ +
<%= t(:popular_vote)%>
<%= render :partial => "shared/results", :locals => {:proposal => @proposal, :width => 20} %> diff --git a/app/views/spokesmen/_form.html.erb b/app/views/spokesmen/_form.html.erb index a703b34..12482a1 100644 --- a/app/views/spokesmen/_form.html.erb +++ b/app/views/spokesmen/_form.html.erb @@ -2,7 +2,7 @@

<%= submit_tag t(:i_am_sure), :class => "make-my-spokesman-submit" %> - <%= t(:or_well)%> + <%= t(:or_well)%> <%= link_to t(:think_more), user_url(@spokesman), class: "oh-no" %>

diff --git a/app/views/spokesmen/show.html.erb b/app/views/spokesmen/show.html.erb index 636714e..be56e2d 100644 --- a/app/views/spokesmen/show.html.erb +++ b/app/views/spokesmen/show.html.erb @@ -8,7 +8,7 @@ <%= t(:chosen_spokesman) %> <% end %> - + <%= t :spokeman_redirect %>

diff --git a/app/views/users/_actions.html.erb b/app/views/users/_actions.html.erb index 43f8a33..ceff136 100644 --- a/app/views/users/_actions.html.erb +++ b/app/views/users/_actions.html.erb @@ -2,13 +2,13 @@ <% if current_user == @user %> <%= link_to( (t :edit_profile) , edit_user_path(@user), :class => "btn btn--info btn-smart")%> <% elsif current_spokesman?(@user) %> - <%= link_to t(:discharge_spokesman, :name => @user.name), spokesman_path(id: @user.id), + <%= link_to t(:discharge_spokesman, :name => @user.name), spokesman_path(id: @user.id), :class => "btn btn--secondary discharge-my-spokesman mb2", :method => :delete %> <% elsif has_spokesman? %> - <%= link_to t(:choose_spokeman, :name => @user.name), edit_spokesman_path(id: @user.id), + <%= link_to t(:choose_spokeman, :name => @user.name), edit_spokesman_path(id: @user.id), :class => "make-my-spokesman btn btn--secondary mb2" %> <% else %> - <%= link_to t(:choose_spokeman, :name => @user.name), new_spokesman_path(id: @user.id), + <%= link_to t(:choose_spokeman, :name => @user.name), new_spokesman_path(id: @user.id), :class => "make-my-spokesman btn btn--secondary mb2" %> <% end %>
\ No newline at end of file diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 246404d..598f2ee 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -9,7 +9,7 @@