ActionItem279: done

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1646 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem279: done
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1646 3f533792-8f58-4932-b0fe-aaf55b0a4547
AurelioAHeckert
1 parent c6e22675
Showing 9 changed files with 85 additions and 28 deletions Show diff stats
app/controllers/public/account_controller.rb
app/models/change_password.rb
app/models/user.rb
app/views/account/forgot_password.rhtml
app/views/account/login.rhtml
app/views/account/login_block.rhtml
app/views/account/signup.rhtml
app/views/layouts/application.rhtml
public/javascripts/noosfero-show-help.js
@@ -11,7 +11,7 @@ class AccountController &lt; PublicController
   def login
     @user = User.new
     return unless request.post?
-    self.current_user = User.authenticate(params[:login], params[:password])
+    self.current_user = User.authenticate(params[:user][:login], params[:user][:password])
     if logged_in?
       if params[:remember_me] == "1"
         self.current_user.remember_me
 # TODO: send an e-mail with a hash code to the task after the ChangePassword is creatd -> override messages from #Task
+class HumanName
+  def human_name
+    @name
+  end
+  def initialize(name)
+    @name = name
+  end
+end
+
 class ChangePassword < Task
   serialize :data, Hash
@@ -7,6 +16,9 @@ class ChangePassword &lt; Task
     self[:data] ||= {}
   end
+  self.columns_hash['login'] = HumanName.new _('Username')
+  self.columns_hash['email'] = HumanName.new _('e-Mail')
+
   attr_accessor :login, :email, :password, :password_confirmation
   N_('ChangePassword|Login')
   N_('ChangePassword|Email')
@@ -7,6 +7,14 @@ class User &lt; ActiveRecord::Base
   N_('User|Password')
   N_('User|Password confirmation')
+  def self.human_attribute_name(attrib)
+    case attrib.to_sym
+      when :login:  return _('Username')
+      when :email:  return _('e-Mail')
+      else self.superclass.human_attribute_name(attrib)
+    end
+  end
+
   before_create do |user|
     if user.environment.nil?
       user.environment = Environment.default
@@ -2,11 +2,15 @@
 <%= error_messages_for :change_password %>
-<%= help(_('To change your password, please fill the form on this screen using yout username and your e-mail. You will receive a message at that e-mail address with a web address you can access to create a new password.')) %>
+<% labelled_form_for :change_password, @change_password,
+                     :url => { :action => 'forgot_password' },
+                     :html => { :help => _('To change your password, please fill the form on this screen using your username and your e-mail. You will receive a message at that e-mail address with a web address you can access to create a new password.') } do |f| %>
+
+  <%= f.text_field :login,
+                   :onchange => 'this.value = convToValidLogin( this.value )' %>
+
+  <%= f.text_field :email %>
-<% form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
-  <%= labelled_form_field(_('Username'), (f.text_field :login)) %>
-  <%= labelled_form_field(_('E-mail'), (f.text_field :email)) %>
 <div>
   <% button_bar do %>
     <%= submit_button('send', _('Send change password procedure by e-mail')) %>
@@ -2,13 +2,20 @@
 <h2><%= _('Login') %></h2>
-<% labelled_form_for :user, @user, :url => { :controller => 'account', :action => 'login' } do |f| %>
+<%
+  @user = User.new  if ! @user
+%>
-<%= display_form_field(_('Login'),
-    text_field_tag(:login, nil,
-    :onchange => 'this.value = convToValidLogin( this.value )') ) %>
+<% labelled_form_for :user, @user,
+   :url => { :controller => 'account', :action => 'login' },
+   :html => { :help => _('If you are a registered user, enter your username and password to be authenticated.')+'<p/>'+_('To join on this environment, click on "<b>I want to be an user!</b>".')+'<p/>'+_('If you forgot your password, click on "<b>I forgot my password!</b>" link.') } do |f| %>
-<%= display_form_field(_('Password'), password_field_tag(:password) ) %>
+<%= f.text_field :login,
+                 :help => _('Here goes the nickname that you give on the registration.'),
+                 :onchange => 'this.value = convToValidLogin( this.value )' %>
+
+<%= f.password_field :password,
+                     :help => _('your password is personal, protect it.') %>
 <% button_bar do %>
   <%= submit_button( 'login', _('Log in') )%>
@@ -17,11 +24,11 @@
 <% end %>
