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

fixing conflicts

Browse Source
This commit is contained in:
rgarcia
2015-07-27 23:29:32 +02:00
parent 137267887c 99481722ce
commit cc3f151914
18 changed files with 115 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/comments.js.coffee Normal file
View File

@@ -0,0 +1,9 @@
jQuery ->
toggle_comment = (id) ->
$("#js-comment-form-#{id}").toggle()
$('.js-add-comment-link').click ->
id = $(this).data().id
toggle_comment(id)
false

13
app/controllers/debates_controller.rb
View File

@@ -1,4 +1,5 @@
class DebatesController < ApplicationController
include RecaptchaHelper
before_action :set_debate, only: [:show, :edit, :update]
before_action :authenticate_user!, except: [:show, :index]
before_action :validate_ownership, only: [:edit, :update]
@@ -24,8 +25,11 @@ class DebatesController < ApplicationController
def create
@debate = Debate.new(debate_params)
@debate.author = current_user
@debate.save
respond_with @debate
if verify_captcha? and @debate.save
redirect_to @debate, notice: t('flash.actions.create.notice', resource_name: 'Debate')
else
render :new
end
end
def update
@@ -47,4 +51,9 @@ class DebatesController < ApplicationController
raise ActiveRecord::RecordNotFound unless @debate.editable_by?(current_user)
end
def verify_captcha?
return true unless recaptcha_keys?
verify_recaptcha(model: @debate)
end
end

11
app/helpers/comments_helper.rb Normal file
View File

@@ -0,0 +1,11 @@
module CommentsHelper
def comment_link_text(parent)
parent.class == Debate ? "Comentar" : "Responder"
end
def comment_button_text(parent)
parent.class == Debate ? "Publicar comentario" : "Publicar respuesta"
end
end

8
app/helpers/recaptcha_helper.rb Normal file
View File

@@ -0,0 +1,8 @@
module RecaptchaHelper
def recaptcha_keys?
Recaptcha.configuration.public_key.present? &&
Recaptcha.configuration.private_key.present?
end
end

18
app/views/comments/_form.html.erb
View File

@@ -1,7 +1,11 @@
<%= form_for [@debate, Comment.new] do |f| %>
<%= f.text_area :body %>
<%= f.hidden_field :commentable_type, value: parent.class %>
<%= f.hidden_field :commentable_id, value: parent.id %>
<%= f.submit 'Publicar comentario', :class => "button radius" %>
<% end %>
<%= link_to comment_link_text(parent), "", class: "js-add-comment-link", data: {'id': parent.id} %>
<div id="js-comment-form-<%= parent.id %>" style="display:none">
<%= form_for [@debate, Comment.new] do |f| %>
<%= f.text_area :body %>
<%= f.hidden_field :commentable_type, value: parent.class %>
<%= f.hidden_field :commentable_id, value: parent.id %>
<%= f.submit comment_button_text(parent), :class => "button radius" %>
<% end %>
</div>

2
app/views/debates/_form.html.erb
View File

@@ -30,6 +30,8 @@
Acepto la política de privacidad y el aviso legal
<% end %>
<%= render 'shared/captcha' %>
<div class="actions">
<%= f.submit %>
</div>

14
app/views/layouts/application.html.erb
View File

@@ -5,16 +5,16 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title><%= content_for?(:title) ? yield(:title) : "Participación" %></title>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "vendor/modernizr" %>
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
<script src="https://www.google.com/recaptcha/api.js?hl=<%= I18n.locale %>"></script>
</head>
<body>
<body>
<%= render 'layouts/header' %>
<% if notice %>
<p class="alert-box success"><%= notice %></p>
<% end %>
@@ -22,11 +22,11 @@
<% if alert %>
<p class="alert-box success"><%= alert %></p>
<% end %>
<div class="row">
<div class="small-12 column">
<%= yield %>
</div>
</div>
</body>
</div>
</body>
</html>

3
app/views/shared/_captcha.html.erb Normal file
View File

@@ -0,0 +1,3 @@
<% if recaptcha_keys? %>
<%= recaptcha_tags ajax: true, hl: I18n.locale %>
<% end %>

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

@@ -1,3 +1,3 @@
<% if debate.tags.any? %>
<i class="fi-price-tag"></i> <%= tags(debate) %>
<i class="fi-price-tag"></i> <span class='tags'><%= tags(debate) %></span>
<% end %>