Action icons are not visible in IE #414

app/views/dmsf/_dir.html.erb

@@ -39,73 +39,63 @@
 <td class="modified"><%= format_time(subfolder.modified) if subfolder %>                
   <% if locked_for_user %>
     <% if subfolder.lock.reverse[0].user %>            
-      <%= link_to('',
+      <%= link_to(image_tag(link ? 'locked_gray.png' : 'locked.png', :plugin => 'redmine_dmsf'),
         user_path(subfolder.lock.reverse[0].user),
-        :title => l(:title_locked_by_user, :user => subfolder.lock.reverse[0].user),
-        :class => 'icon icon-dmsf-locked') %>
+        :title => l(:title_locked_by_user, :user => subfolder.lock.reverse[0].user)) %>
     <% else %>            
-      <%= content_tag(:span, '', :title => l(:notice_account_unknown_email), 
-        :class => 'icon icon-dmsf-locked') %>
+      <%= content_tag(:span, image_tag(link ? 'locked_gray.png' : 'locked.png', :plugin => 'redmine_dmsf'), 
+        :title => l(:notice_account_unknown_email)) %>
     <% end %>
   <% elsif locked %>          
-    <%= content_tag(:span, '', :title => l(:title_locked_by_you), 
-      :class => 'icon icon-dmsf-lockedbycurrent') %>
+    <%= content_tag(:span, image_tag(link ? 'lockedbycurrent_gray.png' : 'lockedbycurrent.png', :plugin => 'redmine_dmsf'), 
+      :title => l(:title_locked_by_you)) %>
   <% end %>        
 </td>
 <td class="version"></td>
 <td class="workflow"></td>
 <td class="author"><%= h(subfolder.user) if subfolder %></td>
-<td class="actions">
-  <% if @folder_manipulation_allowed %>          
-    <div class="right_icon_box">
-      <% unless locked %>
-       <%= link_to('',
-          edit_dmsf_path(:id => project, :folder_id => subfolder),
-          :title => l(:link_edit, :title => subfolder ? h(subfolder.title) : project.name),
-          :class => 'icon icon-edit') %>
-        <% if subfolder %>
-          <%= link_to('',
-            lock_dmsf_path(:id => project, :folder_id => subfolder),
-            :title => l(:title_lock_file),
-            :class => 'icon icon-dmsf-lock') %>                  
-        <% else %>
-          <span class="icon"></span>
-        <% end %>
-        <% if (subfolder && subfolder.notification) || (!subfolder && project.dmsf_notification) %>            
-          <%= link_to('',            
-            notify_deactivate_dmsf_path(:id => project, :folder_id => subfolder),
-            :title => l(:title_notifications_active_deactivate),
-            :class => 'icon icon-notification-on') %>
-        <% else %>            
-          <%= link_to('',
-            notify_activate_dmsf_path(:id => project, :folder_id => subfolder),
-            :title => l(:title_notifications_not_active_activate),
-            :class => 'icon icon-notification-off') %>
-        <% end %>
-        <% if link %>
-          <%= link_to('',            
-            dmsf_link_path(link),
-            :data => {:confirm => l(:text_are_you_sure)},
-            :method => :delete,
-            :title => l(:title_delete),
-            :class => 'icon icon-del') %>                       
-        <% else %>
-          <%= link_to('',
-            delete_dmsf_path(:id => project, :folder_id => subfolder),
-            :data => {:confirm => l(:text_are_you_sure)},            
-            :title => l(:title_delete),
-            :class => 'icon icon-del') %>             
-        <% end %>    
-      <% else %>       
+<td class="buttons">
+  <% if @folder_manipulation_allowed %>
+    <% unless locked %>
+     <%= link_to(image_tag('edit.png'),
+        edit_dmsf_path(:id => project, :folder_id => subfolder),
+        :title => l(:link_edit, :title => subfolder ? h(subfolder.title) : project.name)) %>
+      <% if subfolder %>
+        <%= link_to(image_tag('lock.png', :plugin => 'redmine_dmsf'),
+          lock_dmsf_path(:id => project, :folder_id => subfolder),
+          :title => l(:title_lock_file)) %>
+      <% else %>
         <span class="icon"></span>
