* all icons replaced (new icons are based on GPL icon set: "KDE Crystal Diamond 2.5" -by paolino- and "kNeu! Alpha v0.1" -by Pablo Fabregat-)

* fixed: subprojects count is always 0 on projects list

git-svn-id: http://redmine.rubyforge.org/svn/trunk@157 e93f8b46-1217-0410-a6f0-8f06a7374b81

31 files changed, 107 insertions, 117 deletions

diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml
index 74c075516..8f092b525 100644
--- a/app/views/account/login.rhtml
+++ b/app/views/account/login.rhtml
@@ -1,6 +1,6 @@
 <center>

 <div class="box login">

-<h2><%= image_tag 'login' %>&nbsp;&nbsp;<%=l(:label_please_login)%></h2>
+<h2 class="icon22 icon22-authent"><%=l(:label_please_login)%></h2>
 

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

 <p><label for="login"><%=l(:field_login)%>:</label>

diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml
index d937e287c..901134c27 100644
--- a/app/views/admin/index.rhtml
+++ b/app/views/admin/index.rhtml
@@ -1,50 +1,41 @@
 <h2><%=l(:label_administration)%></h2>

 

-<p>

-<%= image_tag "projects" %>

+<p class="icon22 icon22-projects">

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

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

 </p>

 

-<p>

-<%= image_tag "users" %>

+<p class="icon22 icon22-users">

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

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

 </p>

 

-<p>

-<%= image_tag "role" %>

+<p class="icon22 icon22-role">

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

 </p>

 

-<p>

-<%= image_tag "tracker" %>

+<p class="icon22 icon22-tracker">

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

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

-</p>

-

-<p>

-<%= image_tag "workflow" %>

 <%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses' %> |

 <%= link_to l(:label_workflow), :controller => 'roles', :action => 'workflow' %>

 </p>

 

-<p>

-<%= image_tag "options" %>

+<p class="icon22 icon22-workflow">

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

+</p>

+

+<p class="icon22 icon22-options">

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

 </p>

 

-<p>

-<%= image_tag "mailer" %>

+<p class="icon22 icon22-notifications">

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

 </p>

 

-<p>

-<%= image_tag "login" %>

+<p class="icon22 icon22-authent">

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

 </p>

 

-<p>

-<%= image_tag "help" %>

+<p class="icon22 icon22-info">

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

 </p>
\ No newline at end of file
diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index ecfff0357..b30cf2af5 100644
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= 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' %>
 </div>
 
 <h2><%=l(:label_project_plural)%></h2>
@@ -18,8 +18,8 @@
   <tr class="<%= cycle("odd", "even") %>">

 	<td><%= link_to project.name, :controller => 'projects', :action => 'settings', :id => project %>

 	<td><%=h project.description %>

-	<td align="center"><%= image_tag 'true' if project.is_public? %>
-	<td align="center"><%= project.projects_count %>

+	<td align="center"><%= image_tag 'true.png' if project.is_public? %>
+	<td align="center"><%= project.children_count %>

 	<td align="center"><%= format_date(project.created_on) %>

   <td align="center">
     <%= 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 d65e56d96..f486f45b7 100644
--- a/app/views/auth_sources/list.rhtml
+++ b/app/views/auth_sources/list.rhtml
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= 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' %>
 </div>
 
 <h2><%=l(:label_auth_source_plural)%></h2>
diff --git a/app/views/custom_fields/list.rhtml b/app/views/custom_fields/list.rhtml
index eef3e8631..982e66aab 100644
--- a/app/views/custom_fields/list.rhtml
+++ b/app/views/custom_fields/list.rhtml
@@ -16,8 +16,8 @@
 	<td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td>

 	<td align="center"><%= l(custom_field.type_name) %></td>
 	<td align="center"><%= l(CustomField::FIELD_FORMATS[custom_field.field_format][:name]) %></td>

-	<td align="center"><%= image_tag 'true' if custom_field.is_required? %></td>