-<p class="forgot-passwd">
+<p class="forgot-passwd" help="<%= _('You can recover your password clicking on this link.') %>">
 <%= link_to _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>
 </p>
-<p class="want-to-be-an-user"><strong>
+<p class="want-to-be-an-user" help="<%= _('Click here to join to this environment, if you is not already an user.') %>"><strong>
 <%= link_to _("I want to be an user!"), :controller => 'account', :action => 'signup' %>
 </strong></p>
@@ -4,25 +4,33 @@
     <h2><%= _('Login') %></h2>
     <div class="login-box-content">
+
+<%
+  @user = User.new  if ! @user
+%>
     <% labelled_form_for :user, @user,
+       :html => { :help => _('If you are a registered user, enter your username and password to be authenticated.')+'<p/>'+_('To join on this environment, click on "<b>New user</b>".')+'<p/>'+_('If you forgot your password, click on "<b>I forgot my password!</b>" link.') },
        :url => { :controller => 'account', :action => 'login' } do |f| %>
-      <%= display_form_field(_('Username'),
-          text_field_tag(:login, nil,
-          :onchange => 'this.value = convToValidLogin( this.value )') ) %>
-      <%= display_form_field(_('Password'), password_field_tag(:password) ) %>
+<%= f.text_field :login,
+                 :help => _('Here goes the nickname that you give on the registration.'),
+                 :onchange => 'this.value = convToValidLogin( this.value )' %>
+
+<%= f.password_field :password,
+                     :help => _('your password is personal, protect it.') %>
       <% button_bar do %>
         <%= submit_button( 'login', _('Log in') )%>
         <%= link_to content_tag( 'span', _('New user') ),
             { :controller => 'account', :action => 'signup' },
+            :help => _('Click here to join to this environment, if you is not already an user.'),
             :class => 'button with-text icon-add' %>
       <% end %>
     <% end %>
-    <div class="forgot-passwd">
+    <div class="forgot-passwd" help="<%= _('You can recover your password clicking on this link.') %>">
     <%= link_to _("I forgot my password!"),
        :controller => 'account', :action => 'forgot_password' %>
     </div>
 <h1><%= _('Register') %></h1>
 <%= error_messages_for :user %>
-<% labelled_form_for :user, @user do |f| -%>
-  
+<% labelled_form_for :user, @user,
+   :html => { :help=>_('Fill all this fields to join in this environment.' +
+                       '<p/>If you forgot your password, do not create a new account,' +
+                       ' click on the "<b>I forgot my password!</b>" link. ;-)')
+            } do |f| -%>
+
 <%= f.text_field :login,
-                 :onchange => 'this.value = convToValidLogin( this.value )' %>
+    :help => help=_('"Username" is a simple nickname to recognize you on this environment.'),
+    :onchange => 'this.value = convToValidLogin( this.value )' %>
+<small><%= help %></small>
+
+<%= f.text_field :email,
+    :help => help=_('We\'ll send you an e-mail to validate your registration.') %>
+<small><%= help %></small>
+
+<%= f.password_field :password,
+    :help => help=_('Do not use a obviously password, but try some unforgettable word.') %>
+<small><%= help %></small>
-<%= f.text_field :email %>
-<%= f.password_field :password %>
-<%= f.password_field :password_confirmation %>
+<%= f.password_field :password_confirmation,
+    :help => help=_('We need to be sure that you wrote correctly your password.') %>
+<small><%= help %></small>
 <% if @terms_of_use %>
   <p>
@@ -21,6 +35,6 @@
 <% end %>
 <% button_bar do %>
-  <%= submit_button('save', _('Sign up'), :cancel => {:action => 'index'}) %>
+  <%= submit_button('save', _('Sign up'), :cancel => {:action => 'index'}, :class => 'icon-menu-login') %>
 <% end %>
 <% end -%>
@@ -110,7 +110,7 @@
         <a href="#" id="btShowHelp" class="icon-help32on"
            title="<%= _('Turn help on/off') %>"
-           onclick="mouseHelpOnOff()"><span><%= _('Help') %></span></a>
+           onclick="mouseHelpOnOff(); return false"><span><%= _('Help') %></span></a>
       </div><!-- id="noosfero_bar" -->
@@ -153,6 +153,7 @@
       </div>
     </div>
     <%= javascript_include_tag 'show-mouse-help' %>
