Merge branch 'fix_asset_problem' into develop

amooma · Dec 18, 2012 · 9c39298 · 9c39298
2 parents 6d4151d + 725dee0
commit 9c39298
Show file tree

Hide file tree

Showing 34 changed files with 2 additions and 2 deletions.
diff --git a/app/assets/icons/cellphone-32x.png b/app/assets/icons/cellphone-32x.png
diff --git a/app/assets/icons/clock-32x.png b/app/assets/icons/clock-32x.png
diff --git a/app/assets/icons/cross-16x.png b/app/assets/icons/cross-16x.png
diff --git a/app/assets/icons/facebook-32x.png b/app/assets/icons/facebook-32x.png
diff --git a/app/assets/icons/fax-32x.png b/app/assets/icons/fax-32x.png
diff --git a/app/assets/icons/headphones-16x.png b/app/assets/icons/headphones-16x.png
diff --git a/app/assets/icons/headphones-32x.png b/app/assets/icons/headphones-32x.png
diff --git a/app/assets/icons/house-32x.png b/app/assets/icons/house-32x.png
diff --git a/app/assets/icons/mic-32x.png b/app/assets/icons/mic-32x.png
diff --git a/app/assets/icons/microphone-16x.png b/app/assets/icons/microphone-16x.png
diff --git a/app/assets/icons/microphone-32x.png b/app/assets/icons/microphone-32x.png
diff --git a/app/assets/icons/mute-16x.png b/app/assets/icons/mute-16x.png
diff --git a/app/assets/icons/phone-down-32x.png b/app/assets/icons/phone-down-32x.png
diff --git a/app/assets/icons/phone-mobile-32x.png b/app/assets/icons/phone-mobile-32x.png
diff --git a/app/assets/icons/phone-up-32x.png b/app/assets/icons/phone-up-32x.png
diff --git a/app/assets/icons/search-13x16.png b/app/assets/icons/search-13x16.png
diff --git a/app/assets/icons/skype-32x.png b/app/assets/icons/skype-32x.png
diff --git a/app/assets/icons/star-16x.png b/app/assets/icons/star-16x.png
diff --git a/app/assets/icons/suitcase-32x.png b/app/assets/icons/suitcase-32x.png
diff --git a/app/assets/icons/tag-16x.png b/app/assets/icons/tag-16x.png
diff --git a/app/assets/icons/twitter-32x.png b/app/assets/icons/twitter-32x.png
diff --git a/app/assets/icons/unmute-16x.png b/app/assets/icons/unmute-16x.png
diff --git a/app/assets/icons/user-16x.png b/app/assets/icons/user-16x.png
diff --git a/app/assets/icons/user-female-16x.png b/app/assets/icons/user-female-16x.png
diff --git a/app/assets/icons/user-male-16x.png b/app/assets/icons/user-male-16x.png
diff --git a/app/assets/icons/gs_envelope_16x.png → app/assets/images/icons/gs_envelope_16x.png b/app/assets/icons/gs_envelope_16x.png → app/assets/images/icons/gs_envelope_16x.png
diff --git a/app/assets/icons/gs_forward_16x.png → app/assets/images/icons/gs_forward_16x.png b/app/assets/icons/gs_forward_16x.png → app/assets/images/icons/gs_forward_16x.png
diff --git a/app/assets/icons/gs_missed_16x.png → app/assets/images/icons/gs_missed_16x.png b/app/assets/icons/gs_missed_16x.png → app/assets/images/icons/gs_missed_16x.png
diff --git a/app/assets/icons/gs_placed_16x.png → app/assets/images/icons/gs_placed_16x.png b/app/assets/icons/gs_placed_16x.png → app/assets/images/icons/gs_placed_16x.png
diff --git a/app/assets/icons/gs_received_16x.png → app/assets/images/icons/gs_received_16x.png b/app/assets/icons/gs_received_16x.png → app/assets/images/icons/gs_received_16x.png
diff --git a/app/assets/icons/phone-down-green-32x.png → ...ets/images/icons/phone-down-green-32x.png b/app/assets/icons/phone-down-green-32x.png → ...ets/images/icons/phone-down-green-32x.png
diff --git a/app/assets/icons/phone-down-grey-32x.png → ...sets/images/icons/phone-down-grey-32x.png b/app/assets/icons/phone-down-grey-32x.png → ...sets/images/icons/phone-down-grey-32x.png
diff --git a/app/assets/icons/phone-down-red-32x.png → ...ssets/images/icons/phone-down-red-32x.png b/app/assets/icons/phone-down-red-32x.png → ...ssets/images/icons/phone-down-red-32x.png
diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml
@@ -10,9 +10,9 @@
     %tr{:class => cycle('odd', 'even')}
       %td
         - if sip_account.registration
-          %img{:src => '/assets/icons/phone-down-green-32x.png'}
+          =image_tag 'icons/phone-down-green-32x.png'
         - else
-          %img{:src => '/assets/icons/phone-down-grey-32x.png'}
+          =image_tag 'icons/phone-down-grey-32x.png'
       %td
         = sip_account.caller_name
       - phone_numbers = sip_account.phone_numbers