##// END OF EJS Templates
Use #labelled_form_for instead of #labelled_tabular_form_for....
Jean-Philippe Lang -
r8021:9636882c1e89
parent child
Show More
@@ -866,6 +866,7 module ApplicationHelper
866 end
866 end
867
867
868 def labelled_tabular_form_for(*args, &proc)
868 def labelled_tabular_form_for(*args, &proc)
869 ActiveSupport::Deprecation.warn "ApplicationHelper#labelled_tabular_form_for is deprecated and will be removed in Redmine 1.5. Use #labelled_form_for instead."
869 args << {} unless args.last.is_a?(Hash)
870 args << {} unless args.last.is_a?(Hash)
870 options = args.last
871 options = args.last
871 options[:html] ||= {}
872 options[:html] ||= {}
@@ -60,7 +60,7 function toggle_custom_field_format() {
60 //]]>
60 //]]>
61 </script>
61 </script>
62
62
63 <div class="box">
63 <div class="box tabular">
64 <p><%= f.text_field :name, :required => true %></p>
64 <p><%= f.text_field :name, :required => true %></p>
65 <p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :onchange => "toggle_custom_field_format();",
65 <p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :onchange => "toggle_custom_field_format();",
66 :disabled => !@custom_field.new_record? %></p>
66 :disabled => !@custom_field.new_record? %></p>
@@ -76,7 +76,7 function toggle_custom_field_format() {
76 <%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
76 <%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
77 </div>
77 </div>
78
78
79 <div class="box">
79 <div class="box tabular">
80 <% case @custom_field.class.name
80 <% case @custom_field.class.name
81 when "IssueCustomField" %>
81 when "IssueCustomField" %>
82
82
@@ -2,7 +2,7
2 &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>
2 &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>
3 &#187; <%=h @custom_field.name %></h2>
3 &#187; <%=h @custom_field.name %></h2>
4
4
5 <% labelled_tabular_form_for :custom_field, @custom_field, :url => { :action => "edit", :id => @custom_field } do |f| %>
5 <% labelled_form_for :custom_field, @custom_field, :url => { :action => "edit", :id => @custom_field } do |f| %>
6 <%= render :partial => 'form', :locals => { :f => f } %>
6 <%= render :partial => 'form', :locals => { :f => f } %>
7 <%= submit_tag l(:button_save) %>
7 <%= submit_tag l(:button_save) %>
8 <% end %>
8 <% end %>
@@ -2,7 +2,7
2 &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>
2 &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>
3 &#187; <%= l(:label_custom_field_new) %></h2>
3 &#187; <%= l(:label_custom_field_new) %></h2>
4
4
5 <% labelled_tabular_form_for :custom_field, @custom_field, :url => { :action => "new" } do |f| %>
5 <% labelled_form_for :custom_field, @custom_field, :url => { :action => "new" } do |f| %>
6 <%= render :partial => 'form', :locals => { :f => f } %>
6 <%= render :partial => 'form', :locals => { :f => f } %>
7 <%= hidden_field_tag 'type', @custom_field.type %>
7 <%= hidden_field_tag 'type', @custom_field.type %>
8 <%= submit_tag l(:button_save) %>
8 <%= submit_tag l(:button_save) %>
@@ -1,6 +1,6
1 <%= error_messages_for 'category' %>
1 <%= error_messages_for 'category' %>
2
2
3 <div class="box">
3 <div class="box tabular">
4 <p><%= f.text_field :name, :size => 30, :required => true %></p>
4 <p><%= f.text_field :name, :size => 30, :required => true %></p>
5 <p><%= f.select :assigned_to_id, principals_options_for_select(@project.assignable_users, @category.assigned_to), :include_blank => true %></p>
5 <p><%= f.select :assigned_to_id, principals_options_for_select(@project.assignable_users, @category.assigned_to), :include_blank => true %></p>
6 </div>
6 </div>
@@ -1,6 +1,6
1 <h2><%=l(:label_issue_category)%></h2>
1 <h2><%=l(:label_issue_category)%></h2>
2
2
3 <% labelled_tabular_form_for :issue_category, @category, :url => issue_category_path(@category), :html => {:method => :put} do |f| %>
3 <% labelled_form_for :issue_category, @category, :url => issue_category_path(@category), :html => {:method => :put} do |f| %>
4 <%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
4 <%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
5 <%= submit_tag l(:button_save) %>
5 <%= submit_tag l(:button_save) %>
6 <% end %>
6 <% end %>
@@ -1,6 +1,6
1 <h2><%=l(:label_issue_category_new)%></h2>
1 <h2><%=l(:label_issue_category_new)%></h2>
2
2
3 <% labelled_tabular_form_for :issue_category, @category, :url => project_issue_categories_path(@project) do |f| %>
3 <% labelled_form_for :issue_category, @category, :url => project_issue_categories_path(@project) do |f| %>
4 <%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
4 <%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
5 <%= submit_tag l(:button_create) %>
5 <%= submit_tag l(:button_create) %>
6 <% end %>
6 <% end %>
@@ -1,6 +1,6
1 <h2><%=l(:label_news)%></h2>
1 <h2><%=l(:label_news)%></h2>
2
2
3 <% labelled_tabular_form_for @news, :html => { :id => 'news-form', :method => :put } do |f| %>
3 <% labelled_form_for @news, :html => { :id => 'news-form', :method => :put } 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 <%= link_to_remote l(:label_preview),
6 <%= link_to_remote l(:label_preview),
@@ -7,7 +7,7
7
7
8 <div id="add-news" style="display:none;">
8 <div id="add-news" style="display:none;">
9 <h2><%=l(:label_news_new)%></h2>
9 <h2><%=l(:label_news_new)%></h2>
10 <% labelled_tabular_form_for @news, :url => project_news_index_path(@project),
10 <% labelled_form_for @news, :url => project_news_index_path(@project),
11 :html => { :id => 'news-form' } do |f| %>
11 :html => { :id => 'news-form' } do |f| %>
12 <%= render :partial => 'news/form', :locals => { :f => f } %>
12 <%= render :partial => 'news/form', :locals => { :f => f } %>
13 <%= submit_tag l(:button_create) %>
13 <%= submit_tag l(:button_create) %>
@@ -1,6 +1,6
1 <h2><%=l(:label_news_new)%></h2>
1 <h2><%=l(:label_news_new)%></h2>
2
2
3 <% labelled_tabular_form_for @news, :url => project_news_index_path(@project),
3 <% labelled_form_for @news, :url => project_news_index_path(@project),
4 :html => { :id => 'news-form' } do |f| %>
4 :html => { :id => 'news-form' } do |f| %>
5 <%= render :partial => 'news/form', :locals => { :f => f } %>
5 <%= render :partial => 'news/form', :locals => { :f => f } %>
6 <%= submit_tag l(:button_create) %>
6 <%= submit_tag l(:button_create) %>
@@ -16,7 +16,7
16
16
17 <% if authorize_for('news', 'edit') %>
17 <% if authorize_for('news', 'edit') %>
18 <div id="edit-news" style="display:none;">
18 <div id="edit-news" style="display:none;">
19 <% labelled_tabular_form_for :news, @news, :url => news_path(@news),
19 <% labelled_form_for :news, @news, :url => news_path(@news),
20 :html => { :id => 'news-form', :method => :put } do |f| %>
20 :html => { :id => 'news-form', :method => :put } do |f| %>
21 <%= render :partial => 'form', :locals => { :f => f } %>
21 <%= render :partial => 'form', :locals => { :f => f } %>
22 <%= submit_tag l(:button_save) %>
22 <%= submit_tag l(:button_save) %>
@@ -1,4 +1,4
1 <% labelled_tabular_form_for @project do |f| %>
1 <% labelled_form_for @project 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,6 +1,6
1 <%= error_messages_for 'project' %>
1 <%= error_messages_for 'project' %>
2
2
3 <div class="box">
3 <div class="box tabular">
4 <!--[form:project]-->
4 <!--[form:project]-->
5 <p><%= f.text_field :name, :required => true, :size => 60 %></p>
5 <p><%= f.text_field :name, :required => true, :size => 60 %></p>
6
6
@@ -24,7 +24,7
24 </div>
24 </div>
25
25
26 <% if @project.new_record? %>
26 <% if @project.new_record? %>
27 <fieldset class="box"><legend><%= l(:label_module_plural) %></legend>
27 <fieldset class="box tabular"><legend><%= l(:label_module_plural) %></legend>
28 <% Redmine::AccessControl.available_project_modules.each do |m| %>
28 <% Redmine::AccessControl.available_project_modules.each do |m| %>
29 <label class="floating">
29 <label class="floating">
30 <%= check_box_tag 'project[enabled_module_names][]', m, @project.module_enabled?(m), :id => "project_enabled_module_names_#{m}" %>
30 <%= check_box_tag 'project[enabled_module_names][]', m, @project.module_enabled?(m), :id => "project_enabled_module_names_#{m}" %>
@@ -38,7 +38,7
38
38
39 <% if @project.new_record? || @project.module_enabled?('issue_tracking') %>
39 <% if @project.new_record? || @project.module_enabled?('issue_tracking') %>
40 <% unless @trackers.empty? %>
40 <% unless @trackers.empty? %>
41 <fieldset class="box" id="project_trackers"><legend><%=l(:label_tracker_plural)%></legend>
41 <fieldset class="box tabular" id="project_trackers"><legend><%=l(:label_tracker_plural)%></legend>
42 <% @trackers.each do |tracker| %>
42 <% @trackers.each do |tracker| %>
43 <label class="floating">
43 <label class="floating">
44 <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
44 <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
@@ -50,7 +50,7
50 <% end %>
50 <% end %>
51
51
52 <% unless @issue_custom_fields.empty? %>
52 <% unless @issue_custom_fields.empty? %>
53 <fieldset class="box" id="project_issue_custom_fields"><legend><%=l(:label_custom_field_plural)%></legend>
53 <fieldset class="box tabular" id="project_issue_custom_fields"><legend><%=l(:label_custom_field_plural)%></legend>
54 <% @issue_custom_fields.each do |custom_field| %>
54 <% @issue_custom_fields.each do |custom_field| %>
55 <label class="floating">
55 <label class="floating">
56 <%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
56 <%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
@@ -1,9 +1,9
1 <h2><%=l(:label_project_new)%></h2>
1 <h2><%=l(:label_project_new)%></h2>
2
2
3 <% labelled_tabular_form_for @project, :url => { :action => "copy" } do |f| %>
3 <% labelled_form_for @project, :url => { :action => "copy" } do |f| %>
4 <%= render :partial => 'form', :locals => { :f => f } %>
4 <%= render :partial => 'form', :locals => { :f => f } %>
5
5
6 <fieldset class="box"><legend><%= l(:button_copy) %></legend>
6 <fieldset class="box tabular"><legend><%= l(:button_copy) %></legend>
7 <label class="block"><%= check_box_tag 'only[]', 'members', true %> <%= l(:label_member_plural) %> (<%= @source_project.members.count %>)</label>
7 <label class="block"><%= check_box_tag 'only[]', 'members', true %> <%= l(:label_member_plural) %> (<%= @source_project.members.count %>)</label>
8 <label class="block"><%= check_box_tag 'only[]', 'versions', true %> <%= l(:label_version_plural) %> (<%= @source_project.versions.count %>)</label>
8 <label class="block"><%= check_box_tag 'only[]', 'versions', true %> <%= l(:label_version_plural) %> (<%= @source_project.versions.count %>)</label>
9 <label class="block"><%= check_box_tag 'only[]', 'issue_categories', true %> <%= l(:label_issue_category_plural) %> (<%= @source_project.issue_categories.count %>)</label>
9 <label class="block"><%= check_box_tag 'only[]', 'issue_categories', true %> <%= l(:label_issue_category_plural) %> (<%= @source_project.issue_categories.count %>)</label>
@@ -1,6 +1,6
1 <h2><%=l(:label_project_new)%></h2>
1 <h2><%=l(:label_project_new)%></h2>
2
2
3 <% labelled_tabular_form_for @project do |f| %>
3 <% labelled_form_for @project 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' %>
@@ -1,6 +1,6
1 <%= error_messages_for 'role' %>
1 <%= error_messages_for 'role' %>
2
2
3 <div class="box">
3 <div class="box tabular">
4 <% unless @role.builtin? %>
4 <% unless @role.builtin? %>
5 <p><%= f.text_field :name, :required => true %></p>
5 <p><%= f.text_field :name, :required => true %></p>
6 <p><%= f.check_box :assignable %></p>
6 <p><%= f.check_box :assignable %></p>
@@ -13,7 +13,7
13 </div>
13 </div>
14
14
15 <h3><%= l(:label_permissions) %></h3>
15 <h3><%= l(:label_permissions) %></h3>
16 <div class="box" id="permissions">
16 <div class="box tabular" id="permissions">
17 <% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
17 <% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
18 <% perms_by_module.keys.sort.each do |mod| %>
18 <% perms_by_module.keys.sort.each do |mod| %>
19 <fieldset><legend><%= mod.blank? ? l(:label_project) : l_or_humanize(mod, :prefix => 'project_module_') %></legend>
19 <fieldset><legend><%= mod.blank? ? l(:label_project) : l_or_humanize(mod, :prefix => 'project_module_') %></legend>
@@ -1,6 +1,6
1 <h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> &#187; <%=h @role.name %></h2>
1 <h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> &#187; <%=h @role.name %></h2>
2
2
3 <% labelled_tabular_form_for :role, @role, :url => { :action => 'edit' }, :html => {:id => 'role_form'} do |f| %>
3 <% labelled_form_for :role, @role, :url => { :action => 'edit' }, :html => {:id => 'role_form'} 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,6 +1,6
1 <h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> &#187; <%=l(:label_role_new)%></h2>
1 <h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> &#187; <%=l(:label_role_new)%></h2>
2
2
3 <% labelled_tabular_form_for :role, @role, :url => { :action => 'new' }, :html => {:id => 'role_form'} do |f| %>
3 <% labelled_form_for :role, @role, :url => { :action => 'new' }, :html => {:id => 'role_form'} 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 <% end %>
6 <% end %>
@@ -1,6 +1,6
1 <h2><%= l(:label_spent_time) %></h2>
1 <h2><%= l(:label_spent_time) %></h2>
2
2
3 <% labelled_tabular_form_for(:time_entry, @time_entry, :url => {
3 <% labelled_form_for(:time_entry, @time_entry, :url => {
4 :action => (@time_entry.new_record? ? 'create' : 'update'),
4 :action => (@time_entry.new_record? ? 'create' : 'update'),
5 :id => @time_entry,
5 :id => @time_entry,
6 :project_id => @time_entry.project
6 :project_id => @time_entry.project
@@ -9,7 +9,7
9 <%= error_messages_for 'time_entry' %>
9 <%= error_messages_for 'time_entry' %>
10 <%= back_url_hidden_field_tag %>
10 <%= back_url_hidden_field_tag %>
11
11
12 <div class="box">
12 <div class="box tabular">
13 <p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></p>
13 <p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></p>
14 <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
14 <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
15 <p><%= f.text_field :hours, :size => 6, :required => true %></p>
15 <p><%= f.text_field :hours, :size => 6, :required => true %></p>
@@ -1,7 +1,7
1 <%= back_url_hidden_field_tag %>
1 <%= back_url_hidden_field_tag %>
2 <%= error_messages_for 'version' %>
2 <%= error_messages_for 'version' %>
3
3
4 <div class="box">
4 <div class="box tabular">
5 <p><%= f.text_field :name, :size => 60, :required => true %></p>
5 <p><%= f.text_field :name, :size => 60, :required => true %></p>
6 <p><%= f.text_field :description, :size => 60 %></p>
6 <p><%= f.text_field :description, :size => 60 %></p>
7 <p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p>
7 <p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p>
@@ -1,6 +1,6
1 <h2><%=l(:label_version)%></h2>
1 <h2><%=l(:label_version)%></h2>
2
2
3 <% labelled_tabular_form_for @version do |f| %>
3 <% labelled_form_for @version 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,6 +1,6
1 <h2><%=l(:label_version_new)%></h2>
1 <h2><%=l(:label_version_new)%></h2>
2
2
3 <% labelled_tabular_form_for @version, :url => project_versions_path(@project) do |f| %>
3 <% labelled_form_for @version, :url => project_versions_path(@project) 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 %>
@@ -4,8 +4,8
4
4
5 <%= error_messages_for 'page' %>
5 <%= error_messages_for 'page' %>
6
6
7 <% labelled_tabular_form_for :wiki_page, @page, :url => { :action => 'rename' } do |f| %>
7 <% labelled_form_for :wiki_page, @page, :url => { :action => 'rename' } do |f| %>
8 <div class="box">
8 <div class="box tabular">
9 <p><%= f.text_field :title, :required => true, :size => 100 %></p>
9 <p><%= f.text_field :title, :required => true, :size => 100 %></p>
10 <p><%= f.check_box :redirect_existing_links %></p>
10 <p><%= f.check_box :redirect_existing_links %></p>
11 <p><%= f.select :parent_id, "<option value=''></option>" + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent), :label => :field_parent_title %></p>
11 <p><%= f.select :parent_id, "<option value=''></option>" + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent), :label => :field_parent_title %></p>
General Comments 0
You need to be logged in to leave comments. Login now