Download as
Browse Code »

Commit 85013489aebd73f73e35a8965f0d3169bf4bfe2d

Authored by Antonio Terceiro
1 parent cef90ed7
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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 62 page['terms-of-use'].hide
63 63 end %>
64 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 66 </div>
67 67 <% end %>
68 68  
... ...
app/views/account/accept_terms.rhtml
  Diff comments   View file @8501348
... ... @@ -19,7 +19,7 @@
19 19 <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
20 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 23 <% button_bar do %>
24 24 <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
25 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 @@
  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
... ...
db/schema.rb
  Diff comments   View file @8501348
... ... @@ -9,7 +9,7 @@
9 9 #
10 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 14 create_table "article_versions", :force => true do |t|
15 15 t.integer "article_id"
... ... @@ -88,8 +88,8 @@ ActiveRecord::Schema.define(:version =&gt; 71) do
88 88 t.boolean "virtual", :default => false
89 89 end
90 90  
91   - add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id"
92 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 94 create_table "blocks", :force => true do |t|
95 95 t.string "title"
... ... @@ -130,8 +130,8 @@ ActiveRecord::Schema.define(:version =&gt; 71) do
130 130 t.boolean "virtual", :default => false
131 131 end
132 132  
133   - add_index "categories_profiles", ["category_id"], :name => "index_categories_profiles_on_category_id"
134 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 136 create_table "comments", :force => true do |t|
137 137 t.string "title"
... ... @@ -165,6 +165,7 @@ ActiveRecord::Schema.define(:version =&gt; 71) do
165 165 t.text "custom_header"
166 166 t.text "custom_footer"
167 167 t.string "theme"
  168 + t.string "terms_of_use_acceptance_text"
168 169 end
169 170  
170 171 create_table "external_feeds", :force => true do |t|
... ... @@ -210,8 +211,8 @@ ActiveRecord::Schema.define(:version =&gt; 71) do
210 211 t.datetime "updated_at"
211 212 end
212 213  
213   - add_index "product_categorizations", ["category_id"], :name => "index_product_categorizations_on_category_id"
214 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 217 create_table "products", :force => true do |t|
217 218 t.integer "enterprise_id"
... ... @@ -291,8 +292,8 @@ ActiveRecord::Schema.define(:version =&gt; 71) do
291 292 t.datetime "created_at"
292 293 end
293 294  
294   - add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
295 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 298 create_table "tags", :force => true do |t|
298 299 t.string "name"
... ...