Fix whitespace in (Rails) views

Signed-off-by: Alex Coles <alex@alexbcoles.com>
pull/1389/head
Alex Coles 11 years ago
parent f517b3a422
commit 9f762c3cd4
  1. 4
      app/views/admin/plugins.html.erb
  2. 8
      app/views/admin/projects.html.erb
  3. 1
      app/views/auth_sources/edit.html.erb
  4. 10
      app/views/auth_sources/index.html.erb
  5. 2
      app/views/common/list_attachments.json.erb
  6. 2
      app/views/copy_projects/copy_settings/_block_checkbox.html.erb
  7. 6
      app/views/custom_fields/_form.html.erb
  8. 26
      app/views/groups/_memberships.html.erb
  9. 44
      app/views/groups/_users.html.erb
  10. 2
      app/views/layouts/admin.html.erb
  11. 1
      app/views/members/_autocomplete_for_member.html.erb
  12. 6
      app/views/members/autocomplete_for_member.json.erb
  13. 2
      app/views/messages/_form.html.erb
  14. 30
      app/views/my/page_layout.html.erb
  15. 2
      app/views/projects/form/attributes/_project_type_id.html.erb
  16. 22
      app/views/projects/settings/_boards.html.erb
  17. 20
      app/views/projects/settings/_categories.html.erb
  18. 2
      app/views/queries/_filters.html.erb
  19. 26
      app/views/repositories/committers.html.erb
  20. 6
      app/views/settings/_mail_handler.html.erb
  21. 4
      app/views/settings/_projects.html.erb
  22. 8
      app/views/settings/_repositories.html.erb
  23. 1
      app/views/time_entries/reports/show.html.erb
  24. 2
      app/views/timelines/_custom_fields.html.erb
  25. 1
      app/views/timelines/_timeline.html.erb
  26. 2
      app/views/timelog/edit.html.erb
  27. 14
      app/views/types/_form.html.erb
  28. 2
      app/views/user_mailer/work_package_added.html.erb
  29. 1
      app/views/users/_mail_notifications.html.erb
  30. 26
      app/views/users/_memberships.html.erb
  31. 1
      app/views/users/_preferences.html.erb
  32. 18
      app/views/users/index.html.erb
  33. 12
      app/views/users/new.html.erb
  34. 2
      app/views/versions/_form.html.erb
  35. 1
      app/views/versions/edit.html.erb
  36. 2
      app/views/versions/index.html.erb
  37. 1
      app/views/watchers/replace_selectors.rjs
  38. 2
      app/views/wiki/destroy.html.erb
  39. 1
      app/views/wiki/new.html.erb
  40. 1
      app/views/work_package_relations/destroy.js.erb
  41. 1
      app/views/work_packages/_action_menu_with_edit_container.html.erb
  42. 1
      app/views/work_packages/_form_update.html.erb
  43. 40
      app/views/work_packages/bulk/edit.html.erb
  44. 6
      app/views/work_packages/calendars/index.html.erb
  45. 12
      app/views/work_packages/moves/new.html.erb
  46. 1
      app/views/work_packages/reports/report.html.erb
  47. 1
      app/views/work_packages/reports/report_details.html.erb
  48. 6
      app/views/workflows/edit.html.erb

@ -37,8 +37,8 @@ See doc/COPYRIGHT.rdoc for more details.
<tr class="<%= cycle('odd', 'even') %>">
<td><span class="name"><%=h plugin.name %></span>
<%= content_tag('span', h(plugin.description), :class => 'description') unless plugin.description.blank? %>
<%= content_tag('span', link_to(h(plugin.url), plugin.url), :class => 'url') unless plugin.url.blank? %>
</td>
<%= content_tag('span', link_to(h(plugin.url), plugin.url), :class => 'url') unless plugin.url.blank? %>
</td>
<td class="author"><%= plugin.author_url.blank? ? h(plugin.author) : link_to(h(plugin.author), plugin.author_url) %></td>
<td class="version"><%=h plugin.version %></td>
<td class="configure"><%= link_to(l(:button_configure), :controller => '/settings', :action => 'plugin', :id => plugin.id) if plugin.configurable? %></td>

@ -28,7 +28,7 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<div id="admin-index">
<%= render :partial => 'no_data' if @no_configuration_data %>
<%= render :partial => 'no_data' if @no_configuration_data %>
</div>
<% content_for :action_menu_specific do %>
@ -64,9 +64,9 @@ See doc/COPYRIGHT.rdoc for more details.
<tbody>
<% project_tree(@projects) do |project, level| %>
<tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
<td class="name"><span><%= link_to project, settings_project_path(project), :title => project.short_description %></span></td>
<td align="center"><%= checked_image project.is_public? %></td>
<td align="center"><%= format_date(project.created_on) %></td>
<td class="name"><span><%= link_to project, settings_project_path(project), :title => project.short_description %></span></td>
<td align="center"><%= checked_image project.is_public? %></td>
<td align="center"><%= format_date(project.created_on) %></td>
<td class="buttons">
<%= link_to(l(:button_archive),
archive_project_path(project, :status => params[:status]),

@ -35,4 +35,3 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_save) %>
<% end %>

