diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-11 21:01:21 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-11 21:01:21 +0000 |
commit | 967564cba0bdc7b75ecd3bd44a2a4ae1c7d82c64 (patch) | |
tree | 91ffba7b7f5b51365e0b20ccb555c41404337c9f /app | |
parent | 05690057590a2a8d7fe82a1d5df4412ddf879829 (diff) | |
download | redmine-967564cba0bdc7b75ecd3bd44a2a4ae1c7d82c64.tar.gz redmine-967564cba0bdc7b75ecd3bd44a2a4ae1c7d82c64.zip |
Removed deprecated align and width html attributes (#15307).
git-svn-id: http://svn.redmine.org/redmine/trunk@12268 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
34 files changed, 111 insertions, 116 deletions
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index 05a9f61f7..41018c871 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -4,34 +4,34 @@ <%= back_url_hidden_field_tag %> <table> <tr> - <td align="right"><label for="username"><%=l(:field_login)%>:</label></td> - <td align="left"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td> + <td style="text-align:right;"><label for="username"><%=l(:field_login)%>:</label></td> + <td style="text-align:left;"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td> </tr> <tr> - <td align="right"><label for="password"><%=l(:field_password)%>:</label></td> - <td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td> + <td style="text-align:right;"><label for="password"><%=l(:field_password)%>:</label></td> + <td style="text-align:left;"><%= password_field_tag 'password', nil, :tabindex => '2' %></td> </tr> <% if Setting.openid? %> <tr> - <td align="right"><label for="openid_url"><%=l(:field_identity_url)%></label></td> - <td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td> + <td style="text-align:right;"><label for="openid_url"><%=l(:field_identity_url)%></label></td> + <td style="text-align:left;"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td> </tr> <% end %> <tr> <td></td> - <td align="left"> + <td style="text-align:left;"> <% if Setting.autologin? %> <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label> <% end %> </td> </tr> <tr> - <td align="left"> + <td style="text-align:left;"> <% if Setting.lost_password? %> <%= link_to l(:label_password_lost), lost_password_path %> <% end %> </td> - <td align="right"> + <td style="text-align:right;"> <input type="submit" name="login" value="<%=l(:button_login)%> »" tabindex="5"/> </td> </tr> diff --git a/app/views/admin/info.html.erb b/app/views/admin/info.html.erb index adfc5a7d6..3205a00eb 100644 --- a/app/views/admin/info.html.erb +++ b/app/views/admin/info.html.erb @@ -5,8 +5,8 @@ <table class="list"> <% @checklist.each do |label, result| %> <tr class="<%= cycle 'odd', 'even' %>"> - <td><%= l(label) %></td> - <td width="30px"><%= image_tag((result ? 'true.png' : 'exclamation.png'), + <td class="name"><%= l(label) %></td> + <td class="tick"><%= image_tag((result ? 'true.png' : 'exclamation.png'), :style => "vertical-align:bottom;") %></td> </tr> <% end %> diff --git a/app/views/admin/plugins.html.erb b/app/views/admin/plugins.html.erb index 4b1d3767e..7cd4fe763 100644 --- a/app/views/admin/plugins.html.erb +++ b/app/views/admin/plugins.html.erb @@ -4,7 +4,7 @@ <table class="list plugins"> <% @plugins.each do |plugin| %> <tr id="plugin-<%= plugin.id %>" class="<%= cycle('odd', 'even') %>"> - <td><span class="name"><%=h plugin.name %></span> + <td class="name"><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> diff --git a/app/views/admin/projects.html.erb b/app/views/admin/projects.html.erb index b7b198973..0de7040a4 100644 --- a/app/views/admin/projects.html.erb +++ b/app/views/admin/projects.html.erb @@ -28,8 +28,8 @@ <% 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, {}, :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><%= checked_image project.is_public? %></td> + <td><%= format_date(project.created_on) %></td> <td class="buttons"> <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock') unless project.archived? %> <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if project.archived? && (project.parent.nil? || !project.parent.archived?) %> diff --git a/app/views/auth_sources/index.html.erb b/app/views/auth_sources/index.html.erb index 975146180..ad84572d4 100644 --- a/app/views/auth_sources/index.html.erb +++ b/app/views/auth_sources/index.html.erb @@ -15,10 +15,10 @@ <tbody> <% for source in @auth_sources %> <tr id="auth-source-<%= source.id %>" class="<%= cycle("odd", "even") %>"> - <td><%= link_to(h(source.name), :action => 'edit', :id => source)%></td> - <td align="center"><%= h source.auth_method_name %></td> - <td align="center"><%= h source.host %></td> - <td align="center"><%= h source.users.count %></td> + <td class="name"><%= link_to(h(source.name), :action => 'edit', :id => source)%></td> + <td><%= h source.auth_method_name %></td> + <td><%= h source.host %></td> + <td><%= h source.users.count %></td> <td class="buttons"> <%= link_to l(:button_test), try_connection_auth_source_path(source), :class => 'icon icon-test' %> <%= delete_link auth_source_path(source) %> diff --git a/app/views/boards/index.html.erb b/app/views/boards/index.html.erb index f859e822b..640b8a1a3 100644 --- a/app/views/boards/index.html.erb +++ b/app/views/boards/index.html.erb @@ -10,7 +10,7 @@ <tbody> <% Board.board_tree(@boards) do |board, level| %> <tr class="<%= cycle 'odd', 'even' %>"> - <td style="padding-left: <%= level * 18 %>px;"> + <td class="name" style="padding-left: <%= level * 18 %>px;"> <%= link_to h(board.name), project_board_path(board.project, board), :class => "board" %><br /> <%=h board.description %> </td> diff --git a/app/views/custom_fields/_index.html.erb b/app/views/custom_fields/_index.html.erb index afee212c9..d55d08cfc 100644 --- a/app/views/custom_fields/_index.html.erb +++ b/app/views/custom_fields/_index.html.erb @@ -1,6 +1,6 @@ <table class="list"> <thead><tr> - <th width="30%"><%=l(:field_name)%></th> + <th><%=l(:field_name)%></th> <th><%=l(:field_field_format)%></th> <th><%=l(:field_is_required)%></th> <% if tab[:name] == 'IssueCustomField' %> @@ -8,17 +8,17 @@ <th><%=l(:label_used_by)%></th> <% end %> <th><%=l(:button_sort)%></th> - <th width="10%"></th> + <th></th> </tr></thead> <tbody> <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%> <tr class="<%= cycle("odd", "even") %>"> - <td><%= link_to h(custom_field.name), edit_custom_field_path(custom_field) %></td> - <td align="center"><%= l(Redmine::CustomFieldFormat.label_for(custom_field.field_format)) %></td> - <td align="center"><%= checked_image custom_field.is_required? %></td> + <td class="name"><%= link_to h(custom_field.name), edit_custom_field_path(custom_field) %></td> + <td><%= l(Redmine::CustomFieldFormat.label_for(custom_field.field_format)) %></td> + <td><%= checked_image custom_field.is_required? %></td> <% if tab[:name] == 'IssueCustomField' %> - <td align="center"><%= checked_image custom_field.is_for_all? %></td> - <td align="center"><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td> + <td><%= checked_image custom_field.is_for_all? %></td> + <td><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td> <% end %> <td class="reorder"><%= reorder_links('custom_field', {:action => 'update', :id => custom_field}, :put) %></td> <td class="buttons"> diff --git a/app/views/enumerations/index.html.erb b/app/views/enumerations/index.html.erb index d8aa921c2..684b933a6 100644 --- a/app/views/enumerations/index.html.erb +++ b/app/views/enumerations/index.html.erb @@ -8,20 +8,18 @@ <table class="list"><thead> <tr> <th><%= l(:field_name) %></th> - <th style="width:15%;"><%= l(:field_is_default) %></th> - <th style="width:15%;"><%= l(:field_active) %></th> - <th style="width:15%;"><%=l(:button_sort)%></th> - <th align="center" style="width:10%;"> </th> + <th><%= l(:field_is_default) %></th> + <th><%= l(:field_active) %></th> + <th><%=l(:button_sort)%></th> + <th></th> </tr></thead> <% enumerations.each do |enumeration| %> <tr class="<%= cycle('odd', 'even') %>"> - <td><%= link_to h(enumeration), edit_enumeration_path(enumeration) %></td> - <td class="center" style="width:15%;"><%= checked_image enumeration.is_default? %></td> - <td class="center" style="width:15%;"><%= checked_image enumeration.active? %></td> + <td class="name"><%= link_to h(enumeration), edit_enumeration_path(enumeration) %></td> + <td class="tick"><%= checked_image enumeration.is_default? %></td> + <td class="tick"><%= checked_image enumeration.active? %></td> <td class="reorder"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}, :put) %></td> - <td class="buttons"> - <%= delete_link enumeration_path(enumeration) %> - </td> + <td class="buttons"><%= delete_link enumeration_path(enumeration) %></td> </tr> <% end %> </table> diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index 5077dbd8f..c164cc011 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -20,7 +20,7 @@ <% next if container.attachments.empty? -%> <% if container.is_a?(Version) -%> <tr> - <th colspan="6" align="left"> + <th colspan="6"> <%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %> </th> </tr> @@ -32,7 +32,7 @@ <td class="filesize"><%= number_to_human_size(file.filesize) %></td> <td class="downloads"><%= file.downloads %></td> <td class="digest"><%= file.digest %></td> - <td align="center"> + <td class="buttons"> <%= link_to(image_tag('delete.png'), attachment_path(file), :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %> </td> diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb index 9b138d2d7..b0e82fa54 100644 --- a/app/views/gantts/show.html.erb +++ b/app/views/gantts/show.html.erb @@ -293,11 +293,11 @@ <table style="width:100%"> <tr> - <td align="left"> + <td style="text-align:left;"> <%= link_to_content_update("\xc2\xab " + l(:label_previous), params.merge(@gantt.params_previous)) %> </td> - <td align="right"> + <td style="text-align:right;"> <%= link_to_content_update(l(:label_next) + " \xc2\xbb", params.merge(@gantt.params_next)) %> </td> diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb index 2ce91dc58..d48afe9f0 100644 --- a/app/views/groups/index.html.erb +++ b/app/views/groups/index.html.erb @@ -14,8 +14,8 @@ <tbody> <% @groups.each do |group| %> <tr class="<%= cycle 'odd', 'even' %>"> - <td><%= link_to h(group), edit_group_path(group) %></td> - <td align="center"><%= group.users.size %></td> + <td class="name"><%= link_to h(group), edit_group_path(group) %></td> + <td><%= group.users.size %></td> <td class="buttons"><%= delete_link group %></td> </tr> <% end %> diff --git a/app/views/issue_statuses/index.html.erb b/app/views/issue_statuses/index.html.erb index 61d0c616b..659dd18fa 100644 --- a/app/views/issue_statuses/index.html.erb +++ b/app/views/issue_statuses/index.html.erb @@ -19,12 +19,12 @@ <tbody> <% for status in @issue_statuses %> <tr class="<%= cycle("odd", "even") %>"> - <td><%= link_to h(status.name), edit_issue_status_path(status) %></td> + <td class="name"><%= link_to h(status.name), edit_issue_status_path(status) %></td> <% if Issue.use_status_for_done_ratio? %> - <td align="center"><%= h status.default_done_ratio %></td> + <td><%= h status.default_done_ratio %></td> <% end %> - <td align="center"><%= checked_image status.is_default? %></td> - <td align="center"><%= checked_image status.is_closed? %></td> + <td><%= checked_image status.is_default? %></td> + <td><%= checked_image status.is_closed? %></td> <td class="reorder"><%= reorder_links('issue_status', {:action => 'update', :id => status}, :put) %></td> <td class="buttons"> <%= delete_link issue_status_path(status) %> diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb index 7953ee6fe..fbd83c382 100644 --- a/app/views/my/blocks/_timelog.html.erb +++ b/app/views/my/blocks/_timelog.html.erb @@ -34,7 +34,7 @@ entries_by_day = entries.group_by(&:spent_on) <td class="subject"><%=h entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td> <td class="comments"><%=h entry.comments %></td> <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td> - <td align="center"> + <td class="buttons"> <% if entry.editable_by?(@user) -%> <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry}, :title => l(:button_edit) %> diff --git a/app/views/projects/settings/_activities.html.erb b/app/views/projects/settings/_activities.html.erb index 8c9a6121c..65c26f57c 100644 --- a/app/views/projects/settings/_activities.html.erb +++ b/app/views/projects/settings/_activities.html.erb @@ -7,23 +7,23 @@ <% TimeEntryActivity.new.available_custom_fields.each do |value| %> <th><%= h value.name %></th> <% end %> - <th style="width:15%;"><%= l(:field_active) %></th> + <th><%= l(:field_active) %></th> </tr></thead> <% @project.activities(true).each do |enumeration| %> <%= fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %> <tr class="<%= cycle('odd', 'even') %>"> - <td> + <td class="name"> <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %> <%= h(enumeration) %> </td> - <td align="center" style="width:15%;"><%= checked_image !enumeration.project %></td> + <td class="tick"><%= checked_image !enumeration.project %></td> <% enumeration.custom_field_values.each do |value| %> - <td align="center"> + <td> <%= custom_field_tag "enumerations[#{enumeration.id}]", value %> </td> <% end %> - <td align="center" style="width:15%;"> + <td> <%= ff.check_box :active %> </td> </tr> diff --git a/app/views/projects/settings/_boards.html.erb b/app/views/projects/settings/_boards.html.erb index c1e023efe..b6a460b97 100644 --- a/app/views/projects/settings/_boards.html.erb +++ b/app/views/projects/settings/_boards.html.erb @@ -10,8 +10,8 @@ <% Board.board_tree(@project.boards) do |board, level| next if board.new_record? %> <tr class="<%= cycle 'odd', 'even' %>"> - <td style="padding-left: <%= level * 18 %>px;"><%= link_to board.name, project_board_path(@project, board) %></td> - <td><%=h board.description %></td> + <td class="name" style="padding-left: <%= level * 18 %>px;"><%= link_to board.name, project_board_path(@project, board) %></td> + <td class="description"><%=h board.description %></td> <td class="reorder"> <% if authorize_for("boards", "edit") %> <%= reorder_links('board', {:controller => 'boards', :action => 'update', :project_id => @project, :id => board}, :put) %> diff --git a/app/views/projects/settings/_issue_categories.html.erb b/app/views/projects/settings/_issue_categories.html.erb index 2bb3c728f..7c56fb667 100644 --- a/app/views/projects/settings/_issue_categories.html.erb +++ b/app/views/projects/settings/_issue_categories.html.erb @@ -9,7 +9,7 @@ <% for category in @project.issue_categories %> <% unless category.new_record? %> <tr class="<%= cycle 'odd', 'even' %>"> - <td><%=h(category.name) %></td> + <td class="name"><%=h(category.name) %></td> <td><%=h(category.assigned_to.name) if category.assigned_to %></td> <td class="buttons"> <% if User.current.allowed_to?(:manage_categories, @project) %> diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb index 6cb21002d..90a9d549d 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? %> <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member"> - <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td> + <td class="name <%= 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> <%= form_for(member, diff --git a/app/views/projects/settings/_repositories.html.erb b/app/views/projects/settings/_repositories.html.erb index 4492165c9..9352963cf 100644 --- a/app/views/projects/settings/_repositories.html.erb +++ b/app/views/projects/settings/_repositories.html.erb @@ -12,11 +12,11 @@ <tbody> <% @project.repositories.sort.each do |repository| %> <tr class="<%= cycle 'odd', 'even' %>"> - <td> + <td class="name"> <%= link_to repository.identifier, {:controller => 'repositories', :action => 'show',:id => @project, :repository_id => repository.identifier_param} if repository.identifier.present? %> </td> - <td align="center"><%= checked_image repository.is_default? %></td> + <td><%= checked_image repository.is_default? %></td> <td><%=h repository.scm_name %></td> <td><%=h repository.url %></td> <td class="buttons"> diff --git a/app/views/queries/index.html.erb b/app/views/queries/index.html.erb index 41051758e..98b0dfb72 100644 --- a/app/views/queries/index.html.erb +++ b/app/views/queries/index.html.erb @@ -10,15 +10,13 @@ <table class="list"> <% @queries.each do |query| %> <tr class="<%= cycle('odd', 'even') %>"> - <td> + <td class="name"> <%= link_to h(query.name), :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %> </td> - <td align="right"> - <small> + <td class="buttons"> <% if query.editable_by?(User.current) %> <%= link_to l(:button_edit), edit_query_path(query), :class => 'icon icon-edit' %> <%= delete_link query_path(query) %> - </small> <% end %> </td> </tr> diff --git a/app/views/reports/_details.html.erb b/app/views/reports/_details.html.erb index 4a01c7333..7d2ea4dcb 100644 --- a/app/views/reports/_details.html.erb +++ b/app/views/reports/_details.html.erb @@ -1,27 +1,26 @@ <% if @statuses.empty? or rows.empty? %> <p><i><%=l(:label_no_data)%></i></p> <% else %> -<% col_width = 70 / (@statuses.length+3) %> -<table class="list"> +<table class="list issue-report"> <thead><tr> -<th style="width:25%"></th> +<th></th> <% for status in @statuses %> -<th style="width:<%= col_width %>%"><%=h status.name %></th> +<th><%=h status.name %></th> <% end %> -<th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_open_issues_plural)%></strong></th> -<th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_closed_issues_plural)%></strong></th> -<th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_total)%></strong></th> +<th><strong><%=l(:label_open_issues_plural)%></strong></th> +<th><strong><%=l(:label_closed_issues_plural)%></strong></th> +<th><strong><%=l(:label_total)%></strong></th> </tr></thead> <tbody> <% for row in rows %> <tr class="<%= cycle("odd", "even") %>"> - <td><%= link_to h(row.name), aggregate_path(@project, field_name, row) %></td> + <td class="name"><%= link_to h(row.name), aggregate_path(@project, field_name, row) %></td> <% for status in @statuses %> - <td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, aggregate_path(@project, field_name, row, :status_id => status.id) %></td> + <td><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, aggregate_path(@project, field_name, row, :status_id => status.id) %></td> <% end %> - <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, aggregate_path(@project, field_name, row, :status_id => "o") %></td> - <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, aggregate_path(@project, field_name, row, :status_id => "c") %></td> - <td align="center"><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %></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> + <td><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %></td> </tr> <% end %> </tbody> diff --git a/app/views/reports/_simple.html.erb b/app/views/reports/_simple.html.erb index 8ea18f16f..8cfefe8a7 100644 --- a/app/views/reports/_simple.html.erb +++ b/app/views/reports/_simple.html.erb @@ -1,20 +1,20 @@ <% if @statuses.empty? or rows.empty? %> <p><i><%=l(:label_no_data)%></i></p> <% else %> -<table class="list"> +<table class="list issue-report"> <thead><tr> -<th style="width:25%"></th> -<th align="center" style="width:25%"><%=l(:label_open_issues_plural)%></th> -<th align="center" style="width:25%"><%=l(:label_closed_issues_plural)%></th> -<th align="center" style="width:25%"><%=l(:label_total)%></th> +<th></th> +<th><%=l(:label_open_issues_plural)%></th> +<th><%=l(:label_closed_issues_plural)%></th> +<th><%=l(:label_total)%></th> </tr></thead> <tbody> <% for row in rows %> <tr class="<%= cycle("odd", "even") %>"> - <td><%= link_to h(row.name), aggregate_path(@project, field_name, row) %></td> - <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, aggregate_path(@project, field_name, row, :status_id => "o") %></td> - <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, aggregate_path(@project, field_name, row, :status_id => "c") %></td> - <td align="center"><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %></td> + <td class="name"><%= link_to h(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> + <td><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %></td> </tr> <% end %> </tbody> diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb index 4f3fb2b4e..9eaab23b6 100644 --- a/app/views/roles/index.html.erb +++ b/app/views/roles/index.html.erb @@ -14,7 +14,7 @@ <tbody> <% for role in @roles %> <tr class="<%= cycle("odd", "even") %>"> - <td><%= content_tag(role.builtin? ? 'em' : 'span', link_to(h(role.name), edit_role_path(role))) %></td> + <td class="name"><%= content_tag(role.builtin? ? 'em' : 'span', link_to(h(role.name), edit_role_path(role))) %></td> <td class="reorder"> <% unless role.builtin? %> <%= reorder_links('role', {:action => 'update', :id => role}, :put) %> diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb index bf745a66a..13a072ff3 100644 --- a/app/views/roles/permissions.html.erb +++ b/app/views/roles/permissions.html.erb @@ -32,13 +32,13 @@ <% end %> <% perms_by_module[mod].each do |permission| %> <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>"> - <td> + <td class="name"> <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')", :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> <%= l_or_humanize(permission.name, :prefix => 'permission_') %> </td> <% @roles.each do |role| %> - <td align="center"> + <td> <% if role.setable_permissions.include? permission %> <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %> <% end %> diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb index 522b13032..d257375d5 100644 --- a/app/views/timelog/_list.html.erb +++ b/app/views/timelog/_list.html.erb @@ -21,7 +21,7 @@ <tr 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 align="center"> + <td class="buttons"> <% if entry.editable_by?(User.current) -%> <%= link_to image_tag('edit.png'), edit_time_entry_path(entry), :title => l(:button_edit) %> diff --git a/app/views/timelog/_report_criteria.html.erb b/app/views/timelog/_report_criteria.html.erb index 9a5d142f2..8ebb29e58 100644 --- a/app/views/timelog/_report_criteria.html.erb +++ b/app/views/timelog/_report_criteria.html.erb @@ -3,7 +3,7 @@ <% next if hours_for_value.empty? -%> <tr class="<%= cycle('odd', 'even') %> <%= criterias.length > level+1 ? 'subtotal' : 'last-level' %>"> <%= ("<td></td>" * level).html_safe %> -<td><%= h(format_criteria_value(@report.available_criteria[criterias[level]], value)) %></td> +<td class="name"><%= h(format_criteria_value(@report.available_criteria[criterias[level]], value)) %></td> <%= ("<td></td>" * (criterias.length - level - 1)).html_safe -%> <% total = 0 -%> <% @report.periods.each do |period| -%> diff --git a/app/views/timelog/report.html.erb b/app/views/timelog/report.html.erb index d88ee782a..ac2637ef1 100644 --- a/app/views/timelog/report.html.erb +++ b/app/views/timelog/report.html.erb @@ -43,9 +43,9 @@ <% end %> <% columns_width = (40 / (@report.periods.length+1)).to_i %> <% @report.periods.each do |period| %> - <th class="period" width="<%= columns_width %>%"><%= period %></th> + <th class="period" style="width:<%= columns_width %>%;"><%= period %></th> <% end %> - <th class="total" width="<%= columns_width %>%"><%= l(:label_total_time) %></th> + <th class="total" style="width:<%= columns_width %>%;"><%= l(:label_total_time) %></th> </tr> </thead> <tbody> diff --git a/app/views/trackers/fields.html.erb b/app/views/trackers/fields.html.erb index d3e31fe45..9e472e707 100644 --- a/app/views/trackers/fields.html.erb +++ b/app/views/trackers/fields.html.erb @@ -25,13 +25,13 @@ </tr> <% Tracker::CORE_FIELDS.each do |field| %> <tr class="<%= cycle("odd", "even") %>"> - <td> + <td class="name"> <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.core-field-#{field}')", :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> <%= l("field_#{field}".sub(/_id$/, '')) %> </td> <% @trackers.each do |tracker| %> - <td align="center"> + <td> <%= check_box_tag "trackers[#{tracker.id}][core_fields][]", field, tracker.core_fields.include?(field), :class => "tracker-#{tracker.id} core-field-#{field}" %> </td> @@ -47,13 +47,13 @@ </tr> <% @custom_fields.each do |field| %> <tr class="<%= cycle("odd", "even") %>"> - <td> + <td class="name"> <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.custom-field-#{field.id}')", :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> <%= field.name %> </td> <% @trackers.each do |tracker| %> - <td align="center"> + <td> <%= check_box_tag "trackers[#{tracker.id}][custom_field_ids][]", field.id, tracker.custom_fields.include?(field), :class => "tracker-#{tracker.id} custom-field-#{field.id}" %> </td> diff --git a/app/views/trackers/index.html.erb b/app/views/trackers/index.html.erb index 0d6e11898..d1928e989 100644 --- a/app/views/trackers/index.html.erb +++ b/app/views/trackers/index.html.erb @@ -15,8 +15,8 @@ <tbody> <% for tracker in @trackers %> <tr class="<%= cycle("odd", "even") %>"> - <td><%= link_to h(tracker.name), edit_tracker_path(tracker) %></td> - <td align="center"> + <td class="name"><%= link_to h(tracker.name), edit_tracker_path(tracker) %></td> + <td> <% unless tracker.workflow_rules.count > 0 %> <span class="icon icon-warning"> <%= l(:text_tracker_no_workflow) %> (<%= link_to l(:button_edit), workflows_edit_path(:tracker_id => tracker) %>) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 85dc27f67..80b05ff1a 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -41,9 +41,9 @@ <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? %></td> + <td class="tick"><%= checked_image user.admin? %></td> + <td class="created_on"><%= format_time(user.created_on) %></td> + <td class="last_login_on"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td> <td class="buttons"> <%= change_status_link(user) %> <%= delete_link user_path(user, :back_url => users_path(params)) unless User.current == user %> diff --git a/app/views/versions/_issue_counts.html.erb b/app/views/versions/_issue_counts.html.erb index 002be4938..951cc0186 100644 --- a/app/views/versions/_issue_counts.html.erb +++ b/app/views/versions/_issue_counts.html.erb @@ -13,14 +13,14 @@ <table> <% counts.each do |count| %> <tr> - <td width="130px" align="right" > + <td style="width:130px; text-align:right;"> <% if count[:group] -%> <%= link_to(h(count[:group]), project_issues_path(version.project, :set_filter => 1, :status_id => '*', :fixed_version_id => version, "#{criteria}_id" => count[:group])) %> <% else -%> <%= link_to(l(:label_none), project_issues_path(version.project, :set_filter => 1, :status_id => '*', :fixed_version_id => version, "#{criteria}_id" => "!*")) %> <% end %> </td> - <td width="240px"> + <td style="width:240px;"> <%= progress_bar((count[:closed].to_f / count[:total])*100, :legend => "#{count[:closed]}/#{count[:total]}", :width => "#{(count[:total].to_f / max * 200).floor}px;") %> diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb index b78005a9b..85442bd76 100644 --- a/app/views/versions/index.html.erb +++ b/app/views/versions/index.html.erb @@ -21,7 +21,7 @@ <% issues.each do |issue| -%> <tr class="hascontextmenu"> <td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td> - <td><%= link_to_issue(issue, :project => (@project != issue.project)) %></td> + <td class="subject"><%= link_to_issue(issue, :project => (@project != issue.project)) %></td> </tr> <% end -%> </table> diff --git a/app/views/workflows/_form.html.erb b/app/views/workflows/_form.html.erb index ec015a994..19d94d60c 100644 --- a/app/views/workflows/_form.html.erb +++ b/app/views/workflows/_form.html.erb @@ -1,17 +1,17 @@ <table class="list transitions transitions-<%= name %>"> <thead> <tr> - <th align="left"> + <th> <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input')", :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> <%=l(:label_current_status)%> </th> - <th align="center" colspan="<%= @statuses.length %>"><%=l(:label_new_statuses_allowed)%></th> + <th colspan="<%= @statuses.length %>"><%=l(:label_new_statuses_allowed)%></th> </tr> <tr> <td></td> <% for new_status in @statuses %> - <td width="<%= 75 / @statuses.size %>%" align="center"> + <td style="width:<%= 75 / @statuses.size %>%;"> <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input.new-status-#{new_status.id}')", :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> <%=h new_status.name %> @@ -22,7 +22,7 @@ <tbody> <% for old_status in @statuses %> <tr class="<%= cycle("odd", "even") %>"> - <td> + <td class="name"> <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.id}')", :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> @@ -30,7 +30,7 @@ </td> <% for new_status in @statuses -%> <% checked = workflows.detect {|w| w.old_status_id == old_status.id && w.new_status_id == new_status.id} %> - <td align="center" class="<%= checked ? 'enabled' : '' %>"> + <td class="<%= checked ? 'enabled' : '' %>"> <%= check_box_tag "issue_status[#{ old_status.id }][#{new_status.id}][]", name, checked, :class => "old-status-#{old_status.id} new-status-#{new_status.id}" %> </td> diff --git a/app/views/workflows/index.html.erb b/app/views/workflows/index.html.erb index 8e87dfd6b..029a149a4 100644 --- a/app/views/workflows/index.html.erb +++ b/app/views/workflows/index.html.erb @@ -19,9 +19,9 @@ <tbody> <% @workflow_counts.each do |tracker, roles| -%> <tr class="<%= cycle('odd', 'even') %>"> - <td><%= h tracker %></td> + <td class="name"><%= h tracker %></td> <% roles.each do |role, count| -%> - <td align="center"> + <td> <%= link_to((count > 0 ? count : image_tag('false.png')), {:action => 'edit', :role_id => role, :tracker_id => tracker}, :title => l(:button_edit)) %> </td> <% end -%> diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb index 89c3ceef9..11212e6b8 100644 --- a/app/views/workflows/permissions.html.erb +++ b/app/views/workflows/permissions.html.erb @@ -35,14 +35,14 @@ <table class="list fields_permissions"> <thead> <tr> - <th align="left"> + <th> </th> - <th align="center" colspan="<%= @statuses.length %>"><%=l(:label_issue_status)%></th> + <th colspan="<%= @statuses.length %>"><%=l(:label_issue_status)%></th> </tr> <tr> <td></td> <% for status in @statuses %> - <td width="<%= 75 / @statuses.size %>%" align="center"> + <td style="width:<%= 75 / @statuses.size %>%;"> <%=h status.name %> </td> <% end %> @@ -57,11 +57,11 @@ </tr> <% @fields.each do |field, name| %> <tr class="<%= cycle("odd", "even") %>"> - <td> + <td class="name"> <%=h name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> </td> <% for status in @statuses -%> - <td align="center" class="<%= @permissions[status.id][field] %>"> + <td class="<%= @permissions[status.id][field] %>"> <%= field_permission_tag(@permissions, status, field, @role) %> <% unless status == @statuses.last %><a href="#" class="repeat-value">»</a><% end %> </td> @@ -77,11 +77,11 @@ </tr> <% @custom_fields.each do |field| %> <tr class="<%= cycle("odd", "even") %>"> - <td> + <td class="name"> <%=h field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> </td> <% for status in @statuses -%> - <td align="center" class="<%= @permissions[status.id][field.id.to_s] %>"> + <td class="<%= @permissions[status.id][field.id.to_s] %>"> <%= field_permission_tag(@permissions, status, field, @role) %> <% unless status == @statuses.last %><a href="#" class="repeat-value">»</a><% end %> </td> |