Icons

44 files changed, 10 insertions, 1 deletions

diff --git a/app/assets/images/icons/cellphone-32x.png b/app/assets/images/icons/cellphone-32x.png
new file mode 100644
index 0000000..cfc41f5
--- /dev/null
+++ b/app/assets/images/icons/cellphone-32x.png
diff --git a/app/assets/images/icons/clock-32x.png b/app/assets/images/icons/clock-32x.png
new file mode 100644
index 0000000..c076042
--- /dev/null
+++ b/app/assets/images/icons/clock-32x.png
diff --git a/app/assets/images/icons/cross-16x.png b/app/assets/images/icons/cross-16x.png
new file mode 100644
index 0000000..e22ed6f
--- /dev/null
+++ b/app/assets/images/icons/cross-16x.png
diff --git a/app/assets/images/icons/facebook-32x.png b/app/assets/images/icons/facebook-32x.png
new file mode 100644
index 0000000..08fa0f7
--- /dev/null
+++ b/app/assets/images/icons/facebook-32x.png
diff --git a/app/assets/images/icons/fax-32x.png b/app/assets/images/icons/fax-32x.png
new file mode 100644
index 0000000..b05ee59
--- /dev/null
+++ b/app/assets/images/icons/fax-32x.png
diff --git a/app/assets/images/icons/gs_envelope_16x.png b/app/assets/images/icons/gs_envelope_16x.png
new file mode 100644
index 0000000..6a82ade
--- /dev/null
+++ b/app/assets/images/icons/gs_envelope_16x.png
diff --git a/app/assets/images/icons/gs_forward_16x.png b/app/assets/images/icons/gs_forward_16x.png
new file mode 100644
index 0000000..13c57eb
--- /dev/null
+++ b/app/assets/images/icons/gs_forward_16x.png
diff --git a/app/assets/images/icons/gs_missed_16x.png b/app/assets/images/icons/gs_missed_16x.png
new file mode 100644
index 0000000..0b3b706
--- /dev/null
+++ b/app/assets/images/icons/gs_missed_16x.png
diff --git a/app/assets/images/icons/gs_placed_16x.png b/app/assets/images/icons/gs_placed_16x.png
new file mode 100644
index 0000000..b5065e9
--- /dev/null
+++ b/app/assets/images/icons/gs_placed_16x.png
diff --git a/app/assets/images/icons/gs_received_16x.png b/app/assets/images/icons/gs_received_16x.png
new file mode 100644
index 0000000..cd40c1a
--- /dev/null
+++ b/app/assets/images/icons/gs_received_16x.png
diff --git a/app/assets/images/icons/headphones-16x.png b/app/assets/images/icons/headphones-16x.png
new file mode 100644
index 0000000..dee8346
--- /dev/null
+++ b/app/assets/images/icons/headphones-16x.png
diff --git a/app/assets/images/icons/headphones-32x.png b/app/assets/images/icons/headphones-32x.png
new file mode 100644
index 0000000..89a5df7
--- /dev/null
+++ b/app/assets/images/icons/headphones-32x.png
diff --git a/app/assets/images/icons/house-32x.png b/app/assets/images/icons/house-32x.png
new file mode 100644
index 0000000..b112915
--- /dev/null
+++ b/app/assets/images/icons/house-32x.png
diff --git a/app/assets/images/icons/mic-32x.png b/app/assets/images/icons/mic-32x.png
new file mode 100644
index 0000000..30c4531
--- /dev/null
+++ b/app/assets/images/icons/mic-32x.png
diff --git a/app/assets/images/icons/microphone-16x.png b/app/assets/images/icons/microphone-16x.png
new file mode 100644
index 0000000..b62422d
--- /dev/null
+++ b/app/assets/images/icons/microphone-16x.png
diff --git a/app/assets/images/icons/microphone-32x.png b/app/assets/images/icons/microphone-32x.png
new file mode 100644
index 0000000..30c4531
--- /dev/null
+++ b/app/assets/images/icons/microphone-32x.png
diff --git a/app/assets/images/icons/mute-16x.png b/app/assets/images/icons/mute-16x.png
new file mode 100644
index 0000000..0656f3f
--- /dev/null
+++ b/app/assets/images/icons/mute-16x.png
diff --git a/app/assets/images/icons/phone-down-32x.png b/app/assets/images/icons/phone-down-32x.png
new file mode 100644
index 0000000..38c3560
--- /dev/null
+++ b/app/assets/images/icons/phone-down-32x.png
diff --git a/app/assets/images/icons/phone-down-green-32x.png b/app/assets/images/icons/phone-down-green-32x.png
new file mode 100644
index 0000000..9f21d45
--- /dev/null
+++ b/app/assets/images/icons/phone-down-green-32x.png
diff --git a/app/assets/images/icons/phone-down-grey-32x.png b/app/assets/images/icons/phone-down-grey-32x.png
new file mode 100644
index 0000000..2b604ce
--- /dev/null
+++ b/app/assets/images/icons/phone-down-grey-32x.png
diff --git a/app/assets/images/icons/phone-down-red-32x.png b/app/assets/images/icons/phone-down-red-32x.png
new file mode 100644
index 0000000..f4cbde7
--- /dev/null
+++ b/app/assets/images/icons/phone-down-red-32x.png
diff --git a/app/assets/images/icons/phone-mobile-32x.png b/app/assets/images/icons/phone-mobile-32x.png
new file mode 100644
index 0000000..b373e1a
--- /dev/null
+++ b/app/assets/images/icons/phone-mobile-32x.png
diff --git a/app/assets/images/icons/phone-up-32x.png b/app/assets/images/icons/phone-up-32x.png
new file mode 100644
index 0000000..9b765c7
--- /dev/null
+++ b/app/assets/images/icons/phone-up-32x.png
diff --git a/app/assets/images/icons/search-13x16.png b/app/assets/images/icons/search-13x16.png
new file mode 100644
index 0000000..16aa3c6
--- /dev/null
+++ b/app/assets/images/icons/search-13x16.png
diff --git a/app/assets/images/icons/skype-32x.png b/app/assets/images/icons/skype-32x.png
new file mode 100644
index 0000000..c3b0978
--- /dev/null
+++ b/app/assets/images/icons/skype-32x.png
diff --git a/app/assets/images/icons/star-16x.png b/app/assets/images/icons/star-16x.png
new file mode 100644
index 0000000..6b16932
--- /dev/null
+++ b/app/assets/images/icons/star-16x.png
diff --git a/app/assets/images/icons/suitcase-32x.png b/app/assets/images/icons/suitcase-32x.png
new file mode 100644
index 0000000..f53daa9
--- /dev/null
+++ b/app/assets/images/icons/suitcase-32x.png
diff --git a/app/assets/images/icons/tag-16x.png b/app/assets/images/icons/tag-16x.png
new file mode 100644
index 0000000..b4522d7
--- /dev/null
+++ b/app/assets/images/icons/tag-16x.png
diff --git a/app/assets/images/icons/twitter-32x.png b/app/assets/images/icons/twitter-32x.png
new file mode 100644
index 0000000..51351a7
--- /dev/null
+++ b/app/assets/images/icons/twitter-32x.png
diff --git a/app/assets/images/icons/unmute-16x.png b/app/assets/images/icons/unmute-16x.png
new file mode 100644
index 0000000..e9dfde0
--- /dev/null
+++ b/app/assets/images/icons/unmute-16x.png
diff --git a/app/assets/images/icons/user-16x.png b/app/assets/images/icons/user-16x.png
new file mode 100644
index 0000000..909403a
--- /dev/null
+++ b/app/assets/images/icons/user-16x.png
diff --git a/app/assets/images/icons/user-female-16x.png b/app/assets/images/icons/user-female-16x.png
new file mode 100644
index 0000000..38dde34
--- /dev/null
+++ b/app/assets/images/icons/user-female-16x.png
diff --git a/app/assets/images/icons/user-male-16x.png b/app/assets/images/icons/user-male-16x.png
new file mode 100644
index 0000000..e03fd0f
--- /dev/null
+++ b/app/assets/images/icons/user-male-16x.png
diff --git a/app/assets/images/screenshots/gs5/gs5_boot_menu.png b/app/assets/images/screenshots/gs5/gs5_boot_menu.png
deleted file mode 100644
index 0502d3a..0000000
--- a/app/assets/images/screenshots/gs5/gs5_boot_menu.png
+++ /dev/null
diff --git a/app/assets/images/screenshots/gs5/gs5_conferences_new.png b/app/assets/images/screenshots/gs5/gs5_conferences_new.png
deleted file mode 100644
index e0369af..0000000
--- a/app/assets/images/screenshots/gs5/gs5_conferences_new.png
+++ /dev/null
diff --git a/app/assets/images/screenshots/gs5/gs5_login.png b/app/assets/images/screenshots/gs5/gs5_login.png
deleted file mode 100644
index 97d6bbe..0000000
--- a/app/assets/images/screenshots/gs5/gs5_login.png
+++ /dev/null
diff --git a/app/assets/images/screenshots/gs5/gs5_phone_book_entries.png b/app/assets/images/screenshots/gs5/gs5_phone_book_entries.png
deleted file mode 100644
index 9a4be07..0000000
--- a/app/assets/images/screenshots/gs5/gs5_phone_book_entries.png
+++ /dev/null
diff --git a/app/assets/images/screenshots/gs5/gs5_phones_new.png b/app/assets/images/screenshots/gs5/gs5_phones_new.png
deleted file mode 100644
index d9024e6..0000000
--- a/app/assets/images/screenshots/gs5/gs5_phones_new.png
+++ /dev/null
diff --git a/app/assets/images/screenshots/gs5/gs5_setup_admin.png b/app/assets/images/screenshots/gs5/gs5_setup_admin.png
deleted file mode 100644
index f97ff8f..0000000
--- a/app/assets/images/screenshots/gs5/gs5_setup_admin.png
+++ /dev/null
diff --git a/app/assets/images/screenshots/gs5/gs5_tenants_new.png b/app/assets/images/screenshots/gs5/gs5_tenants_new.png
deleted file mode 100644
index 0f6a6e2..0000000
--- a/app/assets/images/screenshots/gs5/gs5_tenants_new.png
+++ /dev/null
diff --git a/app/assets/images/stefan-wintermeyer-klein.jpg b/app/assets/images/stefan-wintermeyer-klein.jpg
deleted file mode 100644
index 3b62099..0000000
--- a/app/assets/images/stefan-wintermeyer-klein.jpg
+++ /dev/null
diff --git a/app/assets/images/stefan-wintermeyer.jpg b/app/assets/images/stefan-wintermeyer.jpg
deleted file mode 100644
index 4fdeb30..0000000
--- a/app/assets/images/stefan-wintermeyer.jpg
+++ /dev/null
diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index d6a8422..d6f08cb 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -19,6 +19,15 @@
 
       - if current_user
         %ul.nav.pull-right
+          %li
+            - if current_user.image?
+              =image_tag(current_user.image_url(:mini).to_s, :class => 'img-rounded')
+            - else
+              - if current_user.male?
+                = image_tag 'icons/user-male-16x.png', :class => 'img-rounded'
+              - else
+                = image_tag 'icons/user-female-16x.png', :class => 'img-rounded'
+
           - if current_page?(tenant_user_path(current_user.current_tenant, current_user))
             %li.active
               %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} 
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 75eaf54..4c39fd1 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -3,7 +3,7 @@
 .row
   .span3
     - cache(['user_show_aside', I18n.locale, @user, @user.sip_accounts, @user.conferences]) do
-      = image_tag @user.image_url(:small).to_s, class: 'display' if @user.image? && @user.image_url(:small)
+      = image_tag @user.image_url(:small).to_s, :class => 'img-rounded' if @user.image? && @user.image_url(:small)
       %p
         %strong= t('users.show.user_name') + ":"
         = @user.user_name