From f67005b1bcbf4b0049b8d60dfcc669bd98745a49 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Wed, 23 Jan 2013 13:11:03 +0100
Subject: UI

---
 app/views/users/show.html.haml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'app/views/users/show.html.haml')

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 4c39fd1..f38a4a1 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -4,12 +4,18 @@
   .span3
     - cache(['user_show_aside', I18n.locale, @user, @user.sip_accounts, @user.conferences]) do
       = 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
-      %p
-        %strong= t('users.show.email') + ":"
-        = @user.email
+      %table{:class => 'table table-striped'}
+        %tbody
+          %tr
+            %td
+              %strong= t('users.show.user_name') + ":"
+            %td
+              = @user.user_name
+          %tr
+            %td
+              %strong= t('users.show.email') + ":"
+            %td
+              = @user.email
 
       %p.controls
         = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @tenant, :child => @user }
-- 
cgit v1.2.3


From af4a02e15a02481e23f9458ae0a430ec52c57417 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sat, 26 Jan 2013 15:13:35 +0100
Subject: UI

---
 app/views/users/show.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/views/users/show.html.haml')

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index f38a4a1..7d32cca 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -10,12 +10,12 @@
             %td
               %strong= t('users.show.user_name') + ":"
             %td
-              = @user.user_name
+              = truncate(@user.user_name, :length => 14)
           %tr
             %td
               %strong= t('users.show.email') + ":"
             %td
-              = @user.email
+              = truncate(@user.email, :length => 14)
 
       %p.controls
         = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @tenant, :child => @user }
-- 
cgit v1.2.3


From 6d5cc233d0db71f826a27c9151d0af121d0fe616 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sat, 26 Jan 2013 20:02:35 +0100
Subject: Changed the way the avatar is rendered and replaced e-mail address
 with e-mail.

---
 app/views/users/show.html.haml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'app/views/users/show.html.haml')

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 7d32cca..68fdc9d 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -3,7 +3,15 @@
 .row
   .span3
     - cache(['user_show_aside', I18n.locale, @user, @user.sip_accounts, @user.conferences]) do
-      = image_tag @user.image_url(:small).to_s, :class => 'img-rounded' if @user.image? && @user.image_url(:small)
+
+      - if @user.image? && @user.image_url(:profile)
+        %span.hidden-phone
+          %ul.thumbnails
+            %li.span3
+              %div.thumbnail
+                %a.thumbnail{:href => @user.image_url(:profile).to_s}
+                  =image_tag(@user.image_url(:profile), :alt => "Avatar #{@user}")
+
       %table{:class => 'table table-striped'}
         %tbody
           %tr
-- 
cgit v1.2.3


From 680073d4cf7619bddfb7f79ea9e538a33d9dcdee Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sat, 26 Jan 2013 20:11:45 +0100
Subject: Refactoring

---
 app/views/users/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views/users/show.html.haml')

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 68fdc9d..0b9c06e 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -12,7 +12,7 @@
                 %a.thumbnail{:href => @user.image_url(:profile).to_s}
                   =image_tag(@user.image_url(:profile), :alt => "Avatar #{@user}")
 
-      %table{:class => 'table table-striped'}
+      %table.table.table-striped
         %tbody
           %tr
             %td
-- 
cgit v1.2.3


From c23704427182d8b63600dd404f1295763e88addd Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sat, 26 Jan 2013 20:15:28 +0100
Subject: Show a rounded avatar photo and link to the original version of that
 photo.

---
 app/views/users/show.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/views/users/show.html.haml')

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 0b9c06e..639a52a 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -9,8 +9,8 @@
           %ul.thumbnails
             %li.span3
               %div.thumbnail
-                %a.thumbnail{:href => @user.image_url(:profile).to_s}
-                  =image_tag(@user.image_url(:profile), :alt => "Avatar #{@user}")
+                %a.thumbnail{:href => @user.image_url}
+                  =image_tag(@user.image_url(:profile), :alt => "Avatar #{@user}", :class => 'img-rounded')
 
       %table.table.table-striped
         %tbody
-- 
cgit v1.2.3