diff --git a/app/views/projects/form/_activities.html.erb b/app/views/projects/form/_activities.html.erb new file mode 100644 index 0000000000..d0d0b27c0d --- /dev/null +++ b/app/views/projects/form/_activities.html.erb @@ -0,0 +1,110 @@ +<%#-- copyright +OpenProject is a project management system. +Copyright (C) 2012-2015 the OpenProject Foundation (OPF) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See doc/COPYRIGHT.rdoc for more details. + +++#%> + +
+ <%=l(:label_enabled_project_activities)%> + +
+
+ + + + + + <% TimeEntryActivity.new.available_custom_fields.each do |value| %> + + <% end %> + + + + + + + <% TimeEntryActivity.new.available_custom_fields.each do |value| %> + + <% end %> + + + <% @project.activities(true).each do |enumeration| %> + <%= fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %> + + + + + <% enumeration.custom_field_values.each do |value| %> + + <% end %> + + <% end %> + <% end %> +
+
+
+ + <%= Enumeration.human_attribute_name(:active) %> + +
+
+ 		+
+
+ + <%= Enumeration.human_attribute_name(:name) %> + +
+
+ 		+
+
+ + <%= l(:enumeration_system_activity) %> + +
+
+ 		+
+
+ + <%= h value.name %> + +
+
+
+ <%= label_tag "enumerations_#{enumeration.id}_active", "#{h(enumeration.name)} #{l(:description_active)}", :class => "hidden-for-sighted" %> + <%= ff.check_box :active %> + + <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %> + <%= h(enumeration) %> + <%= checked_image !enumeration.project %> + <%= custom_field_tag "enumerations[#{enumeration.id}]", value %> +
+
+
+
+
diff --git a/app/views/projects/settings/_activities.html.erb b/app/views/projects/settings/_activities.html.erb index 510d04d9a6..3e01fea1c6 100644 --- a/app/views/projects/settings/_activities.html.erb +++ b/app/views/projects/settings/_activities.html.erb @@ -26,89 +26,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See doc/COPYRIGHT.rdoc for more details. ++#%> -<%= form_tag(project_enumerations_path(@project), :method => :put, :class => "tabular") do %> -
-
- - - - - - <% TimeEntryActivity.new.available_custom_fields.each do |value| %> - - <% end %> - - - - - - - <% TimeEntryActivity.new.available_custom_fields.each do |value| %> - - <% end %> - - - <% @project.activities(true).each do |enumeration| %> - <%= fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %> - - - - - <% enumeration.custom_field_values.each do |value| %> - - <% end %> - - <% end %> - <% end %> -
-
-
- - <%= Enumeration.human_attribute_name(:active) %> - -
-
- 		-
-
- - <%= Enumeration.human_attribute_name(:name) %> - -
-
- 		-
-
- - <%= l(:enumeration_system_activity) %> - -
-
- 		-
-
- - <%= h value.name %> - -
-
-
- <%= label_tag "enumerations_#{enumeration.id}_active", "#{h(enumeration.name)} #{l(:description_active)}", :class => "hidden-for-sighted" %> - <%= ff.check_box :active %> - - <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %> - <%= h(enumeration) %> - <%= checked_image !enumeration.project %> - <%= custom_field_tag "enumerations[#{enumeration.id}]", value %> -
-
-
-
-
- <%= link_to(l(:button_reset), project_enumerations_path(@project), - :method => :delete, - data: { confirm: l(:text_are_you_sure) }, - :class => 'icon icon-delete') %> -
- <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %> + +<%= form_tag project_enumerations_path(@project), + method: :put, + class: "tabular" do %> + + <%= render partial: 'projects/form/activities', locals: { project: @project } %> + +

<%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>

<% end %> + +
diff --git a/config/locales/en.yml b/config/locales/en.yml index a920bb879b..bc6ef904f2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -754,6 +754,7 @@ en: label_enabled_project_custom_fields: 'Enabled custom fields' label_enabled_project_types: 'Enabled types' label_enabled_project_modules: 'Enabled modules' + label_enabled_project_activities: 'Enabled time tracking activities' label_end_to_end: "end to end" label_end_to_start: "end to start" label_enumeration_new: "New enumeration value"