@ -39,11 +39,11 @@ See doc/COPYRIGHT.rdoc for more details.
<table class="list">
<thead><tr>
<th><%= AuthSource.human_attribute_name(:name) %></th>
<th><%= AuthSource.human_attribute_name(:type) %></th>
<th><%= AuthSource.human_attribute_name(:host) %></th>
<th><%= l(:label_user_plural)%></th>
<th></th>
<th><%= AuthSource.human_attribute_name(:name) %></th>
<th><%= AuthSource.human_attribute_name(:type) %></th>
<th><%= AuthSource.human_attribute_name(:host) %></th>
<th><%= l(:label_user_plural)%></th>
<th></th>
</tr></thead>
<tbody>
<% for source in @auth_sources %>

@ -34,4 +34,4 @@ See doc/COPYRIGHT.rdoc for more details.
:url => url_for(:controller => '/attachments', :action => 'show', :id => a, :filename => a.filename),
:is_image => !!a.image? # doing the !! as image? for whatever reason returns null or a number
}
}.to_json.html_safe %>
}.to_json.html_safe %>

@ -31,4 +31,4 @@ See doc/COPYRIGHT.rdoc for more details.
<%= check_box_tag 'only[]', name, checked, :id => "only_#{name}" %>
<%= "#{label} (#{count})" %>
</label>
<% end %>
<% end %>

@ -95,14 +95,14 @@ function toggle_custom_field_format() {
if (p_searchable) Element.hide(p_searchable.parentNode);
hide_and_disable(p_values);
break;
case "user":
case "user":
case "version":
Element.hide(p_length.parentNode);
Element.hide(p_regexp.parentNode);
if (p_searchable) Element.hide(p_searchable.parentNode);
hide_and_disable(p_values);
Element.hide(p_default_value);
break;
break;
default:
Element.show(p_length.parentNode);
Element.show(p_regexp.parentNode);
@ -206,7 +206,7 @@ jQuery(".locale_selector").each(function (index) {
<%= check_box_tag "custom_field[type_ids][]", type.id, (@custom_field.types.include? type), :id => "custom_field_type_ids_#{type.id}" %>
<%= content_tag :label, (type.is_standard) ? l(:label_custom_field_default_type) : h(type), :class => "no-css", :for => "custom_field_type_ids_#{type.id}" %>
<% end %>
<%= hidden_field_tag "custom_field[type_ids][]", '' %>
<%= hidden_field_tag "custom_field[type_ids][]", '' %>
</fieldset>
&nbsp;
<p><%= f.check_box :is_required %></p>

@ -33,16 +33,16 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="splitcontentleft">
<% if @group.memberships.any? %>
<table class="list memberships">
<thead><tr>
<th><%= Project.model_name.human %></th>
<th><%= l(:label_role_plural) %></th>
<th style="width:15%"></th>
</tr></thead>
<tbody>
<% @group.memberships.each do |membership| %>
<% next if membership.new_record? %>
<tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
<td class="project"><%=h membership.project %></td>
<thead><tr>
<th><%= Project.model_name.human %></th>
<th><%= l(:label_role_plural) %></th>
<th style="width:15%"></th>
</tr></thead>
<tbody>
<% @group.memberships.each do |membership| %>
<% next if membership.new_record? %>
<tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
<td class="project"><%=h membership.project %></td>
<td class="roles">
<span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
<%= form_tag(membership_of_group_path(@group, membership),
@ -50,7 +50,7 @@ See doc/COPYRIGHT.rdoc for more details.
:remote => true,
:id => "member-#{membership.id}-roles-form",
:style => 'display:none;') do %>
<p><% roles.each do |role| %>
<p><% roles.each do |role| %>
<label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role) %> <%=h role %></label><br />
<% end %></p>
<p><%= submit_tag l(:button_change) %>
@ -64,8 +64,8 @@ See doc/COPYRIGHT.rdoc for more details.
:remote => true,
:class => 'icon icon-delete' %>
</td>
</tr>
</tbody>
</tr>
</tbody>
<% end; reset_cycle %>
</table>
<% else %>

@ -29,28 +29,28 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="splitcontentleft">
<% if @group.users.any? %>
<table class="list users">
<thead><tr>
<th><%= User.model_name.human %></th>
<th style="width:15%"></th>
</tr></thead>
<tbody>
<% @group.users.sort.each do |user| %>
<tr id="user-<%= user.id %>" class="<%= cycle 'odd', 'even' %>">
<td class="user"><%= link_to_user user %></td>
<td class="buttons">
<table class="list users">
<thead><tr>
<th><%= User.model_name.human %></th>
<th style="width:15%"></th>
</tr></thead>
<tbody>
<% @group.users.sort.each do |user| %>
<tr id="user-<%= user.id %>" class="<%= cycle 'odd', 'even' %>">
<td class="user"><%= link_to_user user %></td>
<td class="buttons">
<%= link_to l(:button_delete), member_of_group_path(@group, user),
:method => :delete,
:remote => :true,
:class => 'icon icon-delete' %>
</td>
</tr>
<% end %>
</tbody>
</table>
</td>
</tr>
<% end %>
</tbody>
</table>
<% else %>
<p class="nodata"><%= l(:label_no_data) %></p>
<p class="nodata"><%= l(:label_no_data) %></p>
<% end %>
</div>
@ -60,8 +60,8 @@ See doc/COPYRIGHT.rdoc for more details.
<%= form_tag(members_of_group_path(@group), :method => :post, :remote => true) do |f| %>
<fieldset><legend><%=l(:label_user_new)%></legend>
<p><%= label_tag "user_search", l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>
<%= observe_field(:user_search,
<p><%= label_tag "user_search", l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>
<%= observe_field(:user_search,
:frequency => 0.5,
:update => :users,
:url => { :controller => '/groups', :action => 'autocomplete_for_user', :id => @group },
@ -69,12 +69,12 @@ See doc/COPYRIGHT.rdoc for more details.
:method => :get)
%>
<div id="users">
<%= principals_check_box_tags 'user_ids[]', users %>
</div>
<div id="users">
<%= principals_check_box_tags 'user_ids[]', users %>
</div>
<p><%= submit_tag l(:button_add) %></p>
</fieldset>
</fieldset>
<% end %>
<% end %>

@ -31,7 +31,7 @@ See doc/COPYRIGHT.rdoc for more details.
default_breadcrumb) %>
<% @page_header_title = l(:label_administration) %>
<% content_for :main_menu do %>
<%= render :partial => 'admin/menu' %>
<%= render :partial => 'admin/menu' %>
<% end %>
<%= render :file => "layouts/base" %>

@ -56,4 +56,3 @@ See doc/COPYRIGHT.rdoc for more details.
</div>
<p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
<% end %>

@ -31,12 +31,12 @@ See doc/COPYRIGHT.rdoc for more details.
"results":
{
"items":[
<% @principals.each_with_index do |principal, ix| %>
<% @principals.each_with_index do |principal, ix| %>
{
"id": <%= principal.id.to_json.html_safe %>,
"name": <%= principal.name.to_json.html_safe %>
} <%= "," unless ix == @principals.length - 1 %>
<% end %> ],
} <%= "," unless ix == @principals.length - 1 %>
<% end %> ],
"total": <%= @total ? @total : @principals.size %>,
"more": <%= @more ? @more : 0 %>
}

