diff --git a/app/views/admin/info.html.erb b/app/views/admin/info.html.erb index 2be1d28..c56d14e 100644 --- a/app/views/admin/info.html.erb +++ b/app/views/admin/info.html.erb @@ -4,7 +4,7 @@
<%= label.is_a?(Symbol) ? l(label) : label %> |
<%= 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 d9c3228..a5667f2 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) %> | diff --git a/app/views/auth_sources/index.html.erb b/app/views/auth_sources/index.html.erb index ecde2bf..7a0ffa5 100644 --- a/app/views/auth_sources/index.html.erb +++ b/app/views/auth_sources/index.html.erb @@ -14,7 +14,7 @@
<%= link_to(source.name, :action => 'edit', :id => source)%> | <%= source.auth_method_name %> | <%= source.host %> | diff --git a/app/views/boards/index.html.erb b/app/views/boards/index.html.erb index 2907413..21280e1 100644 --- a/app/views/boards/index.html.erb +++ b/app/views/boards/index.html.erb @@ -9,7 +9,7 @@
<%= 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 1f58acd..4a0a588 100644 --- a/app/views/boards/show.html.erb +++ b/app/views/boards/show.html.erb @@ -35,7 +35,7 @@ | ||
<%= link_to custom_field.name, edit_custom_field_path(custom_field) %> | <%= l(custom_field.format.label) %> | <%= checked_image custom_field.is_required? %> | @@ -25,6 +25,6 @@ <%= delete_link custom_field_path(custom_field) %>
<%= address.address %> | <%= toggle_email_address_notify_link(address) %> diff --git a/app/views/enumerations/index.html.erb b/app/views/enumerations/index.html.erb index 5f1d2ea..01e943e 100644 --- a/app/views/enumerations/index.html.erb +++ b/app/views/enumerations/index.html.erb @@ -13,7 +13,7 @@ | |
<%= link_to enumeration, edit_enumeration_path(enumeration) %> | <%= checked_image enumeration.is_default? %> | <%= checked_image enumeration.active? %> | @@ -24,7 +24,6 @@
<%= link_to l(:label_enumeration_new), new_enumeration_path(:type => klass.name) %>
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index decc731..50e7bd9 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_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 old mode 100644 new mode 100755 index 851fca1..7e34fca --- 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 %>
<%= 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 76a629f..8f95958 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 %> | @@ -44,7 +44,7 @@ <%= call_table_row_hook principal, membership %>
<%= link_to query.name, :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %> | diff --git a/app/views/reports/_details.html.erb b/app/views/reports/_details.html.erb index ab7fe36..998089c 100644 --- a/app/views/reports/_details.html.erb +++ b/app/views/reports/_details.html.erb @@ -13,7 +13,7 @@|
<%= link_to row.name, aggregate_path(@project, field_name, row) %> | <% for status in @statuses %><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, aggregate_path(@project, field_name, row, :status_id => status.id) %> | @@ -25,5 +25,4 @@ <% end %>
" * level).html_safe %> | <%= format_criteria_value(@report.available_criteria[criterias[level]], value) %> | <%= ("" * (criterias.length - level - 1)).html_safe -%> diff --git a/app/views/trackers/fields.html.erb b/app/views/trackers/fields.html.erb index b53f1fa..61d1da4 100644 --- a/app/views/trackers/fields.html.erb +++ b/app/views/trackers/fields.html.erb @@ -25,7 +25,7 @@ |
<%= link_to_function('', "toggleCheckboxesBySelector('input.core-field-#{field}')", :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", @@ -48,7 +48,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 5f40cf0..8f6c210 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.count > 0 %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 60e42c6..3fc82b6 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 %> | diff --git a/app/views/wiki/history.html.erb b/app/views/wiki/history.html.erb index 1369234..e5e72b1 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| %> -
<%= 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) %> | diff --git a/app/views/workflows/_form.html.erb b/app/views/workflows/_form.html.erb index 9fb2705..def117b 100644 --- a/app/views/workflows/_form.html.erb +++ b/app/views/workflows/_form.html.erb @@ -24,7 +24,7 @@
<%= 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 1a07805..66785a4 100644 --- a/app/views/workflows/index.html.erb +++ b/app/views/workflows/index.html.erb @@ -17,7 +17,7 @@ | ||
<%= tracker.name %> | <% @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 0fb4c8b..fc886e0 100644 --- a/app/views/workflows/permissions.html.erb +++ b/app/views/workflows/permissions.html.erb @@ -60,7 +60,7 @@||
<%= name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> | @@ -80,7 +80,7 @@||
<%= field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> | diff --git a/public/javascripts/application.js b/public/javascripts/application.js index f38b69b..8d703ad 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -685,10 +685,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 old mode 100644 new mode 100755 index bb2b0b8..646c734 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -317,6 +317,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; } @@ -330,7 +332,7 @@ table.plugins span.url { display: block; font-size: 0.9em; } table.list.enumerations {table-layout: fixed;} -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%;} @@ -343,8 +345,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;}