Index: app/views/account/login.html.erb =================================================================== --- app/views/account/login.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1322) +++ app/views/account/login.html.erb (.../app) (working copy) @@ -4,34 +4,34 @@ <%= back_url_hidden_field_tag %> - - + + - - + + <% if Setting.openid? %> - - + + <% end %> - - - Index: app/views/my/blocks/_timelog.html.erb =================================================================== --- app/views/my/blocks/_timelog.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/my/blocks/_timelog.html.erb (.../app) (working copy) @@ -31,7 +31,7 @@ - <% roles.each do |role, count| -%> - <% end -%> Index: app/views/workflows/permissions.html.erb =================================================================== --- app/views/workflows/permissions.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/workflows/permissions.html.erb (.../app) (working copy) @@ -35,14 +35,14 @@
<%= 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 %> +
<%=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) %> Index: app/views/workflows/index.html.erb =================================================================== --- app/views/workflows/index.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/workflows/index.html.erb (.../app) (working copy) @@ -23,7 +23,7 @@
<%= 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 %> @@ -61,7 +61,7 @@ <%=h name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> <% for status in @statuses -%> - <% end -%> @@ -80,7 +80,7 @@ <%=h field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %> <% for status in @statuses -%> - <% end -%> Index: app/views/workflows/_form.html.erb =================================================================== --- app/views/workflows/_form.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/workflows/_form.html.erb (.../app) (working copy) @@ -1,17 +1,17 @@
+ <%=l(:label_issue_status)%><%=l(:label_issue_status)%>
+ <%=h status.name %> + <%= field_permission_tag(@permissions, status, field) %> + <%= field_permission_tag(@permissions, status, field) %>
- - + <% for new_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} %> - Index: app/views/reports/_simple.html.erb =================================================================== --- app/views/reports/_simple.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/reports/_simple.html.erb (.../app) (working copy) @@ -4,17 +4,17 @@
+ <%= 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 %> @@ -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}" %>
- - - + + + <% for row in rows %> "> - - - + + + <% end %> Index: app/views/reports/_details.html.erb =================================================================== --- app/views/reports/_details.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/reports/_details.html.erb (.../app) (working copy) @@ -8,20 +8,20 @@ <% for status in @statuses %> <% end %> - - - + + + <% for row in rows %> "> <% for status in @statuses %> - + <% end %> - - - + + + <% end %> Index: app/views/custom_fields/_index.html.erb =================================================================== --- app/views/custom_fields/_index.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/custom_fields/_index.html.erb (.../app) (working copy) @@ -14,13 +14,13 @@ <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%> "> - - + + <% if tab[:name] == 'IssueCustomField' %> - - + + <% end %> - + Index: app/views/timelog/_list.html.erb =================================================================== --- app/views/timelog/_list.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/timelog/_list.html.erb (.../app) (working copy) @@ -21,7 +21,7 @@ hascontextmenu"> <%= raw @query.inline_columns.map {|column| ""}.join %> - - - - + + + - @@ -32,7 +32,7 @@ - Index: app/views/auth_sources/index.html.erb =================================================================== --- app/views/auth_sources/index.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/auth_sources/index.html.erb (.../app) (working copy) @@ -10,15 +10,14 @@ - <% for source in @auth_sources %> "> - - - + + +
<%=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 => "*") %><%= 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 => "*") %>
<%=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) %><%= 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 => "*") %>
<%= 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? %><%= 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) %>
<%= 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) %> Index: app/views/users/index.html.erb =================================================================== --- app/views/users/index.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/users/index.html.erb (.../app) (working copy) @@ -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 %> Index: app/views/files/index.html.erb =================================================================== --- app/views/files/index.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/files/index.html.erb (.../app) (working copy) @@ -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") %>
<%= 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 %> <%=l(:field_type)%> <%=l(:field_host)%> <%=l(:label_user_plural)%>
<%= link_to(h(source.name), :action => 'edit', :id => source)%><%= h source.auth_method_name %>

<%= h source.host %>

<%= h source.host1 %>

<%= h source.host2 %>

<%= h source.users.count %><%= h source.auth_method_name %>

