diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ccfc5d50..0f0d577e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -50,6 +50,14 @@ module ApplicationHelper link_to user.display_name, :controller => 'account', :action => 'show', :id => user end + def image_to_function(name, function, html_options = {}) + html_options.symbolize_keys! + tag(:input, html_options.merge({ + :type => "image", :src => image_path(name), + :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};" + })) + end + def format_date(date) l_date(date) if date end @@ -145,7 +153,7 @@ module ApplicationHelper end def calendar_for(field_id) - image_tag("calendar", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) + + image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) + javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });") end end diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb index ec14ecbe..300fbfe5 100644 --- a/app/helpers/sort_helper.rb +++ b/app/helpers/sort_helper.rb @@ -96,10 +96,10 @@ module SortHelper key, order = session[@sort_name][:key], session[@sort_name][:order] if key == column if order.downcase == 'asc' - icon = 'sort_asc' + icon = 'sort_asc.png' order = 'desc' else - icon = 'sort_desc' + icon = 'sort_desc.png' order = 'asc' end else diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml index 74c07551..8f092b52 100644 --- a/app/views/account/login.rhtml +++ b/app/views/account/login.rhtml @@ -1,6 +1,6 @@
-

<%= image_tag 'login' %>  <%=l(:label_please_login)%>

+

<%=l(:label_please_login)%>

<%= start_form_tag({:action=> "login"}, :class => "tabular") %>

diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml index d937e287..901134c2 100644 --- a/app/views/admin/index.rhtml +++ b/app/views/admin/index.rhtml @@ -1,50 +1,41 @@

<%=l(:label_administration)%>

-

-<%= image_tag "projects" %> +

<%= link_to l(:label_project_plural), :controller => 'admin', :action => 'projects' %> | <%= link_to l(:label_new), :controller => 'projects', :action => 'add' %>

-

-<%= image_tag "users" %> +

<%= link_to l(:label_user_plural), :controller => 'users' %> | <%= link_to l(:label_new), :controller => 'users', :action => 'add' %>

-

-<%= image_tag "role" %> +

<%= link_to l(:label_role_and_permissions), :controller => 'roles' %>

-

-<%= image_tag "tracker" %> +

<%= link_to l(:label_tracker_plural), :controller => 'trackers' %> | -<%= link_to l(:label_custom_field_plural), :controller => 'custom_fields' %> -

- -

-<%= image_tag "workflow" %> <%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses' %> | <%= link_to l(:label_workflow), :controller => 'roles', :action => 'workflow' %>

-

-<%= image_tag "options" %> +

+<%= link_to l(:label_custom_field_plural), :controller => 'custom_fields' %> +

+ +

<%= link_to l(:label_enumerations), :controller => 'enumerations' %>

-

-<%= image_tag "mailer" %> +

<%= link_to l(:field_mail_notification), :controller => 'admin', :action => 'mail_options' %>

-

-<%= image_tag "login" %> +

<%= link_to l(:label_authentication), :controller => 'auth_sources' %>

-

-<%= image_tag "help" %> +

<%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %>

\ No newline at end of file diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml index ecfff035..b30cf2af 100644 --- a/app/views/admin/projects.rhtml +++ b/app/views/admin/projects.rhtml @@ -1,5 +1,5 @@
-<%= link_to l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'pic picAdd' %> +<%= link_to l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add' %>

<%=l(:label_project_plural)%>

@@ -18,8 +18,8 @@ "> <%= link_to project.name, :controller => 'projects', :action => 'settings', :id => project %> <%=h project.description %> - <%= image_tag 'true' if project.is_public? %> - <%= project.projects_count %> + <%= image_tag 'true.png' if project.is_public? %> + <%= project.children_count %> <%= format_date(project.created_on) %> <%= button_to l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => "button-small" %> diff --git a/app/views/auth_sources/list.rhtml b/app/views/auth_sources/list.rhtml index d65e56d9..f486f45b 100644 --- a/app/views/auth_sources/list.rhtml +++ b/app/views/auth_sources/list.rhtml @@ -1,5 +1,5 @@
-<%= link_to l(:label_auth_source_new), {:action => 'new'}, :class => 'pic picAdd' %> +<%= link_to l(:label_auth_source_new), {:action => 'new'}, :class => 'icon icon-add' %>

<%=l(:label_auth_source_plural)%>

diff --git a/app/views/custom_fields/list.rhtml b/app/views/custom_fields/list.rhtml index eef3e863..982e66aa 100644 --- a/app/views/custom_fields/list.rhtml +++ b/app/views/custom_fields/list.rhtml @@ -16,8 +16,8 @@ <%= link_to custom_field.name, :action => 'edit', :id => custom_field %> <%= l(custom_field.type_name) %> <%= l(CustomField::FIELD_FORMATS[custom_field.field_format][:name]) %> - <%= image_tag 'true' if custom_field.is_required? %> - <%= image_tag 'true' if custom_field.is_for_all? %> + <%= image_tag 'true.png' if custom_field.is_required? %> + <%= image_tag 'true.png' if custom_field.is_for_all? %> <%= custom_field.projects.count.to_s + ' ' + lwr(:label_project, custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %> <%= button_to l(:button_delete), { :action => 'destroy', :id => custom_field }, :confirm => l(:text_are_you_sure), :class => "button-small" %> diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml index 923701dd..dab360ed 100644 --- a/app/views/documents/show.rhtml +++ b/app/views/documents/show.rhtml @@ -1,6 +1,6 @@
-<%= link_to_if_authorized l(:button_edit), {:controller => 'documents', :action => 'edit', :id => @document}, :class => 'pic picEdit' %> -<%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy', :id => @document}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> +<%= link_to_if_authorized l(:button_edit), {:controller => 'documents', :action => 'edit', :id => @document}, :class => 'icon icon-edit' %> +<%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy', :id => @document}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>

<%= @document.title %>

@@ -15,7 +15,7 @@ <% for attachment in @attachments %>
  • - <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy_attachment', :id => @document, :attachment_id => attachment}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> + <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy_attachment', :id => @document, :attachment_id => attachment}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
    <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %> (<%= human_size attachment.filesize %>)
    @@ -29,8 +29,8 @@ <% if authorize_for('documents', 'add_attachment') %> <%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular") %> -

    +

    <%= file_field_tag 'attachments[]', :size => 30 %> (<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)

    <%= submit_tag l(:button_add) %> <%= end_form_tag %> diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml index 6c448fdc..18508125 100644 --- a/app/views/enumerations/list.rhtml +++ b/app/views/enumerations/list.rhtml @@ -10,7 +10,7 @@
  • <%= link_to value.name, :action => 'edit', :id => value %>
    • <% end %> -

    <%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option }, :class => "pic picAdd" %>

      +

    <%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option }, :class => "icon icon-add" %>

      <% else %>

    <%= link_to l(name), :opt => option %>

    diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml index c81c8812..bde9b1e2 100644 --- a/app/views/issue_statuses/list.rhtml +++ b/app/views/issue_statuses/list.rhtml @@ -1,5 +1,5 @@
    -<%= link_to l(:label_issue_status_new), {:action => 'new'}, :class => 'pic picAdd' %> +<%= link_to l(:label_issue_status_new), {:action => 'new'}, :class => 'icon icon-add' %>

    <%=l(:label_issue_status_plural)%>

    @@ -15,8 +15,8 @@ <% for status in @issue_statuses %> ">
    <%= link_to status.name, :action => 'edit', :id => status %> - <%= image_tag 'true' if status.is_default? %> - <%= image_tag 'true' if status.is_closed? %> + <%= image_tag 'true.png' if status.is_default? %> + <%= image_tag 'true.png' if status.is_closed? %> <%= button_to l(:button_delete), { :action => 'destroy', :id => status }, :confirm => l(:text_are_you_sure), :class => "button-small" %> diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index 208e5be1..f7b8cda4 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -1,5 +1,5 @@
    -<%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'pic picPdf' %> +<%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'icon icon-pdf' %>

    <%= @issue.tracker.name %> #<%= @issue.id %> - <%=h @issue.subject %>

    @@ -46,9 +46,9 @@ end %>
    -<%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'pic picEdit' %> -<%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'pic picMove' %> -<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> +<%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit' %> +<%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'icon icon-move' %> +<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
    <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %> @@ -77,18 +77,18 @@ end %> <% for attachment in @issue.attachments %> - + - + <% end %>
    <%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon attachment' %> (<%= human_size(attachment.filesize) %>)<%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= human_size(attachment.filesize) %>) <%= format_date(attachment.created_on) %> <%= attachment.author.display_name %>
    <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment }, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
    <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment }, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>

    <% if authorize_for('issues', 'add_attachment') %> <%= start_form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") %> -

    +

    <%= file_field_tag 'attachments[]', :size => 30 %> (<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)

    <%= submit_tag l(:button_add) %> <%= end_form_tag %> diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index cb81f55d..85f41e32 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -28,28 +28,28 @@ diff --git a/app/views/my/blocks/_calendar.rhtml b/app/views/my/blocks/_calendar.rhtml index e57a790c..dfff5b78 100644 --- a/app/views/my/blocks/_calendar.rhtml +++ b/app/views/my/blocks/_calendar.rhtml @@ -29,11 +29,11 @@ while day <= @date_to @issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day } day_issues.each do |i| %> <%= if day == i.start_date and day == i.due_date - image_tag('arrow_bw') + image_tag('arrow_bw.png') elsif day == i.start_date - image_tag('arrow_from') + image_tag('arrow_from.png') elsif day == i.due_date - image_tag('arrow_to') + image_tag('arrow_to.png') end %> <%= link_to "#{i.tracker.name} ##{i.id}", :controller => 'issues', :action => 'show', :id => i %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %>
    <% end %> diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml index 03245f2a..c3661b1f 100644 --- a/app/views/news/show.rhtml +++ b/app/views/news/show.rhtml @@ -1,6 +1,6 @@
    -<%= link_to_if_authorized l(:button_edit), {:controller => 'news', :action => 'edit', :id => @news}, :class => 'pic picEdit' %> -<%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> +<%= link_to_if_authorized l(:button_edit), {:controller => 'news', :action => 'edit', :id => @news}, :class => 'icon icon-edit' %> +<%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>

    <%=h @news.title %>

    @@ -12,12 +12,12 @@
    -

    <%= l(:label_comment_plural) %>

    +

    <%= l(:label_comment_plural) %>

    <% @news.comments.each do |comment| %> <% next if comment.new_record? %>

    <%= format_time(comment.created_on) %> - <%= comment.author.name %>

    - <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> + <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
    <%= simple_format(auto_link(h comment.comment))%> <% end if @news.comments_count > 0 %> diff --git a/app/views/projects/add_document.rhtml b/app/views/projects/add_document.rhtml index 37e0b7d6..b570eabb 100644 --- a/app/views/projects/add_document.rhtml +++ b/app/views/projects/add_document.rhtml @@ -4,8 +4,8 @@ <%= render :partial => 'documents/form' %>
    -

    +

    <%= file_field_tag 'attachments[]', :size => 30 %> (<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)

    diff --git a/app/views/projects/add_file.rhtml b/app/views/projects/add_file.rhtml index 5ae6dde2..baffbe8e 100644 --- a/app/views/projects/add_file.rhtml +++ b/app/views/projects/add_file.rhtml @@ -7,8 +7,8 @@

    <%= select_tag "version_id", options_from_collection_for_select(@versions, "id", "name") %>

    -

    +

    <%= file_field_tag 'attachments[]', :size => 30 %> (<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)

    <%= submit_tag l(:button_add) %> diff --git a/app/views/projects/add_issue.rhtml b/app/views/projects/add_issue.rhtml index 88be854c..951b53bb 100644 --- a/app/views/projects/add_issue.rhtml +++ b/app/views/projects/add_issue.rhtml @@ -25,8 +25,8 @@

    <%= custom_field_tag_with_label @custom_value %>

    <% end %> -

    +

    <%= file_field_tag 'attachments[]', :size => 30 %> (<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)

    diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml index 8bd970fe..b750b0b5 100644 --- a/app/views/projects/calendar.rhtml +++ b/app/views/projects/calendar.rhtml @@ -47,11 +47,11 @@ while day <= @date_to @issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day } day_issues.each do |i| %> <%= if day == i.start_date and day == i.due_date - image_tag('arrow_bw') + image_tag('arrow_bw.png') elsif day == i.start_date - image_tag('arrow_from') + image_tag('arrow_from.png') elsif day == i.due_date - image_tag('arrow_to') + image_tag('arrow_to.png') end %> <%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i }, :title => "#{i.subject}" %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %>
    <% end %> @@ -64,6 +64,6 @@ end %> -<%= image_tag 'arrow_from' %>  <%= l(:text_tip_task_begin_day) %>
    -<%= image_tag 'arrow_to' %>  <%= l(:text_tip_task_end_day) %>
    -<%= image_tag 'arrow_bw' %>  <%= l(:text_tip_task_begin_end_day) %>
    \ No newline at end of file +<%= image_tag 'arrow_from.png' %>  <%= l(:text_tip_task_begin_day) %>
    +<%= image_tag 'arrow_to.png' %>  <%= l(:text_tip_task_end_day) %>
    +<%= image_tag 'arrow_bw.png' %>  <%= l(:text_tip_task_begin_end_day) %>
    \ No newline at end of file diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml index 33d87e6d..615d8323 100644 --- a/app/views/projects/gantt.rhtml +++ b/app/views/projects/gantt.rhtml @@ -1,6 +1,6 @@
    <%= l(:label_export_to) %> -<%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :output => 'pdf'}, :class => 'pic picPdf' %> +<%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :output => 'pdf'}, :class => 'icon icon-pdf' %>

    <%= l(:label_gantt) %>

    @@ -21,14 +21,14 @@ <%= if @zoom < 4 - link_to image_tag('zoom_in'), {:zoom => (@zoom+1), :year => @year_from, :month => @month_from, :months => @months} + link_to image_tag('zoom_in.png'), {:zoom => (@zoom+1), :year => @year_from, :month => @month_from, :months => @months} else - image_tag 'zoom_in_g' + image_tag 'zoom_in_g.png' end %> <%= if @zoom > 1 - link_to image_tag('zoom_out'), :zoom => (@zoom-1), :year => @year_from, :month => @month_from, :months => @months + link_to image_tag('zoom_out.png'), :zoom => (@zoom-1), :year => @year_from, :month => @month_from, :months => @months else - image_tag 'zoom_out_g' + image_tag 'zoom_out_g.png' end %> @@ -179,13 +179,12 @@ top = headers_heigth + 12 i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today - i_left = ((i_start_date - @date_from)*zoom).floor - i_width = ((i_end_date - i_start_date + 1)*zoom).floor - d_width = ((i_done_date - i_start_date)*zoom).floor - l_width = ((i_late_date - i_start_date+1)*zoom).floor if i_late_date - l_width ||= 0 + i_left = ((i_start_date - @date_from)*zoom).floor + i_width = ((i_end_date - i_start_date + 1)*zoom).floor - 2 # total width of the issue (- 2 for left and right borders) + d_width = ((i_done_date - i_start_date)*zoom).floor - 2 # done width + l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor - 2 : 0 # delay width %> -
     
    +
     
    <% if l_width > 0 %>
     
    <% end %> diff --git a/app/views/projects/list_documents.rhtml b/app/views/projects/list_documents.rhtml index c24785f6..ab48bada 100644 --- a/app/views/projects/list_documents.rhtml +++ b/app/views/projects/list_documents.rhtml @@ -1,5 +1,5 @@
    -<%= link_to_if_authorized l(:label_document_new), {:controller => 'projects', :action => 'add_document', :id => @project}, :class => 'pic picAdd' %> +<%= link_to_if_authorized l(:label_document_new), {:controller => 'projects', :action => 'add_document', :id => @project}, :class => 'icon icon-add' %>

    <%=l(:label_document_plural)%>

    diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml index d2173bae..660d8bb0 100644 --- a/app/views/projects/list_files.rhtml +++ b/app/views/projects/list_files.rhtml @@ -1,5 +1,5 @@
    -<%= link_to_if_authorized l(:label_attachment_new), {:controller => 'projects', :action => 'add_file', :id => @project}, :class => 'pic picAdd' %> +<%= link_to_if_authorized l(:label_attachment_new), {:controller => 'projects', :action => 'add_file', :id => @project}, :class => 'icon icon-add' %>

    <%=l(:label_attachment_plural)%>

    @@ -19,7 +19,7 @@ <% for version in @versions %> <% unless version.attachments.empty? %> - <%= image_tag 'package' %> <%= version.name %> + <%= version.name %> <% for file in version.attachments %> "> @@ -31,7 +31,7 @@ <% if delete_allowed %>
    - <%= link_to_if_authorized '', {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> + <%= link_to_if_authorized '', {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
    <% end %> diff --git a/app/views/projects/list_issues.rhtml b/app/views/projects/list_issues.rhtml index e71a7b2d..2d7fc1f5 100644 --- a/app/views/projects/list_issues.rhtml +++ b/app/views/projects/list_issues.rhtml @@ -12,9 +12,9 @@ { :url => { :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 }, :update => "content", :with => "Form.serialize('query_form')" - }, :class => 'pic picCheck' %> + }, :class => 'icon icon-edit' %> - <%= link_to l(:button_clear), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1}, :class => 'pic picDelete' %> + <%= link_to l(:button_clear), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1}, :class => 'icon icon-del' %> <% if authorize_for('projects', 'add_query') %> <%= link_to_remote l(:button_save), @@ -22,7 +22,7 @@ :method => 'get', :update => "content", :with => "Form.serialize('query_form')" - }, :class => 'pic picEdit' %> + }, :class => 'icon icon-save' %> <% end %>
    @@ -30,8 +30,8 @@
    <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %> <% if authorize_for('projects', 'add_query') %> - <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'pic picEdit' %> - <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> + <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %> + <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %> <% end %>

    <%= @query.name %>

    @@ -71,8 +71,8 @@
    <%= l(:label_export_to) %> -<%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon file' %>, -<%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'pic picPdf' %> +<%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon icon-csv' %>, +<%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'icon icon-pdf' %>

    <%= submit_tag l(:button_move), :class => "button-small" %>   diff --git a/app/views/projects/list_news.rhtml b/app/views/projects/list_news.rhtml index 8d8f9966..6cdf75c4 100644 --- a/app/views/projects/list_news.rhtml +++ b/app/views/projects/list_news.rhtml @@ -1,5 +1,5 @@

    -<%= link_to_if_authorized l(:label_news_new), {:controller => 'projects', :action => 'add_news', :id => @project}, :class => 'pic picAdd' %> +<%= link_to_if_authorized l(:label_news_new), {:controller => 'projects', :action => 'add_news', :id => @project}, :class => 'icon icon-add' %>

    <%=l(:label_news_plural)%>

    diff --git a/app/views/projects/settings.rhtml b/app/views/projects/settings.rhtml index 6c2e53cd..60594657 100644 --- a/app/views/projects/settings.rhtml +++ b/app/views/projects/settings.rhtml @@ -27,7 +27,7 @@ <% end %> - <%= link_to_if_authorized l(:button_delete), {:controller => 'members', :action => 'destroy', :id => member}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> + <%= link_to_if_authorized l(:button_delete), {:controller => 'members', :action => 'destroy', :id => member}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %> <% end %> @@ -57,8 +57,8 @@ <%= format_date(version.effective_date) %> <%=h version.description %> - <%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'pic picEdit' %> - <%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> + <%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %> + <%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %> <% end %> @@ -87,7 +87,7 @@ <% end %> - <%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => @category}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> + <%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => @category}, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %> <% end %> diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml index 212e10f9..4c9e4e04 100644 --- a/app/views/projects/show.rhtml +++ b/app/views/projects/show.rhtml @@ -16,7 +16,7 @@
    <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
    -

    <%= image_tag "tracker" %> <%=l(:label_tracker_plural)%>

    +

    <%=l(:label_tracker_plural)%>

    -

    <%=l(:field_tracker)%>  <%= link_to image_tag('zoom_in'), :detail => 'tracker' %>

    +

    <%=l(:field_tracker)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'tracker' %>

    <%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
    -

    <%=l(:field_author)%>  <%= link_to image_tag('zoom_in'), :detail => 'author' %>

    +

    <%=l(:field_author)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'author' %>

    <%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %>
    -

    <%=l(:field_priority)%>  <%= link_to image_tag('zoom_in'), :detail => 'priority' %>

    +

    <%=l(:field_priority)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'priority' %>

    <%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
    -

    <%=l(:field_category)%>  <%= link_to image_tag('zoom_in'), :detail => 'category' %>

    +

    <%=l(:field_category)%>  <%= link_to image_tag('zoom_in.png'), :detail => 'category' %>

    <%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
    diff --git a/app/views/repositories/_dir_list.rhtml b/app/views/repositories/_dir_list.rhtml index 7b80c5f1..717802b4 100644 --- a/app/views/repositories/_dir_list.rhtml +++ b/app/views/repositories/_dir_list.rhtml @@ -10,7 +10,7 @@ <% total_size = 0 @entries.each do |entry| %> -<%= link_to h(entry.name), { :action => (entry.is_dir? ? 'browse' : 'revisions'), :id => @project, :path => entry.path, :rev => @rev }, :class => "icon " + (entry.is_dir? ? 'folder' : 'file') %> +<%= link_to h(entry.name), { :action => (entry.is_dir? ? 'browse' : 'revisions'), :id => @project, :path => entry.path, :rev => @rev }, :class => ("icon " + (entry.is_dir? ? 'icon-folder' : 'icon-file')) %> <%= human_size(entry.size) unless entry.is_dir? %> <%= link_to entry.lastrev.identifier, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier %> <%=h entry.lastrev.author %> diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml index 0e8109c8..141d7587 100644 --- a/app/views/roles/list.rhtml +++ b/app/views/roles/list.rhtml @@ -1,5 +1,5 @@
    -<%= link_to l(:label_role_new), {:action => 'new'}, :class => 'pic picAdd' %> +<%= link_to l(:label_role_new), {:action => 'new'}, :class => 'icon icon-add' %>

    <%=l(:label_role_plural)%>

    diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml index 18856268..644b1324 100644 --- a/app/views/trackers/list.rhtml +++ b/app/views/trackers/list.rhtml @@ -1,5 +1,5 @@
    -<%= link_to l(:label_tracker_new), {:action => 'new'}, :class => 'pic picAdd' %> +<%= link_to l(:label_tracker_new), {:action => 'new'}, :class => 'icon icon-add' %>

    <%=l(:label_tracker_plural)%>

    diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml index ccf2111a..709aeb7a 100644 --- a/app/views/users/_memberships.rhtml +++ b/app/views/users/_memberships.rhtml @@ -9,7 +9,7 @@ <%= options_from_collection_for_select @roles, "id", "name", membership.role_id %> <%= submit_tag l(:button_change), :class => "button-small" %> - <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %> + <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>

    <%= end_form_tag %> <% end %> diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml index 5eafda62..8e660329 100644 --- a/app/views/users/list.rhtml +++ b/app/views/users/list.rhtml @@ -1,5 +1,5 @@
    -<%= link_to l(:label_user_new), {:action => 'add'}, :class => 'pic picAdd' %> +<%= link_to l(:label_user_new), {:action => 'add'}, :class => 'icon icon-add' %>

    <%=l(:label_user_plural)%>

    @@ -23,8 +23,8 @@ <%= user.firstname %> <%= user.lastname %> <%= user.mail %> - <%= image_tag 'true' if user.admin? %> - <%= image_tag 'locked' if user.locked? %><%= image_tag 'user_new' if user.registered? %> + <%= image_tag 'true.png' if user.admin? %> + <%= image_tag 'locked.png' if user.locked? %><%= image_tag 'user_new.png' if user.registered? %> <%= format_time(user.created_on) %> <%= format_time(user.last_login_on) unless user.last_login_on.nil? %> diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml index 422c94e7..d32771c0 100644 --- a/app/views/welcome/index.rhtml +++ b/app/views/welcome/index.rhtml @@ -10,7 +10,7 @@
    -

    <%=l(:label_project_latest)%>

    +

    <%=l(:label_project_latest)%>

      <% for project in @projects %>
    • diff --git a/public/images/22x22/authent.png b/public/images/22x22/authent.png new file mode 100644 index 00000000..d2b29945 Binary files /dev/null and b/public/images/22x22/authent.png differ diff --git a/public/images/22x22/comment.png b/public/images/22x22/comment.png new file mode 100644 index 00000000..c5186abd Binary files /dev/null and b/public/images/22x22/comment.png differ diff --git a/public/images/22x22/file.png b/public/images/22x22/file.png new file mode 100644 index 00000000..96c56a2b Binary files /dev/null and b/public/images/22x22/file.png differ diff --git a/public/images/22x22/info.png b/public/images/22x22/info.png new file mode 100644 index 00000000..cf54e2c6 Binary files /dev/null and b/public/images/22x22/info.png differ diff --git a/public/images/22x22/notifications.png b/public/images/22x22/notifications.png new file mode 100644 index 00000000..972f4a24 Binary files /dev/null and b/public/images/22x22/notifications.png differ diff --git a/public/images/22x22/options.png b/public/images/22x22/options.png new file mode 100644 index 00000000..48da1516 Binary files /dev/null and b/public/images/22x22/options.png differ diff --git a/public/images/22x22/projects.png b/public/images/22x22/projects.png new file mode 100644 index 00000000..4f023bed Binary files /dev/null and b/public/images/22x22/projects.png differ diff --git a/public/images/22x22/role.png b/public/images/22x22/role.png new file mode 100644 index 00000000..4de98edd Binary files /dev/null and b/public/images/22x22/role.png differ diff --git a/public/images/22x22/tracker.png b/public/images/22x22/tracker.png new file mode 100644 index 00000000..f5139418 Binary files /dev/null and b/public/images/22x22/tracker.png differ diff --git a/public/images/22x22/users.png b/public/images/22x22/users.png new file mode 100644 index 00000000..92f39620 Binary files /dev/null and b/public/images/22x22/users.png differ diff --git a/public/images/22x22/workflow.png b/public/images/22x22/workflow.png new file mode 100644 index 00000000..9d1b9d8b Binary files /dev/null and b/public/images/22x22/workflow.png differ diff --git a/public/images/32x32/file.png b/public/images/32x32/file.png new file mode 100644 index 00000000..1662b530 Binary files /dev/null and b/public/images/32x32/file.png differ diff --git a/public/images/add.png b/public/images/add.png index 6541a681..db59058e 100644 Binary files a/public/images/add.png and b/public/images/add.png differ diff --git a/public/images/admin.png b/public/images/admin.png index 0c190984..c98330ca 100644 Binary files a/public/images/admin.png and b/public/images/admin.png differ diff --git a/public/images/alert.png b/public/images/alert.png index ba107e83..7cc6e4ae 100644 Binary files a/public/images/alert.png and b/public/images/alert.png differ diff --git a/public/images/calendar.png b/public/images/calendar.png index aa269da3..619172a9 100644 Binary files a/public/images/calendar.png and b/public/images/calendar.png differ diff --git a/public/images/check.png b/public/images/check.png deleted file mode 100644 index c348be65..00000000 Binary files a/public/images/check.png and /dev/null differ diff --git a/public/images/comment.png b/public/images/comment.png deleted file mode 100644 index a67d5d42..00000000 Binary files a/public/images/comment.png and /dev/null differ diff --git a/public/images/csv.png b/public/images/csv.png new file mode 100644 index 00000000..40586311 Binary files /dev/null and b/public/images/csv.png differ diff --git a/public/images/delete.png b/public/images/delete.png index 5f2cee53..108a3fc9 100644 Binary files a/public/images/delete.png and b/public/images/delete.png differ diff --git a/public/images/edit.png b/public/images/edit.png index dea7c92e..0275d91e 100644 Binary files a/public/images/edit.png and b/public/images/edit.png differ diff --git a/public/images/file.png b/public/images/file.png index 7a087194..f387dd30 100644 Binary files a/public/images/file.png and b/public/images/file.png differ diff --git a/public/images/folder.png b/public/images/folder.png index 5ad35741..563d3c94 100644 Binary files a/public/images/folder.png and b/public/images/folder.png differ diff --git a/public/images/help.png b/public/images/help.png index da8feb99..af4e6ff4 100644 Binary files a/public/images/help.png and b/public/images/help.png differ diff --git a/public/images/home.png b/public/images/home.png index 7a12add6..21ee5470 100644 Binary files a/public/images/home.png and b/public/images/home.png differ diff --git a/public/images/issues.png b/public/images/issues.png deleted file mode 100644 index e6948bff..00000000 Binary files a/public/images/issues.png and /dev/null differ diff --git a/public/images/locked.png b/public/images/locked.png index 5199dfe2..c2789e35 100644 Binary files a/public/images/locked.png and b/public/images/locked.png differ diff --git a/public/images/login.png b/public/images/login.png deleted file mode 100644 index 7e0c62d9..00000000 Binary files a/public/images/login.png and /dev/null differ diff --git a/public/images/mailer.png b/public/images/mailer.png deleted file mode 100644 index 8008bb84..00000000 Binary files a/public/images/mailer.png and /dev/null differ diff --git a/public/images/move.png b/public/images/move.png index ee6e9486..32fdb846 100644 Binary files a/public/images/move.png and b/public/images/move.png differ diff --git a/public/images/package.png b/public/images/package.png index 634d13d9..ff629d11 100644 Binary files a/public/images/package.png and b/public/images/package.png differ diff --git a/public/images/pdf.png b/public/images/pdf.png index 8c2a80aa..68c9bada 100644 Binary files a/public/images/pdf.png and b/public/images/pdf.png differ diff --git a/public/images/projects.png b/public/images/projects.png index b42347a9..244c896f 100644 Binary files a/public/images/projects.png and b/public/images/projects.png differ diff --git a/public/images/role.png b/public/images/role.png deleted file mode 100644 index ad36d1ca..00000000 Binary files a/public/images/role.png and /dev/null differ diff --git a/public/images/save.png b/public/images/save.png new file mode 100644 index 00000000..7c499b93 Binary files /dev/null and b/public/images/save.png differ diff --git a/public/images/options.png b/public/images/task_done.png similarity index 64% rename from public/images/options.png rename to public/images/task_done.png index a907c20f..2a4c81e9 100644 Binary files a/public/images/options.png and b/public/images/task_done.png differ diff --git a/public/images/task_late.png b/public/images/task_late.png new file mode 100644 index 00000000..2e8a40d6 Binary files /dev/null and b/public/images/task_late.png differ diff --git a/public/images/task_todo.png b/public/images/task_todo.png new file mode 100644 index 00000000..43c1eb9b Binary files /dev/null and b/public/images/task_todo.png differ diff --git a/public/images/tracker.png b/public/images/tracker.png deleted file mode 100644 index f29cfb2a..00000000 Binary files a/public/images/tracker.png and /dev/null differ diff --git a/public/images/true.png b/public/images/true.png index 9afc0b52..929c605f 100644 Binary files a/public/images/true.png and b/public/images/true.png differ diff --git a/public/images/user.png b/public/images/user.png index 89d591c0..5f55e7e4 100644 Binary files a/public/images/user.png and b/public/images/user.png differ diff --git a/public/images/user_new.png b/public/images/user_new.png index c7c71882..aaa430de 100644 Binary files a/public/images/user_new.png and b/public/images/user_new.png differ diff --git a/public/images/user_page.png b/public/images/user_page.png index 940a7b8e..78144862 100644 Binary files a/public/images/user_page.png and b/public/images/user_page.png differ diff --git a/public/images/users.png b/public/images/users.png index 3b9fc5aa..f3a07c3f 100644 Binary files a/public/images/users.png and b/public/images/users.png differ diff --git a/public/images/workflow.png b/public/images/workflow.png deleted file mode 100644 index 868332fe..00000000 Binary files a/public/images/workflow.png and /dev/null differ diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 9663491c..ea033c55 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -27,7 +27,7 @@ background-color:inherit; a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;} a img{border:none;} -p{padding:0 0 1em 0;} +p{margin:0 0 1em 0;} p form{margin-top:0; margin-bottom:20px;} img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;} @@ -124,34 +124,57 @@ text-decoration:none; background-color: #80b0da; } -/**************** Icons links *******************/ -.picHome { background: url(../images/home.png) no-repeat 4px 50%; } -.picUser { background: url(../images/user.png) no-repeat 4px 50%; } -.picUserPage { background: url(../images/user_page.png) no-repeat 4px 50%; } -.picAdmin { background: url(../images/admin.png) no-repeat 4px 50%; } -.picProject { background: url(../images/projects.png) no-repeat 4px 50%; } -.picLogout { background: url(../images/logout.png) no-repeat 4px 50%; } -.picHelp { background: url(../images/help.png) no-repeat 4px 50%; } - -.picEdit { background: url(../images/edit.png) no-repeat 4px 50%; } -.picDelete { background: url(../images/delete.png) no-repeat 4px 50%; } -.picAdd { background: url(../images/add.png) no-repeat 4px 50%; } -.picMove { background: url(../images/move.png) no-repeat 4px 50%; } -.picCheck { background: url(../images/check.png) no-repeat 4px 70%; } -.picPdf { background: url(../images/pdf.png) no-repeat 4px 50%;} - -.pic { padding-left: 18px; margin-left: 3px; } - +/**************** Icons *******************/ .icon { - background-position: 0% 40%; - background-repeat: no-repeat; - padding-left: 20px; +background-position: 0% 40%; +background-repeat: no-repeat; +padding-left: 20px; +padding-top: 2px; +padding-bottom: 3px; +vertical-align: middle; } -.folder { background-image: url(../images/folder.png); } -.file { background-image: url(../images/file.png); } -.attachment { background-image: url(../images/attachment.png); } -.comment { background-image: url(../images/comment.png); } +#navigation .icon { +background-position: 4px 50%; +} + +.icon22 { +background-position: 0% 40%; +background-repeat: no-repeat; +padding-left: 24px; +line-height: 22px; +vertical-align: middle; +} + +.icon-add { background-image: url(../images/add.png); } +.icon-edit { background-image: url(../images/edit.png); } +.icon-del { background-image: url(../images/delete.png); } +.icon-move { background-image: url(../images/move.png); } +.icon-save { background-image: url(../images/save.png); } +.icon-pdf { background-image: url(../images/pdf.png); } +.icon-csv { background-image: url(../images/csv.png); } +.icon-file { background-image: url(../images/file.png); } +.icon-folder { background-image: url(../images/folder.png); } +.icon-package { background-image: url(../images/package.png); } +.icon-home { background-image: url(../images/home.png); } +.icon-user { background-image: url(../images/user.png); } +.icon-mypage { background-image: url(../images/user_page.png); } +.icon-admin { background-image: url(../images/admin.png); } +.icon-projects { background-image: url(../images/projects.png); } +.icon-logout { background-image: url(../images/logout.png); } +.icon-help { background-image: url(../images/help.png); } +.icon-attachment { background-image: url(../images/attachment.png); } + +.icon22-projects { background-image: url(../images/22x22/projects.png); } +.icon22-users { background-image: url(../images/22x22/users.png); } +.icon22-tracker { background-image: url(../images/22x22/tracker.png); } +.icon22-role { background-image: url(../images/22x22/role.png); } +.icon22-workflow { background-image: url(../images/22x22/workflow.png); } +.icon22-options { background-image: url(../images/22x22/options.png); } +.icon22-notifications { background-image: url(../images/22x22/notifications.png); } +.icon22-authent { background-image: url(../images/22x22/authent.png); } +.icon22-info { background-image: url(../images/22x22/info.png); } +.icon22-comment { background-image: url(../images/22x22/comment.png); } /**************** Content styles ****************/ @@ -220,6 +243,7 @@ input.button-small label { font-weight: bold; font-size: 1em; + color: #505050; } fieldset { @@ -265,10 +289,10 @@ margin: 0; } ul.documents li { -background-image: url(../images/file.png); +background-image: url(../images/32x32/file.png); background-repeat: no-repeat; -background-position: 0 .4em; -padding-left: 20px; +background-position: 0 1px; +padding-left: 36px; margin-bottom: 10px; margin-left: -37px; } @@ -499,6 +523,8 @@ img.calendar-trigger { .contextual { float: right; font-size: 0.8em; +line-height: 16px; +padding: 2px; } .contextual select, .contextual input { @@ -528,8 +554,9 @@ font-size: 1em; line-height:0.8em; } -.task_late { background:#f66; } -.task_done { background:#66f; } +.task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; } +.task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; } +.task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; } /***** CSS FORM ******/ .tabular p{ diff --git a/public/stylesheets/print.css b/public/stylesheets/print.css index 2108bcab..76e0eae0 100644 --- a/public/stylesheets/print.css +++ b/public/stylesheets/print.css @@ -1,7 +1,3 @@ -#header, #navigation, #subcontent, #footer { -display:none; -} - -.menu { -display:none; -} +#header, #navigation, #subcontent, #footer { display:none; } +.menu { display:none; } +.contextual { display:none; } \ No newline at end of file