-        <% if (!locked_for_user || @force_file_unlock_allowed) && subfolder.unlockable? %>
-          <%= link_to('',
-            unlock_dmsf_path(:id => project, :folder_id => subfolder),
-            :title => l(:title_unlock_file),
-            :class => 'icon icon-dmsf-unlock')%>        
-        <% end %>        
-      <% end %>                                                                                                                                                                   
-    </div>    
+      <% end %>
+      <% if (subfolder && subfolder.notification) || (!subfolder && project.dmsf_notification) %>            
+        <%= link_to(image_tag('notify.png', :plugin => 'redmine_dmsf'),
+          notify_deactivate_dmsf_path(:id => project, :folder_id => subfolder),
+          :title => l(:title_notifications_active_deactivate)) %>
+      <% else %>            
+        <%= link_to(image_tag('notifynot.png', :plugin => 'redmine_dmsf'),
+          notify_activate_dmsf_path(:id => project, :folder_id => subfolder),
+          :title => l(:title_notifications_not_active_activate)) %>
+      <% end %>
+      <% if link %>
+        <%= link_to(image_tag('delete.png'),
+          dmsf_link_path(link),
+          :data => {:confirm => l(:text_are_you_sure)},
+          :method => :delete,
+          :title => l(:title_delete)) %>                       
+      <% else %>
+        <%= link_to(image_tag('delete.png'),
+          delete_dmsf_path(:id => project, :folder_id => subfolder),
+          :data => {:confirm => l(:text_are_you_sure)},            
+          :title => l(:title_delete)) %>             
+      <% end %>    
+    <% else %>       
+      <span class="icon"></span>
+      <% if (!locked_for_user || @force_file_unlock_allowed) && subfolder.unlockable? %>
+        <%= link_to(image_tag('unlock.png', :plugin => 'redmine_dmsf'),
+          unlock_dmsf_path(:id => project, :folder_id => subfolder),
+          :title => l(:title_unlock_file)) %>        
+      <% end %>        
+    <% end %>                                                                                                                                                                       
   <% end %>
 </td>
 <td class="invisible">0</td>

app/views/dmsf/_dir_trash.html.erb

@@ -39,19 +39,15 @@
 <td class="version"></td>
 <td class="workflow"></td>
 <td class="author"><%= h(subfolder.user) %></td>
-<td class="actions">
-  <% if @folder_manipulation_allowed %>
-    <div class="right_icon_box">           
-      <%= link_to('',
-        restore_dmsf_path(:id => project, :folder_id => subfolder),                
-        :title => l(:title_restore),
-        :class => 'icon icon-dmsf-restore') %>
-      <%= link_to('',
-        delete_dmsf_path(:id => project, :folder_id => subfolder, :commit => 'yes'),
-        :data => {:confirm => l(:text_are_you_sure)},            
-        :title => l(:title_delete),
-        :class => 'icon icon-dmsf-rev-delete') %>  
-    </div>    
+<td class="buttons">
+  <% if @folder_manipulation_allowed %>    
+    <%= link_to(image_tag('restore.png', :plugin => 'redmine_dmsf'),
+      restore_dmsf_path(:id => project, :folder_id => subfolder),                
+      :title => l(:title_restore)) %>
+    <%= link_to(image_tag('rev_delete.png', :plugin => 'redmine_dmsf'),
+      delete_dmsf_path(:id => project, :folder_id => subfolder, :commit => 'yes'),
+      :data => {:confirm => l(:text_are_you_sure)},            
+      :title => l(:title_delete)) %>      
   <% end %>
 </td>
 <td class="invisible">0</td>

app/views/dmsf/_file.html.erb

@@ -41,18 +41,16 @@
   <%= format_time(file.last_revision.updated_at) %>
   <% if locked_for_user %>
     <% if file.lock.reverse[0].user %>            
-      <%= link_to('',
+      <%= link_to(image_tag(link ? 'locked_gray.png' : 'locked.png', :plugin => 'redmine_dmsf'),
         user_path(file.lock.reverse[0].user),
-        :title => l(:title_locked_by_user, :user => file.lock.reverse[0].user),
-        :class => 'icon icon-dmsf-locked') %>
+        :title => l(:title_locked_by_user, :user => file.lock.reverse[0].user)) %>
     <% else %>            
-      <%= content_tag(:span, '', 
-        :title => l(:notice_account_unknown_email), 
-        :class => 'icon icon-dmsf-locked') %>
+      <%= content_tag(:span, image_tag(link ? 'locked_gray.png' : 'locked.png', :plugin => 'redmine_dmsf'), 
+        :title => l(:notice_account_unknown_email)) %>
     <% end %>
   <% elsif locked %>          
