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

removes hashrockets

Browse Source
This commit is contained in:
Juanjo Bazán
2015-07-29 14:27:58 +02:00
parent 146cfbcf84
commit 08671414f2
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -35,7 +35,7 @@ gem 'acts-as-taggable-on'
gem "responders" gem "responders"
gem 'foundation-rails' gem 'foundation-rails'
gem 'acts_as_votable' gem 'acts_as_votable'
gem "recaptcha", :require => "recaptcha/rails" gem "recaptcha", require: "recaptcha/rails"
gem 'ckeditor' gem 'ckeditor'
group :development, :test do group :development, :test do

4
app/views/debates/_debate.html.erb
View File

@@ -12,14 +12,14 @@
<div class="row votes"> <div class="row votes">
<div class="small-8 column"> <div class="small-8 column">
<%= link_to debate_votes_path(debate, value: 'yes'), :class => 'in-favor', method: "post" do %> <%= link_to debate_votes_path(debate, value: 'yes'), class: 'in-favor', method: "post" do %>
<i class="fi-like"></i> <i class="fi-like"></i>
<span><%= percentage('likes', debate) %></span> <span><%= percentage('likes', debate) %></span>
<% end %> <% end %>
<span class="divider"></span> <span class="divider"></span>
<%= link_to debate_votes_path(debate, value: 'no'), :class => 'against', method: "post" do %> <%= link_to debate_votes_path(debate, value: 'no'), class: 'against', method: "post" do %>
<i class="fi-dislike"></i> <i class="fi-dislike"></i>
<span><%= percentage('dislikes', debate) %></span> <span><%= percentage('dislikes', debate) %></span>
<% end %> <% end %>

8
app/views/debates/show.html.erb
View File

@@ -1,6 +1,6 @@
<article class="debate-show"> <article class="debate-show">
<%= link_to t("debates.show.back_link"), debates_path, :class => 'right' %> <%= link_to t("debates.show.back_link"), debates_path, class: 'right' %>
<div class="row"> <div class="row">
<div id="debate-<%= @debate.id %>" class="small-12 medium-9 column"> <div id="debate-<%= @debate.id %>" class="small-12 medium-9 column">
@@ -13,7 +13,7 @@
<div class="votes small-12 medium-3 column"> <div class="votes small-12 medium-3 column">
<div class="small-12 column text-center"> <div class="small-12 column text-center">
<div id="in_favor" class="inline-block"> <div id="in_favor" class="inline-block">
<%= link_to debate_votes_path(@debate, value: 'yes'), :class => 'in-favor', method: "post" do %> <%= link_to debate_votes_path(@debate, value: 'yes'), class: 'in-favor', method: "post" do %>
<i class="fi-like"></i> <i class="fi-like"></i>
<span><%= percentage('likes', @debate) %></span> <span><%= percentage('likes', @debate) %></span>
<% end %> <% end %>
@@ -22,7 +22,7 @@
<span class="divider"></span> <span class="divider"></span>
<div id="against" class="inline-block"> <div id="against" class="inline-block">
<%= link_to debate_votes_path(@debate, value: 'no'), :class => 'against', method: "post" do %> <%= link_to debate_votes_path(@debate, value: 'no'), class: 'against', method: "post" do %>
<i class="fi-dislike"></i> <i class="fi-dislike"></i>
<span><%= percentage('dislikes', @debate) %></span> <span><%= percentage('dislikes', @debate) %></span>
<% end %> <% end %>
@@ -45,7 +45,7 @@
</div> </div>
<% if current_user && @debate.editable_by?(current_user) %> <% if current_user && @debate.editable_by?(current_user) %>
<%= link_to t("debates.show.edit_debate_link"), edit_debate_path(@debate), :class => 'button radius right' %> <%= link_to t("debates.show.edit_debate_link"), edit_debate_path(@debate), class: 'button radius right' %>
<% end %> <% end %>
</article> </article>

4
app/views/layouts/_header.html.erb
View File

@@ -14,7 +14,7 @@
<ul class="title-area"> <ul class="title-area">
<li class="name"> <li class="name">
<%= link_to root_path do %> <%= link_to root_path do %>
<%= image_tag('header-logo-madrid.png', :class => 'left', :size => '96x96') %> <%= image_tag('header-logo-madrid.png', class: 'left', size: '96x96') %>
<%= t("layouts.header.open_gov", open: "<strong>#{t('layouts.header.open')}</strong>").html_safe %> | <span><%= t("layouts.header.participation") %></span> <%= t("layouts.header.open_gov", open: "<strong>#{t('layouts.header.open')}</strong>").html_safe %> | <span><%= t("layouts.header.participation") %></span>
<% end %> <% end %>
</li> </li>
@@ -32,7 +32,7 @@
<div class="small-12 column text-center"> <div class="small-12 column text-center">
<h1><%= t("layouts.header.open_city") %></h1> <h1><%= t("layouts.header.open_city") %></h1>
<h2><%= t("layouts.header.open_city_slogan") %></h2> <h2><%= t("layouts.header.open_city_slogan") %></h2>
<%= link_to t("layouts.header.create_debate"), new_debate_path, :class => 'button radius' %> <%= link_to t("layouts.header.create_debate"), new_debate_path, class: 'button radius' %>
</div> </div>
</div> </div>
<% end %> <% end %>

2
db/migrate/20150718091702_acts_as_commentable_with_threading_migration.rb
View File

@@ -6,7 +6,7 @@ class ActsAsCommentableWithThreadingMigration < ActiveRecord::Migration
t.string :title t.string :title
t.text :body t.text :body
t.string :subject t.string :subject
t.integer :user_id, :null => false t.integer :user_id, null: false
t.integer :parent_id, :lft, :rgt t.integer :parent_id, :lft, :rgt
t.timestamps t.timestamps
end end