From: Jean-Philippe Lang Date: Sat, 16 Nov 2013 07:48:27 +0000 (+0000) Subject: Merged r12265, r12268, r12272 (#15307). X-Git-Tag: 2.4.0~4 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4710cd8e6fbc39a866690d8d7d733ba4354e4f76;p=redmine.git Merged r12265, r12268, r12272 (#15307). git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12282 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- 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 %> - - + + - - + + <% if Setting.openid? %> - - + + <% end %> - - - 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 @@
<%= text_field_tag 'username', params[:username], :tabindex => '1' %><%= text_field_tag 'username', params[:username], :tabindex => '1' %>
<%= password_field_tag 'password', nil, :tabindex => '2' %><%= password_field_tag 'password', nil, :tabindex => '2' %>
<%= text_field_tag "openid_url", nil, :tabindex => '3' %><%= text_field_tag "openid_url", nil, :tabindex => '3' %>
+ <% if Setting.autologin? %> <% end %>
+ <% if Setting.lost_password? %> <%= link_to l(:label_password_lost), lost_password_path %> <% end %> +
<% @checklist.each do |label, result| %> - - + <% 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 @@
<%= l(label) %><%= image_tag((result ? 'true.png' : 'exclamation.png'), + <%= l(label) %><%= image_tag((result ? 'true.png' : 'exclamation.png'), :style => "vertical-align:bottom;") %>
<% @plugins.each do |plugin| %> - 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| %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>"> - - + + <% for source in @auth_sources %> "> - - - - + + + + <% Board.board_tree(@boards) do |board, level| %> - diff --git a/app/views/custom_fields/_index.html.erb b/app/views/custom_fields/_index.html.erb index 79fc09ae5..d55d08cfc 100644 --- a/app/views/custom_fields/_index.html.erb +++ b/app/views/custom_fields/_index.html.erb @@ -1,6 +1,6 @@
<%=h plugin.name %> + <%=h plugin.name %> <%= 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? %>
<%= link_to_project_settings(project, {}, :title => project.short_description) %><%= checked_image project.is_public? %><%= format_date(project.created_on) %><%= checked_image project.is_public? %><%= format_date(project.created_on) %> <%= 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 @@
<%= link_to(h(source.name), :action => 'edit', :id => source)%><%= h source.auth_method_name %><%= h source.host %><%= h source.users.count %><%= link_to(h(source.name), :action => 'edit', :id => source)%><%= h source.auth_method_name %><%= h source.host %><%= h source.users.count %> <%= 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 @@
+ <%= link_to h(board.name), project_board_path(board.project, board), :class => "board" %>
<%=h board.description %>
- + <% if tab[:name] == 'IssueCustomField' %> @@ -8,19 +8,19 @@ <% end %> - + <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%> "> - - - + + + <% if tab[:name] == 'IssueCustomField' %> - - + + <% end %> - + diff --git a/app/views/enumerations/index.html.erb b/app/views/enumerations/index.html.erb index 22311f159..684b933a6 100644 --- a/app/views/enumerations/index.html.erb +++ b/app/views/enumerations/index.html.erb @@ -8,20 +8,18 @@
<%=l(:field_name)%><%=l(:field_name)%> <%=l(:field_field_format)%> <%=l(:field_is_required)%><%=l(:label_used_by)%><%=l(:button_sort)%>
<%= link_to h(custom_field.name), edit_custom_field_path(custom_field) %><%= l(Redmine::CustomFieldFormat.label_for(custom_field.field_format)) %><%= checked_image custom_field.is_required? %><%= link_to h(custom_field.name), edit_custom_field_path(custom_field) %><%= l(Redmine::CustomFieldFormat.label_for(custom_field.field_format)) %><%= checked_image custom_field.is_required? %><%= checked_image custom_field.is_for_all? %><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %><%= checked_image custom_field.is_for_all? %><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %><%= reorder_links('custom_field', {:action => 'update', :id => custom_field}, :put) %><%= reorder_links('custom_field', {:action => 'update', :id => custom_field}, :put) %> <%= delete_link custom_field_path(custom_field) %>
- - - - + + + + <% enumerations.each do |enumeration| %> - - - - - + + + + + <% end %>
<%= l(:field_name) %><%= l(:field_is_default) %><%= l(:field_active) %><%=l(:button_sort)%> <%= l(:field_is_default) %><%= l(:field_active) %><%=l(:button_sort)%>
<%= link_to h(enumeration), edit_enumeration_path(enumeration) %><%= checked_image enumeration.is_default? %><%= checked_image enumeration.active? %><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}, :put) %> - <%= delete_link enumeration_path(enumeration) %> - <%= link_to h(enumeration), edit_enumeration_path(enumeration) %><%= checked_image enumeration.is_default? %><%= checked_image enumeration.active? %><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}, :put) %><%= delete_link enumeration_path(enumeration) %>
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) -%> - + <%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %> @@ -32,7 +32,7 @@ <%= number_to_human_size(file.filesize) %> <%= file.downloads %> <%= file.digest %> - + <%= link_to(image_tag('delete.png'), attachment_path(file), :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %> 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 @@ - - 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 @@ <% @groups.each do |group| %> - - + + <% end %> diff --git a/app/views/issue_statuses/index.html.erb b/app/views/issue_statuses/index.html.erb index dea9fb3cb..659dd18fa 100644 --- a/app/views/issue_statuses/index.html.erb +++ b/app/views/issue_statuses/index.html.erb @@ -19,13 +19,13 @@ <% for status in @issue_statuses %> "> - + <% if Issue.use_status_for_done_ratio? %> - + <% end %> - - - + + + 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) - <% end %> - + <% @project.activities(true).each do |enumeration| %> <%= fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %> - - + <% enumeration.custom_field_values.each do |value| %> - <% end %> - diff --git a/app/views/projects/settings/_boards.html.erb b/app/views/projects/settings/_boards.html.erb index dd8393cda..b6a460b97 100644 --- a/app/views/projects/settings/_boards.html.erb +++ b/app/views/projects/settings/_boards.html.erb @@ -10,9 +10,9 @@ <% Board.board_tree(@project.boards) do |board, level| next if board.new_record? %> - - - + + - + - + <% @project.repositories.sort.each do |repository| %> - - +
+ <%= link_to_content_update("\xc2\xab " + l(:label_previous), params.merge(@gantt.params_previous)) %> + <%= link_to_content_update(l(:label_next) + " \xc2\xbb", params.merge(@gantt.params_next)) %>
<%= link_to h(group), edit_group_path(group) %><%= group.users.size %><%= link_to h(group), edit_group_path(group) %><%= group.users.size %> <%= delete_link group %>
<%= link_to h(status.name), edit_issue_status_path(status) %><%= link_to h(status.name), edit_issue_status_path(status) %><%= h status.default_done_ratio %><%= h status.default_done_ratio %><%= checked_image status.is_default? %><%= checked_image status.is_closed? %><%= reorder_links('issue_status', {:action => 'update', :id => status}, :put) %><%= checked_image status.is_default? %><%= checked_image status.is_closed? %><%= reorder_links('issue_status', {:action => 'update', :id => status}, :put) %> <%= delete_link issue_status_path(status) %> <%=h entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %> <%=h entry.comments %> <%= html_hours("%.2f" % entry.hours) %> + <% 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| %> <%= h value.name %><%= l(:field_active) %><%= l(:field_active) %>
+ <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %> <%= h(enumeration) %> <%= checked_image !enumeration.project %><%= checked_image !enumeration.project %> + <%= custom_field_tag "enumerations[#{enumeration.id}]", value %> + <%= ff.check_box :active %>
<%= link_to board.name, project_board_path(@project, board) %><%=h board.description %> + <%= link_to board.name, project_board_path(@project, board) %><%=h board.description %> <% if authorize_for("boards", "edit") %> <%= reorder_links('board', {:controller => 'boards', :action => 'update', :project_id => @project, :id => board}, :put) %> <% end %> 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? %>
<%=h(category.name) %><%=h(category.name) %> <%=h(category.assigned_to.name) if category.assigned_to %> <% 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? %>
<%= link_to_user member.principal %><%= link_to_user member.principal %> <%= member.roles.sort.collect(&:to_s).join(', ') %> <%= 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 @@
+ <%= link_to repository.identifier, {:controller => 'repositories', :action => 'show',:id => @project, :repository_id => repository.identifier_param} if repository.identifier.present? %> <%= checked_image repository.is_default? %><%= checked_image repository.is_default? %> <%=h repository.scm_name %> <%=h repository.url %> 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 @@ <% @queries.each do |query| %> - - 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? %>

<%=l(:label_no_data)%>

<% else %> -<% col_width = 70 / (@statuses.length+3) %> -
+ <%= link_to h(query.name), :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %> - + <% if query.editable_by?(User.current) %> <%= link_to l(:button_edit), edit_query_path(query), :class => 'icon icon-edit' %> <%= delete_link query_path(query) %> - <% end %>
+
- + <% for status in @statuses %> - + <% end %> - - - + + + <% for row in rows %> "> - + <% for status in @statuses %> - + <% end %> - - - + + + <% end %> 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? %>

<%=l(:label_no_data)%>

<% else %> -
<%=h status.name %><%=h status.name %><%=l(:label_open_issues_plural)%><%=l(:label_closed_issues_plural)%><%=l(:label_total)%><%=l(:label_open_issues_plural)%><%=l(:label_closed_issues_plural)%><%=l(:label_total)%>
<%= link_to h(row.name), aggregate_path(@project, field_name, row) %><%= link_to h(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) %><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, aggregate_path(@project, field_name, row, :status_id => status.id) %><%= 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") %><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %><%= 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") %><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %>
+
- - - - + + + + <% for row in rows %> "> - - - - + + + + <% end %> diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb index 4240d096b..9eaab23b6 100644 --- a/app/views/roles/index.html.erb +++ b/app/views/roles/index.html.erb @@ -14,8 +14,8 @@ <% for role in @roles %> "> - - + - <% @roles.each do |role| %> - hascontextmenu"> <%= raw @query.inline_columns.map {|column| ""}.join %> - <%= ("" * level).html_safe %> - + <%= ("" * (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| %> - + <% end %> - + 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 @@ <% Tracker::CORE_FIELDS.each do |field| %> "> - <% @trackers.each do |tracker| %> - @@ -47,13 +47,13 @@ <% @custom_fields.each do |field| %> "> - <% @trackers.each do |tracker| %> - diff --git a/app/views/trackers/index.html.erb b/app/views/trackers/index.html.erb index 469ff7945..d1928e989 100644 --- a/app/views/trackers/index.html.erb +++ b/app/views/trackers/index.html.erb @@ -15,15 +15,15 @@ <% for tracker in @trackers %> "> - - + - - - - + + +
<%=l(:label_open_issues_plural)%><%=l(:label_closed_issues_plural)%><%=l(:label_total)%><%=l(:label_open_issues_plural)%><%=l(:label_closed_issues_plural)%><%=l(:label_total)%>
<%= link_to h(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") %><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %><%= link_to h(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") %><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %>
<%= content_tag(role.builtin? ? 'em' : 'span', link_to(h(role.name), edit_role_path(role))) %> + <%= content_tag(role.builtin? ? 'em' : 'span', link_to(h(role.name), edit_role_path(role))) %> <% unless role.builtin? %> <%= reorder_links('role', {:action => 'update', :id => role}, :put) %> <% end %> 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| %>
+ <%= 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_') %> + <% 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 @@
<%= check_box_tag("ids[]", entry.id, false, :id => nil) %>#{column_content(column, entry)} + <% 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? -%>
<%= h(format_criteria_value(@report.available_criteria[criterias[level]], value)) %><%= h(format_criteria_value(@report.available_criteria[criterias[level]], value)) %><%= period %><%= period %><%= l(:label_total_time) %><%= l(:label_total_time) %>
+ <%= 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$/, '')) %> + <%= check_box_tag "trackers[#{tracker.id}][core_fields][]", field, tracker.core_fields.include?(field), :class => "tracker-#{tracker.id} core-field-#{field}" %>
+ <%= 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 %> + <%= check_box_tag "trackers[#{tracker.id}][custom_field_ids][]", field.id, tracker.custom_fields.include?(field), :class => "tracker-#{tracker.id} custom-field-#{field.id}" %>
<%= link_to h(tracker.name), edit_tracker_path(tracker) %> + <%= link_to h(tracker.name), edit_tracker_path(tracker) %> <% unless tracker.workflow_rules.count > 0 %> <%= l(:text_tracker_no_workflow) %> (<%= link_to l(:button_edit), workflows_edit_path(:tracker_id => tracker) %>) <% end %> + <%= reorder_links('tracker', {:action => 'update', :id => tracker}, :put) %> 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 @@ <%= h(user.firstname) %> <%= h(user.lastname) %> <%= checked_image user.admin? %><%= format_time(user.created_on) %><%= checked_image user.admin? %><%= format_time(user.created_on) %> <%= 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 @@ <% counts.each do |count| %> - - - + <% end -%>
+ <% 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 %> + <%= 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| -%>
<%= check_box_tag 'ids[]', issue.id, false, :id => nil %><%= link_to_issue(issue, :project => (@project != issue.project)) %><%= link_to_issue(issue, :project => (@project != issue.project)) %>
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 @@ - - + <% for new_status in @statuses %> - <% for old_status in @statuses %> "> - <% for new_status in @statuses -%> <% checked = workflows.detect {|w| w.old_status_id == old_status.id && w.new_status_id == new_status.id} %> - 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 @@ <% @workflow_counts.each do |tracker, roles| -%> - + <% roles.each do |role, count| -%> - <% 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 @@
+ <%= 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)%> <%=l(:label_new_statuses_allowed)%><%=l(:label_new_statuses_allowed)%>
+ <%= 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 @@
+ <%= 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 @@ + <%= check_box_tag "issue_status[#{ old_status.id }][#{new_status.id}][]", name, checked, :class => "old-status-#{old_status.id} new-status-#{new_status.id}" %>
<%= h tracker %><%= h tracker %> + <%= link_to((count > 0 ? count : image_tag('false.png')), {:action => 'edit', :role_id => role, :tracker_id => tracker}, :title => l(:button_edit)) %>
- - + <% for status in @statuses %> - <% end %> @@ -57,11 +57,11 @@ <% @fields.each do |field, name| %> "> - <% for status in @statuses -%> - @@ -77,11 +77,11 @@ <% @custom_fields.each do |field| %> "> - <% for status in @statuses -%> - diff --git a/public/help/ar/wiki_syntax.html b/public/help/ar/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/ar/wiki_syntax.html +++ b/public/help/ar/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
+ <%=l(:label_issue_status)%><%=l(:label_issue_status)%>
+ <%=h status.name %>
+ <%=h name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> + <%= field_permission_tag(@permissions, status, field, @role) %> <% unless status == @statuses.last %>»<% end %>
+ <%=h field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> + <%= field_permission_tag(@permissions, status, field, @role) %> <% unless status == @statuses.last %>»<% end %>
- + diff --git a/public/help/az/wiki_syntax.html b/public/help/az/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/az/wiki_syntax.html +++ b/public/help/az/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/bg/wiki_syntax.html b/public/help/bg/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/bg/wiki_syntax.html +++ b/public/help/bg/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/bs/wiki_syntax.html b/public/help/bs/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/bs/wiki_syntax.html +++ b/public/help/bs/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/ca/wiki_syntax.html b/public/help/ca/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/ca/wiki_syntax.html +++ b/public/help/ca/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/cs/wiki_syntax.html b/public/help/cs/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/cs/wiki_syntax.html +++ b/public/help/cs/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/da/wiki_syntax.html b/public/help/da/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/da/wiki_syntax.html +++ b/public/help/da/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/de/wiki_syntax.html b/public/help/de/wiki_syntax.html index 86fdd4c3d..1ca6cee7b 100644 --- a/public/help/de/wiki_syntax.html +++ b/public/help/de/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/el/wiki_syntax.html b/public/help/el/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/el/wiki_syntax.html +++ b/public/help/el/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Schriftarten
Fett*Fett*Fett
Fett*Fett*Fett
Kursiv_Kursiv_Kursiv
Unterstrichen+Unterstrichen+Unterstrichen
Durchgestrichen-Durchgestrichen-Durchgestrichen
- + diff --git a/public/help/en-gb/wiki_syntax.html b/public/help/en-gb/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/en-gb/wiki_syntax.html +++ b/public/help/en-gb/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/en/wiki_syntax.html b/public/help/en/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/en/wiki_syntax.html +++ b/public/help/en/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/es/wiki_syntax.html b/public/help/es/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/es/wiki_syntax.html +++ b/public/help/es/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/et/wiki_syntax.html b/public/help/et/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/et/wiki_syntax.html +++ b/public/help/et/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/eu/wiki_syntax.html b/public/help/eu/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/eu/wiki_syntax.html +++ b/public/help/eu/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/fa/wiki_syntax.html b/public/help/fa/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/fa/wiki_syntax.html +++ b/public/help/fa/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/fi/wiki_syntax.html b/public/help/fi/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/fi/wiki_syntax.html +++ b/public/help/fi/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/fr/wiki_syntax.html b/public/help/fr/wiki_syntax.html index 5615a6532..d3e26783f 100644 --- a/public/help/fr/wiki_syntax.html +++ b/public/help/fr/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/gl/wiki_syntax.html b/public/help/gl/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/gl/wiki_syntax.html +++ b/public/help/gl/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Gras*Gras
Strong*Gras*Gras
Italic_Italique_Italique
Underline+Sous-ligné+Sous-ligné
Deleted-Barré-Barré
- + diff --git a/public/help/he/wiki_syntax.html b/public/help/he/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/he/wiki_syntax.html +++ b/public/help/he/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/hr/wiki_syntax.html b/public/help/hr/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/hr/wiki_syntax.html +++ b/public/help/hr/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/hu/wiki_syntax.html b/public/help/hu/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/hu/wiki_syntax.html +++ b/public/help/hu/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/id/wiki_syntax.html b/public/help/id/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/id/wiki_syntax.html +++ b/public/help/id/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/it/wiki_syntax.html b/public/help/it/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/it/wiki_syntax.html +++ b/public/help/it/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/ja/wiki_syntax.html b/public/help/ja/wiki_syntax.html index 27e74cf32..e38624992 100644 --- a/public/help/ja/wiki_syntax.html +++ b/public/help/ja/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/ko/wiki_syntax.html b/public/help/ko/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/ko/wiki_syntax.html +++ b/public/help/ko/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
フォントスタイル
太字*太字*太字
太字*太字*太字
斜体_斜体_斜体
下線+下線+下線
取り消し線-取り消し線-取り消し線
- + diff --git a/public/help/lt/wiki_syntax.html b/public/help/lt/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/lt/wiki_syntax.html +++ b/public/help/lt/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/lv/wiki_syntax.html b/public/help/lv/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/lv/wiki_syntax.html +++ b/public/help/lv/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/mk/wiki_syntax.html b/public/help/mk/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/mk/wiki_syntax.html +++ b/public/help/mk/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/mn/wiki_syntax.html b/public/help/mn/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/mn/wiki_syntax.html +++ b/public/help/mn/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/nl/wiki_syntax.html b/public/help/nl/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/nl/wiki_syntax.html +++ b/public/help/nl/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/no/wiki_syntax.html b/public/help/no/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/no/wiki_syntax.html +++ b/public/help/no/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/pl/wiki_syntax.html b/public/help/pl/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/pl/wiki_syntax.html +++ b/public/help/pl/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/pt-br/wiki_syntax.html b/public/help/pt-br/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/pt-br/wiki_syntax.html +++ b/public/help/pt-br/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/pt/wiki_syntax.html b/public/help/pt/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/pt/wiki_syntax.html +++ b/public/help/pt/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/ro/wiki_syntax.html b/public/help/ro/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/ro/wiki_syntax.html +++ b/public/help/ro/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/ru/wiki_syntax.html b/public/help/ru/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/ru/wiki_syntax.html +++ b/public/help/ru/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/sk/wiki_syntax.html b/public/help/sk/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/sk/wiki_syntax.html +++ b/public/help/sk/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/sl/wiki_syntax.html b/public/help/sl/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/sl/wiki_syntax.html +++ b/public/help/sl/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/sq/wiki_syntax.html b/public/help/sq/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/sq/wiki_syntax.html +++ b/public/help/sq/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/sr-yu/wiki_syntax.html b/public/help/sr-yu/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/sr-yu/wiki_syntax.html +++ b/public/help/sr-yu/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/sr/wiki_syntax.html b/public/help/sr/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/sr/wiki_syntax.html +++ b/public/help/sr/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/sv/wiki_syntax.html b/public/help/sv/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/sv/wiki_syntax.html +++ b/public/help/sv/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/th/wiki_syntax.html b/public/help/th/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/th/wiki_syntax.html +++ b/public/help/th/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/tr/wiki_syntax.html b/public/help/tr/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/tr/wiki_syntax.html +++ b/public/help/tr/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/uk/wiki_syntax.html b/public/help/uk/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/uk/wiki_syntax.html +++ b/public/help/uk/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/vi/wiki_syntax.html b/public/help/vi/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/vi/wiki_syntax.html +++ b/public/help/vi/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/zh-tw/wiki_syntax.html b/public/help/zh-tw/wiki_syntax.html index bd9986fad..5669d14d6 100644 --- a/public/help/zh-tw/wiki_syntax.html +++ b/public/help/zh-tw/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted
- + diff --git a/public/help/zh/wiki_syntax.html b/public/help/zh/wiki_syntax.html index a390a414b..d67dc885a 100644 --- a/public/help/zh/wiki_syntax.html +++ b/public/help/zh/wiki_syntax.html @@ -22,7 +22,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
字型樣式
粗體(加強語氣)*粗體(加強語氣)*粗體(加強語氣)
粗體(加強語氣)*粗體(加強語氣)*粗體(加強語氣)
斜體_斜體_斜體
底線+底線+底線
刪除線-刪除線-刪除線
- + diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 2823229f2..717984084 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -123,12 +123,15 @@ a#toggle-completed-versions {color:#999;} /***** Tables *****/ table.list { border: 1px solid #e4e4e4; border-collapse: collapse; width: 100%; margin-bottom: 4px; } table.list th { background-color:#EEEEEE; padding: 4px; white-space:nowrap; } -table.list td { vertical-align: top; padding-right:10px; } +table.list td {text-align:center; vertical-align:top; padding-right:10px;} table.list td.id { width: 2%; text-align: center;} +table.list td.name, table.list td.description, table.list td.subject, table.list td.comments {text-align: left;} +table.list td.tick {width:15%} table.list td.checkbox { width: 15px; padding: 2px 0 0 0; } table.list td.checkbox input {padding:0px;} table.list td.buttons { width: 15%; white-space:nowrap; text-align: right; } table.list td.buttons a { padding-right: 0.6em; } +table.list td.reorder {width:15%; white-space:nowrap; text-align:center; } table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; } tr.project td.name a { white-space:nowrap; } @@ -148,7 +151,7 @@ tr.project.idnt-9 td.name {padding-left: 12.5em;} tr.issue { text-align: center; white-space: nowrap; } tr.issue td.subject, tr.issue td.category, td.assigned_to, tr.issue td.string, tr.issue td.text, tr.issue td.relations { white-space: normal; } -tr.issue td.subject, tr.issue td.relations { text-align: left; } +tr.issue td.relations { text-align: left; } tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;} tr.issue td.relations span {white-space: nowrap;} table.issues td.description {color:#777; font-size:90%; padding:4px 4px 4px 24px; text-align:left; white-space:normal;} @@ -165,10 +168,12 @@ tr.issue.idnt-7 td.subject {padding-left: 9.5em;} tr.issue.idnt-8 td.subject {padding-left: 11em;} tr.issue.idnt-9 td.subject {padding-left: 12.5em;} +table.issue-report {table-layout:fixed;} + tr.entry { border: 1px solid #f8f8f8; } tr.entry td { white-space: nowrap; } -tr.entry td.filename { width: 30%; } -tr.entry td.filename_no_report { width: 70%; } +tr.entry td.filename {width:30%; text-align:left;} +tr.entry td.filename_no_report {width:70%; text-align:left;} tr.entry td.size { text-align: right; font-size: 90%; } tr.entry td.revision, tr.entry td.author { text-align: center; } tr.entry td.age { text-align: right; } @@ -184,7 +189,7 @@ tr.changeset td.revision_graph { width: 15%; background-color: #fffffb; } tr.changeset td.author { text-align: center; width: 15%; white-space:nowrap;} tr.changeset td.committed_on { text-align: center; width: 15%; white-space:nowrap;} -table.files tr.file td { text-align: center; } +table.files tbody th {text-align:left;} table.files tr.file td.filename { text-align: left; padding-left: 24px; } table.files tr.file td.digest { font-size: 80%; } @@ -202,9 +207,9 @@ tr.version td.name { padding-left: 20px; } tr.version.shared td.name { background: url(../images/link.png) no-repeat 0% 70%; } tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; } -tr.user td { width:13%; } +tr.user td {width:13%;white-space: nowrap;} +tr.user td.username, tr.user td.firstname, tr.user td.lastname, tr.user td.email {text-align:left;} tr.user td.email { width:18%; } -tr.user td { white-space: nowrap; } tr.user.locked, tr.user.registered { color: #aaa; } tr.user.locked a, tr.user.registered a { color: #aaa; } @@ -223,7 +228,7 @@ table.plugins span.name { font-weight: bold; display: block; margin-bottom: 6px; table.plugins span.description { display: block; font-size: 0.9em; } table.plugins span.url { display: block; font-size: 0.9em; } -table.list tbody tr.group td { padding: 0.8em 0 0.5em 0.3em; font-weight: bold; border-bottom: 1px solid #ccc; } +table.list tbody tr.group td { padding: 0.8em 0 0.5em 0.3em; font-weight: bold; border-bottom: 1px solid #ccc; text-align:left; } table.list tbody tr.group span.count {position:relative; top:-1px; color:#fff; font-size:10px; background:#9DB9D5; padding:0px 6px 1px 6px; border-radius:3px; margin-left:4px;} tr.group a.toggle-all { color: #aaa; font-size: 80%; font-weight: normal; display:none;} tr.group:hover a.toggle-all { display:inline;} @@ -245,10 +250,9 @@ table.attributes th { vertical-align: top; text-align: left; } table.attributes td { vertical-align: top; } table.boards a.board, h3.comments { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; } -table.boards td.topic-count, table.boards td.message-count {text-align:center;} -table.boards td.last-message {font-size:80%;} +table.boards td.last-message {text-align:left;font-size:80%;} -table.messages td.author, table.messages td.created_on, table.messages td.reply-count {text-align:center;} +table.messages td.last_message {text-align:left;} table.query-columns { border-collapse: collapse;
Font Styles
Strong*Strong*Strong
Strong*Strong*Strong
Italic_Italic_Italic
Underline+Underline+Underline
Deleted-Deleted-Deleted