-	<td align="center"><%= image_tag 'true' if custom_field.is_for_all? %></td>

+	<td align="center"><%= image_tag 'true.png' if custom_field.is_required? %></td>

+	<td align="center"><%= image_tag 'true.png' if custom_field.is_for_all? %></td>

 	<td align="center"><%= 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? %></td>
 	<td align="center">
 	   <%= 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 923701dd2..dab360eda 100644
--- a/app/views/documents/show.rhtml
+++ b/app/views/documents/show.rhtml
@@ -1,6 +1,6 @@
 <div class="contextual">

-<%= 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' %>

 </div>

 

 <h2><%= @document.title %></h2>

@@ -15,7 +15,7 @@
 <% for attachment in @attachments %>
     <li>

         <div class="contextual">

-        <%= 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' %>

         </div>

         <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>

         (<%= human_size attachment.filesize %>)<br />

@@ -29,8 +29,8 @@
 

 <% if authorize_for('documents', 'add_attachment') %>

   <%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular") %>

-    <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp;

-    <%= link_to_function image_tag('add'), "addFileField()" %></label>

+    <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>

+    <%= image_to_function "add.png", "addFileField();return false" %></label>

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

   <%= submit_tag l(:button_add) %>

   <%= end_form_tag %> 

diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml
index 6c448fdc7..18508125f 100644
--- a/app/views/enumerations/list.rhtml
+++ b/app/views/enumerations/list.rhtml
@@ -10,7 +10,7 @@
 			<li><%= link_to value.name, :action => 'edit', :id => value %></li>	

 		<% end %>

     </ul>

-    <p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option }, :class => "pic picAdd" %></p>&nbsp;

+    <p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option }, :class => "icon icon-add" %></p>&nbsp;

     

 	<% else %>	

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

diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml
index c81c88127..bde9b1e23 100644
--- a/app/views/issue_statuses/list.rhtml
+++ b/app/views/issue_statuses/list.rhtml
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= 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' %>
 </div>
 
 <h2><%=l(:label_issue_status_plural)%></h2>
@@ -15,8 +15,8 @@
 <% for status in @issue_statuses %>
   <tr class="<%= cycle("odd", "even") %>">
   <td><div class="square" style="background:#<%= status.html_color %>;"></div> <%= link_to status.name, :action => 'edit', :id => status %></td>

-  <td align="center"><%= image_tag 'true' if status.is_default? %></td>

-  <td align="center"><%= image_tag 'true' if status.is_closed? %></td>

+  <td align="center"><%= image_tag 'true.png' if status.is_default? %></td>

+  <td align="center"><%= image_tag 'true.png' if status.is_closed? %></td>

   <td align="center">
     <%= button_to l(:button_delete), { :action => 'destroy', :id => status }, :confirm => l(:text_are_you_sure), :class => "button-small" %>

   </td>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 208e5be12..f7b8cda4b 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -1,5 +1,5 @@
 <div class="contextual">

-<%= 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' %>

 </div>

 

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

@@ -46,9 +46,9 @@ end %>
 <br />

 

 <div class="contextual">

-<%= 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' %>

 </div>

 

 <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>

@@ -77,18 +77,18 @@ end %>
 <table width="100%">

 <% for attachment in @issue.attachments %>

 <tr>

-<td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon attachment' %> (<%= human_size(attachment.filesize) %>)</td>

+<td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= human_size(attachment.filesize) %>)</td>

 <td><%= format_date(attachment.created_on) %></td>

 <td><%= attachment.author.display_name %></td>

-<td><div class="contextual"><%= 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' %></div></td>

+<td><div class="contextual"><%= 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' %></div></td>

 </tr>

 <% end %>
 </table>

 <br />

 <% if authorize_for('issues', 'add_attachment') %>

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

-  <p id="attachments_p"><label><%=l(:label_attachment_new)%>&nbsp;

-  <%= link_to_function image_tag('add'), "addFileField()" %></label>