<%= h source.host %>

<%= h source.host1 %>

<%= h source.host2 %>

<%= 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) %> Index: app/views/versions/_issue_counts.html.erb =================================================================== --- app/views/versions/_issue_counts.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/versions/_issue_counts.html.erb (.../app) (working copy) @@ -13,7 +13,7 @@ <% counts.each do |count| %> - <% @trackers.each do |tracker| %> - @@ -53,7 +53,7 @@ <%= field.name %> <% @trackers.each do |tracker| %> - Index: app/views/trackers/index.html.erb =================================================================== --- app/views/trackers/index.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/trackers/index.html.erb (.../app) (working copy) @@ -16,14 +16,14 @@ <% for tracker in @trackers %> "> - - - + <% end %> Index: app/views/issue_statuses/index.html.erb =================================================================== --- app/views/issue_statuses/index.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/issue_statuses/index.html.erb (.../app) (working copy) @@ -21,11 +21,11 @@ "> <% if Issue.use_status_for_done_ratio? %> - + <% end %> - - - + + + Index: app/views/roles/index.html.erb =================================================================== --- app/views/roles/index.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/roles/index.html.erb (.../app) (working copy) @@ -15,7 +15,7 @@ <% for role in @roles %> "> - <% @roles.each do |role| %> - <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>"> - - + + - + - - + <% enumeration.custom_field_values.each do |value| %> - <% end %> - Index: app/views/gantts/show.html.erb =================================================================== --- app/views/gantts/show.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/gantts/show.html.erb (.../app) (working copy) @@ -280,11 +280,11 @@
+ <% 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 -%> Index: app/views/trackers/fields.html.erb =================================================================== --- app/views/trackers/fields.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/trackers/fields.html.erb (.../app) (working copy) @@ -31,7 +31,7 @@ <%= 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}" %> + <%= 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) %> + <% 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) %> Index: app/views/groups/index.html.erb =================================================================== --- app/views/groups/index.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/groups/index.html.erb (.../app) (working copy) @@ -24,7 +24,7 @@
<%= link_to h(group), edit_group_path(group) %> <%= auth_label %><%= group.users.size %><%= group.users.size %> <%= delete_link group %>
<%= 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) %>
<%= 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 %> Index: app/views/roles/permissions.html.erb =================================================================== --- app/views/roles/permissions.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/roles/permissions.html.erb (.../app) (working copy) @@ -38,7 +38,7 @@ <%= 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 %> Index: app/views/admin/projects.html.erb =================================================================== --- app/views/admin/projects.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/admin/projects.html.erb (.../app) (working copy) @@ -28,8 +28,8 @@ <% project_tree(@projects) do |project, level| %>
<%= 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?) %> Index: app/views/projects/settings/_repositories.html.erb =================================================================== --- app/views/projects/settings/_repositories.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/projects/settings/_repositories.html.erb (.../app) (working copy) @@ -16,7 +16,7 @@ <%= 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 %> Index: app/views/projects/settings/_boards.html.erb =================================================================== --- app/views/projects/settings/_boards.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/projects/settings/_boards.html.erb (.../app) (working copy) @@ -12,7 +12,7 @@
<%= 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 %> Index: app/views/projects/settings/_activities.html.erb =================================================================== --- app/views/projects/settings/_activities.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/projects/settings/_activities.html.erb (.../app) (working copy) @@ -17,13 +17,13 @@ <%= 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 %>
- - Index: app/views/enumerations/index.html.erb =================================================================== --- app/views/enumerations/index.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/enumerations/index.html.erb (.../app) (working copy) @@ -11,7 +11,7 @@ - + <% enumerations.each do |enumeration| %> Index: app/views/queries/index.html.erb =================================================================== --- app/views/queries/index.html.erb (.../https://projects.lanit-tercom.com/svn/redmine/trunk/app) (revision 1320) +++ app/views/queries/index.html.erb (.../app) (working copy) @@ -13,7 +13,7 @@ -
+ <%= 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)) %> <%= l(:field_is_default) %> <%= l(:field_active) %>
<%= 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' %>