summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-18 20:04:36 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-18 20:04:36 +0100
commit9cbab740703bf01382431004b59ddf4cd60041be (patch)
tree97fa17fa1af279e556d82c990d1f381f4fb80914
parent6d4151d0e73f38e6c4a9a8b1b0077dfc3306902b (diff)
Moved assets to the right directory and fixed a view.
-rw-r--r--app/assets/icons/cellphone-32x.pngbin1938 -> 0 bytes
-rw-r--r--app/assets/icons/clock-32x.pngbin5968 -> 0 bytes
-rw-r--r--app/assets/icons/cross-16x.pngbin3350 -> 0 bytes
-rw-r--r--app/assets/icons/facebook-32x.pngbin402 -> 0 bytes
-rw-r--r--app/assets/icons/fax-32x.pngbin5762 -> 0 bytes
-rw-r--r--app/assets/icons/gs_envelope_16x.pngbin371 -> 0 bytes
-rw-r--r--app/assets/icons/gs_forward_16x.pngbin301 -> 0 bytes
-rw-r--r--app/assets/icons/gs_missed_16x.pngbin354 -> 0 bytes
-rw-r--r--app/assets/icons/gs_placed_16x.pngbin397 -> 0 bytes
-rw-r--r--app/assets/icons/gs_received_16x.pngbin390 -> 0 bytes
-rw-r--r--app/assets/icons/headphones-16x.pngbin3285 -> 0 bytes
-rw-r--r--app/assets/icons/headphones-32x.pngbin5906 -> 0 bytes
-rw-r--r--app/assets/icons/house-32x.pngbin5741 -> 0 bytes
-rw-r--r--app/assets/icons/mic-32x.pngbin5837 -> 0 bytes
-rw-r--r--app/assets/icons/microphone-16x.pngbin3239 -> 0 bytes
-rw-r--r--app/assets/icons/microphone-32x.pngbin5837 -> 0 bytes
-rw-r--r--app/assets/icons/mute-16x.pngbin3349 -> 0 bytes
-rw-r--r--app/assets/icons/phone-down-32x.pngbin5879 -> 0 bytes
-rw-r--r--app/assets/icons/phone-down-green-32x.pngbin3426 -> 0 bytes
-rw-r--r--app/assets/icons/phone-down-grey-32x.pngbin3283 -> 0 bytes
-rw-r--r--app/assets/icons/phone-down-red-32x.pngbin3312 -> 0 bytes
-rw-r--r--app/assets/icons/phone-mobile-32x.pngbin5509 -> 0 bytes
-rw-r--r--app/assets/icons/phone-up-32x.pngbin5861 -> 0 bytes
-rw-r--r--app/assets/icons/search-13x16.pngbin849 -> 0 bytes
-rw-r--r--app/assets/icons/skype-32x.pngbin625 -> 0 bytes
-rw-r--r--app/assets/icons/star-16x.pngbin3379 -> 0 bytes
-rw-r--r--app/assets/icons/suitcase-32x.pngbin5550 -> 0 bytes
-rw-r--r--app/assets/icons/tag-16x.pngbin3286 -> 0 bytes
-rw-r--r--app/assets/icons/twitter-32x.pngbin397 -> 0 bytes
-rw-r--r--app/assets/icons/unmute-16x.pngbin3373 -> 0 bytes
-rw-r--r--app/assets/icons/user-16x.pngbin3287 -> 0 bytes
-rw-r--r--app/assets/icons/user-female-16x.pngbin1680 -> 0 bytes
-rw-r--r--app/assets/icons/user-male-16x.pngbin1559 -> 0 bytes
-rw-r--r--app/views/sip_accounts/_index_core.html.haml4
34 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/icons/cellphone-32x.png b/app/assets/icons/cellphone-32x.png
deleted file mode 100644
index cfc41f5..0000000
--- a/app/assets/icons/cellphone-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/clock-32x.png b/app/assets/icons/clock-32x.png
deleted file mode 100644
index c076042..0000000
--- a/app/assets/icons/clock-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/cross-16x.png b/app/assets/icons/cross-16x.png
deleted file mode 100644
index e22ed6f..0000000
--- a/app/assets/icons/cross-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/facebook-32x.png b/app/assets/icons/facebook-32x.png
deleted file mode 100644
index 08fa0f7..0000000
--- a/app/assets/icons/facebook-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/fax-32x.png b/app/assets/icons/fax-32x.png
deleted file mode 100644
index b05ee59..0000000
--- a/app/assets/icons/fax-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/gs_envelope_16x.png b/app/assets/icons/gs_envelope_16x.png
deleted file mode 100644
index 6a82ade..0000000
--- a/app/assets/icons/gs_envelope_16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/gs_forward_16x.png b/app/assets/icons/gs_forward_16x.png
deleted file mode 100644
index 13c57eb..0000000
--- a/app/assets/icons/gs_forward_16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/gs_missed_16x.png b/app/assets/icons/gs_missed_16x.png
deleted file mode 100644
index 0b3b706..0000000
--- a/app/assets/icons/gs_missed_16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/gs_placed_16x.png b/app/assets/icons/gs_placed_16x.png
deleted file mode 100644
index b5065e9..0000000
--- a/app/assets/icons/gs_placed_16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/gs_received_16x.png b/app/assets/icons/gs_received_16x.png
deleted file mode 100644
index cd40c1a..0000000
--- a/app/assets/icons/gs_received_16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/headphones-16x.png b/app/assets/icons/headphones-16x.png
deleted file mode 100644
index dee8346..0000000
--- a/app/assets/icons/headphones-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/headphones-32x.png b/app/assets/icons/headphones-32x.png
deleted file mode 100644
index 89a5df7..0000000
--- a/app/assets/icons/headphones-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/house-32x.png b/app/assets/icons/house-32x.png
deleted file mode 100644
index b112915..0000000
--- a/app/assets/icons/house-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/mic-32x.png b/app/assets/icons/mic-32x.png
deleted file mode 100644
index 30c4531..0000000
--- a/app/assets/icons/mic-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/microphone-16x.png b/app/assets/icons/microphone-16x.png
deleted file mode 100644
index b62422d..0000000
--- a/app/assets/icons/microphone-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/microphone-32x.png b/app/assets/icons/microphone-32x.png
deleted file mode 100644
index 30c4531..0000000
--- a/app/assets/icons/microphone-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/mute-16x.png b/app/assets/icons/mute-16x.png
deleted file mode 100644
index 0656f3f..0000000
--- a/app/assets/icons/mute-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/phone-down-32x.png b/app/assets/icons/phone-down-32x.png
deleted file mode 100644
index 38c3560..0000000
--- a/app/assets/icons/phone-down-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/phone-down-green-32x.png b/app/assets/icons/phone-down-green-32x.png
deleted file mode 100644
index 9f21d45..0000000
--- a/app/assets/icons/phone-down-green-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/phone-down-grey-32x.png b/app/assets/icons/phone-down-grey-32x.png
deleted file mode 100644
index 2b604ce..0000000
--- a/app/assets/icons/phone-down-grey-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/phone-down-red-32x.png b/app/assets/icons/phone-down-red-32x.png
deleted file mode 100644
index f4cbde7..0000000
--- a/app/assets/icons/phone-down-red-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/phone-mobile-32x.png b/app/assets/icons/phone-mobile-32x.png
deleted file mode 100644
index b373e1a..0000000
--- a/app/assets/icons/phone-mobile-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/phone-up-32x.png b/app/assets/icons/phone-up-32x.png
deleted file mode 100644
index 9b765c7..0000000
--- a/app/assets/icons/phone-up-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/search-13x16.png b/app/assets/icons/search-13x16.png
deleted file mode 100644
index 16aa3c6..0000000
--- a/app/assets/icons/search-13x16.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/skype-32x.png b/app/assets/icons/skype-32x.png
deleted file mode 100644
index c3b0978..0000000
--- a/app/assets/icons/skype-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/star-16x.png b/app/assets/icons/star-16x.png
deleted file mode 100644
index 6b16932..0000000
--- a/app/assets/icons/star-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/suitcase-32x.png b/app/assets/icons/suitcase-32x.png
deleted file mode 100644
index f53daa9..0000000
--- a/app/assets/icons/suitcase-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/tag-16x.png b/app/assets/icons/tag-16x.png
deleted file mode 100644
index b4522d7..0000000
--- a/app/assets/icons/tag-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/twitter-32x.png b/app/assets/icons/twitter-32x.png
deleted file mode 100644
index 51351a7..0000000
--- a/app/assets/icons/twitter-32x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/unmute-16x.png b/app/assets/icons/unmute-16x.png
deleted file mode 100644
index e9dfde0..0000000
--- a/app/assets/icons/unmute-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/user-16x.png b/app/assets/icons/user-16x.png
deleted file mode 100644
index 909403a..0000000
--- a/app/assets/icons/user-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/user-female-16x.png b/app/assets/icons/user-female-16x.png
deleted file mode 100644
index 38dde34..0000000
--- a/app/assets/icons/user-female-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/icons/user-male-16x.png b/app/assets/icons/user-male-16x.png
deleted file mode 100644
index e03fd0f..0000000
--- a/app/assets/icons/user-male-16x.png
+++ /dev/null
Binary files differ
diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml
index 7f8dcd2..69c9302 100644
--- 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