[Git][noosfero/noosfero][master] 2 commits: Add ssl true option in recaptcha_tags

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
50c480f8 by matheuslacerda at 2016-11-30T11:40:59-02:00
Add ssl true option in recaptcha_tags

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>
Signed-off-by: Matheus Miranda <matheusmirandalacerda at gmail.com>
Signed-off-by: Vítor Barbosa <vitornga15 at gmail.com>

Conflicts:
	app/views/comment/_comment_form.html.erb
	app/views/content_viewer/_comment_form.html.erb

- - - - -
1124e574 by Rodrigo Souto at 2017-01-18T11:19:26+00:00
Merge branch 'recaptcha_tags_fixes' into 'master'

Add ssl true option in recaptcha_tags

See merge request !1057
- - - - -


6 changed files:

- app/views/account/_signup_form.html.erb
- app/views/account/forgot_password.html.erb
- app/views/cms/suggest_an_article.html.erb
- app/views/comment/_comment_form.html.erb
- app/views/contact/new.html.erb
- app/views/content_viewer/_comment_form.html.erb


Changes:

=====================================
app/views/account/_signup_form.html.erb
=====================================
--- a/app/views/account/_signup_form.html.erb
+++ b/app/views/account/_signup_form.html.erb
@@ -127,7 +127,7 @@
   <% end %>
 </div>
 
-<%= recaptcha_tags :ajax => true, :display => {:theme => 'clean'} if @block_bot %>
+<%= recaptcha_tags :ajax => true, :ssl => true, :display => {:theme => 'clean'} if @block_bot %>
 <%= render :partial => 'shared/custom_fields', :locals => {:f => f, :profile => @person, :signup => true} %>
 
 <p style="text-align: center">


=====================================
app/views/account/forgot_password.html.erb
=====================================
--- a/app/views/account/forgot_password.html.erb
+++ b/app/views/account/forgot_password.html.erb
@@ -6,7 +6,7 @@
   <%= labelled_form_field fields_label, text_field_tag(:value) %>
 
   <h3><%= _('Please type the captcha text below') %></h3>
-  <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
+  <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true, :ssl => true) %>
 
   <div>
     <%= button_bar do %>


=====================================
app/views/cms/suggest_an_article.html.erb
=====================================
--- a/app/views/cms/suggest_an_article.html.erb
+++ b/app/views/cms/suggest_an_article.html.erb
@@ -19,7 +19,7 @@
 
   <%= hidden_field_tag('back_to', @back_to) %>
 
-  <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) unless logged_in? %>
+  <%= recaptcha_tags(:display => { :theme => 'clean' }, :ssl => true, :ajax => true) unless logged_in? %>
 
   <%= button_bar do %>
     <%= submit_button :save, _('Save') %>


=====================================
app/views/comment/_comment_form.html.erb
=====================================
--- a/app/views/comment/_comment_form.html.erb
+++ b/app/views/comment/_comment_form.html.erb
@@ -7,8 +7,8 @@
 <% if !edition_mode && !pass_without_comment_captcha? %>
   <div id="recaptcha-container" style="display: none">
     <h3><%= _('Please type the two words below') %></h3>
-    <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
-    <%= button_bar do %>
+    <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true, :ssl => true) %>
+    <% button_bar do %>
       <%= button_to_function :add, _('Confirm'), "return false", :id => "confirm-captcha" %>
       <%= button_to_function :cancel, _('Cancel'), "noosfero.modal.close()" %>
     <% end %>


=====================================
app/views/contact/new.html.erb
=====================================
--- a/app/views/contact/new.html.erb
+++ b/app/views/contact/new.html.erb
@@ -30,7 +30,7 @@
   <%= labelled_form_field check_box(:contact, :receive_a_copy) + _('I want to receive a copy of the message in my e-mail.'), '' %>
 
   <% unless logged_in? %>
-    <%= recaptcha_tags :ajax => true, :display => {:theme => 'clean'} %>
+    <%= recaptcha_tags :ajax => true, :ssl => true, :display => {:theme => 'clean'} %>
   <% end %>
 
   <%= submit_button(:send, _('Send'), :onclick => "jQuery('#confirm').val('true')") %>


=====================================
app/views/content_viewer/_comment_form.html.erb
=====================================
--- a/app/views/content_viewer/_comment_form.html.erb
+++ b/app/views/content_viewer/_comment_form.html.erb
@@ -35,8 +35,8 @@ function submit_comment_form(button) {
 <% unless pass_without_comment_captcha? %>
   <div id="recaptcha-container" style="display: none">
     <h3><%= _('Please type the two words below') %></h3>
-    <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
-    <%= button_bar do %>
+    <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true, :ssl => true) %>
+    <% button_bar do %>
       <%= button_to_function :add, _('Confirm'), "return false", :id => "confirm-captcha" %>
       <%= button_to_function :cancel, _('Cancel'), "noosfero.modal.close()" %>
     <% end %>



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/18224ab42551059c11486555106f2194549a57e3...1124e5746b97908da3ba1fd5f3b2026a917cb6b8
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170118/d2aa6185/attachment-0001.html>