From 520d834c1c059ea0f8106bb5a482937c08c060a7 Mon Sep 17 00:00:00 2001
From: Romit Choudhary <rc@zammad.com>
Date: Wed, 28 Jul 2021 15:57:23 +0200
Subject: [PATCH] Fixes #2930 - CTI Callerlog signaling hides "+" for new
 ticket if more than one user is found

---
 .../views/navigation/menu_cti_ringing.jst.eco | 92 +++++++++----------
 app/assets/stylesheets/zammad.scss            |  8 +-
 2 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/app/assets/javascripts/app/views/navigation/menu_cti_ringing.jst.eco b/app/assets/javascripts/app/views/navigation/menu_cti_ringing.jst.eco
index 2bce01fb0..c0e562596 100644
--- a/app/assets/javascripts/app/views/navigation/menu_cti_ringing.jst.eco
+++ b/app/assets/javascripts/app/views/navigation/menu_cti_ringing.jst.eco
@@ -9,56 +9,56 @@
         <div class="btn btn--text js-remove" title="<%- @Ti('Remove') %>"><%- @Icon('diagonal-cross') %></div>
         -->
       </div>
-      <div class="horizontal center">
-        <% user = undefined %>
-        <% shown = false %>
-        <% if item.preferences.from && !_.isEmpty(item.preferences.from): %>
-          <% for caller_id in item.preferences.from: %>
-            <% if caller_id.user_id && App.User.exists(caller_id.user_id): %>
-              <% user = App.User.fullLocal(caller_id.user_id) %>
-              <% classes = ['user-popover', 'u-textTruncate'] %>
-              <% classes.push('is-inactive') if !user.active %>
-              <% if shown: %><div class="spacer"></div><% end %>
-              <div class="user-card">
-                <a href="<%- user.uiUrl() %>"><%- user.avatar() %></a>
-                <div class="<%= classes.join(' ') %>" data-id="<%- user.id %>"><% if caller_id.level isnt 'known': %><%- @T('maybe') %>: <% end %><%= user.displayNameLong() %></div>
-                <span class="text-muted"><%= item.from_pretty %></span>
-              </div>
-              <% shown = true %>
-            <% else if !_.isEmpty(caller_id.comment): %>
-              <% shown = true %>
-              <div class="user-card">
-                <%- @unique_avatar(caller_id.comment, caller_id.comment.split(" ").map((name) -> name[0]).join("")) %>
-                <%- @T('maybe') %>: <%= caller_id.comment %><br>
-                <span class="text-muted"><%= item.from_pretty %></span>
-              </div>
-            <% end %>
+      <% user = undefined %>
+      <% shown = false %>
+      <% if item.preferences.from && !_.isEmpty(item.preferences.from): %>
+        <% for caller_id in item.preferences.from: %>
+          <% if caller_id.user_id && App.User.exists(caller_id.user_id): %>
+            <% user = App.User.fullLocal(caller_id.user_id) %>
+            <% classes = ['user-popover', 'u-textTruncate'] %>
+            <% classes.push('is-inactive') if !user.active %>
+            <% if shown: %><div class="spacer"></div><% end %>
+            <div class="user-card">
+              <a href="<%- user.uiUrl() %>"><%- user.avatar() %></a>
+              <div class="<%= classes.join(' ') %>" data-id="<%- user.id %>"><% if caller_id.level isnt 'known': %><%- @T('maybe') %>: <% end %><%= user.displayNameLong() %></div>
+              <span class="text-muted"><%= item.from_pretty %></span>
+              <div class="btn btn--small btn--quad btn--create space-left js-newTicket" title="<%- @Ti('New Ticket') %>" data-user-id="<% if user: %><%- user.id %><% end %>"><%- @Icon('plus') %></div>
+            </div>
+            <% shown = true %>
+          <% else if !_.isEmpty(caller_id.comment): %>
+            <% shown = true %>
+            <div class="user-card">
+              <%- @unique_avatar(caller_id.comment, caller_id.comment.split(" ").map((name) -> name[0]).join("")) %>
+              <%- @T('maybe') %>: <%= caller_id.comment %><br>
+              <span class="text-muted"><%= item.from_pretty %></span>
+              <div class="btn btn--small btn--quad btn--create space-left js-newTicket" title="<%- @Ti('New Ticket') %>" data-user-id="<% if user: %><%- user.id %><% end %>"><%- @Icon('plus') %></div>
+            </div>
           <% end %>
         <% end %>
