Bladeren bron

Merge pull request #1189 from aragonc/1.11.x

change user name in menu avatar -refs BT#7683
Alex Aragon Calixto 8 jaren geleden
bovenliggende
commit
b6d1610d5c
3 gewijzigde bestanden met toevoegingen van 16 en 3 verwijderingen
  1. 11 0
      app/Resources/public/css/base.css
  2. 1 1
      main/inc/lib/usermanager.lib.php
  3. 4 2
      main/template/default/layout/menu.tpl

+ 11 - 0
app/Resources/public/css/base.css

@@ -261,6 +261,17 @@ a.thumbnail:hover{
     z-index: 100;
     width: 100%;
 }
+.avatar-user .dropdown-toggle{
+    padding-top: 8px;
+    padding-bottom: 5px;
+}
+.avatar-user .img-circle{
+    border: 2px solid #FFFFFF;
+}
+.dropdown-menu .username{
+    color: #fff;
+    padding-left: 9px;
+}
 /* notifications help and bug */
 #touch-button.btn-touch{
   background-color: #C2C2C2;

+ 1 - 1
main/inc/lib/usermanager.lib.php

@@ -1664,7 +1664,7 @@ class UserManager
         // Storing the new photos in 4 versions with various sizes.
 
         $small = new Image($source_file);
-        $small->resize(22);
+        $small->resize(32);
         $small->send_image($path.'small_'.$filename);
         $medium = new Image($source_file);
         $medium->resize(85);

+ 4 - 2
main/template/default/layout/menu.tpl

@@ -22,11 +22,13 @@
                <li><a href="{{ message_url }}">{{ user_notifications }}</a></li>
                {% endif %}
                {% if _u.status != 6 %}
-                <li class="dropdown">
+                <li class="dropdown avatar-user">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-                        {{ _u.complete_name }} <span class="caret"></span>
+                        <img class="img-circle" src="{{ _u.avatar_small }}" alt="{{ _u.complete_name }}" />  <span class="caret"></span>
                     </a>
                     <ul class="dropdown-menu" role="menu">
+                        <li class="username">{{ _u.complete_name }}</li>
+                        <li role="separator" class="divider"></li>
                         <li>
                             {{ profile_link }}
                             {{ message_link }}