Download as
Browse Code »

Commit 945956c1e3fe5e232e2b6ea6425be13b94155c7a

Authored by Braulio Bhavamitra
2 parents c2137b8e 9f3e8c3d
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Merge branch 'signup-intro' into 'master' 

Signup introduction text

See merge request !485
Showing 4 changed files with 15 additions and 0 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @945956c
@@ -248,6 +248,9 @@ class Environment < ActiveRecord::Base @@ -248,6 +248,9 @@ class Environment < ActiveRecord::Base
248 # store the Environment settings as YAML-serialized Hash. 248 # store the Environment settings as YAML-serialized Hash.
249 acts_as_having_settings :field => :settings 249 acts_as_having_settings :field => :settings
250 250
  251 + # introduce and explain to users something about the signup
  252 + settings_items :signup_intro, :type => String
  253 +
251 # the environment's terms of use: every user must accept them before registering. 254 # the environment's terms of use: every user must accept them before registering.
252 settings_items :terms_of_use, :type => String 255 settings_items :terms_of_use, :type => String
253 256
app/views/account/signup.html.erb
  Diff comments   View file @945956c
1 <h1><%= _('Sign up for %s!') % environment.name %></h1> 1 <h1><%= _('Sign up for %s!') % environment.name %></h1>
  2 +
  3 +<div id='signup-intro'>
  4 + <%= environment.signup_intro %>
  5 +</div>
  6 +
2 <%= render :partial => 'signup_form' %> 7 <%= render :partial => 'signup_form' %>
app/views/admin_panel/_signup_intro.html.erb 0 → 100644
  Diff comments   View file @945956c
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +<div class='description'>
  2 + <%= _('This text will be shown to the user on the top of the sign up form.') %>
  3 +</div>
  4 +
  5 +<%= labelled_form_field(_('Body'), text_area(:environment, :signup_intro, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
app/views/admin_panel/site_info.html.erb
  Diff comments   View file @945956c
@@ -17,6 +17,8 @@ @@ -17,6 +17,8 @@
17 :content => (render :partial => 'signup_welcome_text', :locals => {:f => f})} %> 17 :content => (render :partial => 'signup_welcome_text', :locals => {:f => f})} %>
18 <% tabs << {:title => _('Signup welcome page'), :id => 'signup-welcome-message', 18 <% tabs << {:title => _('Signup welcome page'), :id => 'signup-welcome-message',
19 :content => (render :partial => 'signup_welcome_screen', :locals => {:f => f}) }%> 19 :content => (render :partial => 'signup_welcome_screen', :locals => {:f => f}) }%>
  20 + <% tabs << {:title => _('Signup introduction text'), :id => 'signup-intro',
  21 + :content => (render :partial => 'signup_intro', :locals => {:f => f})} %>
20 <%= render_tabs(tabs) %> 22 <%= render_tabs(tabs) %>
21 <% button_bar do %> 23 <% button_bar do %>
22 <%= submit_button(:save, _('Save'), :cancel => {:action => 'index'}) %> 24 <%= submit_button(:save, _('Save'), :cancel => {:action => 'index'}) %>