diff options
26 files changed, 198 insertions, 119 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8865bc8e5..12dcceae6 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -454,18 +454,18 @@ module ApplicationHelper end def reorder_links(name, url, method = :post) - link_to(image_tag('2uparrow.png', :alt => l(:label_sort_highest)), - url.merge({"#{name}[move_to]" => 'highest'}), - :method => method, :title => l(:label_sort_highest)) + - link_to(image_tag('1uparrow.png', :alt => l(:label_sort_higher)), - url.merge({"#{name}[move_to]" => 'higher'}), - :method => method, :title => l(:label_sort_higher)) + - link_to(image_tag('1downarrow.png', :alt => l(:label_sort_lower)), - url.merge({"#{name}[move_to]" => 'lower'}), - :method => method, :title => l(:label_sort_lower)) + - link_to(image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), - url.merge({"#{name}[move_to]" => 'lowest'}), - :method => method, :title => l(:label_sort_lowest)) + link_to('', + url.merge({"#{name}[move_to]" => 'highest'}), :method => method, + :title => l(:label_sort_highest), :class => 'icon-only icon-move-top') + + link_to('', + url.merge({"#{name}[move_to]" => 'higher'}), :method => method, + :title => l(:label_sort_higher), :class => 'icon-only icon-move-up') + + link_to('', + url.merge({"#{name}[move_to]" => 'lower'}), :method => method, + :title => l(:label_sort_lower), :class => 'icon-only icon-move-down') + + link_to('', + url.merge({"#{name}[move_to]" => 'lowest'}), :method => method, + :title => l(:label_sort_lowest), :class => 'icon-only icon-move-bottom') end def breadcrumb(*args) @@ -887,7 +887,8 @@ module ApplicationHelper @current_section += 1 if @current_section > 1 content_tag('div', - link_to(image_tag('edit.png'), options[:edit_section_links].merge(:section => @current_section)), + link_to('', options[:edit_section_links].merge(:section => @current_section), + :class => 'icon-only icon-edit'), :class => 'contextual', :title => l(:button_edit_section), :id => "section-#{@current_section}") + heading.html_safe @@ -1098,9 +1099,10 @@ module ApplicationHelper end def toggle_checkboxes_link(selector) - link_to_function image_tag('toggle_check.png'), + link_to_function '', "toggleCheckboxesBySelector('#{selector}')", - :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}" + :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}", + :class => 'toggle-checkboxes' end def progress_bar(pcts, options={}) @@ -1122,7 +1124,7 @@ module ApplicationHelper def checked_image(checked=true) if checked - @checked_image_tag ||= image_tag('toggle_check.png') + @checked_image_tag ||= content_tag(:span, nil, :class => 'icon-only icon-checked') end end diff --git a/app/helpers/email_addresses_helper.rb b/app/helpers/email_addresses_helper.rb index f397e9907..c30aaa6a6 100644 --- a/app/helpers/email_addresses_helper.rb +++ b/app/helpers/email_addresses_helper.rb @@ -22,17 +22,17 @@ module EmailAddressesHelper # Returns a link to enable or disable notifications for the address def toggle_email_address_notify_link(address) if address.notify? - link_to image_tag('email.png'), + link_to '', user_email_address_path(address.user, address, :notify => '0'), - :method => :put, + :method => :put, :remote => true, :title => l(:label_disable_notifications), - :remote => true + :class => 'icon icon-email' else - link_to image_tag('email_disabled.png'), + link_to '', user_email_address_path(address.user, address, :notify => '1'), - :method => :put, + :method => :put, :remote => true, :title => l(:label_enable_notifications), - :remote => true + :class => 'icon icon-email-disabled' end end end diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 0743fc022..4353e5033 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -442,11 +442,10 @@ module IssuesHelper # Link to the attachment if it has not been removed value = link_to_attachment(atta, :download => true, :only_path => options[:only_path]) if options[:only_path] != false && atta.is_text? - value += link_to( - image_tag('magnifier.png'), - :controller => 'attachments', :action => 'show', - :id => atta, :filename => atta.filename - ) + value += link_to('', + { :controller => 'attachments', :action => 'show', + :id => atta, :filename => atta.filename }, + :class => 'icon icon-magnifier') end else value = content_tag("i", h(value)) if value diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb index d6d6ec4e9..4e9fd3866 100644 --- a/app/helpers/journals_helper.rb +++ b/app/helpers/journals_helper.rb @@ -30,14 +30,18 @@ module JournalsHelper editable = User.current.logged? && (User.current.allowed_to?(:edit_issue_notes, issue.project) || (journal.user == User.current && User.current.allowed_to?(:edit_own_issue_notes, issue.project))) links = [] if !journal.notes.blank? - links << link_to(image_tag('comment.png'), + links << link_to('', {:controller => 'journals', :action => 'new', :id => issue, :journal_id => journal}, :remote => true, :method => 'post', - :title => l(:button_quote)) if options[:reply_links] - links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes", + :title => l(:button_quote), + :class => 'icon-only icon-comment' + ) if options[:reply_links] + links << link_to_in_place_notes_editor('', "journal-#{journal.id}-notes", { :controller => 'journals', :action => 'edit', :id => journal, :format => 'js' }, - :title => l(:button_edit)) if editable + :title => l(:button_edit), + :class => 'icon-only icon-edit' + ) if editable end content << content_tag('div', links.join(' ').html_safe, :class => 'contextual') unless links.empty? content << textilizable(journal, :notes) diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index 4bf6424b9..9a5de7406 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -58,8 +58,10 @@ module WatchersHelper :object_id => object.id, :user_id => user} s << ' ' - s << link_to(image_tag('delete.png'), url, - :remote => true, :method => 'delete', :class => "delete") + s << link_to('', url, + :remote => true, :method => 'delete', + :class => "delete icon-only icon-del", + :title => l(:button_delete)) end content << content_tag('li', s, :class => "user-#{user.id}") end diff --git a/app/views/admin/info.html.erb b/app/views/admin/info.html.erb index 14d33bab0..2be1d28fd 100644 --- a/app/views/admin/info.html.erb +++ b/app/views/admin/info.html.erb @@ -6,8 +6,7 @@ <% @checklist.each do |label, result| %> <tr class="<%= cycle 'odd', 'even' %>"> <td class="name"><%= label.is_a?(Symbol) ? l(label) : label %></td> - <td class="tick"><%= image_tag((result ? 'true.png' : 'exclamation.png'), - :style => "vertical-align:bottom;") %></td> + <td class="tick"><span class="icon-only <%= (result ? 'icon-ok' : 'icon-error') %>"></span></td> </tr> <% end %> </table> diff --git a/app/views/admin/plugins.html.erb b/app/views/admin/plugins.html.erb index 47c1dfade..020dbc818 100644 --- a/app/views/admin/plugins.html.erb +++ b/app/views/admin/plugins.html.erb @@ -36,7 +36,7 @@ $(document).ready(function(){ $("table.plugins td.version span").addClass("unknown"); $.each(data, function(plugin_id, plugin_data){ var s = $("tr#plugin-"+plugin_id+" td.version span"); - s.removeClass("icon-checked icon-warning unknown"); + s.removeClass("icon-ok icon-warning unknown"); if (plugin_data.url) { if (s.parent("a").length>0) { s.unwrap(); @@ -45,7 +45,7 @@ $(document).ready(function(){ s.wrap($("<a></a>").attr("href", plugin_data.url).attr("target", "_blank")); } if (plugin_data.c == s.text()) { - s.addClass("icon-checked"); + s.addClass("icon-ok"); } else if (plugin_data.c) { s.addClass("icon-warning"); s.attr("title", "<%= escape_javascript l(:label_latest_compatible_version) %>: "+plugin_data.c); diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb index 0804b8002..53324c221 100644 --- a/app/views/attachments/_links.html.erb +++ b/app/views/attachments/_links.html.erb @@ -1,24 +1,28 @@ <div class="attachments"> <div class="contextual"> - <%= link_to image_tag('edit.png'), - container_attachments_edit_path(container), - :title => l(:label_edit_attachments) if options[:editable] %> + <%= link_to('', + container_attachments_edit_path(container), + :title => l(:label_edit_attachments), + :class => 'icon-only icon-edit' + ) if options[:editable] %> </div> <% for attachment in attachments %> <p><%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%> <% if attachment.is_text? %> - <%= link_to image_tag('magnifier.png'), - :controller => 'attachments', :action => 'show', - :id => attachment, :filename => attachment.filename %> + <%= link_to '', + { :controller => 'attachments', :action => 'show', + :id => attachment, :filename => attachment.filename }, + :class => 'icon icon-magnifier', + :title => l(:button_view) %> <% end %> <%= " - #{attachment.description}" unless attachment.description.blank? %> <span class="size">(<%= number_to_human_size attachment.filesize %>)</span> <% if options[:deletable] %> - <%= link_to image_tag('delete.png'), attachment_path(attachment), - :data => {:confirm => l(:text_are_you_sure)}, - :method => :delete, - :class => 'delete', - :title => l(:button_delete) %> + <%= link_to '', attachment_path(attachment), + :data => {:confirm => l(:text_are_you_sure)}, + :method => :delete, + :class => 'delete icon-only icon-del', + :title => l(:button_delete) %> <% end %> <% if options[:author] %> <span class="author"><%= attachment.author %>, <%= format_time(attachment.created_on) %></span> diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index 07b863cbe..f0a989063 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -20,22 +20,26 @@ <% if @issue.safe_attribute?('category_id') && @issue.project.issue_categories.any? %> <p><%= f.select :category_id, (@issue.project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true, :required => @issue.required_attribute?('category_id') %> -<%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'), +<%= link_to('', new_project_issue_category_path(@issue.project), :remote => true, :method => 'get', :title => l(:label_issue_category_new), - :tabindex => 200) if User.current.allowed_to?(:manage_categories, @issue.project) %></p> + :tabindex => 200, + :class => 'icon-only icon-add' + ) if User.current.allowed_to?(:manage_categories, @issue.project) %></p> <% end %> <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %> <p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true, :required => @issue.required_attribute?('fixed_version_id') %> -<%= link_to(image_tag('add.png', :style => 'vertical-align: middle;'), +<%= link_to('', new_project_version_path(@issue.project), :remote => true, :method => 'get', :title => l(:label_version_new), - :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %> + :tabindex => 200, + :class => 'icon-only icon-add' + ) if User.current.allowed_to?(:manage_versions, @issue.project) %> </p> <% end %> </div> diff --git a/app/views/issues/_relations.html.erb b/app/views/issues/_relations.html.erb index bfbd1f28c..b79e74489 100644 --- a/app/views/issues/_relations.html.erb +++ b/app/views/issues/_relations.html.erb @@ -19,12 +19,14 @@ <td class="status"><%= other_issue.status.name %></td> <td class="start_date"><%= format_date(other_issue.start_date) %></td> <td class="due_date"><%= format_date(other_issue.due_date) %></td> - <td class="buttons"><%= link_to image_tag('link_break.png'), + <td class="buttons"><%= link_to('', relation_path(relation), :remote => true, :method => :delete, :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:label_relation_delete) if User.current.allowed_to?(:manage_issue_relations, @project) %></td> + :title => l(:label_relation_delete), + :class => 'icon-only icon-link-break' + ) if User.current.allowed_to?(:manage_issue_relations, @project) %></td> </tr> <% end %> </table> diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 23e6f0285..60c7d5f99 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -39,22 +39,26 @@ <div class="message reply" id="<%= "message-#{message.id}" %>"> <div class="contextual"> <%= link_to( - image_tag('comment.png'), + '', {:action => 'quote', :id => message}, :remote => true, :method => 'get', - :title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %> + :title => l(:button_quote), + :class => 'icon icon-comment' + ) if !@topic.locked? && authorize_for('messages', 'reply') %> <%= link_to( - image_tag('edit.png'), + '', {:action => 'edit', :id => message}, - :title => l(:button_edit) + :title => l(:button_edit), + :class => 'icon icon-edit' ) if message.editable_by?(User.current) %> <%= link_to( - image_tag('delete.png'), + '', {:action => 'destroy', :id => message}, :method => :post, :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete) + :title => l(:button_delete), + :class => 'icon icon-del' ) if message.destroyable_by?(User.current) %> </div> <h4> diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb index 747039c85..76b974e52 100644 --- a/app/views/my/blocks/_timelog.html.erb +++ b/app/views/my/blocks/_timelog.html.erb @@ -42,12 +42,13 @@ entries_by_day = entries.group_by(&:spent_on) <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td> <td class="buttons"> <% if entry.editable_by?(@user) -%> - <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry}, - :title => l(:button_edit) %> - <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry}, - :data => {:confirm => l(:text_are_you_sure)}, - :method => :delete, - :title => l(:button_delete) %> + <%= link_to '', {:controller => 'timelog', :action => 'edit', :id => entry}, + :title => l(:button_edit), + :class => 'icon-only icon-edit' %> + <%= link_to '', {:controller => 'timelog', :action => 'destroy', :id => entry}, + :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, + :title => l(:button_delete), + :class => 'icon-only icon-del' %> <% end -%> </td> </tr> diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb index c188d2e2c..008a07567 100644 --- a/app/views/news/show.html.erb +++ b/app/views/news/show.html.erb @@ -36,8 +36,10 @@ <% @comments.each do |comment| %> <% next if comment.new_record? %> <div class="contextual"> - <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment}, - :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %> + <%= link_to_if_authorized '', {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment}, + :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, + :title => l(:button_delete), + :class => 'icon-only icon-del' %> </div> <h4><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4> <%= textilizable(comment.comments) %> diff --git a/app/views/reports/issue_report.html.erb b/app/views/reports/issue_report.html.erb index d40841dae..1cb3ccdd3 100644 --- a/app/views/reports/issue_report.html.erb +++ b/app/views/reports/issue_report.html.erb @@ -1,31 +1,52 @@ <h2><%=l(:label_report_plural)%></h2> <div class="splitcontentleft"> -<h3><%=l(:field_tracker)%> <%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'tracker') %></h3> +<h3> + <%=l(:field_tracker)%> + <%= link_to '', project_issues_report_details_path(@project, :detail => 'tracker'), :class => 'icon-only icon-zoom-in' %> +</h3> <%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %> <br /> -<h3><%=l(:field_priority)%> <%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'priority') %></h3> +<h3> + <%=l(:field_priority)%> + <%= link_to '', project_issues_report_details_path(@project, :detail => 'priority'), :class => 'icon-only icon-zoom-in' %> +</h3> <%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %> <br /> -<h3><%=l(:field_assigned_to)%> <%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'assigned_to') %></h3> +<h3> + <%=l(:field_assigned_to)%> + <%= link_to '', project_issues_report_details_path(@project, :detail => 'assigned_to'), :class => 'icon-only icon-zoom-in' %> +</h3> <%= render :partial => 'simple', :locals => { :data => @issues_by_assigned_to, :field_name => "assigned_to_id", :rows => @assignees } %> <br /> -<h3><%=l(:field_author)%> <%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'author') %></h3> +<h3> + <%=l(:field_author)%> + <%= link_to '', project_issues_report_details_path(@project, :detail => 'author'), :class => 'icon-only icon-zoom-in' %> +</h3> <%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %> <br /> <%= call_hook(:view_reports_issue_report_split_content_left, :project => @project) %> </div> <div class="splitcontentright"> -<h3><%=l(:field_version)%> <%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'version') %></h3> +<h3> + <%=l(:field_version)%> + <%= link_to '', project_issues_report_details_path(@project, :detail => 'version'), :class => 'icon-only icon-zoom-in' %> +</h3> <%= render :partial => 'simple', :locals => { :data => @issues_by_version, :field_name => "fixed_version_id", :rows => @versions } %> <br /> <% if @project.children.any? %> -<h3><%=l(:field_subproject)%> <%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'subproject') %></h3> +<h3> + <%=l(:field_subproject)%> + <%= link_to '', project_issues_report_details_path(@project, :detail => 'subproject'), :class => 'icon-only icon-zoom-in' %> +</h3> <%= render :partial => 'simple', :locals => { :data => @issues_by_subproject, :field_name => "project_id", :rows => @subprojects } %> <br /> <% end %> -<h3><%=l(:field_category)%> <%= link_to image_tag('zoom_in.png'), project_issues_report_details_path(@project, :detail => 'category') %></h3> +<h3> + <%=l(:field_category)%> + <%= link_to '', project_issues_report_details_path(@project, :detail => 'category'), :class => 'icon-only icon-zoom-in' %> +</h3> <%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %> <br /> <%= call_hook(:view_reports_issue_report_split_content_right, :project => @project) %> diff --git a/app/views/repositories/_related_issues.html.erb b/app/views/repositories/_related_issues.html.erb index 649cc70e8..ea4539120 100644 --- a/app/views/repositories/_related_issues.html.erb +++ b/app/views/repositories/_related_issues.html.erb @@ -11,14 +11,16 @@ <ul> <% @changeset.issues.visible.each do |issue| %> <li id="<%= "related-issue-#{issue.id}" %>"><%= link_to_issue issue %> - <%= link_to(image_tag('link_break.png'), + <%= link_to('', {:controller => 'repositories', :action => 'remove_related_issue', :id => @project, :repository_id => @repository.identifier_param, :rev => @changeset.identifier, :issue_id => issue}, :remote => true, :method => :delete, :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:label_relation_delete)) if manage_allowed %> + :title => l(:label_relation_delete), + :class => 'icon-only icon-link-break' + ) if manage_allowed %> </li> <% end %> </ul> diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb index cea4bd9e6..b403cffe1 100644 --- a/app/views/roles/permissions.html.erb +++ b/app/views/roles/permissions.html.erb @@ -9,9 +9,11 @@ <th><%=l(:label_permissions)%></th> <% @roles.each do |role| %> <th> + <%= link_to_function('', + "toggleCheckboxesBySelector('input.role-#{role.id}')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", + :class => 'icon-only icon-checked') %> <%= content_tag(role.builtin? ? 'em' : 'span', role.name) %> - <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.role-#{role.id}')", - :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> </th> <% end %> </tr> @@ -33,8 +35,10 @@ <% perms_by_module[mod].each do |permission| %> <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>"> <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)}") %> + <%= link_to_function('', + "toggleCheckboxesBySelector('.permission-#{permission.name} input')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", + :class => 'icon-only icon-checked') %> <%= l_or_humanize(permission.name, :prefix => 'permission_') %> </td> <% @roles.each do |role| %> diff --git a/app/views/settings/_repositories.html.erb b/app/views/settings/_repositories.html.erb index b3c5b1b16..bb7a23704 100644 --- a/app/views/settings/_repositories.html.erb +++ b/app/views/settings/_repositories.html.erb @@ -23,12 +23,7 @@ </td> <td> <% if enabled %> - <%= - image_tag( - (scm_class.scm_available ? 'true.png' : 'exclamation.png'), - :style => "vertical-align:bottom;" - ) - %> + <span class="icon <%= (scm_class.scm_available ? 'icon-ok' : 'icon-error') %>"></span> <%= scm_class.scm_command %> <% end %> </td> @@ -124,7 +119,8 @@ ) %> </td> <td class="buttons"> - <%= link_to(image_tag('delete.png'), '#', :class => 'delete-commit-keywords') %> + <%= link_to('', '#', + :class => 'delete-commit-keywords icon-only icon-del') %> </td> </tr> <% end %> @@ -133,7 +129,10 @@ <td><em class="info"><%= l(:text_comma_separated) %></em></td> <td></td> <td></td> - <td class="buttons"><%= link_to(image_tag('add.png'), '#', :class => 'add-commit-keywords') %></td> + <td class="buttons"> + <%= link_to('', '#', + :class => 'add-commit-keywords icon-only icon-add') %> + </td> </tr> </tbody> </table> diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb index 7ec60cdbd..df497d47e 100644 --- a/app/views/timelog/_list.html.erb +++ b/app/views/timelog/_list.html.erb @@ -21,12 +21,14 @@ <%= raw @query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, entry)}</td>"}.join %> <td class="buttons"> <% if entry.editable_by?(User.current) -%> - <%= link_to image_tag('edit.png'), edit_time_entry_path(entry), - :title => l(:button_edit) %> - <%= link_to image_tag('delete.png'), time_entry_path(entry), - :data => {:confirm => l(:text_are_you_sure)}, - :method => :delete, - :title => l(:button_delete) %> + <%= link_to '', edit_time_entry_path(entry), + :title => l(:button_edit), + :class => 'icon icon-edit' %> + <%= link_to '', time_entry_path(entry), + :data => {:confirm => l(:text_are_you_sure)}, + :method => :delete, + :title => l(:button_delete), + :class => 'icon-only icon-del' %> <% end -%> </td> </tr> diff --git a/app/views/trackers/fields.html.erb b/app/views/trackers/fields.html.erb index 285a01b7e..b53f1fa0f 100644 --- a/app/views/trackers/fields.html.erb +++ b/app/views/trackers/fields.html.erb @@ -9,9 +9,10 @@ <th></th> <% @trackers.each do |tracker| %> <th> + <%= link_to_function('', "toggleCheckboxesBySelector('input.tracker-#{tracker.id}')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", + :class => 'icon-only icon-checked') %> <%= tracker.name %> - <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.tracker-#{tracker.id}')", - :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> </th> <% end %> </tr> @@ -26,8 +27,9 @@ <% Tracker::CORE_FIELDS.each do |field| %> <tr class="<%= cycle("odd", "even") %>"> <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)}") %> + <%= link_to_function('', "toggleCheckboxesBySelector('input.core-field-#{field}')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", + :class => 'icon-only icon-checked') %> <%= l("field_#{field}".sub(/_id$/, '')) %> </td> <% @trackers.each do |tracker| %> @@ -48,8 +50,9 @@ <% @custom_fields.each do |field| %> <tr class="<%= cycle("odd", "even") %>"> <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)}") %> + <%= link_to_function('', "toggleCheckboxesBySelector('input.custom-field-#{field.id}')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", + :class => 'icon-only icon-checked') %> <%= field.name %> </td> <% @trackers.each do |tracker| %> diff --git a/app/views/workflows/_form.html.erb b/app/views/workflows/_form.html.erb index 76f6fefe3..9fb2705e7 100644 --- a/app/views/workflows/_form.html.erb +++ b/app/views/workflows/_form.html.erb @@ -2,8 +2,9 @@ <thead> <tr> <th> - <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input')", - :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> + <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", + :class => 'icon-only icon-checked') %> <%=l(:label_current_status)%> </th> <th colspan="<%= @statuses.length %>"><%=l(:label_new_statuses_allowed)%></th> @@ -12,8 +13,9 @@ <td></td> <% for new_status in @statuses %> <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)}") %> + <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input.new-status-#{new_status.id}')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", + :class => 'icon-only icon-checked') %> <%= new_status.name %> </td> <% end %> @@ -24,8 +26,9 @@ <% next if old_status.nil? && name != 'always' %> <tr class="<%= cycle("odd", "even") %>"> <td class="name"> - <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.try(:id) || 0}')", - :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %> + <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.try(:id) || 0}')", + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}", + :class => 'icon-only icon-checked') %> <%= old_status ? old_status.name : content_tag('em', l(:label_issue_new)) %> </td> diff --git a/app/views/workflows/edit.html.erb b/app/views/workflows/edit.html.erb index ab9f72b9f..3eac0a39a 100644 --- a/app/views/workflows/edit.html.erb +++ b/app/views/workflows/edit.html.erb @@ -16,12 +16,12 @@ <label><%=l(:label_role)%>: <%= options_for_workflow_select 'role_id[]', Role.sorted.select(&:consider_workflow?), @roles, :id => 'role_id', :class => 'expandable' %> </label> - <a href="#" data-expands="#role_id"><%= image_tag 'bullet_toggle_plus.png' %></a> + <a href="#" data-expands="#role_id"><span class="toggle-multiselect"></span></a> <label><%=l(:label_tracker)%>: <%= options_for_workflow_select 'tracker_id[]', Tracker.sorted, @trackers, :id => 'tracker_id', :class => 'expandable' %> </label> - <a href="#" data-expands="#tracker_id"><%= image_tag 'bullet_toggle_plus.png' %></a> + <a href="#" data-expands="#tracker_id"><span class="toggle-multiselect"></span></a> <%= submit_tag l(:button_edit), :name => nil %> diff --git a/app/views/workflows/index.html.erb b/app/views/workflows/index.html.erb index 3ee55d125..1a0780532 100644 --- a/app/views/workflows/index.html.erb +++ b/app/views/workflows/index.html.erb @@ -22,7 +22,9 @@ <% @roles.each do |role| -%> <% count = @workflow_counts[[tracker.id, role.id]] || 0 %> <td> - <%= link_to((count > 0 ? count : image_tag('false.png')), {:action => 'edit', :role_id => role, :tracker_id => tracker}, :title => l(:button_edit)) %> + <%= link_to((count > 0 ? count : content_tag(:span, nil, :class => 'icon-only icon-not-ok')), + {:action => 'edit', :role_id => role, :tracker_id => tracker}, + :title => l(:button_edit)) %> </td> <% end -%> </tr> diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb index 03740214d..3b8f84e41 100644 --- a/app/views/workflows/permissions.html.erb +++ b/app/views/workflows/permissions.html.erb @@ -16,12 +16,12 @@ <label><%=l(:label_role)%>: <%= options_for_workflow_select 'role_id[]', Role.sorted.select(&:consider_workflow?), @roles, :id => 'role_id', :class => 'expandable' %> </label> - <a href="#" data-expands="#role_id"><%= image_tag 'bullet_toggle_plus.png' %></a> + <a href="#" data-expands="#role_id"><span class="toggle-multiselect"></a> <label><%=l(:label_tracker)%>: <%= options_for_workflow_select 'tracker_id[]', Tracker.sorted, @trackers, :id => 'tracker_id', :class => 'expandable' %> </label> - <a href="#" data-expands="#tracker_id"><%= image_tag 'bullet_toggle_plus.png' %></a> + <a href="#" data-expands="#tracker_id"><span class="toggle-multiselect"></a> <%= submit_tag l(:button_edit), :name => nil %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index e3f70d0a1..0c8903c29 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -130,6 +130,9 @@ a.collapsible {padding-left: 12px; background: url(../images/arrow_expanded.png) a.collapsible.collapsed {background: url(../images/arrow_collapsed.png) no-repeat -5px 40%;} a#toggle-completed-versions {color:#999;} + +a.toggle-checkboxes { margin-left: 5px; padding-left: 12px; background: url(../images/toggle_check.png) no-repeat 0% 50%; } + /***** 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; } @@ -297,7 +300,7 @@ div.news h3 { background: url(../images/news.png) no-repeat 0% 50%; padding-left div.projects h3 { background: url(../images/projects.png) no-repeat 0% 50%; padding-left: 20px; } #watchers select {width: 95%; display: block;} -#watchers a.delete {opacity: 0.4; vertical-align: middle;} +#watchers a.delete {opacity: 0.4; margin-left: 5px;} #watchers a.delete:hover {opacity: 1;} #watchers img.gravatar {margin: 0 4px 2px 0;} @@ -391,7 +394,7 @@ fieldset#filters td.values input {height:1em;} .add-filter {width:35%; float:right; text-align: right; vertical-align: top;} #issue_is_private_wrap {float:right; margin-right:1em;} -.toggle-multiselect {background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%; padding-left:8px; margin-left:0; cursor:pointer;} +.toggle-multiselect {background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%; padding-left:16px; margin-left:0; margin-right:5px; cursor:pointer;} .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; } div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;} @@ -461,6 +464,7 @@ div.wiki-page .contextual a {opacity: 0.4} div.wiki-page .contextual a:hover {opacity: 1} form .attributes select { width: 60%; } +form .attributes select + a.icon-only { vertical-align: middle; margin-left: 4px; } input#issue_subject, input#document_title { width: 99%; } select#issue_done_ratio { width: 95px; } @@ -1089,6 +1093,11 @@ a.close-icon:hover {background-image:url('../images/close_hl.png');} padding-top: 2px; padding-bottom: 3px; } +.icon-only { + background-position: 0% 50%; + background-repeat: no-repeat; + padding-left: 16px; +} .icon-add { background-image: url(../images/add.png); } .icon-edit { background-image: url(../images/edit.png); } @@ -1111,12 +1120,13 @@ a.close-icon:hover {background-image:url('../images/close_hl.png');} .icon-time-add { background-image: url(../images/time_add.png); } .icon-stats { background-image: url(../images/stats.png); } .icon-warning { background-image: url(../images/warning.png); } +.icon-error { background-image: url(../images/exclamation.png); } .icon-fav { background-image: url(../images/fav.png); } .icon-fav-off { background-image: url(../images/fav_off.png); } .icon-reload { background-image: url(../images/reload.png); } .icon-lock { background-image: url(../images/locked.png); } .icon-unlock { background-image: url(../images/unlock.png); } -.icon-checked { background-image: url(../images/true.png); } +.icon-checked { background-image: url(../images/toggle_check.png); } .icon-details { background-image: url(../images/zoom_in.png); } .icon-report { background-image: url(../images/report.png); } .icon-comment { background-image: url(../images/comment.png); } @@ -1125,9 +1135,19 @@ a.close-icon:hover {background-image:url('../images/close_hl.png');} .icon-issue { background-image: url(../images/ticket.png); } .icon-zoom-in { background-image: url(../images/zoom_in.png); } .icon-zoom-out { background-image: url(../images/zoom_out.png); } +.icon-magnifier { background-image: url(../images/magnifier.png); } .icon-passwd { background-image: url(../images/textfield_key.png); } .icon-test { background-image: url(../images/bullet_go.png); } +.icon-email { background-image: url(../images/email.png); } +.icon-email-disabled { background-image: url(../images/email_disabled.png); } .icon-email-add { background-image: url(../images/email_add.png); } +.icon-move-up { background-image: url(../images/1uparrow.png); } +.icon-move-top { background-image: url(../images/2uparrow.png); } +.icon-move-down { background-image: url(../images/1downarrow.png); } +.icon-move-bottom { background-image: url(../images/2downarrow.png); } +.icon-ok { background-image: url(../images/true.png); } +.icon-not-ok { background-image: url(../images/false.png); } +.icon-link-break { background-image: url(../images/link_break.png); } .icon-file { background-image: url(../images/files/default.png); } .icon-file.text-plain { background-image: url(../images/files/text.png); } diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 395a5615e..0ad26973e 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -1424,7 +1424,7 @@ class IssuesControllerTest < ActionController::TestCase assert_select 'div#watchers ul' do assert_select 'li' do assert_select 'a[href="/users/2"]' - assert_select 'a img[alt=Delete]' + assert_select 'a[class*=delete]' end end end @@ -1441,7 +1441,7 @@ class IssuesControllerTest < ActionController::TestCase assert_select 'li' do assert_select 'img.gravatar' assert_select 'a[href="/users/2"]' - assert_select 'a img[alt=Delete]' + assert_select 'a[class*=delete]' end end end diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 6b0d1c7d3..6c0d7abd0 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -1243,14 +1243,14 @@ RAW # heading that contains inline code assert_match Regexp.new('<div class="contextual" title="Edit this section" id="section-4">' + - '<a href="/projects/1/wiki/Test/edit\?section=4"><img src="/images/edit.png(\?\d+)?" alt="Edit" /></a></div>' + + '<a class="icon-only icon-edit" href="/projects/1/wiki/Test/edit\?section=4"></a></div>' + '<a name="Subtitle-with-inline-code"></a>' + '<h2 >Subtitle with <code>inline code</code><a href="#Subtitle-with-inline-code" class="wiki-anchor">¶</a></h2>'), result # last heading assert_match Regexp.new('<div class="contextual" title="Edit this section" id="section-5">' + - '<a href="/projects/1/wiki/Test/edit\?section=5"><img src="/images/edit.png(\?\d+)?" alt="Edit" /></a></div>' + + '<a class="icon-only icon-edit" href="/projects/1/wiki/Test/edit\?section=5"></a></div>' + '<a name="Subtitle-after-pre-tag"></a>' + '<h2 >Subtitle after pre tag<a href="#Subtitle-after-pre-tag" class="wiki-anchor">¶</a></h2>'), result |