@@ -1,8 +1,8 | |||||
1 | <h2><%=l(:label_document)%></h2> |
|
1 | <h2><%=l(:label_document)%></h2> | |
2 |
|
2 | |||
3 | <%= labelled_form_for @document do |f| %> |
|
3 | <%= labelled_form_for @document, :html => {:multipart => true} do |f| %> | |
4 | <%= render :partial => 'form', :locals => {:f => f} %> |
|
4 | <%= render :partial => 'form', :locals => {:f => f} %> | |
5 | <p><%= submit_tag l(:button_save) %></p> |
|
5 | <p><%= submit_tag l(:button_save) %></p> | |
6 | <% end %> |
|
6 | <% end %> | |
7 |
|
7 | |||
8 |
|
8 |
@@ -1,6 +1,6 | |||||
1 | <%= title [l(@enumeration.option_name), enumerations_path], @enumeration.name %> |
|
1 | <%= title [l(@enumeration.option_name), enumerations_path], @enumeration.name %> | |
2 |
|
2 | |||
3 | <%= labelled_form_for :enumeration, @enumeration, :url => enumeration_path(@enumeration), :html => {:method => :put} do |f| %> |
|
3 | <%= labelled_form_for :enumeration, @enumeration, :url => enumeration_path(@enumeration), :html => {:method => :put, :multipart => true} do |f| %> | |
4 | <%= render :partial => 'form', :locals => {:f => f} %> |
|
4 | <%= render :partial => 'form', :locals => {:f => f} %> | |
5 | <%= submit_tag l(:button_save) %> |
|
5 | <%= submit_tag l(:button_save) %> | |
6 | <% end %> |
|
6 | <% end %> |
@@ -1,7 +1,7 | |||||
1 | <%= title [l(@enumeration.option_name), enumerations_path], l(:label_enumeration_new) %> |
|
1 | <%= title [l(@enumeration.option_name), enumerations_path], l(:label_enumeration_new) %> | |
2 |
|
2 | |||
3 | <%= labelled_form_for :enumeration, @enumeration, :url => enumerations_path do |f| %> |
|
3 | <%= labelled_form_for :enumeration, @enumeration, :url => enumerations_path, :html => {:multipart => true} do |f| %> | |
4 | <%= f.hidden_field :type %> |
|
4 | <%= f.hidden_field :type %> | |
5 | <%= render :partial => 'form', :locals => {:f => f} %> |
|
5 | <%= render :partial => 'form', :locals => {:f => f} %> | |
6 | <%= submit_tag l(:button_create) %> |
|
6 | <%= submit_tag l(:button_create) %> | |
7 | <% end %> |
|
7 | <% end %> |
@@ -1,4 +1,4 | |||||
1 | <%= labelled_form_for @group, :url => group_path(@group) do |f| %> |
|
1 | <%= labelled_form_for @group, :url => group_path(@group), :html => {:multipart => true} do |f| %> | |
2 | <%= render :partial => 'form', :locals => { :f => f } %> |
|
2 | <%= render :partial => 'form', :locals => { :f => f } %> | |
3 | <%= submit_tag l(:button_save) %> |
|
3 | <%= submit_tag l(:button_save) %> | |
4 | <% end %> |
|
4 | <% end %> |
@@ -1,9 +1,9 | |||||
1 | <%= title [l(:label_group_plural), groups_path], l(:label_group_new) %> |
|
1 | <%= title [l(:label_group_plural), groups_path], l(:label_group_new) %> | |
2 |
|
2 | |||
3 | <%= labelled_form_for @group do |f| %> |
|
3 | <%= labelled_form_for @group, :html => {:multipart => true} do |f| %> | |
4 | <%= render :partial => 'form', :locals => { :f => f } %> |
|
4 | <%= render :partial => 'form', :locals => { :f => f } %> | |
5 | <p> |
|
5 | <p> | |
6 | <%= f.submit l(:button_create) %> |
|
6 | <%= f.submit l(:button_create) %> | |
7 | <%= f.submit l(:button_create_and_continue), :name => 'continue' %> |
|
7 | <%= f.submit l(:button_create_and_continue), :name => 'continue' %> | |
8 | </p> |
|
8 | </p> | |
9 | <% end %> |
|
9 | <% end %> |
@@ -1,60 +1,60 | |||||
1 | <div class="contextual"> |
|
1 | <div class="contextual"> | |
2 | <%= additional_emails_link(@user) %> |
|
2 | <%= additional_emails_link(@user) %> | |
3 | <%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %> |
|
3 | <%= link_to(l(:button_change_password), {:action => 'password'}, :class => 'icon icon-passwd') if @user.change_password_allowed? %> | |
4 | <%= call_hook(:view_my_account_contextual, :user => @user)%> |
|
4 | <%= call_hook(:view_my_account_contextual, :user => @user)%> | |
5 | </div> |
|
5 | </div> | |
6 |
|
6 | |||
7 | <h2> |
|
7 | <h2> | |
8 | <%= avatar_edit_link(@user, :size => "50") %> |
|
8 | <%= avatar_edit_link(@user, :size => "50") %> | |
9 | <%=l(:label_my_account)%> |
|
9 | <%=l(:label_my_account)%> | |
10 | </h2> |
|
10 | </h2> | |
11 |
|
11 | |||
12 | <%= error_messages_for 'user' %> |
|
12 | <%= error_messages_for 'user' %> | |
13 |
|
13 | |||
14 | <%= labelled_form_for :user, @user, |
|
14 | <%= labelled_form_for :user, @user, | |
15 | :url => { :action => "account" }, |
|
15 | :url => { :action => "account" }, | |
16 | :html => { :id => 'my_account_form', |
|
16 | :html => { :id => 'my_account_form', | |
17 | :method => :post } do |f| %> |
|
17 | :method => :post, :multipart => true } do |f| %> | |
18 | <div class="splitcontentleft"> |
|
18 | <div class="splitcontentleft"> | |
19 | <fieldset class="box tabular"> |
|
19 | <fieldset class="box tabular"> | |
20 | <legend><%=l(:label_information_plural)%></legend> |
|
20 | <legend><%=l(:label_information_plural)%></legend> | |
21 | <p><%= f.text_field :firstname, :required => true %></p> |
|
21 | <p><%= f.text_field :firstname, :required => true %></p> | |
22 | <p><%= f.text_field :lastname, :required => true %></p> |
|
22 | <p><%= f.text_field :lastname, :required => true %></p> | |
23 | <p><%= f.text_field :mail, :required => true %></p> |
|
23 | <p><%= f.text_field :mail, :required => true %></p> | |
24 | <% unless @user.force_default_language? %> |
|
24 | <% unless @user.force_default_language? %> | |
25 | <p><%= f.select :language, lang_options_for_select %></p> |
|
25 | <p><%= f.select :language, lang_options_for_select %></p> | |
26 | <% end %> |
|
26 | <% end %> | |
27 | <% if Setting.openid? %> |
|
27 | <% if Setting.openid? %> | |
28 | <p><%= f.text_field :identity_url %></p> |
|
28 | <p><%= f.text_field :identity_url %></p> | |
29 | <% end %> |
|
29 | <% end %> | |
30 |
|
30 | |||
31 | <% @user.custom_field_values.select(&:editable?).each do |value| %> |
|
31 | <% @user.custom_field_values.select(&:editable?).each do |value| %> | |
32 | <p><%= custom_field_tag_with_label :user, value %></p> |
|
32 | <p><%= custom_field_tag_with_label :user, value %></p> | |
33 | <% end %> |
|
33 | <% end %> | |
34 | <%= call_hook(:view_my_account, :user => @user, :form => f) %> |
|
34 | <%= call_hook(:view_my_account, :user => @user, :form => f) %> | |
35 | </fieldset> |
|
35 | </fieldset> | |
36 |
|
36 | |||
37 | <p class="mobile-hide"><%= submit_tag l(:button_save) %></p> |
|
37 | <p class="mobile-hide"><%= submit_tag l(:button_save) %></p> | |
38 | </div> |
|
38 | </div> | |
39 |
|
39 | |||
40 | <div class="splitcontentright"> |
|
40 | <div class="splitcontentright"> | |
41 | <fieldset class="box"> |
|
41 | <fieldset class="box"> | |
42 | <legend><%=l(:field_mail_notification)%></legend> |
|
42 | <legend><%=l(:field_mail_notification)%></legend> | |
43 | <%= render :partial => 'users/mail_notifications' %> |
|
43 | <%= render :partial => 'users/mail_notifications' %> | |
44 | </fieldset> |
|
44 | </fieldset> | |
45 |
|
45 | |||
46 | <fieldset class="box tabular"> |
|
46 | <fieldset class="box tabular"> | |
47 | <legend><%=l(:label_preferences)%></legend> |
|
47 | <legend><%=l(:label_preferences)%></legend> | |
48 | <%= render :partial => 'users/preferences' %> |
|
48 | <%= render :partial => 'users/preferences' %> | |
49 | <%= call_hook(:view_my_account_preferences, :user => @user, :form => f) %> |
|
49 | <%= call_hook(:view_my_account_preferences, :user => @user, :form => f) %> | |
50 | </fieldset> |
|
50 | </fieldset> | |
51 |
|
51 | |||
52 | <p class="mobile-show"><%= submit_tag l(:button_save) %></p> |
|
52 | <p class="mobile-show"><%= submit_tag l(:button_save) %></p> | |
53 | </div> |
|
53 | </div> | |
54 | <% end %> |
|
54 | <% end %> | |
55 |
|
55 | |||
56 | <% content_for :sidebar do %> |
|
56 | <% content_for :sidebar do %> | |
57 | <%= render :partial => 'sidebar' %> |
|
57 | <%= render :partial => 'sidebar' %> | |
58 | <% end %> |
|
58 | <% end %> | |
59 |
|
59 | |||
60 | <% html_title(l(:label_my_account)) -%> |
|
60 | <% html_title(l(:label_my_account)) -%> |
@@ -1,4 +1,4 | |||||
1 | <%= labelled_form_for @project do |f| %> |
|
1 | <%= labelled_form_for @project, :html => {:multipart => true} do |f| %> | |
2 | <%= render :partial => 'form', :locals => { :f => f } %> |
|
2 | <%= render :partial => 'form', :locals => { :f => f } %> | |
3 | <%= submit_tag l(:button_save) %> |
|
3 | <%= submit_tag l(:button_save) %> | |
4 | <% end %> |
|
4 | <% end %> |
@@ -1,7 +1,7 | |||||
1 | <%= title l(:label_project_new) %> |
|
1 | <%= title l(:label_project_new) %> | |
2 |
|
2 | |||
3 | <%= labelled_form_for @project do |f| %> |
|
3 | <%= labelled_form_for @project, :html => {:multipart => true} do |f| %> | |
4 | <%= render :partial => 'form', :locals => { :f => f } %> |
|
4 | <%= render :partial => 'form', :locals => { :f => f } %> | |
5 | <%= submit_tag l(:button_create) %> |
|
5 | <%= submit_tag l(:button_create) %> | |
6 | <%= submit_tag l(:button_create_and_continue), :name => 'continue' %> |
|
6 | <%= submit_tag l(:button_create_and_continue), :name => 'continue' %> | |
7 | <% end %> |
|
7 | <% end %> |
@@ -1,6 +1,6 | |||||
1 | <h2><%= l(:label_spent_time) %></h2> |
|
1 | <h2><%= l(:label_spent_time) %></h2> | |
2 |
|
2 | |||
3 | <%= labelled_form_for @time_entry, :url => time_entry_path(@time_entry) do |f| %> |
|
3 | <%= labelled_form_for @time_entry, :url => time_entry_path(@time_entry), :html => {:multipart => true} do |f| %> | |
4 | <%= render :partial => 'form', :locals => {:f => f} %> |
|
4 | <%= render :partial => 'form', :locals => {:f => f} %> | |
5 | <%= submit_tag l(:button_save) %> |
|
5 | <%= submit_tag l(:button_save) %> | |
6 | <% end %> |
|
6 | <% end %> |
@@ -1,7 +1,7 | |||||
1 | <h2><%= l(:label_spent_time) %></h2> |
|
1 | <h2><%= l(:label_spent_time) %></h2> | |
2 |
|
2 | |||
3 | <%= labelled_form_for @time_entry, :url => time_entries_path do |f| %> |
|
3 | <%= labelled_form_for @time_entry, :url => time_entries_path, :html => {:multipart => true} do |f| %> | |
4 | <%= render :partial => 'form', :locals => {:f => f} %> |
|
4 | <%= render :partial => 'form', :locals => {:f => f} %> | |
5 | <%= submit_tag l(:button_create) %> |
|
5 | <%= submit_tag l(:button_create) %> | |
6 | <%= submit_tag l(:button_create_and_continue), :name => 'continue' %> |
|
6 | <%= submit_tag l(:button_create_and_continue), :name => 'continue' %> | |
7 | <% end %> |
|
7 | <% end %> |
@@ -1,7 +1,7 | |||||
1 | <%= labelled_form_for @user do |f| %> |
|
1 | <%= labelled_form_for @user, :html => {:multipart => true} do |f| %> | |
2 | <%= render :partial => 'form', :locals => { :f => f } %> |
|
2 | <%= render :partial => 'form', :locals => { :f => f } %> | |
3 | <% if @user.active? && email_delivery_enabled? && @user != User.current -%> |
|
3 | <% if @user.active? && email_delivery_enabled? && @user != User.current -%> | |
4 | <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p> |
|
4 | <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p> | |
5 | <% end -%> |
|
5 | <% end -%> | |
6 | <p><%= submit_tag l(:button_save) %></p> |
|
6 | <p><%= submit_tag l(:button_save) %></p> | |
7 | <% end %> |
|
7 | <% end %> |
@@ -1,30 +1,30 | |||||
1 | <%= title [l(:label_user_plural), users_path], l(:label_user_new) %> |
|
1 | <%= title [l(:label_user_plural), users_path], l(:label_user_new) %> | |
2 |
|
2 | |||
3 | <%= labelled_form_for @user do |f| %> |
|
3 | <%= labelled_form_for @user, :html => {:multipart => true} do |f| %> | |
4 | <%= render :partial => 'form', :locals => { :f => f } %> |
|
4 | <%= render :partial => 'form', :locals => { :f => f } %> | |
5 | <% if email_delivery_enabled? %> |
|
5 | <% if email_delivery_enabled? %> | |
6 | <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p> |
|
6 | <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p> | |
7 | <% end %> |
|
7 | <% end %> | |
8 | <p> |
|
8 | <p> | |
9 | <%= submit_tag l(:button_create) %> |
|
9 | <%= submit_tag l(:button_create) %> | |
10 | <%= submit_tag l(:button_create_and_continue), :name => 'continue' %> |
|
10 | <%= submit_tag l(:button_create_and_continue), :name => 'continue' %> | |
11 | </p> |
|
11 | </p> | |
12 | <% end %> |
|
12 | <% end %> | |
13 |
|
13 | |||
14 | <% if @auth_sources.present? && @auth_sources.any?(&:searchable?) %> |
|
14 | <% if @auth_sources.present? && @auth_sources.any?(&:searchable?) %> | |
15 | <%= javascript_tag do %> |
|
15 | <%= javascript_tag do %> | |
16 | observeAutocompleteField('user_login', '<%= escape_javascript autocomplete_for_new_user_auth_sources_path %>', { |
|
16 | observeAutocompleteField('user_login', '<%= escape_javascript autocomplete_for_new_user_auth_sources_path %>', { | |
17 | select: function(event, ui) { |
|
17 | select: function(event, ui) { | |
18 | $('input#user_firstname').val(ui.item.firstname); |
|
18 | $('input#user_firstname').val(ui.item.firstname); | |
19 | $('input#user_lastname').val(ui.item.lastname); |
|
19 | $('input#user_lastname').val(ui.item.lastname); | |
20 | $('input#user_mail').val(ui.item.mail); |
|
20 | $('input#user_mail').val(ui.item.mail); | |
21 | $('select#user_auth_source_id option').each(function(){ |
|
21 | $('select#user_auth_source_id option').each(function(){ | |
22 | if ($(this).attr('value') == ui.item.auth_source_id) { |
|
22 | if ($(this).attr('value') == ui.item.auth_source_id) { | |
23 | $(this).attr('selected', true); |
|
23 | $(this).attr('selected', true); | |
24 | $('select#user_auth_source_id').trigger('change'); |
|
24 | $('select#user_auth_source_id').trigger('change'); | |
25 | } |
|
25 | } | |
26 | }); |
|
26 | }); | |
27 | } |
|
27 | } | |
28 | }); |
|
28 | }); | |
29 | <% end %> |
|
29 | <% end %> | |
30 | <% end %> |
|
30 | <% end %> |
@@ -1,7 +1,7 | |||||
1 | <h2><%=l(:label_version)%></h2> |
|
1 | <h2><%=l(:label_version)%></h2> | |
2 |
|
2 | |||
3 | <%= labelled_form_for @version do |f| %> |
|
3 | <%= labelled_form_for @version, :html => {:multipart => true} do |f| %> | |
4 | <%= render :partial => 'form', :locals => { :f => f } %> |
|
4 | <%= render :partial => 'form', :locals => { :f => f } %> | |
5 | <%= submit_tag l(:button_save) %> |
|
5 | <%= submit_tag l(:button_save) %> | |
6 | <% end %> |
|
6 | <% end %> | |
7 |
|
7 |
@@ -1,6 +1,6 | |||||
1 | <h2><%=l(:label_version_new)%></h2> |
|
1 | <h2><%=l(:label_version_new)%></h2> | |
2 |
|
2 | |||
3 | <%= labelled_form_for @version, :url => project_versions_path(@project) do |f| %> |
|
3 | <%= labelled_form_for @version, :url => project_versions_path(@project), :html => {:multipart => true} do |f| %> | |
4 | <%= render :partial => 'versions/form', :locals => { :f => f } %> |
|
4 | <%= render :partial => 'versions/form', :locals => { :f => f } %> | |
5 | <%= submit_tag l(:button_create) %> |
|
5 | <%= submit_tag l(:button_create) %> | |
6 | <% end %> |
|
6 | <% end %> |
General Comments 0
You need to be logged in to leave comments.
Login now