For logged in users, we now show a thumbnail instead of their email

address.
jfly · Nov 24, 2015 · a77e6f6 · a77e6f6
1 parent a75c4e8
commit a77e6f6
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/WcaOnRails/app/assets/images/missing_avatar_thumb.png b/WcaOnRails/app/assets/images/missing_avatar_thumb.png
diff --git a/WcaOnRails/app/assets/stylesheets/delegates.scss b/WcaOnRails/app/assets/stylesheets/delegates.scss
@@ -26,10 +26,11 @@ tr.candidate-delegate {
   height: 50px;
 
   vertical-align: middle;
-}
-.avatar-thumbnail-lg {
-  width: 100px;
-  height: 100px;
+
+  &.avatar-thumbnail-lg {
+    width: 100px;
+    height: 100px;
+  }
 }
 
 .popover-content img {

diff --git a/WcaOnRails/app/assets/stylesheets/navbar-static-top.scss b/WcaOnRails/app/assets/stylesheets/navbar-static-top.scss
@@ -34,6 +34,14 @@ body {
     }
   }
 
+  $nav-avatar-thumbnail-size: 40px;
+  .avatar-thumbnail {
+    width: $nav-avatar-thumbnail-size;
+    height: $nav-avatar-thumbnail-size;
+    margin-top: -($nav-avatar-thumbnail-size - 20px) / 2;
+    margin-bottom: -($nav-avatar-thumbnail-size - 20px) / 2;
+  }
+
   .navbar-collapse {
     background: #ddd;
     margin: 0;

diff --git a/WcaOnRails/app/views/layouts/application.html.erb b/WcaOnRails/app/views/layouts/application.html.erb
@@ -100,7 +100,7 @@
             <a href="#" class="dropdown-toggle top-nav" data-toggle="dropdown" data-hover="dropdown">
               <% if current_user %>
                 <% notification_count = notifications_for_user(current_user).length %>
-                <%= current_user.email %>
+                <%= render "shared/user_avatar", user: current_user, do_not_show_full_image_on_hover: true %>
                 <% if notification_count > 0 %>
                   <span class="badge"><%= notification_count %></span>
                 <% end %>
@@ -111,6 +111,9 @@
             </a>
             <ul class="dropdown-menu" role="menu">
               <% if current_user %>
+                <li role="presentation" class="dropdown-header">
+                  <%= current_user.name %>
+                </li>
                 <li>
                   <%= link_to notifications_path do %>
                     Notifications

diff --git a/WcaOnRails/app/views/shared/_user_avatar.html.erb b/WcaOnRails/app/views/shared/_user_avatar.html.erb
@@ -3,8 +3,14 @@
   <% url = user.send(avatar_symbol).url(:thumb) + ( defined?(break_cache) ? "?#{Time.now.to_f}" : "" ) %>
   <div class="avatar-thumbnail <%= defined?(avatar_class) ? avatar_class : "" %>"
        style="background-image: url('<%= url %>');"
-       data-trigger="hover" data-toggle="popover" title="<%= defined?(title) ? title : "" %>" data-html="true" data-content="<img src='<%= user.send(avatar_symbol).url %>'></img>"
+       <% if !defined?(do_not_show_full_image_on_hover) %>
+         data-trigger="hover"
+         data-toggle="popover"
+         title="<%= defined?(title) ? title : "" %>"
+         data-html="true"
+         data-content="<img src='<%= user.send(avatar_symbol).url %>'></img>"
+       <% end %>
   ></div>
 <% else %>
-  <div class="avatar-thumbnail"></div>
+  <div class="avatar-thumbnail" style="background-image: url('<%= asset_path 'missing_avatar_thumb.png' %>');"></div>
 <% end %>