Trimmed long names in header

Fixes #87

diff --git a/app/User.php b/app/User.php
index e1b7c143b267d6fe24d28a1ae8b1f2324c840594..a16eab972ac60a34aaae852e4d127be2f0ecdb2f 100644 (file)
--- a/app/User.php
+++ b/app/User.php
@@ -162,4 +162,19 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     {
         return '/settings/users/' . $this->id;
     }
     {
         return '/settings/users/' . $this->id;
     }

+
+    /**
+     * Get a shortened version of the user's name.
+     * @param int $chars
+     * @return string
+     */
+    public function getShortName($chars = 8)
+    {
+        if (strlen($this->name) <= $chars) return $this->name;
+
+        $splitName = explode(' ', $this->name);
+        if (strlen($splitName[0]) <= $chars) return $splitName[0];
+
+        return '';
+    }

 }
 }

diff --git a/resources/assets/sass/_header.scss b/resources/assets/sass/_header.scss
index 95d3534985b9b0c6fd877db8b850375e99e9c13a..aa7c2f4712de44f63a8d2ef40bf9be7f887086f6 100644 (file)
--- a/resources/assets/sass/_header.scss
+++ b/resources/assets/sass/_header.scss
@@ -56,18 +56,14 @@ header {
       padding-top: $-xxs;
     }
     > i {
       padding-top: $-xxs;
     }
     > i {

-      padding-top: $-xs*1.2;
+      padding-top: 4px;
+      font-size: 18px;

     }
     @include smaller-than($screen-md) {
       padding-left: $-xs;
       .name {
         display: none;
       }
     }
     @include smaller-than($screen-md) {
       padding-left: $-xs;
       .name {
         display: none;
       }

-      i {
-        font-size: 2em;
-        padding-left: 0;
-        padding-top: 0;
-      }

     }
   }
   @include smaller-than($screen-md) {
     }
   }
   @include smaller-than($screen-md) {

diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index 4c5ccf83442e3c421507651def6297522cb41975..96bc2093607a3899d9971580d12897cf0ce0cc3f 100644 (file)
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -56,7 +56,7 @@
                             <div class="dropdown-container" dropdown>
                                 <span class="user-name" dropdown-toggle>
                                     <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">
                             <div class="dropdown-container" dropdown>
                                 <span class="user-name" dropdown-toggle>
                                     <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">

-                                    <span class="name" ng-non-bindable>{{ $currentUser->name }}</span> <i class="zmdi zmdi-caret-down"></i>
+                                    <span class="name" ng-non-bindable>{{ $currentUser->getShortName(9) }}</span> <i class="zmdi zmdi-caret-down"></i>

                                 </span>
                                 <ul>
                                     <li>
                                 </span>
                                 <ul>
                                     <li>