+  <p id="attachments_p"><label><%=l(:label_attachment_new)%>

+  <%= image_to_function "add.png", "addFileField();return false" %></label>

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

   <%= submit_tag l(:button_add) %>

   <%= end_form_tag %> 

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index cb81f55db..85f41e327 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -28,28 +28,28 @@
 	

 	<div id="navigation">

 		<ul>

-	<li class="selected"><%= link_to l(:label_home), { :controller => '' }, :class => "picHome" %></li>

-	<li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "picUserPage" %></li>

-	<li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "picProject" %></li>

+	<li class="selected"><%= link_to l(:label_home), { :controller => '' }, :class => "icon icon-home" %></li>

+	<li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "icon icon-mypage" %></li>

+	<li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects" %></li>

 			

     <% unless @project.nil? || @project.id.nil? %>

-        <li class="submenu"><%= link_to @project.name, { :controller => 'projects', :action => 'show', :id => @project }, :class => "picProject", :onmouseover => "buttonMouseover(event, 'menuProject');"  %></li>

+        <li class="submenu"><%= link_to @project.name, { :controller => 'projects', :action => 'show', :id => @project }, :class => "icon icon-projects", :onmouseover => "buttonMouseover(event, 'menuProject');"  %></li>

     <% end %>

 			

     <% if loggedin? %>

-		<li><%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => "picUser" %></li>

+		<li><%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => "icon icon-user" %></li>

     <% end %>

 			

 	<% if admin_loggedin? %>

-		<li class="submenu"><%= link_to l(:label_administration), { :controller => 'admin' }, :class => "picAdmin", :onmouseover => "buttonMouseover(event, 'menuAdmin');" %></li>

+		<li class="submenu"><%= link_to l(:label_administration), { :controller => 'admin' }, :class => "icon icon-admin", :onmouseover => "buttonMouseover(event, 'menuAdmin');" %></li>

 	<% end %>

 			

-	<li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => params[:controller], :page => params[:action] }, :onclick => "window.open(this.href); return false;", :class => "picHelp" %></li>

+	<li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => params[:controller], :page => params[:action] }, :onclick => "window.open(this.href); return false;", :class => "icon icon-help" %></li>

 	

 	<% if loggedin? %>

-		<li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "picUser" %></li>	

+		<li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "icon icon-user" %></li>	

 	<% else %>	

-		<li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "picUser" %></li>

+		<li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "icon icon-user" %></li>

 	<% end %>

 		</ul>		

 	</div>

diff --git a/app/views/my/blocks/_calendar.rhtml b/app/views/my/blocks/_calendar.rhtml
index e57a790cb..dfff5b78a 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 %>

 		<small><%= link_to "#{i.tracker.name} ##{i.id}", :controller => 'issues', :action => 'show', :id => i %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br />

 	<% end %>

diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index 03245f2ad..c3661b1f8 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -1,6 +1,6 @@
 <div class="contextual">

-<%= 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' %>

 </div>

 

 <h2><%=h @news.title %></h2>

@@ -12,12 +12,12 @@
 <br />

 

 <div id="comments" style="margin-bottom:16px;">

-<h3 class="icon comment"><%= l(:label_comment_plural) %></h3>

+<h3 class="icon22 icon22-comment"><%= l(:label_comment_plural) %></h3>

 <% @news.comments.each do |comment| %>

     <% next if comment.new_record? %>

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

     <div class="contextual">

-        <%= 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' %>

     </div>

     <%= 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 37e0b7d60..b570eabbd 100644
--- a/app/views/projects/add_document.rhtml
+++ b/app/views/projects/add_document.rhtml
@@ -4,8 +4,8 @@
 <%= render :partial => 'documents/form' %>
 
 <div class="box">

-<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp;
-<%= link_to_function image_tag('add'), "addFileField()" %></label>
+<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
+<%= image_to_function "add.png", "addFileField();return false" %></label>
 <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
 </div>
 