-    <%= content_tag(:span, '', :title => l(:title_locked_by_you), 
-      :class => 'icon icon-dmsf-lockedbycurrent') %>
+    <%= content_tag(:span, image_tag(link ? 'lockedbycurrent_gray.png' : 'lockedbycurrent.png', :plugin => 'redmine_dmsf'), 
+      :title => l(:title_locked_by_you)) %>
   <% end %>
 </td>
 <td class="version" title="<%= file.last_revision.comment %>"><%= file.last_revision.version %></td>
@@ -71,124 +69,110 @@
   <% end %>
 </td>
 <td class="author"><%= h(file.last_revision.user) %></td>
-<td class="actions">
-  <% if @file_manipulation_allowed || @file_approval_allowed %>
-    <div class="right_icon_box">
-      <% if @file_manipulation_allowed %>
-        <% unless locked %>
-          <%= link_to('',
-            dmsf_file_path(:id => file),
-            :title => l(:link_details, :title => h(file.last_revision.title)),
-            :class => 'icon icon-dmsf-file-details') %>
-          <%= link_to('',
-            lock_dmsf_files_path(:id => file),
-            :title => l(:title_lock_file),
-            :class => 'icon icon-dmsf-lock') %>        
-          <% if file.notification %>              
-            <%= link_to('',
-              notify_deactivate_dmsf_files_path(:id => file),
-              :title => l(:title_notifications_active_deactivate),
-              :class => 'icon icon-notification-on') %>
-          <% else %>              
-            <%= link_to('',
-              notify_activate_dmsf_files_path(:id => file),
-              :title => l(:title_notifications_not_active_activate),
-              :class => 'icon icon-notification-off') %>
-          <% end %>
-          <% if link %>
-            <%= link_to('',            
-              dmsf_link_path(link),
-              :data => {:confirm => l(:text_are_you_sure)},
+<td class="buttons">
+  <% if @file_manipulation_allowed || @file_approval_allowed %>    
+    <% if @file_manipulation_allowed %>
+      <% unless locked %>
+        <%= link_to(image_tag('filedetails.png', :plugin => 'redmine_dmsf'),
+          dmsf_file_path(:id => file),
+          :title => l(:link_details, :title => h(file.last_revision.title))) %>
+        <%= link_to(image_tag('lock.png', :plugin => 'redmine_dmsf'),
+          lock_dmsf_files_path(:id => file),
+          :title => l(:title_lock_file)) %>        
+        <% if file.notification %>              
+          <%= link_to(image_tag('notify.png', :plugin => 'redmine_dmsf'),
+            notify_deactivate_dmsf_files_path(:id => file),
+            :title => l(:title_notifications_active_deactivate)) %>
+        <% else %>              
+          <%= link_to(image_tag('notifynot.png', :plugin => 'redmine_dmsf'),
+            notify_activate_dmsf_files_path(:id => file),
+            :title => l(:title_notifications_not_active_activate)) %>
+        <% end %>
+        <% if link %>
+          <%= link_to(image_tag('delete.png'), 
+              dmsf_link_path(:id => file), 
+              :data => {:confirm => l(:text_are_you_sure)}, 
               :method => :delete,
-              :title => l(:title_delete),
-              :class => 'icon icon-del') %>                       
-          <% else %>
-            <% if @file_delete_allowed %>
-              <%= link_to('',
-                dmsf_file_path(:id => file),
-                :data => {:confirm => l(:text_are_you_sure)},
-                :method => :delete,
-                :title => l(:title_delete),
-                :class => 'icon icon-del') unless locked_for_user %>
-            <% else %>
-              <span class="icon"></span>
-            <% end %>
-          <% end %>        
+              :title => l(:title_delete)) %>
         <% else %>
-          <span class="icon"></span>
-          <% if (!locked_for_user || @force_file_unlock_allowed) && file.unlockable? %>
-            <%= link_to('',
-              unlock_dmsf_files_path(:id => file),
-              :title => l(:title_unlock_file),
-              :class => 'icon icon-dmsf-unlock')%>
+          <% if @file_delete_allowed %>              
+            <%= link_to(image_tag('delete.png'), 
+              dmsf_file_path(:id => file), 
+              :data => {:confirm => l(:text_are_you_sure)}, 
+              :method => :delete,
+              :title => l(:title_delete)) unless locked_for_user %>
           <% else %>
             <span class="icon"></span>
           <% end %>
-          <span class="icon icon-margin-left"></span>
+        <% end %>        
+      <% else %>
+        <span class="icon"></span>
+        <% if (!locked_for_user || @force_file_unlock_allowed) && file.unlockable? %>
+          <%= link_to(image_tag('unlock.png', :plugin => 'redmine_dmsf'),
+            unlock_dmsf_files_path(:id => file),
+            :title => l(:title_unlock_file))%>
+        <% else %>
           <span class="icon"></span>
         <% end %>
+        <!--<span class="icon icon-margin-left"></span>-->
+        <span class="icon"></span>
+        <span class="icon icon-narrow"></span>
       <% end %>
-      <% if @file_approval_allowed %>
-        <% case file.last_revision.workflow %>
-          <%  when DmsfWorkflow::STATE_WAITING_FOR_APPROVAL %>                                            
-            <% if wf %>
-              <% assignments = wf.next_assignments(file.last_revision.id) %>
-              <% index = assignments.find_index{|assignment| assignment.user_id == User.current.id} if assignments %>
-              <% if index %>
-                <%= link_to('',
-                  action_dmsf_workflow_path(
-                    :project_id => project.id, 
-                    :id => wf.id, 
-                    :dmsf_workflow_step_assignment_id => assignments[index].id,
-                    :dmsf_file_revision_id => file.last_revision.id),
-                  :title => l(:title_waiting_for_approval),
-                  :class => 'icon icon-dmsf-waiting-for-approval',
-                  :remote => true) %>
-              <% else %>
-                <%= content_tag(:span, '',
-                  :title => "#{l(:label_dmsf_wokflow_action_approve)} #{l(:label_dmsf_wokflow_action_reject)} #{l(:label_dmsf_wokflow_action_delegate)}", 
-                  :class => 'icon icon-dmsf-waiting-for-approval') %>
-              <% end %>
-            <% else %>                  
-              <%= content_tag(:span, '',
-                :title => "#{l(:label_dmsf_wokflow_action_approve)} #{l(:label_dmsf_wokflow_action_reject)} #{l(:label_dmsf_wokflow_action_delegate)}", 
-                :class => 'icon icon-dmsf-waiting-for-approval') %>
-            <% end %>
-          <% when DmsfWorkflow::STATE_APPROVED %>                
-            <%= content_tag(:span, '', :title => l(:title_approved), 
-              :class => 'icon icon-dmsf-approved') %>
-          <% when DmsfWorkflow::STATE_ASSIGNED %>
-            <% if User.current && (file.last_revision.dmsf_workflow_assigned_by == User.current.id) && wf %>                 
-              <%= link_to('',
-                start_dmsf_workflow_path(                                                    
-                  :id => file.last_revision.dmsf_workflow_id,                                                     
+    <% end %>
+    <% if @file_approval_allowed %>
+      <% case file.last_revision.workflow %>
+        <%  when DmsfWorkflow::STATE_WAITING_FOR_APPROVAL %>                                            
+          <% if wf %>
+            <% assignments = wf.next_assignments(file.last_revision.id) %>
+            <% index = assignments.find_index{|assignment| assignment.user_id == User.current.id} if assignments %>
+            <% if index %>
+              <%= link_to(image_tag('waiting_for_approval.png', :plugin => 'redmine_dmsf'),
+                action_dmsf_workflow_path(
+                  :project_id => project.id, 
+                  :id => wf.id, 
+                  :dmsf_workflow_step_assignment_id => assignments[index].id,
                   :dmsf_file_revision_id => file.last_revision.id),
-                :title => l(:label_dmsf_wokflow_action_start),
-                :class => 'icon icon-dmsf-assigned') %>
-            <% else %>                  
-              <%= content_tag(:span, '', 
-                title => l(:label_dmsf_wokflow_action_start), 
-                :class => 'icon icon-dmsf-assigned') %>
+                :title => l(:title_waiting_for_approval),                
+                :remote => true) %>
+            <% else %>
+              <%= content_tag(:span, image_tag('waiting_for_approval.png', :plugin => 'redmine_dmsf'),
+                :title => "#{l(:label_dmsf_wokflow_action_approve)} #{l(:label_dmsf_wokflow_action_reject)} #{l(:label_dmsf_wokflow_action_delegate)}") %>
             <% end %>
-          <% when DmsfWorkflow::STATE_REJECTED %>                
-            <%= content_tag(:span, '', :title => l(:title_rejected), 
-              :class => 'icon icon-dmsf-rejected') %>
-          <% else %>
-            <% if @workflows_available %>
-              <%= link_to('',
-                assign_dmsf_workflow_path(
-                  :project_id => project.id,                                                                                                    
-                  :dmsf_file_revision_id => file.last_revision.id),
-                  :title => l(:label_dmsf_wokflow_action_assign),
-                  :class => 'icon icon-dmsf-none',
-                  :remote => true) %>                                                            
-            <% end %>
-        <% end %> 
-      <% end %>
-    </div>    
+          <% else %>                  
+            <%= content_tag(:span, image_tag('waiting_for_approval.png', :plugin => 'redmine_dmsf'),
+              :title => "#{l(:label_dmsf_wokflow_action_approve)} #{l(:label_dmsf_wokflow_action_reject)} #{l(:label_dmsf_wokflow_action_delegate)}") %>
+          <% end %>
+        <% when DmsfWorkflow::STATE_APPROVED %>                
+          <%= content_tag(:span, image_tag('approved.png', :plugin => 'redmine_dmsf'), 
+            :title => l(:title_approved)) %>
+        <% when DmsfWorkflow::STATE_ASSIGNED %>
+          <% if User.current && (file.last_revision.dmsf_workflow_assigned_by == User.current.id) && wf %>                 
+            <%= link_to(image_tag('assigned.png', :plugin => 'redmine_dmsf'),
+              start_dmsf_workflow_path(                                                    
+                :id => file.last_revision.dmsf_workflow_id,                                                     
+                :dmsf_file_revision_id => file.last_revision.id),
+              :title => l(:label_dmsf_wokflow_action_start)) %>
+          <% else %>                  
+            <%= content_tag(:span, image_tag('assigned.png', :plugin => 'redmine_dmsf'), 
+              title => l(:label_dmsf_wokflow_action_start)) %>
+          <% end %>
+        <% when DmsfWorkflow::STATE_REJECTED %>                
+          <%= content_tag(:span, image_tag('assigned.png', :plugin => 'redmine_dmsf'), 
+            :title => l(:title_rejected)) %>
+        <% else %>
+          <% if @workflows_available %>
+            <%= link_to(image_tag('none.png', :plugin => 'redmine_dmsf'),
+              assign_dmsf_workflow_path(
+                :project_id => project.id,                                                                                                    
+                :dmsf_file_revision_id => file.last_revision.id),
+                :title => l(:label_dmsf_wokflow_action_assign),                
+                :remote => true) %>                                                            
+          <% end %>
+      <% end %> 
+    <% end %>    
   <% end %>
 </td>
 <td class="invisible">1</td>
 <td class="invisible"><%= file.last_revision.size %></td>
 <td class="invisible"><%= file.last_revision.updated_at.to_i %></td>
-<td class="invisible"><%= file.last_revision.iversion %></td>
+<td class="invisible"><%= file.last_revision.iversion %></td>

app/views/dmsf/_file_trash.html.erb

@@ -1,4 +1,6 @@
 <%#=
+# encoding: utf-8
+#
 # Redmine plugin for Document Management System "Features"
 #
 # Copyright (C) 2011-15 Karel Pičman <karel.picman@kontron.com>
@@ -35,20 +37,16 @@
   <%= file.last_revision.workflow_str(false) %>  
 </td>
 <td class="author"><%= h(file.last_revision.user) %></td>
-<td class="actions">
-  <% if @file_manipulation_allowed %>          
-    <div class="right_icon_box">
-      <%= link_to('',
-        restore_dmsf_file_path(:id => file),                
-        :title => l(:title_restore),
-        :class => 'icon icon-dmsf-restore') %>
-      <%= link_to('',
-        dmsf_file_path(:id => file, :commit => 'yes'),
-        :data => {:confirm => l(:text_are_you_sure)},
-        :method => :delete,
-        :title => l(:title_delete),
-        :class => 'icon icon-dmsf-rev-delete') %>           
-    </div>    
+<td class="buttons">
+  <% if @file_manipulation_allowed %>              
+    <%= link_to(image_tag('restore.png', :plugin => 'redmine_dmsf'),
+      restore_dmsf_file_path(:id => file),                
+      :title => l(:title_restore)) %>
+    <%= link_to(image_tag('rev_delete.png', :plugin => 'redmine_dmsf'),
+      dmsf_file_path(:id => file, :commit => 'yes'),
+      :data => {:confirm => l(:text_are_you_sure)},
+      :method => :delete,
+      :title => l(:title_delete)) %>               
   <% end %>
 </td>
 <td class="invisible">1</td>

app/views/dmsf/_path.html.erb

@@ -1,6 +1,9 @@
-<%# Redmine plugin for Document Management System "Features"
+<%
+# encoding: utf-8
 #
-# Copyright (C) 2013   Karel Pičman <karel.picman@kontron.com>
+# Redmine plugin for Document Management System "Features"
+#
+# Copyright (C) 2011-15   Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

app/views/dmsf/_url.html.erb

@@ -33,26 +33,23 @@
 <td class="version"></td>
 <td class="workflow"></td>
 <td class="author"><%= h(link.user) %></td>
-<td class="actions">
-  <% if @file_manipulation_allowed %>
-    <div class="right_icon_box">
-      <% if @file_manipulation_allowed %>
-            <span class="icon"></span>
-            <span class="icon"></span>
-            <span class="icon icon-margin-left"></span>
-            <%= link_to('',            
-              dmsf_link_path(link),
-              :data => {:confirm => l(:text_are_you_sure)},
-              :method => :delete,
-              :title => l(:title_delete),
-              :class => 'icon icon-del') %>
-        <% else %>
-          <span class="icon"></span>
-          <span class="icon"></span>
-          <span class="icon icon-margin-left"></span>
-          <span class="icon"></span>
-        <% end %>
-    </div>    
+<td class="buttons">
+  <% if @file_manipulation_allowed %>    
+    <% if @file_manipulation_allowed %>
+      <span class="icon"></span>
+      <span class="icon"></span>
+      <span class="icon"></span>
+      <%= link_to('delete.png',            
+        dmsf_link_path(link),
+        :data => {:confirm => l(:text_are_you_sure)},
+        :method => :delete,
+        :title => l(:title_delete)) %>
+    <% else %>
+      <span class="icon"></span>
+      <span class="icon"></span>
+      <span class="icon"></span>
+      <span class="icon icon-narrow"></span>
+    <% end %>    
   <% end %>
 </td>
 <td class="invisible">1</td>

app/views/dmsf/_url_trash.html.erb

@@ -23,32 +23,28 @@
 <td class="check"><%= check_box_tag(name, id, false, 
   :title => l(:title_check_for_restore_or_delete)) %></td>
 <td class="title">
-    <%= link_to(h(title),
-                link.external_url,
-                :target => "_blank",
-                :class => 'icon icon-link') %>
-    <div class="filename" title="<%= l(:label_target_folder)%>"><%= link.external_url %></div>
+  <%= link_to(h(title),
+    link.external_url,
+    :target => "_blank",
+    :class => 'icon icon-link') %>
+  <div class="filename" title="<%= l(:label_target_folder)%>"><%= link.external_url %></div>
 </td>
 <td class="size"></td>
 <td class="modified"><%= format_time(link.updated_at) %></td>
 <td class="version"></td>
 <td class="workflow"></td>
 <td class="author"><%= h(link.user) %></td>
-<td class="actions">
-    <% if @file_manipulation_allowed %>
-        <div class="right_icon_box">
-            <%= link_to('',
-                        restore_dmsf_link_path(:id => link),
-                        :title => l(:title_restore),
-                        :class => 'icon icon-dmsf-restore') %>
-            <%= link_to('',
-                        dmsf_link_path(:id => link, :commit => 'yes'),
-                        :data => {:confirm => l(:text_are_you_sure)},
-                        :method => :delete,
-                        :title => l(:title_delete),
-                        :class => 'icon icon-dmsf-rev-delete') %>
-        </div>
-    <% end %>
+<td class="buttons">
+  <% if @file_manipulation_allowed %>        
+    <%= link_to(image_tag('restore.png', :plugin => 'redmine_dmsf'),
+      restore_dmsf_link_path(:id => link),
+      :title => l(:title_restore)) %>
+    <%= link_to(image_tag('rev_delete.png', :plugin => 'redmine_dmsf'),
+      dmsf_link_path(:id => link, :commit => 'yes'),
+      :data => {:confirm => l(:text_are_you_sure)},
+      :method => :delete,
+      :title => l(:title_delete)) %>
+  <% end %>
 </td>
 <td class="invisible">1</td>
 <td class="invisible"></td>

app/views/dmsf_files/show.html.erb

@@ -72,20 +72,16 @@
     <div class="fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix">	
       <div class="dataTables_lenght">
         <div class="controls" style="float: right">            
-          <%= link_to_function(
-            '', 
+          <%= link_to_function image_tag('rev_downloads.png', :plugin => 'redmine_dmsf'), 
             "$('#revision_access-#{revision.id}').toggle()", 
-            :title => l(:title_download_entries),
-            :class => 'icon icon-dmsf-rev-downloads') %>
-          <%= link_to('',            
+            :title => l(:title_download_entries) %>
+          <%= link_to image_tag('rev_download.png', :plugin => 'redmine_dmsf'),
             dmsf_file_path(@file, :download => revision),
-            :title => l(:title_title_version_version_download, :title => h(revision.title), :version => revision.version),
-            :class => 'icon icon-dmsf-rev-download') %>          
-          <%= link_to '',
+            :title => l(:title_title_version_version_download, :title => h(revision.title), :version => revision.version) %>
+          <%= link_to image_tag('rev_delete.png', :plugin => 'redmine_dmsf'),
             delete_revision_path(revision),
             :data => {:confirm => l(:text_are_you_sure)},
-            :title => l(:title_delete_revision),
-            :class => 'icon icon-dmsf-rev-delete' if @file_delete_allowed && (@file.revisions.visible.count > 1) %>          
+            :title => l(:title_delete_revision) if @file_delete_allowed && (@file.revisions.visible.count > 1) %>          
         </div>      
         <i><%= l(:info_revision, :rev => revision.id) %></i>
         <%= (revision.source_revision.nil? ? l(:label_created) : l(:label_changed)).downcase %>

assets/stylesheets/dmsf.css

@@ -276,30 +276,13 @@ table.list td.step {
 .modal{ font-size: 12px}
 
 /* Command icons */
-.icon-margin-left { margin-left: 3px; }
+.icon-narrow { padding-left: 16px }
 .icon-link { background-image: url(../images/link.png); }
 .icon-notification-on { background-image: url(../images/notify.png); margin-left: 3px; }
 .icon-notification-off { background-image: url(../images/notifynot.png); margin-left: 3px; }
 .icon-dmsf-lock { background-image: url(../images/lock.png); }
 .icon-dmsf-unlock { background-image: url(../images/unlock.png); }
 .icon-dmsf-locked { background-image: url(../images/locked.png); margin-left: 2px }
-.icon-dmsf-lockedbycurrent { background-image: url(../images/lockedbycurrent.png); margin-left: 2px }
-.icon-dmsf-waiting-for-approval { background-image: url(../images/waiting_for_approval.png); }
-.icon-dmsf-approved { background-image: url(../images/approved.png); }
-.icon-dmsf-assigned { background-image: url(../images/assigned.png); }
-.icon-dmsf-rejected { background-image: url(../images/rejected.png); }
-.icon-dmsf-none { background-image: url(../images/none.png); }
-.icon-dmsf-file-details { background-image: url(../images/filedetails.png); }
-.icon-dmsf-rev-download { background-image: url(../images/rev_download.png); }
-.icon-dmsf-rev-downloads { background-image: url(../images/rev_downloads.png); }
-.icon-dmsf-rev-delete { background-image: url(../images/rev_delete.png); }
-.icon-dmsf-restore { background-image: url(../images/restore.png); }
-
-tr.gray .icon-dmsf-locked { background-image: url(../images/locked_gray.png); margin-left: 2px }
-tr.gray .icon-dmsf-lockedbycurrent { background-image: url(../images/lockedbycurrent_gray.png); margin-left: 2px }
-
-tr.gray .icon-dmsf-locked { background-image: url(../images/locked_gray.png); margin-left: 2px }
-tr.gray .icon-dmsf-lockedbycurrent { background-image: url(../images/lockedbycurrent_gray.png); margin-left: 2px }
 
 /* File types */
 tr.gray .icon-folder { background-image: url(../images/folder_gray.png); }