##// END OF EJS Templates
Restored error messages on my account....
Jean-Philippe Lang -
r6046:5b648a7daed9
parent child
Show More
@@ -1,50 +1,51
1 <div class="contextual">
1 <div class="contextual">
2 <%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %>
2 <%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %>
3 <%= call_hook(:view_my_account_contextual, :user => @user)%>
3 <%= call_hook(:view_my_account_contextual, :user => @user)%>
4 </div>
4 </div>
5
5
6 <h2><%=l(:label_my_account)%></h2>
6 <h2><%=l(:label_my_account)%></h2>
7 <%= error_messages_for 'user' %>
7
8
8 <% form_for :user, @user, :url => { :action => "account" },
9 <% form_for :user, @user, :url => { :action => "account" },
9 :builder => TabularFormBuilder,
10 :builder => TabularFormBuilder,
10 :lang => current_language,
11 :lang => current_language,
11 :html => { :id => 'my_account_form' } do |f| %>
12 :html => { :id => 'my_account_form' } do |f| %>
12 <div class="splitcontentleft">
13 <div class="splitcontentleft">
13 <fieldset class="box tabular">
14 <fieldset class="box tabular">
14 <legend><%=l(:label_information_plural)%></legend>
15 <legend><%=l(:label_information_plural)%></legend>
15 <p><%= f.text_field :firstname, :required => true %></p>
16 <p><%= f.text_field :firstname, :required => true %></p>
16 <p><%= f.text_field :lastname, :required => true %></p>
17 <p><%= f.text_field :lastname, :required => true %></p>
17 <p><%= f.text_field :mail, :required => true %></p>
18 <p><%= f.text_field :mail, :required => true %></p>
18 <p><%= f.select :language, lang_options_for_select %></p>
19 <p><%= f.select :language, lang_options_for_select %></p>
19 <% if Setting.openid? %>
20 <% if Setting.openid? %>
20 <p><%= f.text_field :identity_url %></p>
21 <p><%= f.text_field :identity_url %></p>
21 <% end %>
22 <% end %>
22
23
23 <% @user.custom_field_values.select(&:editable?).each do |value| %>
24 <% @user.custom_field_values.select(&:editable?).each do |value| %>
24 <p><%= custom_field_tag_with_label :user, value %></p>
25 <p><%= custom_field_tag_with_label :user, value %></p>
25 <% end %>
26 <% end %>
26 <%= call_hook(:view_my_account, :user => @user, :form => f) %>
27 <%= call_hook(:view_my_account, :user => @user, :form => f) %>
27 </fieldset>
28 </fieldset>
28
29
29 <%= submit_tag l(:button_save) %>
30 <%= submit_tag l(:button_save) %>
30 </div>
31 </div>
31
32
32 <div class="splitcontentright">
33 <div class="splitcontentright">
33 <fieldset class="box">
34 <fieldset class="box">
34 <legend><%=l(:field_mail_notification)%></legend>
35 <legend><%=l(:field_mail_notification)%></legend>
35 <%= render :partial => 'users/mail_notifications' %>
36 <%= render :partial => 'users/mail_notifications' %>
36 </fieldset>
37 </fieldset>
37
38
38 <fieldset class="box tabular">
39 <fieldset class="box tabular">
39 <legend><%=l(:label_preferences)%></legend>
40 <legend><%=l(:label_preferences)%></legend>
40 <%= render :partial => 'users/preferences' %>
41 <%= render :partial => 'users/preferences' %>
41 </fieldset>
42 </fieldset>
42
43
43 </div>
44 </div>
44 <% end %>
45 <% end %>
45
46
46 <% content_for :sidebar do %>
47 <% content_for :sidebar do %>
47 <%= render :partial => 'sidebar' %>
48 <%= render :partial => 'sidebar' %>
48 <% end %>
49 <% end %>
49
50
50 <% html_title(l(:label_my_account)) -%>
51 <% html_title(l(:label_my_account)) -%>
General Comments 0
You need to be logged in to leave comments. Login now