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 @@
<%- @Icon('diagonal-cross') %>
--> -
- <% 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: %>
<% end %> -
- <%- user.avatar() %> -
<% if caller_id.level isnt 'known': %><%- @T('maybe') %>: <% end %><%= user.displayNameLong() %>
- <%= item.from_pretty %> -
- <% shown = true %> - <% else if !_.isEmpty(caller_id.comment): %> - <% shown = true %> -
- <%- @unique_avatar(caller_id.comment, caller_id.comment.split(" ").map((name) -> name[0]).join("")) %> - <%- @T('maybe') %>: <%= caller_id.comment %>
- <%= item.from_pretty %> -
- <% 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: %>
<% end %> +
+ <%- user.avatar() %> +
<% if caller_id.level isnt 'known': %><%- @T('maybe') %>: <% end %><%= user.displayNameLong() %>
+ <%= item.from_pretty %> +
<%- @Icon('plus') %>
+
+ <% shown = true %> + <% else if !_.isEmpty(caller_id.comment): %> + <% shown = true %> +
+ <%- @unique_avatar(caller_id.comment, caller_id.comment.split(" ").map((name) -> name[0]).join("")) %> + <%- @T('maybe') %>: <%= caller_id.comment %>
+ <%= item.from_pretty %> +
<%- @Icon('plus') %>
+
<% end %> <% end %> - <% if !shown && !_.isEmpty(item.from_comment): %> - <% shown = true %> -
- <%- @unique_avatar(item.from_comment, item.from_comment.split(" ").map((name) -> name[0]).join("")) %> - <%= item.from_comment %>
- <%= item.from_pretty %> -
- <% end %> - <% if !shown: %> -
- <%- @unique_avatar(item.from_pretty || item.from, '??') %> - <% if !_.isEmpty(item.from_pretty): %> - <%= item.from_pretty %> - <% if item.direction is 'in': %> -
<%- @Icon('plus-small') %> <%- @T('New User') %>
- <% end %> - <% else: %> - <%= item.from %> + <% end %> + <% if !shown && !_.isEmpty(item.from_comment): %> + <% shown = true %> +
+ <%- @unique_avatar(item.from_comment, item.from_comment.split(" ").map((name) -> name[0]).join("")) %> + <%= item.from_comment %>
+ <%= item.from_pretty %> +
<%- @Icon('plus') %>
+
+ <% end %> + <% if !shown: %> +
+ <%- @unique_avatar(item.from_pretty || item.from, '??') %> + <% if !_.isEmpty(item.from_pretty): %> + <%= item.from_pretty %> + <% if item.direction is 'in': %> +
<%- @Icon('plus-small') %> <%- @T('New User') %>
<% end %> -
+ <% else: %> + <%= item.from %> <% end %> -
-
<%- @Icon('plus') %>
-
+
<%- @Icon('plus') %>
+
+ <% end %> <% end %> 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 {