+    <%#
     <div id="noticeAboutHelp" style="display:none">
       <div class="helpAvatar"></div>
       <%= _('Do you want to activate the automatic help mode?') %>
@@ -166,6 +167,7 @@
       <p/>
       <%= _('If needed, you can activate or deactivate the automatic help mode by clicking the question mark symbol in the top-right corner') %>
     </div>
+    %>
     <%= javascript_include_tag 'noosfero-show-help' %>
     <%# javascript_tag('noosferoHelpInit(%s, %s)' % [ _('Do you want to activate the automatic help mode?').inspect, _('If needed, you can activate the automatic help mode by clicking the question mark symbol in the top-right corner').inspect ])  %>
@@ -8,8 +8,8 @@ function mouseHelpOnOff() {
     $("btShowHelp").className = "icon-help32off";
   }
   var date = new Date();
-  // open/close help on help button is remembed by 30 days:
-  date.setTime( date.getTime() + ( 30*24*60*60*1000 ) );
+  // open/close help on help button is remembed by one year:
+  date.setTime( date.getTime() + ( 365*24*60*60*1000 ) );
   var expires = "; expires=" + date.toGMTString();
   document.cookie = "mouseHelpTurnOn="+ pageHelp.info.updateBox + expires +"; path=/";
 }
@@ -33,7 +33,9 @@ if ( document.cookie.indexOf(&quot;mouseHelpTurnOn=&quot;) &gt; -1 ) {
     mouseHelpOnOff();
   }
 }
+
+/* O Noosfero não deve mais propor o help na entrada
 else {
   new Effect.Appear( "noticeAboutHelp", {duration:2} );
 }
-
+*/
	@@ -11,7 +11,7 @@ class AccountController < PublicController		@@ -11,7 +11,7 @@ class AccountController < PublicController
11	def login	11	def login
12	@user = User.new	12	@user = User.new
13	return unless request.post?	13	return unless request.post?
14	- self.current_user = User.authenticate(params[:login], params[:password])	14	+ self.current_user = User.authenticate(params[:user][:login], params[:user][:password])
15	if logged_in?	15	if logged_in?
16	if params[:remember_me] == "1"	16	if params[:remember_me] == "1"
17	self.current_user.remember_me	17	self.current_user.remember_me
1	# TODO: send an e-mail with a hash code to the task after the ChangePassword is creatd -> override messages from #Task	1	# TODO: send an e-mail with a hash code to the task after the ChangePassword is creatd -> override messages from #Task
2		2
		3	+class HumanName
		4	+ def human_name
		5	+ @name
		6	+ end
		7	+ def initialize(name)
		8	+ @name = name
		9	+ end
		10	+end
		11	+
3	class ChangePassword < Task	12	class ChangePassword < Task
4		13
5	serialize :data, Hash	14	serialize :data, Hash
	@@ -7,6 +16,9 @@ class ChangePassword < Task		@@ -7,6 +16,9 @@ class ChangePassword < Task
7	self[:data] \|\|= {}	16	self[:data] \|\|= {}
8	end	17	end
9		18
		19	+ self.columns_hash['login'] = HumanName.new _('Username')
		20	+ self.columns_hash['email'] = HumanName.new _('e-Mail')
		21	+
10	attr_accessor :login, :email, :password, :password_confirmation	22	attr_accessor :login, :email, :password, :password_confirmation
11	N_('ChangePassword\|Login')	23	N_('ChangePassword\|Login')
12	N_('ChangePassword\|Email')	24	N_('ChangePassword\|Email')
	@@ -7,6 +7,14 @@ class User < ActiveRecord::Base		@@ -7,6 +7,14 @@ class User < ActiveRecord::Base
7	N_('User\|Password')	7	N_('User\|Password')
8	N_('User\|Password confirmation')	8	N_('User\|Password confirmation')
9		9
		10	+ def self.human_attribute_name(attrib)
		11	+ case attrib.to_sym
		12	+ when :login: return _('Username')
		13	+ when :email: return _('e-Mail')
		14	+ else self.superclass.human_attribute_name(attrib)
		15	+ end
		16	+ end
		17	+
10	before_create do \|user\|	18	before_create do \|user\|
11	if user.environment.nil?	19	if user.environment.nil?
12	user.environment = Environment.default	20	user.environment = Environment.default