@ -46,7 +46,7 @@ See doc/COPYRIGHT.rdoc for more details.
</p>
<% if !replying && !@message.new_record? && User.current.allowed_to?(:edit_messages, @project) %>
<p><label><%= Board.name.humanize %></label><br />
<p><label><%= Board.name.humanize %></label><br />
<%= f.select :board_id, @project.boards.collect {|b| [b.name, b.id]} %></p>
<% end %>

@ -34,9 +34,9 @@ function recreateSortables() {
Sortable.destroy('list-left');
Sortable.destroy('list-right');
Sortable.create("list-top", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => '/my', :action => 'order_blocks', :group => 'top') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-top")})}, only:'mypage-box', tag:'div'})
Sortable.create("list-left", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => '/my', :action => 'order_blocks', :group => 'left') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-left")})}, only:'mypage-box', tag:'div'})
Sortable.create("list-right", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => '/my', :action => 'order_blocks', :group => 'right') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-right")})}, only:'mypage-box', tag:'div'})
Sortable.create("list-top", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => '/my', :action => 'order_blocks', :group => 'top') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-top")})}, only:'mypage-box', tag:'div'})
Sortable.create("list-left", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => '/my', :action => 'order_blocks', :group => 'left') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-left")})}, only:'mypage-box', tag:'div'})
Sortable.create("list-right", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('<%= url_for(:controller => '/my', :action => 'order_blocks', :group => 'right') %>', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-right")})}, only:'mypage-box', tag:'div'})
}
function updateSelect() {
@ -87,24 +87,24 @@ function removeBlock(block) {
<%= render :partial => 'layouts/action_menu_specific' %>
<div id="list-top" class="block-receiver">
<% @blocks['top'].each do |b|
next unless MyController.available_blocks.keys.include? b %>
<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
<% end if @blocks['top'] %>
<% @blocks['top'].each do |b|
next unless MyController.available_blocks.keys.include? b %>
<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
<% end if @blocks['top'] %>
</div>
<div id="list-left" class="splitcontentleft block-receiver">
<% @blocks['left'].each do |b|
next unless MyController.available_blocks.keys.include? b %>
<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
<% end if @blocks['left'] %>
<% @blocks['left'].each do |b|
next unless MyController.available_blocks.keys.include? b %>
<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
<% end if @blocks['left'] %>
</div>
<div id="list-right" class="splitcontentright block-receiver">
<% @blocks['right'].each do |b|
next unless MyController.available_blocks.keys.include? b %>
<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
<% end if @blocks['right'] %>
<% @blocks['right'].each do |b|
next unless MyController.available_blocks.keys.include? b %>
<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
<% end if @blocks['right'] %>
</div>
<%= sortable_element 'list-top',

@ -27,4 +27,4 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<p><%= form.select :project_type_id, options_for_project_types, :include_blank => true %></p>
<p><%= form.select :project_type_id, options_for_project_types, :include_blank => true %></p>

@ -29,16 +29,16 @@ See doc/COPYRIGHT.rdoc for more details.
<% if @project.boards.any? %>
<table class="list">
<thead><tr>
<th><%= Board.model_name.human %></th>
<th><%= Board.human_attribute_name(:description) %></th>
<th></th>
<th></th>
</tr></thead>
<tbody>
<thead><tr>
<th><%= Board.model_name.human %></th>
<th><%= Board.human_attribute_name(:description) %></th>
<th></th>
<th></th>
</tr></thead>
<tbody>
<% @project.boards.each do |board|
next if board.new_record? %>
<tr class="<%= cycle 'odd', 'even' %>">
next if board.new_record? %>
<tr class="<%= cycle 'odd', 'even' %>">
<td><%=h board.name %></td>
<td><%=h board.description %></td>
<td class="small-icons" align="center">
@ -50,9 +50,9 @@ See doc/COPYRIGHT.rdoc for more details.
<%= link_to_if_authorized l(:button_edit), {:controller => '/boards', :action => 'edit', :project_id => @project, :id => board}, :class => 'icon icon-edit' %>
<%= link_to_if_authorized l(:button_delete), {:controller => '/boards', :action => 'destroy', :project_id => @project, :id => board}, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-delete' %>
</td>
</tr>
</tr>
<% end %>
</tbody>
</tbody>
</table>
<% else %>
<p class="nodata"><%= l(:label_no_data) %></p>

@ -29,15 +29,15 @@ See doc/COPYRIGHT.rdoc for more details.
<% if @project.categories.any? %>
<table class="list">
<thead><tr>
<th><%= Category.model_name.human %></th>
<th><%= Category.human_attribute_name(:assigned_to) %></th>
<th></th>
</tr></thead>
<tbody>
<thead><tr>
<th><%= Category.model_name.human %></th>
<th><%= Category.human_attribute_name(:assigned_to) %></th>
<th></th>
</tr></thead>
<tbody>
<% for category in @project.categories %>
<% unless category.new_record? %>
<tr class="<%= cycle 'odd', 'even' %>">
<% unless category.new_record? %>
<tr class="<%= cycle 'odd', 'even' %>">
<td><%=h(category.name) %></td>
<td><%=h(category.assigned_to.name) if category.assigned_to %></td>
<td class="buttons">
@ -50,8 +50,8 @@ See doc/COPYRIGHT.rdoc for more details.
:confirm => l(:text_are_you_sure),
:class => 'icon icon-delete' %>
</td>
</tr>
<% end %>
</tr>
<% end %>
<% end %>
</tbody>
</table>

@ -52,7 +52,7 @@ function toggle_filter(field) {
if (check_box.checked) {
Element.show("operators_" + field);
Form.Element.enable("operators_" + field);
Form.Element.enable("operators_" + field);
Form.Element.enable("values_" + field);
toggle_operator(field);
} else {

@ -38,26 +38,26 @@ See doc/COPYRIGHT.rdoc for more details.
<%= form_tag({}) do %>
<table class="list">
<thead>
<tr>
<th><%= User.human_attribute_name(:login) %></th>
<th><%= User.model_name.human %></th>
</tr>
<tr>
<th><%= User.human_attribute_name(:login) %></th>
<th><%= User.model_name.human %></th>
</tr>
</thead>
<tbody>
<% i = 0 -%>
<% @committers.each do |committer, user_id| -%>
<tr class="<%= cycle 'odd', 'even' %>">
<td><%=h committer %></td>
<td>
<%= hidden_field_tag "committers[#{i}][]", committer %>
<%= select_tag "committers[#{i}][]", content_tag('option', "-- #{l :actionview_instancetag_blank_option} --", :value => '') + options_from_collection_for_select(@users, 'id', 'name', user_id.to_i) %>
</td>
</tr>
<% i += 1 -%>
<tr class="<%= cycle 'odd', 'even' %>">
<td><%=h committer %></td>
<td>
<%= hidden_field_tag "committers[#{i}][]", committer %>
<%= select_tag "committers[#{i}][]", content_tag('option', "-- #{l :actionview_instancetag_blank_option} --", :value => '') + options_from_collection_for_select(@users, 'id', 'name', user_id.to_i) %>
</td>
</tr>
<% i += 1 -%>
<% end -%>
</tbody>
</table>
<p><%= submit_tag(l(:button_update)) %></p>
<% end %>
<% end %>
<% end %>

@ -38,11 +38,11 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="box tabular settings">
<p><%= setting_check_box :mail_handler_api_enabled,
:onclick => "if (this.checked) { Form.Element.enable('settings_mail_handler_api_key'); } else { Form.Element.disable('settings_mail_handler_api_key'); }"%></p>
:onclick => "if (this.checked) { Form.Element.enable('settings_mail_handler_api_key'); } else { Form.Element.disable('settings_mail_handler_api_key'); }"%></p>
<p><%= setting_text_field :mail_handler_api_key, :size => 30,
:id => 'settings_mail_handler_api_key',
:disabled => !Setting.mail_handler_api_enabled? %>
:id => 'settings_mail_handler_api_key',
:disabled => !Setting.mail_handler_api_enabled? %>
<%= link_to_function l(:label_generate_key), "if ($('settings_mail_handler_api_key').disabled == false) { $('settings_mail_handler_api_key').value = randomKey(20) }" %>
</p>
</div>

@ -38,8 +38,8 @@ See doc/COPYRIGHT.rdoc for more details.
<p><%= setting_check_box :sequential_project_identifiers %></p>
<p><%= setting_select :new_project_user_role_id,
Role.find_all_givable.collect {|r| [r.name, r.id.to_s]},
:blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %></p>
Role.find_all_givable.collect {|r| [r.name, r.id.to_s]},
:blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %></p>
</div>
<%= submit_tag l(:button_save) %>

@ -33,12 +33,12 @@ See doc/COPYRIGHT.rdoc for more details.
<p><%= setting_check_box :autofetch_changesets %></p>
<p><%= setting_check_box :sys_api_enabled,
:onclick => "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %></p>
:onclick => "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %></p>
<p><%= setting_text_field :sys_api_key, :size => 30,
:id => 'settings_sys_api_key',
:disabled => !Setting.sys_api_enabled?,
:label => :setting_mail_handler_api_key %>
:id => 'settings_sys_api_key',
:disabled => !Setting.sys_api_enabled?,
:label => :setting_mail_handler_api_key %>
<%= link_to_function l(:label_generate_key), "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
</p>

@ -102,4 +102,3 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
<% html_title l(:label_spent_time), l(:label_report) %>

@ -60,4 +60,4 @@ custom_fields.each do |custom_field|
<%
end
end
%>
%>

@ -67,4 +67,3 @@ See doc/COPYRIGHT.rdoc for more details.
<% @timeline_header_included = true %>
<% end %>
<% end %>

@ -40,7 +40,7 @@ See doc/COPYRIGHT.rdoc for more details.
<p><%= f.text_field :comments, :size => 100 %></p>
<p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
<% @time_entry.custom_field_values.each do |value| %>
<p><%= custom_field_tag_with_label :time_entry, value %></p>
<p><%= custom_field_tag_with_label :time_entry, value %></p>
<% end %>
<%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
</div>

@ -41,13 +41,13 @@ See doc/COPYRIGHT.rdoc for more details.
<% if WorkPackageCustomField.all.any? %>
<p>
<label><%= l(:label_custom_field_plural) %></label>
<% WorkPackageCustomField.all.each do |field| %>
<label class="block">
<%= check_box_tag 'type[custom_field_ids][]',field.id, @type.custom_fields.include?(field) %>
<%= field.name %>
</label>
<% end %>
<label><%= l(:label_custom_field_plural) %></label>
<% WorkPackageCustomField.all.each do |field| %>
<label class="block">
<%= check_box_tag 'type[custom_field_ids][]',field.id, @type.custom_fields.include?(field) %>
<%= field.name %>
</label>
<% end %>
</p>
<%= hidden_field_tag 'type[custom_field_ids][]', '' %>
<% end %>

@ -30,5 +30,3 @@ See doc/COPYRIGHT.rdoc for more details.
<%= t(:text_work_package_added, :id => "##{@issue.id}", :author => @issue.author) %>
<hr />
<%= render :partial => 'issue_details', :locals => { :issue => @issue } %>

@ -39,4 +39,3 @@ See doc/COPYRIGHT.rdoc for more details.
<p><em><%= l(:text_user_mail_option) %></em></p>
<% end %>
<p><label><%= l(:label_user_mail_no_self_notified) %><%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified] %></label></p>

@ -33,16 +33,16 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="splitcontentleft">
<% if @user.memberships.any? %>
<table class="list memberships">
<thead><tr>
<th><%= Project.model_name.human %></th>
<th><%= l(:label_role_plural) %></th>
<th style="width:15%"></th>
<thead><tr>
<th><%= Project.model_name.human %></th>
<th><%= l(:label_role_plural) %></th>
<th style="width:15%"></th>
<%= call_hook(:view_users_memberships_table_header, :user => @user )%>
</tr></thead>
<tbody>
<% @user.memberships.each do |membership| %>
<% next if membership.new_record? %>
<tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
</tr></thead>
<tbody>
<% @user.memberships.each do |membership| %>
<% next if membership.new_record? %>
<tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
<td class="project">
<%= link_to_project membership.project %>
</td>
@ -51,9 +51,9 @@ See doc/COPYRIGHT.rdoc for more details.
<%= form_for(:membership, :remote => true,
:url => { :action => 'edit_membership', :id => @user, :membership_id => membership },
:html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
<p><% roles.each do |role| %>
<p><% roles.each do |role| %>
<label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role),
:disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
:disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
<% end %></p>
<p><%= submit_tag l(:button_change) %>
<%= link_to_function l(:button_cancel), "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;" %></p>
@ -70,9 +70,9 @@ See doc/COPYRIGHT.rdoc for more details.
:class => 'icon icon-delete') if membership.deletable? %>
</td>
<%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
</tr>
</tr>
<% end; reset_cycle %>
</tbody>
</tbody>
</table>
<% else %>
<p class="nodata"><%= l(:label_no_data) %></p>

@ -36,4 +36,3 @@ See doc/COPYRIGHT.rdoc for more details.
<p><%= pref_fields.select :theme, OpenProject::Themes.all.map {|t| [t.name, t.identifier]}, :label => :label_theme %></p>
<% end %>
<% end %>

@ -65,10 +65,10 @@ See doc/COPYRIGHT.rdoc for more details.
<table class="list">
<thead>
<tr>
<%= sort_header_tag('login', :caption => User.human_attribute_name(:login)) %>
<%= sort_header_tag('firstname', :caption => User.human_attribute_name(:firstname)) %>
<%= sort_header_tag('lastname', :caption => User.human_attribute_name(:lastname)) %>
<%= sort_header_tag('mail', :caption => User.human_attribute_name(:mail)) %>
<%= sort_header_tag('login', :caption => User.human_attribute_name(:login)) %>
<%= sort_header_tag('firstname', :caption => User.human_attribute_name(:firstname)) %>
<%= sort_header_tag('lastname', :caption => User.human_attribute_name(:lastname)) %>
<%= sort_header_tag('mail', :caption => User.human_attribute_name(:mail)) %>
<%= sort_header_tag('admin', :caption => User.human_attribute_name(:admin), :default_order => 'desc') %>
<%= sort_header_tag('created_on', :caption => User.human_attribute_name(:created_on), :default_order => 'desc') %>
<%= sort_header_tag('last_login_on', :caption => User.human_attribute_name(:last_login_on), :default_order => 'desc') %>
@ -79,11 +79,11 @@ See doc/COPYRIGHT.rdoc for more details.
<tbody>
<% for user in @users -%>
<tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %> <%= 'blocked' if user.failed_too_many_recent_login_attempts? %>">
<td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
<td class="firstname"><%= h(user.firstname) %></td>
<td class="lastname"><%= h(user.lastname) %></td>
<td class="email"><%= mail_to(h(user.mail)) %></td>
<td align="center"><%= checked_image user.admin? %></td>
<td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
<td class="firstname"><%= h(user.firstname) %></td>
<td class="lastname"><%= h(user.lastname) %></td>
<td class="email"><%= mail_to(h(user.mail)) %></td>
<td align="center"><%= checked_image user.admin? %></td>
<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
<td class="last_login_on" align="center">
<%= format_time(user.last_login_on) unless user.last_login_on.nil? %>

@ -35,10 +35,10 @@ See doc/COPYRIGHT.rdoc for more details.
:url => { :action => "create" },
:html => { :class => nil, :autocomplete => 'off' },
:as => :user do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
<p>
<%= submit_tag l(:button_create) %>
<%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
</p>
<%= render :partial => 'form', :locals => { :f => f } %>
<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
<p>
<%= submit_tag l(:button_create) %>
<%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
</p>
<% end %>

@ -41,7 +41,7 @@ See doc/COPYRIGHT.rdoc for more details.
<p><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></p>
<% @version.custom_field_values.each do |value| %>
<p><%= custom_field_tag_with_label :version, value %></p>
<p><%= custom_field_tag_with_label :version, value %></p>
<% end %>
</div>

@ -35,4 +35,3 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_save) %>
<% end %>

@ -68,7 +68,7 @@ See doc/COPYRIGHT.rdoc for more details.
<br />
<label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>
<% if @project.descendants.active.any? %>
<%= hidden_field_tag 'with_subprojects', 0 %>
<%= hidden_field_tag 'with_subprojects', 0 %>
<br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
<% end %>
<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>

@ -39,7 +39,7 @@ See doc/COPYRIGHT.rdoc for more details.
<label><%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_wiki_page_reassign_children) %></label>:
<%= label_tag "reassign_to_id", l(:description_wiki_subpages_reassign), :class => "hidden-for-sighted" %>
<%= select_tag 'reassign_to_id', wiki_page_options_for_select(@reassignable_to),
:onclick => "$('todo_reassign').checked = true;" %>
:onclick => "$('todo_reassign').checked = true;" %>
<% end %>
</p>
</div>

@ -84,4 +84,3 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
<% html_title @page.pretty_title %>

@ -31,4 +31,3 @@ jQuery('#work_package_relation_<%= @relation.id %>').remove();
var relationsTable = jQuery('#work-package-relations-table');
if (relationsTable.find('tbody tr').length === 0) relationsTable.addClass('hidden');

@ -36,4 +36,3 @@ See doc/COPYRIGHT.rdoc for more details.
<div id="update">
</div>
<% end %>

@ -35,4 +35,3 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render :partial => "two_column_attributes", :locals => { :attributes => attributes } %>
</div>

@ -40,22 +40,22 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="splitcontentleft">
<p>
<label for="work_package_type_id"><%= WorkPackage.human_attribute_name(:type) %></label>
<%= select_tag('work_package[type_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>".html_safe + options_from_collection_for_select(@types, :id, :name)) %>
<label for="work_package_type_id"><%= WorkPackage.human_attribute_name(:type) %></label>
<%= select_tag('work_package[type_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>".html_safe + options_from_collection_for_select(@types, :id, :name)) %>
</p>
<% if @available_statuses.any? %>
<p>
<label for='status_id'><%= WorkPackage.human_attribute_name(:status) %></label>
<%= select_tag('work_package[status_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>".html_safe + options_from_collection_for_select(@available_statuses, :id, :name)) %>
<label for='status_id'><%= WorkPackage.human_attribute_name(:status) %></label>
<%= select_tag('work_package[status_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>".html_safe + options_from_collection_for_select(@available_statuses, :id, :name)) %>
</p>
<% end %>
<p>
<label for='work_package_priority_id'><%= WorkPackage.human_attribute_name(:priority) %></label>
<%= select_tag('work_package[priority_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>".html_safe + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
<label for='work_package_priority_id'><%= WorkPackage.human_attribute_name(:priority) %></label>
<%= select_tag('work_package[priority_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>".html_safe + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
</p>
<p>
<label for='work_package_assigned_to_id'><%= WorkPackage.human_attribute_name(:assigned_to) %></label>
<%= select_tag('work_package[assigned_to_id]', content_tag('option', l(:label_no_change_option), :value => '') +
<label for='work_package_assigned_to_id'><%= WorkPackage.human_attribute_name(:assigned_to) %></label>
<%= select_tag('work_package[assigned_to_id]', content_tag('option', l(:label_no_change_option), :value => '') +
content_tag('option', l(:label_nobody), :value => 'none') +
options_from_collection_for_select(@assignables, :id, :name)) %>
</p>
@ -67,8 +67,8 @@ See doc/COPYRIGHT.rdoc for more details.
</p>
<% if @project %>
<p>
<label for='category_id'><%= WorkPackage.human_attribute_name(:category) %></label>
<%= select_tag('work_package[category_id]', content_tag('option', l(:label_no_change_option), :value => '') +
<label for='category_id'><%= WorkPackage.human_attribute_name(:category) %></label>
<%= select_tag('work_package[category_id]', content_tag('option', l(:label_no_change_option), :value => '') +
content_tag('option', l(:label_none), :value => 'none') +
options_from_collection_for_select(@project.categories, :id, :name)) %>
</p>
@ -76,8 +76,8 @@ See doc/COPYRIGHT.rdoc for more details.
<% #TODO: allow editing versions when multiple projects %>
<% if @project %>
<p>
<label for='work_package_fixed_version_id'><%= WorkPackage.human_attribute_name(:fixed_version) %></label>
<%= select_tag('work_package[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') +
<label for='work_package_fixed_version_id'><%= WorkPackage.human_attribute_name(:fixed_version) %></label>
<%= select_tag('work_package[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') +
content_tag('option', l(:label_none), :value => 'none') +
version_options_for_select(@project.shared_versions.open.sort)) %>
</p>
@ -96,24 +96,24 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="splitcontentright">
<% if @project && User.current.allowed_to?(:manage_subtasks, @project) %>
<p>
<label for='work_package_parent_id'><%= WorkPackage.human_attribute_name(:parent) %></label>
<%= text_field_tag 'work_package[parent_id]', '', :size => 10 %>
<label for='work_package_parent_id'><%= WorkPackage.human_attribute_name(:parent) %></label>
<%= text_field_tag 'work_package[parent_id]', '', :size => 10 %>
</p>
<div id="parent_work_package_candidates" class="autocomplete"></div>
<%= javascript_tag "observeParentIssueField('#{work_packages_auto_complete_path(project_id: @project.id)}')" %>
<% end %>
<p>
<label for='work_package_start_date'><%= WorkPackage.human_attribute_name(:start_date) %></label>
<%= text_field_tag 'work_package[start_date]', '', :size => 10 %><%= calendar_for('work_package_start_date') %>
<label for='work_package_start_date'><%= WorkPackage.human_attribute_name(:start_date) %></label>
<%= text_field_tag 'work_package[start_date]', '', :size => 10 %><%= calendar_for('work_package_start_date') %>
</p>
<p>
<label for='work_package_due_date'><%= WorkPackage.human_attribute_name(:due_date) %></label>
<%= text_field_tag 'work_package[due_date]', '', :size => 10 %><%= calendar_for('work_package_due_date') %>
<label for='work_package_due_date'><%= WorkPackage.human_attribute_name(:due_date) %></label>
<%= text_field_tag 'work_package[due_date]', '', :size => 10 %><%= calendar_for('work_package_due_date') %>
</p>
<% if WorkPackage.use_field_for_done_ratio? %>
<p>
<label for='work_package_done_ratio'><%= WorkPackage.human_attribute_name(:done_ratio) %></label>
<%= select_tag 'work_package[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>
<label for='work_package_done_ratio'><%= WorkPackage.human_attribute_name(:done_ratio) %></label>
<%= select_tag 'work_package[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>
</p>
<% end %>
</div>

@ -68,9 +68,9 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
<p class="legend cal">
<span class="starting"><%= l(:text_tip_work_package_begin_day) %></span>
<span class="ending"><%= l(:text_tip_work_package_end_day) %></span>
<span class="starting ending"><%= l(:text_tip_work_package_begin_end_day) %></span>
<span class="starting"><%= l(:text_tip_work_package_begin_day) %></span>
<span class="ending"><%= l(:text_tip_work_package_end_day) %></span>
<span class="starting ending"><%= l(:text_tip_work_package_begin_end_day) %></span>
</p>
<% end %>

@ -33,7 +33,7 @@ See doc/COPYRIGHT.rdoc for more details.
<ul>
<% @work_packages.each do |work_package| -%>
<li><%= link_to_work_package work_package %></li>
<li><%= link_to_work_package work_package %></li>
<% end -%>
</ul>
@ -115,12 +115,12 @@ See doc/COPYRIGHT.rdoc for more details.
</div>
<% if @copy %>
<%= hidden_field_tag("copy") %>
<%= submit_tag l(:button_copy) %>
<%= submit_tag l(:button_copy_and_follow), :name => 'follow' %>
<%= hidden_field_tag("copy") %>
<%= submit_tag l(:button_copy) %>
<%= submit_tag l(:button_copy_and_follow), :name => 'follow' %>
<% else %>
<%= submit_tag l(:button_move) %>
<%= submit_tag l(:button_move_and_follow), :name => 'follow' %>
<%= submit_tag l(:button_move) %>
<%= submit_tag l(:button_move_and_follow), :name => 'follow' %>
<% end %>
<% end %>
<% content_for :header_tags do %>

@ -52,4 +52,3 @@ additional_reports << @category_report
<% end %>
<%= call_hook(:view_reports_issue_report_split_content_right, :project => @project) %>
</div>

@ -39,4 +39,3 @@ See doc/COPYRIGHT.rdoc for more details.
<br />
<%= link_to l(:button_back), report_project_work_packages_path(@project) %>

@ -37,11 +37,11 @@ See doc/COPYRIGHT.rdoc for more details.
<%= form_tag({}, :method => 'get') do %>
<p>
<label><%= Role.model_name.human %>:
<%= select_tag 'role_id', options_from_collection_for_select(@roles, "id", "name", @role && @role.id) %></label>
<label><%= Role.model_name.human %>:
<%= select_tag 'role_id', options_from_collection_for_select(@roles, "id", "name", @role && @role.id) %></label>
<label><%= Type.model_name.human %>:
<%= select_tag 'type_id', options_from_collection_for_select(@types, "id", "name", @type && @type.id) %></label>
<%= select_tag 'type_id', options_from_collection_for_select(@types, "id", "name", @type && @type.id) %></label>
<%= hidden_field_tag 'used_statuses_only', '0' %>
<label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>

Loading…
Cancel
Save