Merge commit '95dcf2c7b510406e78d2c7d5472ca1207c67136e' into v0.11.x

Antonio Terceiro
2 parents a1e766d2 95dcf2c7
Showing 3 changed files with 17 additions and 1 deletions Show diff stats
app/views/account/_signup_form.rhtml
app/views/account/activate_enterprise.rhtml
public/stylesheets/common.css
@@ -41,6 +41,17 @@
   <%= hidden_field_tag :new_user, true %>
 <% end %>
  
+<% if ! defined? hidden_atention || ! hidden_atention %>
+<p/>
+<div class="atention">
+<%= _('Here you should create a login for an <b>individual person</b>.
+<br/>
+Do <b>not</b> enter a login for a group nor for an entreprise.
+With your user login, you can create <b>many</b> group or entreprise
+accounts. You can do it from your personal control panel.') %>
+</div>
+<% end %>
+
 <% button_bar do %>
   <%= submit_button('save', _('Sign up'), :cancel => {:action => 'index'}, :class => 'icon-menu-login') %>
 <% end %>
@@ -13,7 +13,7 @@
  
 <div id="enterprise-activation-create-user-form" style="display: none">
   <h3><%= _('Personal signup form') %></h3>
-  <%= render :partial => 'signup_form' %>
+  <%= render :partial => 'signup_form', :locals => { :hidden_atention => true } %>
   <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>
 </div>
  
@@ -157,6 +157,11 @@ div#notice {
   margin: 0px 0px 10px 0px;
 }
  
+.atention {
+  border: 6px double #000;
+  background: #FE5;
+  padding: 8px 13px;
+}
  
 #better-browser-promotion {
   position: absolute;
...	...	@@ -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 %>
...	...
...	...	@@ -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
...	...
...	...	@@ -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;
...	...