-        <% if !shown && !_.isEmpty(item.from_comment): %>
-          <% shown = true %>
-          <div class="user-card">
-            <%- @unique_avatar(item.from_comment, item.from_comment.split(" ").map((name) -> name[0]).join("")) %>
-            <%= item.from_comment %><br>
-            <span class="text-muted"><%= item.from_pretty %></span>
-          </div>
-        <% end %>
-        <% if !shown: %>
-          <div class="user-card">
-            <%- @unique_avatar(item.from_pretty || item.from, '??') %>
-          <% if !_.isEmpty(item.from_pretty): %>
-            <a class="inherit-color" href="<%- App.Utils.phoneify(item.from_pretty) %>"><%= item.from_pretty %></a>
-            <% if item.direction is 'in': %>
-            <div class="btn btn--text btn--create no-padding js-newUser" href="#" data-phone="<%= item.from_pretty %>"><%- @Icon('plus-small') %> <span><%- @T('New User') %></div>
-            <% end %>
-          <% else: %>
-            <a class="inherit-color" href="<%- App.Utils.phoneify(item.from) %>"><%= item.from %></a>
+      <% end %>
+      <% if !shown && !_.isEmpty(item.from_comment): %>
+        <% shown = true %>
+        <div class="user-card">
+          <%- @unique_avatar(item.from_comment, item.from_comment.split(" ").map((name) -> name[0]).join("")) %>
+          <%= item.from_comment %><br>
+          <span class="text-muted"><%= item.from_pretty %></span>
+          <div class="btn btn--small btn--quad btn--create space-left js-newTicket" title="<%- @Ti('New Ticket') %>" data-user-id="<% if user: %><%- user.id %><% end %>"><%- @Icon('plus') %></div>
+        </div>
+      <% end %>
+      <% if !shown: %>
+        <div class="user-card">
+          <%- @unique_avatar(item.from_pretty || item.from, '??') %>
+        <% if !_.isEmpty(item.from_pretty): %>
+          <a class="inherit-color" href="<%- App.Utils.phoneify(item.from_pretty) %>"><%= item.from_pretty %></a>
+          <% if item.direction is 'in': %>
+          <div class="btn btn--text btn--create no-padding js-newUser" href="#" data-phone="<%= item.from_pretty %>"><%- @Icon('plus-small') %> <span><%- @T('New User') %></div>
           <% end %>
-          </div>
+        <% else: %>
+          <a class="inherit-color" href="<%- App.Utils.phoneify(item.from) %>"><%= item.from %></a>
         <% end %>
-        <div class="flex-spacer"></div>
-        <div class="btn btn--small btn--quad btn--create space-left js-newTicket" title="<%- @Ti('New Ticket') %>" data-user-id="<% if user: %><%- user.id %><% end %>"><%- @Icon('plus') %></div>
-      </div>
+          <div class="btn btn--small btn--quad btn--create space-left js-newTicket" title="<%- @Ti('New Ticket') %>" data-user-id="<% if user: %><%- user.id %><% end %>"><%- @Icon('plus') %></div>
+        </div>
+      <% end %>
     </div>
   <% end %>
 </div>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index eb608cadb..bd0f36ead 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -5543,16 +5543,22 @@ footer {
   padding: 2px 0 0 50px;
   position: relative;
   min-height: 40px;
-  max-width: 192px;
+  padding-right: 48px;
   display: flex;
   flex-direction: column;
   justify-content: center;
+  min-width: 192px;
 
   .avatar {
     position: absolute;
     left: 0;
     top: 0;
   }
+
+  .btn.js-newTicket {
+    position: absolute;
+    right: 0;
+  }
 }
 
 .stat-icon {