diff --git a/app/views/account/_signup_form.rhtml b/app/views/account/_signup_form.rhtml index 896ba7c..263c253 100644 --- a/app/views/account/_signup_form.rhtml +++ b/app/views/account/_signup_form.rhtml @@ -62,7 +62,7 @@ page['terms-of-use'].hide end %> -

<%= labelled_check_box(_('I accept the terms of use'), 'user[terms_accepted]') %>

+

<%= 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]') %>

<% end %> diff --git a/app/views/account/accept_terms.rhtml b/app/views/account/accept_terms.rhtml index c68e8be..7a03f64 100644 --- a/app/views/account/accept_terms.rhtml +++ b/app/views/account/accept_terms.rhtml @@ -19,7 +19,7 @@ <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %> <%= hidden_field_tag :answer, params[:answer] %> - <%= 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)' %> + <%= 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)') %> <% button_bar do %> <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %> <%= submit_button 'forward', _('Continue'), {:disabled => true, :class => 'disabled', :id => 'submit-accept-terms'} %> diff --git a/db/migrate/072_add_terms_of_use_acceptance_text.rb b/db/migrate/072_add_terms_of_use_acceptance_text.rb new file mode 100644 index 0000000..d5a5771 --- /dev/null +++ b/db/migrate/072_add_terms_of_use_acceptance_text.rb @@ -0,0 +1,9 @@ +class AddTermsOfUseAcceptanceText < ActiveRecord::Migration + def self.up + add_column :environments, :terms_of_use_acceptance_text, :string + end + + def self.down + remove_column :environments, :terms_of_use_acceptance_text + end +end diff --git a/db/schema.rb b/db/schema.rb index 757b67f..67ecccc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 71) do +ActiveRecord::Schema.define(:version => 72) do create_table "article_versions", :force => true do |t| t.integer "article_id" @@ -88,8 +88,8 @@ ActiveRecord::Schema.define(:version => 71) do t.boolean "virtual", :default => false end - add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id" add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id" + add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id" create_table "blocks", :force => true do |t| t.string "title" @@ -130,8 +130,8 @@ ActiveRecord::Schema.define(:version => 71) do t.boolean "virtual", :default => false end - add_index "categories_profiles", ["category_id"], :name => "index_categories_profiles_on_category_id" add_index "categories_profiles", ["profile_id"], :name => "index_categories_profiles_on_profile_id" + add_index "categories_profiles", ["category_id"], :name => "index_categories_profiles_on_category_id" create_table "comments", :force => true do |t| t.string "title" @@ -165,6 +165,7 @@ ActiveRecord::Schema.define(:version => 71) do t.text "custom_header" t.text "custom_footer" t.string "theme" + t.string "terms_of_use_acceptance_text" end create_table "external_feeds", :force => true do |t| @@ -210,8 +211,8 @@ ActiveRecord::Schema.define(:version => 71) do t.datetime "updated_at" end - add_index "product_categorizations", ["category_id"], :name => "index_product_categorizations_on_category_id" add_index "product_categorizations", ["product_id"], :name => "index_product_categorizations_on_product_id" + add_index "product_categorizations", ["category_id"], :name => "index_product_categorizations_on_category_id" create_table "products", :force => true do |t| t.integer "enterprise_id" @@ -291,8 +292,8 @@ ActiveRecord::Schema.define(:version => 71) do t.datetime "created_at" end - add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type" add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" + add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type" create_table "tags", :force => true do |t| t.string "name" -- libgit2 0.21.2