Commit cd0f618f authored by jplang's avatar jplang
Browse files

Reverts r16051 and r16050 for now (#15361).

git-svn-id: https://svn.redmine.org/redmine/trunk@16052 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 4d21d1cb
......@@ -4,7 +4,7 @@
<table class="list">
<% @checklist.each do |label, result| %>
<tr>
<tr class="<%= cycle 'odd', 'even' %>">
<td class="name"><%= label.is_a?(Symbol) ? l(label) : label %></td>
<td class="tick"><span class="icon-only <%= (result ? 'icon-ok' : 'icon-error') %>"></span></td>
</tr>
......
......@@ -3,7 +3,7 @@
<% if @plugins.any? %>
<table class="list plugins">
<% @plugins.each do |plugin| %>
<tr id="plugin-<%= plugin.id %>">
<tr id="plugin-<%= plugin.id %>" class="<%= cycle('odd', 'even') %>">
<td class="name"><span class="name"><%= plugin.name %></span>
<%= 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? %>
......
......@@ -27,7 +27,7 @@
</tr></thead>
<tbody>
<% project_tree(@projects, :init_level => true) do |project, level| %>
<tr class="<%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
<tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
<td class="name"><span><%= link_to_project_settings(project, {}, :title => project.short_description) %></span></td>
<td><%= checked_image project.is_public? %></td>
<td><%= format_date(project.created_on) %></td>
......
......@@ -14,7 +14,7 @@
</tr></thead>
<tbody>
<% for source in @auth_sources %>
<tr id="auth-source-<%= source.id %>">
<tr id="auth-source-<%= source.id %>" class="<%= cycle("odd", "even") %>">
<td class="name"><%= link_to(source.name, :action => 'edit', :id => source)%></td>
<td><%= source.auth_method_name %></td>
<td><%= source.host %></td>
......
......@@ -9,7 +9,7 @@
</tr></thead>
<tbody>
<% Board.board_tree(@boards) do |board, level| %>
<tr>
<tr class="<%= cycle 'odd', 'even' %>">
<td class="name" style="padding-left: <%= level * 18 %>px;">
<%= link_to board.name, project_board_path(board.project, board), :class => "board" %><br />
<%=h board.description %>
......
......@@ -35,7 +35,7 @@
</tr></thead>
<tbody>
<% @topics.each do |topic| %>
<tr id="message-<%= topic.id %>" class="message <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
<tr id="message-<%= topic.id %>" class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
<td class="subject icon <%= 'icon-sticky' if topic.sticky? %> <%= 'icon-locked' if topic.locked? %>"><%= link_to topic.subject, board_message_path(@board, topic) %></td>
<td class="author"><%= link_to_user(topic.author) %></td>
<td class="created_on"><%= format_time(topic.created_on) %></td>
......
......@@ -12,7 +12,7 @@
<tbody>
<% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
<% back_url = custom_fields_path(:tab => tab[:name]) %>
<tr>
<tr class="<%= cycle("odd", "even") %>">
<td class="name"><%= link_to custom_field.name, edit_custom_field_path(custom_field) %></td>
<td><%= l(custom_field.format.label) %></td>
<td><%= checked_image custom_field.is_required? %></td>
......@@ -25,6 +25,6 @@
<%= delete_link custom_field_path(custom_field) %>
</td>
</tr>
<% end %>
<% end; reset_cycle %>
</tbody>
</table>
<% if @addresses.present? %>
<table class="list email_addresses">
<% @addresses.each do |address| %>
<tr>
<tr class="<%= cycle("odd", "even") %>">
<td class="email"><%= address.address %></td>
<td class="buttons">
<%= toggle_email_address_notify_link(address) %>
......
......@@ -13,7 +13,7 @@
<th></th>
</tr></thead>
<% enumerations.each do |enumeration| %>
<tr>
<tr class="<%= cycle('odd', 'even') %>">
<td class="name"><%= link_to enumeration, edit_enumeration_path(enumeration) %></td>
<td class="tick"><%= checked_image enumeration.is_default? %></td>
<td class="tick"><%= checked_image enumeration.active? %></td>
......@@ -24,6 +24,7 @@
</tr>
<% end %>
</table>
<% reset_cycle %>
<% end %>
<p><%= link_to l(:label_enumeration_new), new_enumeration_path(:type => klass.name) %></p>
......
......@@ -26,7 +26,7 @@
</tr>
<% end -%>
<% container.attachments.each do |file| %>
<tr class="file">
<tr class="file <%= cycle("odd", "even") %>">
<td class="filename"><%= link_to_attachment file, :download => true, :title => file.description %></td>
<td class="created_on"><%= format_time(file.created_on) %></td>
<td class="filesize"><%= number_to_human_size(file.filesize) %></td>
......@@ -37,7 +37,8 @@
:data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
</td>
</tr>
<% end %>
<% end
reset_cycle %>
<% end %>
</tbody>
</table>
......
......@@ -8,7 +8,7 @@
</tr></thead>
<tbody>
<% @group.users.sort.each do |user| %>
<tr id="user-<%= user.id %>">
<tr id="user-<%= user.id %>" class="<%= cycle 'odd', 'even' %>">
<td class="name"><%= link_to_user user %></td>
<td class="buttons">
<%= delete_link group_user_path(@group, :user_id => user), :remote => true %>
......
......@@ -24,7 +24,7 @@
</tr></thead>
<tbody>
<% @groups.each do |group| %>
<tr id="group-<%= group.id %>" class="<%= "builtin" if group.builtin? %>">
<tr id="group-<%= group.id %>" class="<%= cycle 'odd', 'even' %> <%= "builtin" if group.builtin? %>">
<td class="name"><%= link_to group, edit_group_path(group) %></td>
<td class="user_count"><%= (@user_count_by_group_id[group.id] || 0) unless group.builtin? %></td>
<td class="buttons"><%= delete_link group unless group.builtin? %></td>
......
......@@ -16,7 +16,7 @@
</tr></thead>
<tbody>
<% for status in @issue_statuses %>
<tr>
<tr class="<%= cycle("odd", "even") %>">
<td class="name"><%= link_to status.name, edit_issue_status_path(status) %></td>
<% if Issue.use_status_for_done_ratio? %>
<td><%= status.default_done_ratio %></td>
......
<% changesets.each do |changeset| %>
<div class="changeset">
<div class="changeset <%= cycle('odd', 'even') %>">
<p><%= 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) %>
......
......@@ -16,6 +16,7 @@
<tbody>
<% grouped_issue_list(issues, @query, @issue_count_by_group) do |issue, level, group_name, group_count, group_totals| -%>
<% if group_name %>
<% reset_cycle %>
<tr class="group open">
<td colspan="<%= query.inline_columns.size + 1 %>">
<span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
......@@ -25,7 +26,7 @@
</td>
</tr>
<% end %>
<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
<td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
<%= raw query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, issue)}</td>"}.join %>
</tr>
......
......@@ -9,7 +9,7 @@
</tr></thead>
<tbody>
<% for issue in issues %>
<tr id="issue-<%= h(issue.id) %>" class="hascontextmenu <%= issue.css_classes %>">
<tr id="issue-<%= h(issue.id) %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
<td class="id">
<%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;', :id => nil) %>
<%= link_to("#{issue.tracker} ##{issue.id}", issue_path(issue)) %>
......
......@@ -13,7 +13,7 @@
<tbody>
<% principal.memberships.preload(:member_roles => :role).each do |membership| %>
<% next if membership.new_record? %>
<tr id="member-<%= membership.id %>" class="class">
<tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
<td class="project name">
<%= link_to_project membership.project %>
</td>
......@@ -44,7 +44,7 @@
</td>
<%= call_table_row_hook principal, membership %>
</tr>
<% end %>
<% end; reset_cycle %>
</tbody>
</table>
<% else %>
......
......@@ -12,7 +12,7 @@
<% @project.activities(true).each do |enumeration| %>
<%= fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %>
<tr>
<tr class="<%= cycle('odd', 'even') %>">
<td class="name">
<%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %>
<%= enumeration %>
......
......@@ -4,7 +4,7 @@
<div class="table-list-cell"><%= l(:label_board) %></div>
</div>
<%= render_boards_tree(@project.boards) do |board, level| %>
<div class="table-list-row">
<div class="table-list-row <%= cycle 'odd', 'even' %>">
<div class="table-list-cell name" style="padding-left: <%= 2 + level * 16 %>px">
<%= link_to board.name, project_board_path(@project, board) %>
</div>
......
......@@ -8,7 +8,7 @@
<tbody>
<% for category in @project.issue_categories %>
<% unless category.new_record? %>
<tr>
<tr class="<%= cycle 'odd', 'even' %>">
<td class="name"><%= category.name %></td>
<td><%= category.assigned_to.name if category.assigned_to %></td>
<td class="buttons">
......
......@@ -16,7 +16,7 @@
<tbody>
<% members.each do |member| %>
<% next if member.new_record? %>
<tr id="member-<%= member.id %>" class="member">
<tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
<td class="name icon icon-<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
<td class="roles">
<span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>
......@@ -54,7 +54,7 @@
</td>
<%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
</tr>
<% end %>
<% end; reset_cycle %>
</tbody>
</table>
<% else %>
......
......@@ -11,9 +11,9 @@
</thead>
<tbody>
<% @project.repositories.sort.each do |repository| %>
<tr>
<tr class="<%= cycle 'odd', 'even' %>">
<td class="name">
<%= link_to repository.identifier,
<%= link_to repository.identifier,
{:controller => 'repositories', :action => 'show',:id => @project, :repository_id => repository.identifier_param} if repository.identifier.present? %>
</td>
<td><%= checked_image repository.is_default? %></td>
......
......@@ -22,7 +22,7 @@
</tr></thead>
<tbody>
<% @versions.sort.each do |version| %>
<tr class="version <%=h version.status %> <%= 'shared' if version.project != @project %>">
<tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>">
<td class="name <%= 'icon icon-shared' if version.project != @project %>"><%= link_to_version version %></td>
<td class="date"><%= format_date(version.effective_date) %></td>
<td class="description"><%= version.description %></td>
......@@ -36,7 +36,7 @@
<% end %>
</td>
</tr>
<% end %>
<% end; reset_cycle %>
</tbody>
</table>
<% else %>
......
......@@ -49,7 +49,7 @@
</thead>
<tbody>
<% @trackers.each do |tracker| %>
<tr>
<tr class="<%= cycle("odd", "even") %>">
<td class="name">
<%= link_to tracker.name, project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id) %>
</td>
......
......@@ -9,7 +9,7 @@
<% else %>
<table class="list">
<% @queries.each do |query| %>
<tr>
<tr class="<%= cycle('odd', 'even') %>">
<td class="name">
<%= link_to query.name, :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %>
</td>
......
......@@ -13,7 +13,7 @@
</tr></thead>
<tbody>
<% for row in rows %>
<tr>
<tr class="<%= cycle("odd", "even") %>">
<td class="name"><%= link_to row.name, aggregate_path(@project, field_name, row) %></td>
<% for status in @statuses %>
<td><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, aggregate_path(@project, field_name, row, :status_id => status.id) %></td>
......@@ -25,4 +25,5 @@
<% end %>
</tbody>
</table>
<% end %>
<% end
reset_cycle %>
......@@ -10,7 +10,7 @@
</tr></thead>
<tbody>
<% for row in rows %>
<tr>
<tr class="<%= cycle("odd", "even") %>">
<td class="name"><%= link_to row.name, aggregate_path(@project, field_name, row) %></td>
<td><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, aggregate_path(@project, field_name, row, :status_id => "o") %></td>
<td><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, aggregate_path(@project, field_name, row, :status_id => "c") %></td>
......@@ -19,4 +19,5 @@
<% end %>
</tbody>
</table>
<% end %>
<% end
reset_cycle %>
......@@ -33,7 +33,7 @@ end %>
<% show_diff = revisions.size > 1 %>
<% line_num = 1 %>
<% revisions.each do |changeset| %>
<tr class="changeset">
<tr class="changeset <%= cycle 'odd', 'even' %>">
<% 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) %>
......
......@@ -17,7 +17,7 @@
<tbody>
<% i = 0 -%>
<% @committers.each do |committer, user_id| -%>
<tr>
<tr class="<%= cycle 'odd', 'even' %>">
<td><%= committer %></td>
<td>
<%= hidden_field_tag "committers[#{i}][]", committer, :id => nil %>
......
......@@ -91,7 +91,7 @@
<% end %>
</tr>
<% Tracker.sorted.all.each do |tracker| %>
<tr>
<tr class="<%= cycle("odd", "even") %>">
<td class="name"><%= tracker.name %></td>
<% permissions.each do |permission| %>
<td class="<%= "#{permission}_shown" %>"><%= check_box_tag "role[permissions_tracker_ids][#{permission}][]",
......
......@@ -12,7 +12,7 @@
</tr></thead>
<tbody>
<% for role in @roles %>
<tr class="<%= role.builtin? ? "builtin" : "givable" %>">
<tr class="<%= cycle("odd", "even") %> <%= role.builtin? ? "builtin" : "givable" %>">
<td class="name"><%= content_tag(role.builtin? ? 'em' : 'span', link_to(role.name, edit_role_path(role))) %></td>
<td class="buttons">
<%= reorder_handle(role) unless role.builtin? %>
......
......@@ -33,7 +33,7 @@
</tr>
<% end %>
<% perms_by_module[mod].each do |permission| %>
<tr class="permission-<%= permission.name %>">
<tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
<td class="name">
<%= link_to_function('',
"toggleCheckboxesBySelector('.permission-#{permission.name} input')",
......
......@@ -17,6 +17,7 @@
<tbody>
<% grouped_query_results(entries, @query, @entry_count_by_group) do |entry, group_name, group_count, group_totals| -%>
<% if group_name %>
<% reset_cycle %>
<tr class="group open">
<td colspan="<%= @query.inline_columns.size + 2 %>">
<span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
......@@ -30,7 +31,7 @@
</td>
</tr>
<% end %>
<tr id="time-entry-<%= entry.id %>" class="time-entry hascontextmenu">
<tr id="time-entry-<%= entry.id %>" class="time-entry <%= cycle("odd", "even") %> hascontextmenu">
<td class="checkbox hide-when-print"><%= check_box_tag("ids[]", entry.id, false, :id => nil) %></td>
<%= raw @query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, entry)}</td>"}.join %>
<td class="buttons">
......
<% @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? -%>
<tr class="<%= criterias.length > level+1 ? 'subtotal' : 'last-level' %>">
<tr class="<%= cycle('odd', 'even') %> <%= criterias.length > level+1 ? 'subtotal' : 'last-level' %>">
<%= ("<td></td>" * level).html_safe %>
<td class="name"><%= format_criteria_value(@report.available_criteria[criterias[level]], value) %></td>
<%= ("<td></td>" * (criterias.length - level - 1)).html_safe -%>
......
......@@ -25,7 +25,7 @@
</td>
</tr>
<% Tracker::CORE_FIELDS.each do |field| %>
<tr>
<tr class="<%= cycle("odd", "even") %>">
<td class="name">
<%= link_to_function('', "toggleCheckboxesBySelector('input.core-field-#{field}')",
:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
......@@ -48,7 +48,7 @@
</td>
</tr>
<% @custom_fields.each do |field| %>
<tr>
<tr class="<%= cycle("odd", "even") %>">
<td class="name">
<%= link_to_function('', "toggleCheckboxesBySelector('input.custom-field-#{field.id}')",
:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
......
......@@ -13,7 +13,7 @@
</tr></thead>
<tbody>
<% for tracker in @trackers %>
<tr>
<tr class="<%= cycle("odd", "even") %>">
<td class="name"><%= link_to tracker.name, edit_tracker_path(tracker) %></td>
<td>
<% unless tracker.workflow_rules.count > 0 %>
......
......@@ -37,7 +37,7 @@
</tr></thead>
<tbody>
<% for user in @users -%>
<tr class="<%= user.css_classes %>">
<tr class="<%= user.css_classes %> <%= cycle("odd", "even") %>">
<td class="username"><%= avatar(user, :size => "14") %><%= link_to user.login, edit_user_path(user) %></td>
<td class="firstname"><%= user.firstname %></td>
<td class="lastname"><%= user.lastname %></td>
......
......@@ -19,7 +19,7 @@
<% show_diff = @versions.size > 1 %>
<% line_num = 1 %>
<% @versions.each do |ver| %>
<tr class="wiki-page-version">
<tr class="wiki-page-version <%= cycle("odd", "even") %>">
<td class="id"><%= link_to ver.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
<td class="checkbox"><%= 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) %></td>
<td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
......
......@@ -24,7 +24,7 @@
<tbody>
<% for old_status in [nil] + @statuses %>
<% next if old_status.nil? && name != 'always' %>
<tr>
<tr class="<%= cycle("odd", "even") %>">
<td class="name">
<%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.try(:id) || 0}')",
:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
......
......@@ -17,7 +17,7 @@
</thead>
<tbody>
<% @trackers.each do |tracker| -%>
<tr>
<tr class="<%= cycle('odd', 'even') %>">
<td class="name"><%= tracker.name %></td>
<% @roles.each do |role| -%>
<% count = @workflow_counts[[tracker.id, role.id]] || 0 %>
......
......@@ -60,7 +60,7 @@
</td>
</tr>
<% @fields.each do |field, name| %>
<tr>
<tr class="<%= cycle("odd", "even") %>">
<td class="name">
<%= name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
</td>
......@@ -80,7 +80,7 @@
</td>
</tr>
<% @custom_fields.each do |field| %>
<tr>
<tr class="<%= cycle("odd", "even") %>">
<td class="name">
<%= field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
</td>
......
......@@ -685,6 +685,10 @@ 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");
......
......@@ -317,8 +317,6 @@ 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; }
......@@ -332,7 +330,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; background-color: #fff;}
tr.group td { padding: 0.8em 0 0.5em 0.3em; border-bottom: 1px solid #ccc; text-align:left; }
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%;}
......@@ -345,8 +343,8 @@ 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;}
table.list tbody tr:nth-child(odd), #issue-changesets div.changeset:nth-child(odd) {background-color:#f6f7f8;}
table.list tbody tr:nth-child(even), #issue-changesets div.changeset:nth-child(even) {background-color: #fff;}
.odd {background-color:#f6f7f8;}
.even {background-color: #fff;}
tr.builtin td.name {font-style:italic;}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment