Merge pull request #19 from finnlabs/feature/improve_icon_font

CHANGELOG.md

@@ -20,6 +20,8 @@ See doc/COPYRIGHT.md for more details.
 
 # Changelog
 
+* Adaptations for new icon font
+
 ## 3.0.0.pre9
 
 * `#2731` Migrate serialized yaml from syck to psych

app/views/my_projects_overviews/_block.html.erb

@@ -25,7 +25,7 @@ See doc/COPYRIGHT.md for more details.
           :confirm => l(:label_confirm_delete),
           :url => { :action => "remove_block", :block => block_name },
           :complete => "removeBlock('block_#{block_name.dasherize}')" },
-        :class => "icon icon-del"
+        :class => "icon icon-delete"
         %>
   </div>
 

app/views/my_projects_overviews/_block_textilizable.html.erb

@@ -25,7 +25,7 @@ See doc/COPYRIGHT.md for more details.
           :confirm => l(:label_confirm_delete),
           :url => { :action => "remove_block", :block => block_name },
           :complete => "removeBlock('block_#{block_name.dasherize}')" },
-        :class => "icon icon-del"
+        :class => "icon icon-delete"
         %>
   </div>
 

app/views/my_projects_overviews/_page_layout_attachments.html.erb

@@ -22,11 +22,11 @@ See doc/COPYRIGHT.md for more details.
   <p><%= link_to_attachment attachment, :class => 'icon icon-attachment' -%>
     <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
     <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
-    <%= link_to_remote image_tag('webalys/delete.png'),
-	:url => { :action => 'destroy_attachment', :attachment_id => attachment.id, :id => project.id },
+    <%= link_to_remote icon_wrapper('icon-context icon-delete', l(:button_delete)),
+        :url => { :action => 'destroy_attachment', :attachment_id => attachment.id, :id => project.id },
         :confirm => l(:text_are_you_sure),
-        :class => 'delete',
+        :class => 'delete no-decoration-on-hover',
         :title => l(:button_delete),
-	:update => 'page_layout_attachments' %>
+  :update => 'page_layout_attachments' %>
   </p>
 <% end %>

app/views/my_projects_overviews/blocks/_spent_time.html.erb

@@ -56,14 +56,18 @@ See doc/COPYRIGHT.md for more details.
                 <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
                 <td align="center">
                   <% if entry.editable_by?(@user) -%>
-                      <%= link_to image_tag('webalys/edit.png'), {:controller => '/timelog', :action => 'edit', :id => entry},
-                                  :alt => l(:button_edit),
-                                  :title => l(:button_edit) %>
-                      <%= link_to image_tag('webalys/delete.png'), {:controller => '/timelog', :action => 'destroy', :id => entry},
-                                  :confirm => l(:text_are_you_sure),
-                                  :method => :delete,
-                                  :alt => l(:button_delete),
-                                  :title => l(:button_delete) %>
+                    <%= link_to icon_wrapper('icon-context icon-edit', t(:button_edit)),
+                                {:controller => '/timelog', :action => 'edit', :id => entry},
+                                :alt => l(:button_edit),
+                                :class => 'no-decoration-on-hover',
+                                :title => l(:button_edit) %>
+                    <%= link_to icon_wrapper('icon-context icon-delete', t(:button_delete)),
+                                {:controller => '/timelog', :action => 'destroy', :id => entry},
+                                :confirm => l(:text_are_you_sure),
+                                :method => :delete,
+                                :class => 'no-decoration-on-hover',
+                                :alt => l(:button_delete),
+                                :title => l(:button_delete) %>
                   <% end -%>
                 </td>
               </tr>

app/views/my_projects_overviews/index.html.erb

@@ -64,7 +64,7 @@ See doc/COPYRIGHT.md for more details.
 <% content_for :sidebar do %>
   <% if total_hours.present? %>
     <h3><%= l(:label_spent_time) %></h3>
-    <p><span class="icon" data-icon3="f"><%= l_hours(total_hours) %></span></p>
+    <p><span class="icon icon-time"><%= l_hours(total_hours) %></span></p>
     <p>
       <%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => project}) %> |
 

features/step_definitions/custom_overview_page_steps.rb

@@ -37,7 +37,7 @@ Then /^I should be able to change things and see my changes when I finish$/ do
   !60.times{ break unless (driver.find_element(:css, "#ajax-indicator").displayed? rescue true); sleep 1 }
   driver.find_element(:css, "#list-top > #block_timelog").should be_displayed
   # ERROR: Caught exception [ERROR: Unsupported command [selectWindow]]
-  driver.find_element(:css, "#block_wiki > div > a.icon.icon-del").click
+  driver.find_element(:css, "#block_wiki > div > a.icon.icon-delete").click
   # ERROR: Caught exception [ERROR: Unsupported command [getConfirmation]]
   !60.times{ break unless (driver.find_element(:css, "#ajax-indicator").displayed? rescue true); sleep 1 }
   (driver.find_elements(:css, "#block-select > option[value='wiki'][disabled]").size).should == 0
@@ -73,7 +73,7 @@ Then /^I should be able to add a teaser element with custom text$/ do
 end
 
 Then /^I should be able to delete a teaser element$/ do
-  driver.find_element(:css, "#block_a > div > a.icon.icon-del").click
+  driver.find_element(:css, "#block_a > div > a.icon.icon-delete").click
   # ERROR: Caught exception [ERROR: Unsupported command [getConfirmation]]
   driver.find_element(:link, "Back").click
   (driver.find_elements(:css, "#list-right > .mypage-box > p").size).should == 0