From 1b1771afd5dce5373b95a230b020810b371fd035 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Wed, 14 Jan 2015 23:45:18 +0100
Subject: [PATCH] format popovers

---
 .../app/views/popover/organization.jst.eco    | 24 ++++++++++---------
 .../app/views/popover/user.jst.eco            | 15 ++++++------
 app/assets/stylesheets/zammad.css.scss        |  5 ++++
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/app/views/popover/organization.jst.eco b/app/assets/javascripts/app/views/popover/organization.jst.eco
index 98fc357ed..fcf74c795 100644
--- a/app/assets/javascripts/app/views/popover/organization.jst.eco
+++ b/app/assets/javascripts/app/views/popover/organization.jst.eco
@@ -1,18 +1,20 @@
+<hr>
+<div class="horizontal two-columns">
 <% for row in @organizationData: %>
   <% if @organization[row.name]: %>
-    <% if row.tag is 'richtext': %>
-      <div class="customer-info" title="<%- @Ti( row.display ) %>"><%- @organization[row.name] %></div>
-    <% else: %>
-      <div class="customer-info" title="<%- @Ti( row.display ) %>"><%- @L( @P( @organization[row.name] ) ) %></div>
-    <% end %>
+    <div class="column">
+      <h3><%- @T( row.display ) %></h3>
+      <div class="u-textTruncate"><%- @L( @P( @organization[row.name] ) ) %></div>
+    </div>
   <% end %>
 <% end %>
+</div>
 <% if  @organization.members: %>
   <hr>
-  <%- @T('Members') %>
-  <ul>
-    <% for user in @organization.members: %>
-    <li><%= user.displayName() %></li>
-    <% end %>
-  </ul>
+  <h3><%- @T('Members') %></h3>
+  <% for user in @organization.members: %>
+  <div class="person">
+  <%= user.displayName() %>
+  </div>
+  <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/popover/user.jst.eco b/app/assets/javascripts/app/views/popover/user.jst.eco
index 99e8336dd..8fc3f9294 100644
--- a/app/assets/javascripts/app/views/popover/user.jst.eco
+++ b/app/assets/javascripts/app/views/popover/user.jst.eco
@@ -1,15 +1,14 @@
 <% if @user['organization']: %>
-  <div class="customer-info">
-    <%- @P( @user['organization'] ) %>
-  </div>
+<div class="user-organization"><a href="<%- @user.organization.uiUrl() %>"><%= @user.organization.displayName() %></a></div>
 <% end %>
+<hr>
+<div class="horizontal two-columns">
 <% for row in @userData: %>
   <% if @user[row.name]: %>
-    <% if row.tag is 'richtext': %>
-      <div class="customer-info" title="<%- @Ti( row.display ) %>"><%- @user[row.name] %></div>
-    <% else: %>
-      <div class="customer-info" title="<%- @Ti( row.display ) %>"><%- @L( @P( @user[row.name] ) ) %></div>
-    <% end %>
+  <div class="column">
+    <h3><%- @T( row.display ) %></h3>
+    <div class="u-textTruncate"><%- @L( @P( @user[row.name] ) ) %></div>
+  </div>
   <% end %>
 <% end %>
 <% if !_.isEmpty(@user['accounts']): %>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 0548f498c..001a19583 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -2637,6 +2637,11 @@ footer {
     color: #a1a4a7;
   }
 
+  .popover .user-organization {
+    margin-bottom: 8px;
+    margin-top: -4px;
+  }
+
   .popover hr {
     margin: 8px 0;
   }