From cff278793ec79856938d7961b739e1d4986b63f2 Mon Sep 17 00:00:00 2001
From: Andreas N <pixeldesu@nerdwerks.org>
Date: Sat, 31 Jan 2015 16:20:07 +0100
Subject: [PATCH] update timeline design

---
 app/views/shared/_sidebar.html.haml | 36 +++++++++++------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/app/views/shared/_sidebar.html.haml b/app/views/shared/_sidebar.html.haml
index 93f7ab4c..34018942 100644
--- a/app/views/shared/_sidebar.html.haml
+++ b/app/views/shared/_sidebar.html.haml
@@ -1,14 +1,18 @@
 .panel.panel-default.hidden-xs
+  %img.profile--avatar{src: current_user.profile_picture.url(:large)}
+  - unless inbox_count.nil?
+    .profile--panel-badge.panel-badge-info
+      %i.fa.fa-envelope
+      = pluralize(inbox_count, 'new question')
   .panel-body
-    %p
-      Welcome,
-      = current_user.screen_name
-    - unless inbox_count.nil?
-      %p
-        %strong
-          You have
-          = pluralize(inbox_count, 'new question')
-          in your inbox!
+    - if current_user.display_name.blank?
+      .profile--displayname
+        = current_user.screen_name
+    - else
+      .profile--displayname
+        = current_user.display_name
+      .profile--username
+        = current_user.screen_name
     .row
       %a{href: show_user_followers_path(current_user.screen_name)}
         .col-md-6.col-sm-6.col-xs-6
@@ -18,20 +22,6 @@
         .col-md-6.col-sm-6.col-xs-6
           %h4.entry-text#friend-count= current_user.friend_count
           %h6.entry-subtext Following
-    .row
-      .col-md-6.col-sm-6.col-xs-6
-        %h4.entry-text#asked-count= current_user.asked_count
-        %h6.entry-subtext Questions
-      .col-md-6.col-sm-6.col-xs-6
-        %h4.entry-text#answered-count= current_user.answered_count
-        %h6.entry-subtext Answers
-    .row
-      .col-md-6.col-sm-6.col-xs-6
-        %h4.entry-text#asked-count= current_user.commented_count
-        %h6.entry-subtext Comments
-      .col-md-6.col-sm-6.col-xs-6
-        %h4.entry-text#answered-count= current_user.smiled_count
-        %h6.entry-subtext Smiles
 .panel.panel-default.hidden-xs
   .panel-body
     %ul.nav.nav-pills.nav-stacked