From 9814dcf231b50bd1d8e712db8534051ff8a8c8c6 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 25 Jan 2017 11:44:12 +0000 Subject: [PATCH] Use css pseudo-classes instead of cycle("odd", "even") (#15361). Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@16249 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/admin/info.html.erb | 2 +- app/views/admin/plugins.html.erb | 2 +- app/views/admin/projects.html.erb | 2 +- app/views/auth_sources/index.html.erb | 2 +- app/views/boards/index.html.erb | 2 +- app/views/boards/show.html.erb | 2 +- app/views/custom_fields/_index.html.erb | 4 ++-- app/views/email_addresses/_index.html.erb | 2 +- app/views/enumerations/index.html.erb | 3 +-- app/views/files/index.html.erb | 5 ++--- app/views/groups/_users.html.erb | 2 +- app/views/groups/index.html.erb | 2 +- app/views/issue_statuses/index.html.erb | 2 +- app/views/issues/_changesets.html.erb | 2 +- app/views/issues/_list.html.erb | 2 +- app/views/issues/_list_simple.html.erb | 2 +- app/views/principal_memberships/_index.html.erb | 4 ++-- app/views/projects/settings/_activities.html.erb | 2 +- app/views/projects/settings/_boards.html.erb | 2 +- app/views/projects/settings/_issue_categories.html.erb | 2 +- app/views/projects/settings/_members.html.erb | 4 ++-- app/views/projects/settings/_repositories.html.erb | 4 ++-- app/views/projects/settings/_versions.html.erb | 4 ++-- app/views/projects/show.html.erb | 2 +- app/views/queries/index.html.erb | 2 +- app/views/reports/_details.html.erb | 5 ++--- app/views/reports/_simple.html.erb | 5 ++--- app/views/repositories/_revisions.html.erb | 2 +- app/views/repositories/committers.html.erb | 2 +- app/views/roles/_form.html.erb | 2 +- app/views/roles/index.html.erb | 2 +- app/views/roles/permissions.html.erb | 2 +- app/views/timelog/_list.html.erb | 2 +- app/views/timelog/_report_criteria.html.erb | 2 +- app/views/trackers/fields.html.erb | 4 ++-- app/views/trackers/index.html.erb | 2 +- app/views/users/index.html.erb | 2 +- app/views/wiki/history.html.erb | 2 +- app/views/workflows/_form.html.erb | 2 +- app/views/workflows/index.html.erb | 2 +- app/views/workflows/permissions.html.erb | 4 ++-- public/javascripts/application.js | 4 ---- public/stylesheets/application.css | 9 ++++++--- 43 files changed, 57 insertions(+), 62 deletions(-) diff --git a/app/views/admin/info.html.erb b/app/views/admin/info.html.erb index 2be1d28fd..c56d14eb6 100644 --- a/app/views/admin/info.html.erb +++ b/app/views/admin/info.html.erb @@ -4,7 +4,7 @@ <% @checklist.each do |label, result| %> - + diff --git a/app/views/admin/plugins.html.erb b/app/views/admin/plugins.html.erb index 020dbc818..e04e06a7b 100644 --- a/app/views/admin/plugins.html.erb +++ b/app/views/admin/plugins.html.erb @@ -3,7 +3,7 @@ <% if @plugins.any? %>
<%= label.is_a?(Symbol) ? l(label) : label %>
<% @plugins.each do |plugin| %> - + <% project_tree(@projects, :init_level => true) do |project, level| %> - <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>"> + "> diff --git a/app/views/auth_sources/index.html.erb b/app/views/auth_sources/index.html.erb index ecde2bf95..7a0ffa59d 100644 --- a/app/views/auth_sources/index.html.erb +++ b/app/views/auth_sources/index.html.erb @@ -14,7 +14,7 @@ <% for source in @auth_sources %> - "> + diff --git a/app/views/boards/index.html.erb b/app/views/boards/index.html.erb index 29074130b..21280e1af 100644 --- a/app/views/boards/index.html.erb +++ b/app/views/boards/index.html.erb @@ -9,7 +9,7 @@ <% Board.board_tree(@boards) do |board, level| %> - + <% @topics.each do |topic| %> - + diff --git a/app/views/custom_fields/_index.html.erb b/app/views/custom_fields/_index.html.erb index dfc458cdc..04d4aa21d 100644 --- a/app/views/custom_fields/_index.html.erb +++ b/app/views/custom_fields/_index.html.erb @@ -12,7 +12,7 @@ <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%> <% back_url = custom_fields_path(:tab => tab[:name]) %> - "> + @@ -25,6 +25,6 @@ <%= delete_link custom_field_path(custom_field) %> - <% end; reset_cycle %> + <% end %>
<%= plugin.name %> <%= content_tag('span', plugin.description, :class => 'description') unless plugin.description.blank? %> <%= content_tag('span', link_to(plugin.url, plugin.url), :class => 'url') unless plugin.url.blank? %> diff --git a/app/views/admin/projects.html.erb b/app/views/admin/projects.html.erb index 630e78607..077f87c27 100644 --- a/app/views/admin/projects.html.erb +++ b/app/views/admin/projects.html.erb @@ -27,7 +27,7 @@
<%= link_to_project_settings(project, {}, :title => project.short_description) %> <%= checked_image project.is_public? %> <%= format_date(project.created_on) %>
<%= link_to(source.name, :action => 'edit', :id => source)%> <%= source.auth_method_name %> <%= source.host %>
<%= link_to board.name, project_board_path(board.project, board), :class => "board" %>
<%=h board.description %> diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb index 1f58acdc8..4a0a588e9 100644 --- a/app/views/boards/show.html.erb +++ b/app/views/boards/show.html.erb @@ -35,7 +35,7 @@
<%= link_to topic.subject, board_message_path(@board, topic) %> <%= link_to_user(topic.author) %> <%= format_time(topic.created_on) %>
<%= link_to custom_field.name, edit_custom_field_path(custom_field) %> <%= l(custom_field.format.label) %> <%= checked_image custom_field.is_required? %>
diff --git a/app/views/email_addresses/_index.html.erb b/app/views/email_addresses/_index.html.erb index 644cd759b..2fcf0b496 100644 --- a/app/views/email_addresses/_index.html.erb +++ b/app/views/email_addresses/_index.html.erb @@ -1,7 +1,7 @@ <% if @addresses.present? %> <% @addresses.each do |address| %> - "> + <% enumerations.each do |enumeration| %> - + @@ -27,7 +27,6 @@ <% end %>
<%= toggle_email_address_notify_link(address) %> diff --git a/app/views/enumerations/index.html.erb b/app/views/enumerations/index.html.erb index 042934b54..09d13a091 100644 --- a/app/views/enumerations/index.html.erb +++ b/app/views/enumerations/index.html.erb @@ -16,7 +16,7 @@
<%= link_to enumeration, edit_enumeration_path(enumeration) %> <%= checked_image enumeration.is_default? %> <%= checked_image enumeration.active? %>
-<% reset_cycle %> <% else %>

<%= l(:label_no_data) %>

<% end %> diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index decc7314e..50e7bd966 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -26,7 +26,7 @@ <% end -%> <% container.attachments.each do |file| %> - "> + <%= link_to_attachment file, :download => true, :title => file.description %> <%= format_time(file.created_on) %> <%= number_to_human_size(file.filesize) %> @@ -37,8 +37,7 @@ :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %> - <% end - reset_cycle %> + <% end %> <% end %> diff --git a/app/views/groups/_users.html.erb b/app/views/groups/_users.html.erb index 391edf4d8..8c2ab7e4b 100644 --- a/app/views/groups/_users.html.erb +++ b/app/views/groups/_users.html.erb @@ -8,7 +8,7 @@ <% @group.users.sort.each do |user| %> - + <%= link_to_user user %> <%= delete_link group_user_path(@group, :user_id => user), :remote => true %> diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb index a8886d0d8..7b77fec22 100644 --- a/app/views/groups/index.html.erb +++ b/app/views/groups/index.html.erb @@ -24,7 +24,7 @@ <% @groups.each do |group| %> - "> + "> <%= link_to group, edit_group_path(group) %> <%= (@user_count_by_group_id[group.id] || 0) unless group.builtin? %> <%= delete_link group unless group.builtin? %> diff --git a/app/views/issue_statuses/index.html.erb b/app/views/issue_statuses/index.html.erb index 8608402ca..f5e6538c2 100644 --- a/app/views/issue_statuses/index.html.erb +++ b/app/views/issue_statuses/index.html.erb @@ -16,7 +16,7 @@ <% for status in @issue_statuses %> - "> + <%= link_to status.name, edit_issue_status_path(status) %> <% if Issue.use_status_for_done_ratio? %> <%= status.default_done_ratio %> diff --git a/app/views/issues/_changesets.html.erb b/app/views/issues/_changesets.html.erb index 9e172c712..3bd775c06 100644 --- a/app/views/issues/_changesets.html.erb +++ b/app/views/issues/_changesets.html.erb @@ -1,5 +1,5 @@ <% changesets.each do |changeset| %> -
+

<%= link_to_revision(changeset, changeset.repository, :text => "#{l(:label_revision)} #{changeset.format_identifier}") %> <% if changeset.filechanges.any? && User.current.allowed_to?(:browse_repository, changeset.project) %> diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index 851fca1a3..7e34fca24 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -1,7 +1,7 @@ <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do -%> <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>

- +
<% for issue in issues %> - + <% memberships.each do |membership| %> <% next if membership.new_record? %> - + @@ -31,7 +31,7 @@ <%= call_table_row_hook principal, membership %> - <% end; reset_cycle %> + <% end %>
diff --git a/app/views/issues/_list_simple.html.erb b/app/views/issues/_list_simple.html.erb index 0d2850cd0..1e23b161b 100644 --- a/app/views/issues/_list_simple.html.erb +++ b/app/views/issues/_list_simple.html.erb @@ -9,7 +9,7 @@
<%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;', :id => nil) %> <%= link_to("#{issue.tracker} ##{issue.id}", issue_path(issue)) %> diff --git a/app/views/principal_memberships/_index.html.erb b/app/views/principal_memberships/_index.html.erb index 508e2e271..c55a19543 100644 --- a/app/views/principal_memberships/_index.html.erb +++ b/app/views/principal_memberships/_index.html.erb @@ -13,7 +13,7 @@
<%= link_to_project membership.project %>
<% else %> diff --git a/app/views/projects/settings/_activities.html.erb b/app/views/projects/settings/_activities.html.erb index db1a3c286..27a27de5d 100644 --- a/app/views/projects/settings/_activities.html.erb +++ b/app/views/projects/settings/_activities.html.erb @@ -12,7 +12,7 @@ <% @project.activities(true).each do |enumeration| %> <%= fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %> - + <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %> <%= enumeration %> diff --git a/app/views/projects/settings/_boards.html.erb b/app/views/projects/settings/_boards.html.erb index 99479e55a..bf0b786fd 100644 --- a/app/views/projects/settings/_boards.html.erb +++ b/app/views/projects/settings/_boards.html.erb @@ -8,7 +8,7 @@
<%= l(:label_board) %>
<%= render_boards_tree(@project.boards) do |board, level| %> -
+
<%= link_to board.name, project_board_path(@project, board) %>
diff --git a/app/views/projects/settings/_issue_categories.html.erb b/app/views/projects/settings/_issue_categories.html.erb index d1e219ee6..3cd78e387 100644 --- a/app/views/projects/settings/_issue_categories.html.erb +++ b/app/views/projects/settings/_issue_categories.html.erb @@ -10,7 +10,7 @@ <% for category in @project.issue_categories %> <% unless category.new_record? %> - + <%= category.name %> <%= category.assigned_to.name if category.assigned_to %> diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb index 4009e7b15..39f50c105 100644 --- a/app/views/projects/settings/_members.html.erb +++ b/app/views/projects/settings/_members.html.erb @@ -15,7 +15,7 @@ <% members.each do |member| %> <% next if member.new_record? %> - + <%= link_to_user member.principal %> <%= member.roles.sort.collect(&:to_s).join(', ') %> @@ -32,7 +32,7 @@ <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %> -<% end; reset_cycle %> +<% end %> <% else %> diff --git a/app/views/projects/settings/_repositories.html.erb b/app/views/projects/settings/_repositories.html.erb index 61a1bb24e..f460278a0 100644 --- a/app/views/projects/settings/_repositories.html.erb +++ b/app/views/projects/settings/_repositories.html.erb @@ -15,9 +15,9 @@ <% @project.repositories.sort.each do |repository| %> - + - <%= link_to repository.identifier, + <%= link_to repository.identifier, {:controller => 'repositories', :action => 'show',:id => @project, :repository_id => repository.identifier_param} if repository.identifier.present? %> <%= checked_image repository.is_default? %> diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb index c88bd01a4..f402fff7e 100644 --- a/app/views/projects/settings/_versions.html.erb +++ b/app/views/projects/settings/_versions.html.erb @@ -25,7 +25,7 @@ <% @versions.sort.each do |version| %> - + <%= link_to_version version %> <%= format_date(version.effective_date) %> <%= version.description %> @@ -39,7 +39,7 @@ <% end %> -<% end; reset_cycle %> +<% end %> <% else %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 87e398ee4..7de31023c 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -49,7 +49,7 @@ <% @trackers.each do |tracker| %> - "> + <%= link_to tracker.name, project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id) %> diff --git a/app/views/queries/index.html.erb b/app/views/queries/index.html.erb index b0dbc05be..c36c0ca1a 100644 --- a/app/views/queries/index.html.erb +++ b/app/views/queries/index.html.erb @@ -9,7 +9,7 @@ <% else %> <% @queries.each do |query| %> - + diff --git a/app/views/reports/_details.html.erb b/app/views/reports/_details.html.erb index ab7fe3620..998089caf 100644 --- a/app/views/reports/_details.html.erb +++ b/app/views/reports/_details.html.erb @@ -13,7 +13,7 @@ <% for row in rows %> -"> + <% for status in @statuses %> @@ -25,5 +25,4 @@ <% end %>
<%= link_to query.name, :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %>
<%= link_to row.name, aggregate_path(@project, field_name, row) %><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, aggregate_path(@project, field_name, row, :status_id => status.id) %>
-<% end - reset_cycle %> +<% end %> diff --git a/app/views/reports/_simple.html.erb b/app/views/reports/_simple.html.erb index 9dca3554c..d6f51ad19 100644 --- a/app/views/reports/_simple.html.erb +++ b/app/views/reports/_simple.html.erb @@ -10,7 +10,7 @@ <% for row in rows %> -"> + <%= link_to row.name, aggregate_path(@project, field_name, row) %> <%= aggregate_link data, { field_name => row.id, "closed" => 0 }, aggregate_path(@project, field_name, row, :status_id => "o") %> <%= aggregate_link data, { field_name => row.id, "closed" => 1 }, aggregate_path(@project, field_name, row, :status_id => "c") %> @@ -19,5 +19,4 @@ <% end %> -<% end - reset_cycle %> +<% end %> diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb index d1b9c4b04..1d13a1446 100644 --- a/app/views/repositories/_revisions.html.erb +++ b/app/views/repositories/_revisions.html.erb @@ -33,7 +33,7 @@ end %> <% show_diff = revisions.size > 1 %> <% line_num = 1 %> <% revisions.each do |changeset| %> - + <% id_style = (show_revision_graph ? "padding-left:#{(graph_space + 1) * 20}px" : nil) %> <%= content_tag(:td, :class => 'id', :style => id_style) do %> <%= link_to_revision(changeset, @repository) %> diff --git a/app/views/repositories/committers.html.erb b/app/views/repositories/committers.html.erb index b942e4b82..f23e10252 100644 --- a/app/views/repositories/committers.html.erb +++ b/app/views/repositories/committers.html.erb @@ -17,7 +17,7 @@ <% i = 0 -%> <% @committers.each do |committer, user_id| -%> - + <%= committer %> <%= hidden_field_tag "committers[#{i}][]", committer, :id => nil %> diff --git a/app/views/roles/_form.html.erb b/app/views/roles/_form.html.erb index 39acc34a4..5f095e7b2 100644 --- a/app/views/roles/_form.html.erb +++ b/app/views/roles/_form.html.erb @@ -91,7 +91,7 @@ <% end %> <% Tracker.sorted.all.each do |tracker| %> - "> + <%= tracker.name %> <% permissions.each do |permission| %> "><%= check_box_tag "role[permissions_tracker_ids][#{permission}][]", diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb index 8f059648b..ab0bbe8da 100644 --- a/app/views/roles/index.html.erb +++ b/app/views/roles/index.html.erb @@ -12,7 +12,7 @@ <% for role in @roles %> - <%= role.builtin? ? "builtin" : "givable" %>"> + "> <%= content_tag(role.builtin? ? 'em' : 'span', link_to(role.name, edit_role_path(role))) %> <%= reorder_handle(role) unless role.builtin? %> diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb index 50ddd8d2d..a4b14493d 100644 --- a/app/views/roles/permissions.html.erb +++ b/app/views/roles/permissions.html.erb @@ -34,7 +34,7 @@ <% end %> <% perms_by_module[mod].each do |permission| %> <% humanized_perm_name = l_or_humanize(permission.name, :prefix => 'permission_') %> - + <%= link_to_function('', "toggleCheckboxesBySelector('.permission-#{permission.name} input')", diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb index 3721df274..0fb72aeb4 100644 --- a/app/views/timelog/_list.html.erb +++ b/app/views/timelog/_list.html.erb @@ -1,7 +1,7 @@ <%= form_tag({}, :data => {:cm_url => time_entries_context_menu_path}) do -%> <%= hidden_field_tag 'back_url', url_for(:params => request.query_parameters), :id => nil %>
- +
+ <%= ("" * level).html_safe %> <%= ("" * (criterias.length - level - 1)).html_safe -%> diff --git a/app/views/trackers/fields.html.erb b/app/views/trackers/fields.html.erb index 09e5e4e46..8ba1c3ae4 100644 --- a/app/views/trackers/fields.html.erb +++ b/app/views/trackers/fields.html.erb @@ -25,7 +25,7 @@ <% Tracker::CORE_FIELDS.each do |field| %> - "> + <% field_name = l("field_#{field}".sub(/_id$/, '')) %> <% @custom_fields.each do |field| %> - "> + <% for tracker in @trackers %> - "> + <% for user in @users -%> - "> + diff --git a/app/views/wiki/history.html.erb b/app/views/wiki/history.html.erb index 136923460..e5e72b102 100644 --- a/app/views/wiki/history.html.erb +++ b/app/views/wiki/history.html.erb @@ -19,7 +19,7 @@ <% show_diff = @versions.size > 1 %> <% line_num = 1 %> <% @versions.each do |ver| %> -"> + diff --git a/app/views/workflows/_form.html.erb b/app/views/workflows/_form.html.erb index ccdee2385..ea706c50b 100644 --- a/app/views/workflows/_form.html.erb +++ b/app/views/workflows/_form.html.erb @@ -24,7 +24,7 @@ <% for old_status in [nil] + @statuses %> <% next if old_status.nil? && name != 'always' %> - "> + <% @trackers.each do |tracker| -%> - + <% @roles.each do |role| -%> <% count = @workflow_counts[[tracker.id, role.id]] || 0 %> diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb index dadffe354..3a47560c9 100644 --- a/app/views/workflows/permissions.html.erb +++ b/app/views/workflows/permissions.html.erb @@ -60,7 +60,7 @@ <% @fields.each do |field, name| %> - "> + @@ -80,7 +80,7 @@ <% @custom_fields.each do |field| %> - "> + diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 6ad6ac035..c99e35ab5 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -697,10 +697,6 @@ function beforeShowDatePicker(input, inst) { type: 'put', dataType: 'script', data: data, - success: function(data){ - sortable.children(":even").removeClass("even").addClass("odd"); - sortable.children(":odd").removeClass("odd").addClass("even"); - }, error: function(jqXHR, textStatus, errorThrown){ alert(jqXHR.status); sortable.sortable("cancel"); diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 641dd01e7..d9afc8e83 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -320,6 +320,8 @@ table.permissions td.role {color:#999;font-size:90%;font-weight:normal !importan tr.wiki-page-version td.updated_on, tr.wiki-page-version td.author {text-align:center;} +div.mypage-box table.time-entries tr.time-entry { background-color: #fff; } +div.mypage-box table.time-entries tr.odd { background-color:#f6f7f8; } tr.time-entry { text-align: center; white-space: nowrap; } tr.time-entry td.issue, tr.time-entry td.comments, tr.time-entry td.subject, tr.time-entry td.activity { text-align: left; white-space: normal; } td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; } @@ -333,7 +335,7 @@ table.plugins span.url { display: block; font-size: 0.9em; } table.list.enumerations {table-layout: fixed; margin-bottom: 2em;} -tr.group td { padding: 0.8em 0 0.5em 0.3em; border-bottom: 1px solid #ccc; text-align:left; } +tr.group td { padding: 0.8em 0 0.5em 0.3em; border-bottom: 1px solid #ccc; text-align:left; background-color: #fff;} tr.group span.name {font-weight:bold;} tr.group span.count {font-weight:bold; position:relative; top:-1px; color:#fff; font-size:10px; background:#9DB9D5; padding:0px 6px 1px 6px; border-radius:3px; margin-left:4px;} tr.group span.totals {color: #aaa; font-size: 80%;} @@ -346,8 +348,9 @@ table.list tbody tr:hover { background-color:#ffffdd; } table.list tbody tr.group:hover { background-color:inherit; } table td {padding:2px;} table p {margin:0;} -.odd {background-color:#f6f7f8;} -.even {background-color: #fff;} + +table.list tbody tr:nth-child(odd), table.list.odd-even tbody tr.odd, #issue-changesets div.changeset:nth-child(odd) { background-color:#f6f7f8; } +table.list tbody tr:nth-child(even), table.list.odd-even tbody tr.even, #issue-changesets div.changeset:nth-child(even) { background-color: #fff; } tr.builtin td.name {font-style:italic;}
diff --git a/app/views/timelog/_report_criteria.html.erb b/app/views/timelog/_report_criteria.html.erb index f4181172f..6af122ec4 100644 --- a/app/views/timelog/_report_criteria.html.erb +++ b/app/views/timelog/_report_criteria.html.erb @@ -1,7 +1,7 @@ <% @report.hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value| %> <% hours_for_value = select_hours(hours, criterias[level], value) -%> <% next if hours_for_value.empty? -%> -
<%= format_criteria_value(@report.available_criteria[criterias[level]], value) %>
<%= link_to_function('', "toggleCheckboxesBySelector('input.core-field-#{field}')", @@ -49,7 +49,7 @@
<%= link_to_function('', "toggleCheckboxesBySelector('input.custom-field-#{field.id}')", :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", diff --git a/app/views/trackers/index.html.erb b/app/views/trackers/index.html.erb index 7ee6387fd..d5d463b09 100644 --- a/app/views/trackers/index.html.erb +++ b/app/views/trackers/index.html.erb @@ -13,7 +13,7 @@
<%= link_to tracker.name, edit_tracker_path(tracker) %> <% unless tracker.workflow_rules.exists? %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 60e42c603..3fc82b640 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -37,7 +37,7 @@
<%= avatar(user, :size => "14") %><%= link_to user.login, edit_user_path(user) %> <%= user.firstname %> <%= user.lastname %>
<%= link_to ver.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %> <%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('#cbto-#{line_num+1}').prop('checked', true);") if show_diff && (line_num < @versions.size) %> <%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %>
<%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.try(:id) || 0}')", :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", diff --git a/app/views/workflows/index.html.erb b/app/views/workflows/index.html.erb index 1a0780532..66785a40c 100644 --- a/app/views/workflows/index.html.erb +++ b/app/views/workflows/index.html.erb @@ -17,7 +17,7 @@
<%= tracker.name %>
<%= name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
<%= field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>