TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up project activities tab

Browse Source
pull/3412/head
Stefan Botzenhart 9 years ago
parent ff37e615a3
commit 878a4558ac
3 changed files with 121 additions and 85 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 110
      app/views/projects/form/_activities.html.erb
  2. 95
      app/views/projects/settings/_activities.html.erb
  3. 1
      config/locales/en.yml

110
app/views/projects/form/_activities.html.erb
Unescape View File

@ -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.
++#%>
<fieldset class="form--fieldset -with-control" id="project_types">
<legend class="form--fieldset-legend"><%=l(:label_enabled_project_activities)%></legend>
<div class="generic-table--container">
<div class="generic-table--results-container">
<table interactive-table role="grid" class="generic-table">
<colgroup>
<col highlight-col>
<col highlight-col>
<col highlight-col>
<% TimeEntryActivity.new.available_custom_fields.each do |value| %>
<col highlight-col>
<% end %>
</colgroup>
<thead>
<tr>
<th>
<div class="generic-table--sort-header-outer">
<div class="generic-table--sort-header">
<span>
<%= Enumeration.human_attribute_name(:active) %>
</span>
</div>
</div>
</th>
<th>
<div class="generic-table--sort-header-outer">
<div class="generic-table--sort-header">
<span>
<%= Enumeration.human_attribute_name(:name) %>
</span>
</div>
</div>
</th>
<th>
<div class="generic-table--sort-header-outer">
<div class="generic-table--sort-header">
<span>
<%= l(:enumeration_system_activity) %>
</span>
</div>
</div>
</th>
<% TimeEntryActivity.new.available_custom_fields.each do |value| %>
<th>
<div class="generic-table--sort-header-outer">
<div class="generic-table--sort-header">
<span>
<%= h value.name %>
</span>
</div>
</div>
</th>
<% end %>
</tr>
</thead>
<% @project.activities(true).each do |enumeration| %>
<%= fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %>
<tr>
<td>
<%= label_tag "enumerations_#{enumeration.id}_active", "#{h(enumeration.name)} #{l(:description_active)}", :class => "hidden-for-sighted" %>
<%= ff.check_box :active %>
</td>
<td>
<%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %>
<%= h(enumeration) %>
</td>
<td><%= checked_image !enumeration.project %></td>
<% enumeration.custom_field_values.each do |value| %>
<td>
<%= custom_field_tag "enumerations[#{enumeration.id}]", value %>
</td>
<% end %>
</tr>
<% end %>
<% end %>
</table>
<div class="generic-table--header-background"></div>
</div>
</div>
</fieldset>

95
app/views/projects/settings/_activities.html.erb
Unescape View File

@ -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 %>
<div class="generic-table--container">
<div class="generic-table--results-container">
<table interactive-table role="grid" class="generic-table">
<colgroup>
<col highlight-col>
<col highlight-col>
<col highlight-col>
<% TimeEntryActivity.new.available_custom_fields.each do |value| %>
<col highlight-col>
<% end %>
</colgroup>
<thead>
<tr>
<th>
<div class="generic-table--sort-header-outer">
<div class="generic-table--sort-header">
<span>
<%= Enumeration.human_attribute_name(:active) %>
</span>
</div>
</div>
</th>
<th>
<div class="generic-table--sort-header-outer">
<div class="generic-table--sort-header">
<span>
<%= Enumeration.human_attribute_name(:name) %>
</span>
</div>
</div>
</th>
<th>
<div class="generic-table--sort-header-outer">
<div class="generic-table--sort-header">
<span>
<%= l(:enumeration_system_activity) %>
</span>
</div>
</div>
</th>
<% TimeEntryActivity.new.available_custom_fields.each do |value| %>
<th>
<div class="generic-table--sort-header-outer">
<div class="generic-table--sort-header">
<span>
<%= h value.name %>
</span>
</div>
</div>
</th>
<% end %>
</tr>
</thead>
<% @project.activities(true).each do |enumeration| %>
<%= fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %>
<tr>
<td>
<%= label_tag "enumerations_#{enumeration.id}_active", "#{h(enumeration.name)} #{l(:description_active)}", :class => "hidden-for-sighted" %>
<%= ff.check_box :active %>
</td>
<td>
<%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %>
<%= h(enumeration) %>
</td>
<td><%= checked_image !enumeration.project %></td>
<% enumeration.custom_field_values.each do |value| %>
<td>
<%= custom_field_tag "enumerations[#{enumeration.id}]", value %>
</td>
<% end %>
</tr>
<% end %>
<% end %>
</table>
<div class="generic-table--header-background"></div>
</div>
</div>
<div class="contextual">
<%= link_to(l(:button_reset), project_enumerations_path(@project),
:method => :delete,
data: { confirm: l(:text_are_you_sure) },
:class => 'icon icon-delete') %>
</div>
<%= 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 } %>
<p><%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %></p>
<% end %>
<br/>

1
config/locales/en.yml
Unescape View File

@ -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"

Write Preview
Loading…
Cancel
Save