Merge branch 'badge-type-on-hover' into 'eip-develop'

Add badge type to user card on hover

Closes #46

See merge request !80

app/views/badges/_badge.html.erb

@@ -3,6 +3,7 @@
 <% end %>
 
 <% is_small ||= false %>
+<% badge_type ||= '' %>
 
 <span class="tooltip" id="<%= dom_id badge %>">
   <span class="user-badge <%= css_class if defined?(css_class) %>">
@@ -13,7 +14,7 @@
   </span>
   <span style="white-space: normal;" class="tooltip-text">
     <%= is_small ?
-          "This user has been awarded the '#{badge.title}' badge."
+          "This user was awarded a #{badge_type} '#{badge.title}' badge."
           : badge.description %>
   </span>
 </span>
\ No newline at end of file

app/views/users/_common_card.html.erb

@@ -41,7 +41,8 @@
         <% end %>
         <% if !user.pinned_badge.nil? && SiteSetting['UserCardDetailsBadge'] %>
           <span class="badge">
-            <%= render user.pinned_badge.badge, css_class: "#{user.pinned_badge.badge_type}-badge", is_small: true %>
+            <%= render user.pinned_badge.badge, css_class: "#{user.pinned_badge.badge_type}-badge", is_small: true,
+                       badge_type: if user.pinned_badge.default? then '' else user.pinned_badge.badge_type end  %>
           </span>
         <% end %>
       <% end %>