Download as
Browse Code »

Commit 85013489aebd73f73e35a8965f0d3169bf4bfe2d

Authored by Antonio Terceiro
1 parent cef90ed7
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem1264: allow custom text for terms of use acceptance

Showing 4 changed files with 17 additions and 7 deletions   Show diff stats
app/views/account/_signup_form.rhtml
  Diff comments   View file @8501348
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 page['terms-of-use'].hide 62 page['terms-of-use'].hide
63 end %> 63 end %>
64 </div> 64 </div>
65 - <p><%= labelled_check_box(_('I accept the terms of use'), 'user[terms_accepted]') %></p> 65 + <p><%= labelled_check_box(environment.terms_of_use_acceptance_text.blank? ? _('I accept the terms of use') : environment.terms_of_use_acceptance_text, 'user[terms_accepted]') %></p>
66 </div> 66 </div>
67 <% end %> 67 <% end %>
68 68
app/views/account/accept_terms.rhtml
  Diff comments   View file @8501348
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %> 19 <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
20 <%= hidden_field_tag :answer, params[:answer] %> 20 <%= hidden_field_tag :answer, params[:answer] %>
21 21
22 - <%= labelled_check_box _('I read the terms of use and accepted them'), :terms_accepted, '1', false, :onclick => 'toggle_submit_button("submit-accept-terms", this.checked)' %> 22 + <%= labelled_check_box(environment.terms_of_use_acceptance_text.blank? ? _('I read the terms of use and accepted them') : environment.terms_of_use_acceptance_text, :terms_accepted, '1', false, :onclick => 'toggle_submit_button("submit-accept-terms", this.checked)') %>
23 <% button_bar do %> 23 <% button_bar do %>
24 <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %> 24 <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
25 <%= submit_button 'forward', _('Continue'), {:disabled => true, :class => 'disabled', :id => 'submit-accept-terms'} %> 25 <%= submit_button 'forward', _('Continue'), {:disabled => true, :class => 'disabled', :id => 'submit-accept-terms'} %>
db/migrate/072_add_terms_of_use_acceptance_text.rb 0 → 100644
  Diff comments   View file @8501348
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +class AddTermsOfUseAcceptanceText < ActiveRecord::Migration
  2 + def self.up
  3 + add_column :environments, :terms_of_use_acceptance_text, :string
  4 + end
  5 +
  6 + def self.down
  7 + remove_column :environments, :terms_of_use_acceptance_text
  8 + end
  9 +end
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 # 9 #
10 # It's strongly recommended to check this file into your version control system. 10 # It's strongly recommended to check this file into your version control system.
11 11
12 -ActiveRecord::Schema.define(:version => 71) do 12 +ActiveRecord::Schema.define(:version => 72) do
13 13
14 create_table "article_versions", :force => true do |t| 14 create_table "article_versions", :force => true do |t|
15 t.integer "article_id" 15 t.integer "article_id"
@@ -88,8 +88,8 @@ ActiveRecord::Schema.define(:version =&gt; 71) do @@ -88,8 +88,8 @@ ActiveRecord::Schema.define(:version =&gt; 71) do
88 t.boolean "virtual", :default => false 88 t.boolean "virtual", :default => false
89 end 89 end
90 90
91 - add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id"  
92 add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id" 91 add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id"
  92 + add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id"
93 93
94 create_table "blocks", :force => true do |t| 94 create_table "blocks", :force => true do |t|
95 t.string "title" 95 t.string "title"
@@ -130,8 +130,8 @@ ActiveRecord::Schema.define(:version =&gt; 71) do @@ -130,8 +130,8 @@ ActiveRecord::Schema.define(:version =&gt; 71) do
130 t.boolean "virtual", :default => false 130 t.boolean "virtual", :default => false
131 end 131 end
132 132
133 - add_index "categories_profiles", ["category_id"], :name => "index_categories_profiles_on_category_id"  
134 add_index "categories_profiles", ["profile_id"], :name => "index_categories_profiles_on_profile_id" 133 add_index "categories_profiles", ["profile_id"], :name => "index_categories_profiles_on_profile_id"
  134 + add_index "categories_profiles", ["category_id"], :name => "index_categories_profiles_on_category_id"
135 135
136 create_table "comments", :force => true do |t| 136 create_table "comments", :force => true do |t|
137 t.string "title" 137 t.string "title"
@@ -165,6 +165,7 @@ ActiveRecord::Schema.define(:version =&gt; 71) do @@ -165,6 +165,7 @@ ActiveRecord::Schema.define(:version =&gt; 71) do
165 t.text "custom_header" 165 t.text "custom_header"
166 t.text "custom_footer" 166 t.text "custom_footer"
167 t.string "theme" 167 t.string "theme"
  168 + t.string "terms_of_use_acceptance_text"
168 end 169 end
169 170
170 create_table "external_feeds", :force => true do |t| 171 create_table "external_feeds", :force => true do |t|
@@ -210,8 +211,8 @@ ActiveRecord::Schema.define(:version =&gt; 71) do @@ -210,8 +211,8 @@ ActiveRecord::Schema.define(:version =&gt; 71) do
210 t.datetime "updated_at" 211 t.datetime "updated_at"
211 end 212 end
212 213
213 - add_index "product_categorizations", ["category_id"], :name => "index_product_categorizations_on_category_id"  
214 add_index "product_categorizations", ["product_id"], :name => "index_product_categorizations_on_product_id" 214 add_index "product_categorizations", ["product_id"], :name => "index_product_categorizations_on_product_id"
  215 + add_index "product_categorizations", ["category_id"], :name => "index_product_categorizations_on_category_id"
215 216
216 create_table "products", :force => true do |t| 217 create_table "products", :force => true do |t|
217 t.integer "enterprise_id" 218 t.integer "enterprise_id"
@@ -291,8 +292,8 @@ ActiveRecord::Schema.define(:version =&gt; 71) do @@ -291,8 +292,8 @@ ActiveRecord::Schema.define(:version =&gt; 71) do
291 t.datetime "created_at" 292 t.datetime "created_at"
292 end 293 end
293 294
294 - add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"  
295 add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" 295 add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
  296 + add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
296 297
297 create_table "tags", :force => true do |t| 298 create_table "tags", :force => true do |t|
298 t.string "name" 299 t.string "name"