From 8ae0fc6c22f7baf6f2dad2783a350924ba28f2c4 Mon Sep 17 00:00:00 2001
From: nilsding <nilsding@nilsding.org>
Date: Thu, 13 Nov 2014 12:52:08 +0100
Subject: [PATCH] the display name is now shown on the profile if it's set

---
 app/views/user/show.html.haml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/user/show.html.haml b/app/views/user/show.html.haml
index 71c3ce17..824c73e8 100644
--- a/app/views/user/show.html.haml
+++ b/app/views/user/show.html.haml
@@ -5,8 +5,11 @@
         .row
           .col-md-12.col-xs-12.col-sm-9
             %img.img-rounded.img-profile
-        %h1
-          = @user.screen_name
+        - if @user.display_name.blank?
+          %h1= @user.screen_name
+        - else
+          %h1= @user.display_name
+          %h3.text-muted= @user.screen_name
         %ul.list-group
           %li.list-group-item
             Followers