diff --git a/app/views/projects/add_file.rhtml b/app/views/projects/add_file.rhtml
index 5ae6dde29..baffbe8e8 100644
--- a/app/views/projects/add_file.rhtml
+++ b/app/views/projects/add_file.rhtml
@@ -7,8 +7,8 @@
 <p><label for="version_id"><%=l(:field_version)%> <span class="required">*</span></label>

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

 

-<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp;

-<%= link_to_function image_tag('add'), "addFileField()" %></label>

+<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>

+<%= image_to_function "add.png", "addFileField();return false" %></label>

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

 </div>

 <%= submit_tag l(:button_add) %>

diff --git a/app/views/projects/add_issue.rhtml b/app/views/projects/add_issue.rhtml
index 88be854c2..951b53bb9 100644
--- a/app/views/projects/add_issue.rhtml
+++ b/app/views/projects/add_issue.rhtml
@@ -25,8 +25,8 @@
 	<p><%= custom_field_tag_with_label @custom_value %></p>
 <% end %>

 

-<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp;
-<%= link_to_function image_tag('add'), "addFileField()" %></label>
+<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
+<%= image_to_function "add.png", "addFileField();return false" %></label>
 <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Attachment.max_size) %>)</em></p>
 
 </div>
diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml
index 8bd970fe6..b750b0b54 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 %>

 		<small><%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i }, :title => "#{i.subject}" %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br />

 	<% end %>

@@ -64,6 +64,6 @@ end %>
 </tbody>

 </table>

 

-<%= image_tag 'arrow_from' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_day) %><br />

-<%= image_tag 'arrow_to' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br />

-<%= image_tag 'arrow_bw' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_end_day) %><br />
\ No newline at end of file
+<%= image_tag 'arrow_from.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_day) %><br />

+<%= image_tag 'arrow_to.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br />

+<%= image_tag 'arrow_bw.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_end_day) %><br />
\ No newline at end of file
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index 33d87e6dc..615d8323d 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -1,6 +1,6 @@
 <div class="contextual">

 <%= 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' %>

 </div>

 

 <h2><%= l(:label_gantt) %></h2>

@@ -21,14 +21,14 @@
 </td>

 <td align="right">

 <%= 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 %>

 </td>

 </tr>

@@ -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

 	%>	

-	<div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task">&nbsp;</div>

+	<div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task task_todo">&nbsp;</div>

 	<% if l_width > 0 %>

 	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div>

 	<% end %>

diff --git a/app/views/projects/list_documents.rhtml b/app/views/projects/list_documents.rhtml
index c24785f69..ab48badae 100644
--- a/app/views/projects/list_documents.rhtml
+++ b/app/views/projects/list_documents.rhtml
@@ -1,5 +1,5 @@
 <div class="contextual">

-<%= 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' %>

 </div>

 

 <h2><%=l(:label_document_plural)%></h2>

diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml
index d2173bae1..660d8bb07 100644
--- a/app/views/projects/list_files.rhtml
+++ b/app/views/projects/list_files.rhtml
@@ -1,5 +1,5 @@
 <div class="contextual">

-<%= 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' %>

 </div>

 

 <h2><%=l(:label_attachment_plural)%></h2>

@@ -19,7 +19,7 @@
   <tbody>

 <% for version in @versions %>	

   <% unless version.attachments.empty? %>

-  <tr><th colspan="7" align="left"><%= image_tag 'package' %> <b><%= version.name %></b></th></tr>

+  <tr><th colspan="7" align="left"><span class="icon icon-package"><b><%= version.name %></b></span></th></tr>

   <% for file in version.attachments %>		
   <tr class="<%= cycle("odd", "even") %>">

     <td></td>

@@ -31,7 +31,7 @@
     <% if delete_allowed %>

     <td align="center">

         <div class="contextual">

-        <%= 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' %>

         </div>

     </td>

     <% end %>
