1
Download as
Browse Code »

Commit 95dcf2c7b510406e78d2c7d5472ca1207c67136e

Authored by Aurelio A. Heckert
1 parent fb2daa76
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

ActionItem736: explanation in user registration

Showing 3 changed files with 17 additions and 1 deletions   Show diff stats
app/views/account/_signup_form.rhtml
  Diff comments   View file @95dcf2c
... ... @@ -41,6 +41,17 @@
41 41 <%= hidden_field_tag :new_user, true %>
42 42 <% end %>
43 43  
  44 +<% if ! defined? hidden_atention || ! hidden_atention %>
  45 +<p/>
  46 +<div class="atention">
  47 +<%= _('Here you should create a login for an <b>individual person</b>.
  48 +<br/>
  49 +Do <b>not</b> enter a login for a group nor for an entreprise.
  50 +With your user login, you can create <b>many</b> group or entreprise
  51 +accounts. You can do it from your personal control panel.') %>
  52 +</div>
  53 +<% end %>
  54 +
44 55 <% button_bar do %>
45 56 <%= submit_button('save', _('Sign up'), :cancel => {:action => 'index'}, :class => 'icon-menu-login') %>
46 57 <% end %>
... ...
app/views/account/activate_enterprise.rhtml
  Diff comments   View file @95dcf2c
... ... @@ -13,7 +13,7 @@
13 13  
14 14 <div id="enterprise-activation-create-user-form" style="display: none">
15 15 <h3><%= _('Personal signup form') %></h3>
16   - <%= render :partial => 'signup_form' %>
  16 + <%= render :partial => 'signup_form', :locals => { :hidden_atention => true } %>
17 17 <p><%= message = _('<b>Warning</b>: this form is for your personal information, not of your enterprise. So you will have a personal account that can manage your enterprise.') %></p>
18 18 </div>
19 19  
... ...
public/stylesheets/common.css
  Diff comments   View file @95dcf2c
... ... @@ -157,6 +157,11 @@ div#notice {
157 157 margin: 0px 0px 10px 0px;
158 158 }
159 159  
  160 +.atention {
  161 + border: 6px double #000;
  162 + background: #FE5;
  163 + padding: 8px 13px;
  164 +}
160 165  
161 166 #better-browser-promotion {
162 167 position: absolute;
... ...