diff --git a/app/views/projects/list_issues.rhtml b/app/views/projects/list_issues.rhtml
index e71a7b2d3..2d7fc1f54 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 %>

     </div>

     <br />

@@ -30,8 +30,8 @@
     <div class="contextual">

         <%= 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 %>

     </div>    

     <h2><%= @query.name %></h2>

@@ -71,8 +71,8 @@
 </table>

 <div class="contextual">

 <%= 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' %>

 </div>

 <p><%= submit_tag l(:button_move), :class => "button-small" %>

 &nbsp;

diff --git a/app/views/projects/list_news.rhtml b/app/views/projects/list_news.rhtml
index 8d8f99668..6cdf75c4a 100644
--- a/app/views/projects/list_news.rhtml
+++ b/app/views/projects/list_news.rhtml
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= 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' %>
 </div>
 
 <h2><%=l(:label_news_plural)%></h2>
diff --git a/app/views/projects/settings.rhtml b/app/views/projects/settings.rhtml
index 6c2e53cdb..605946576 100644
--- a/app/views/projects/settings.rhtml
+++ b/app/views/projects/settings.rhtml
@@ -27,7 +27,7 @@
         <% end %>
     </td>

     <td>
-        <%= 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' %>
     </td>

 	</tr>

 	<% end %>

@@ -57,8 +57,8 @@
   <td width="100"><%= format_date(version.effective_date) %></td>

   <td><%=h version.description %></td>
   <td>
-      <%= 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' %>
   </td>

   </tr>

 <% end %>

@@ -87,7 +87,7 @@
         <% end %>

     </td>

     <td>
-        <%= 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' %>
     </td>

 	</tr>

 	<% end %>

diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index 212e10f99..4c9e4e04a 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -16,7 +16,7 @@
     <div class="contextual">

     <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>

     </div>

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

+    <h3 class="icon22 icon22-tracker"><%=l(:label_tracker_plural)%></h3>

     <ul>

     <% for tracker in @trackers %>    

       <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project, 

@@ -32,7 +32,7 @@
 

 <div class="splitcontentright">

 	<div class="box">

-		<h3><%= image_tag "users" %> <%=l(:label_member_plural)%></h3>	

+		<h3 class="icon22 icon22-users"><%=l(:label_member_plural)%></h3>	

 		<% for member in @members %>

 		<%= link_to_user member.user %> (<%= member.role.name %>)<br />		

 		<% end %>		

@@ -40,7 +40,7 @@
   

   <% if @subprojects %>

  	<div class="box">

-		<h3><%= image_tag "projects" %> <%=l(:label_subproject_plural)%></h3>	

+		<h3 class="icon22 icon22-projects"><%=l(:label_subproject_plural)%></h3>	

 		<% for subproject in @subprojects %>

 		<%= link_to subproject.name, :action => 'show', :id => subproject %><br />		

 		<% end %>		

diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml
index 4c20d86ff..3b73a9d7a 100644
--- a/app/views/queries/_filters.rhtml
+++ b/app/views/queries/_filters.rhtml
@@ -78,7 +78,7 @@ function toggle_multi_select(field) {
         <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="values[<%= field %>][]" id="values_<%= field %>" class="select-small" style="vertical-align: top;">

         <%= options_for_select options[:values], query.values_for(field) %>        

         </select>

-        <%= link_to_function image_tag('expand'), "toggle_multi_select('#{field}');" %>

+        <%= link_to_function image_tag('expand.png'), "toggle_multi_select('#{field}');" %>

     <% when :date, :date_past %>

         <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>

     <% when :text %>

diff --git a/app/views/reports/issue_report.rhtml b/app/views/reports/issue_report.rhtml
index bceaafa09..31d670761 100644
--- a/app/views/reports/issue_report.rhtml
+++ b/app/views/reports/issue_report.rhtml
@@ -2,7 +2,7 @@
 

 <h3><%= l(:label_query_plural) %></h3>

 <div class="contextual">

-<%= link_to_if_authorized l(:label_query_new), {:controller => 'projects', :action => 'add_query', :id => @project}, :class => 'pic picAdd' %>

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

 </div>

 

 <% if @queries.empty? %><p><i><%=l(:label_no_data)%></i></p><% end %>

@@ -13,19 +13,19 @@
 </ul>

 

 <div class="splitcontentleft">

-<h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in'), :detail => 'tracker' %></h3>

+<h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'tracker' %></h3>

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

 <br />

-<h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in'), :detail => 'author' %></h3>

+<h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'author' %></h3>

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

 <br />

 </div>

 

 <div class="splitcontentright">

-<h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in'), :detail => 'priority' %></h3>

+<h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'priority' %></h3>

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

 <br />

-<h3><%=l(:field_category)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in'), :detail => 'category' %></h3>

+<h3><%=l(:field_category)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'category' %></h3>

 <%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>

 <br />

 </div>

diff --git a/app/views/repositories/_dir_list.rhtml b/app/views/repositories/_dir_list.rhtml
index 7b80c5f1f..717802b4a 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| %>

 <tr class="<%= cycle 'odd', 'even' %>">

-<td><%= 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') %></td>

+<td><%= 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')) %></td>

 <td align="right"><%= human_size(entry.size) unless entry.is_dir? %></td>

 <td align="right"><%= link_to entry.lastrev.identifier, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier %></td>

 <td align="center"><em><%=h entry.lastrev.author %></em></td>

diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml
index 0e8109c8b..141d75873 100644
--- a/app/views/roles/list.rhtml
+++ b/app/views/roles/list.rhtml
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= link_to l(:label_role_new), {:action => 'new'}, :class => 'pic picAdd' %>
+<%= link_to l(:label_role_new), {:action => 'new'}, :class => 'icon icon-add' %>
 </div>
 
 <h2><%=l(:label_role_plural)%></h2>
diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml
index 188562684..644b1324e 100644
--- a/app/views/trackers/list.rhtml
+++ b/app/views/trackers/list.rhtml
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= link_to l(:label_tracker_new), {:action => 'new'}, :class => 'pic picAdd' %>
+<%= link_to l(:label_tracker_new), {:action => 'new'}, :class => 'icon icon-add' %>
 </div>
 
 <h2><%=l(:label_tracker_plural)%></h2>
diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml
index ccf2111a6..709aeb7a3 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 %>

     </select>

     <%= 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' %>

 </p>

 <%= end_form_tag %>

 <% end %>

diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index 5eafda62e..8e660329c 100644
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= link_to l(:label_user_new), {:action => 'add'}, :class => 'pic picAdd' %>
+<%= link_to l(:label_user_new), {:action => 'add'}, :class => 'icon icon-add' %>
 </div>
 
 <h2><%=l(:label_user_plural)%></h2>
@@ -23,8 +23,8 @@
 	<td><%= user.firstname %></td>

 	<td><%= user.lastname %></td>

 	<td><%= user.mail %></td>

-	<td align="center"><%= image_tag 'true' if user.admin? %></td>

-	<td align="center"><%= image_tag 'locked' if user.locked? %><%= image_tag 'user_new' if user.registered? %></td>

+	<td align="center"><%= image_tag 'true.png' if user.admin? %></td>

+	<td align="center"><%= image_tag 'locked.png' if user.locked? %><%= image_tag 'user_new.png' if user.registered? %></td>

 	<td align="center"><%= format_time(user.created_on) %></td>

 	<td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>

   <td align="center">

diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml
index 422c94e7a..d32771c0f 100644
--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
@@ -10,7 +10,7 @@
 

 <div class="splitcontentright">

 	<div class="box">

-	<h3><%=l(:label_project_latest)%></h3>

+	<h3 class="icon22 icon22-projects"><%=l(:label_project_latest)%></h3>

 		<ul>
 		<% for project in @projects %>

 			<li>