From 3186d5e4d763f8e367f8cf9d5c4eae918284bdbf Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 3 Jul 2018 11:49:40 +0200 Subject: [PATCH] autocomplete: also indicate inactive organizations --- ..._object_organization_autocompletion.coffee | 1 - .../user_organization_autocompletion.coffee | 5 ++++ .../generic/object_search/item_object.jst.eco | 2 +- .../object_search/item_organization.jst.eco | 7 +++++ app/assets/stylesheets/svg-dimensions.css | 1 + app/assets/stylesheets/zammad.scss | 27 +++++-------------- public/assets/images/icons.svg | 8 ++++++ .../images/icons/inactive-organization.svg | 11 ++++++++ 8 files changed, 40 insertions(+), 22 deletions(-) create mode 100644 public/assets/images/icons/inactive-organization.svg diff --git a/app/assets/javascripts/app/lib/app_post/_object_organization_autocompletion.coffee b/app/assets/javascripts/app/lib/app_post/_object_organization_autocompletion.coffee index 5d01652d6..58e941f65 100644 --- a/app/assets/javascripts/app/lib/app_post/_object_organization_autocompletion.coffee +++ b/app/assets/javascripts/app/lib/app_post/_object_organization_autocompletion.coffee @@ -90,7 +90,6 @@ class App.ObjectOrganizationAutocompletion extends App.Controller @objectId.val('').trigger('change') onObjectClick: (e) => - return if e.currentTarget.classList.contains('is-inactive') objectId = $(e.currentTarget).data('object-id') @selectObject(objectId) @close() diff --git a/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.coffee b/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.coffee index 8183c5a29..6070589e4 100644 --- a/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.coffee +++ b/app/assets/javascripts/app/lib/app_post/user_organization_autocompletion.coffee @@ -1,5 +1,10 @@ class App.UserOrganizationAutocompletion extends App.ObjectOrganizationAutocompletion + objectSingle: 'User' + objectIcon: 'user' + inactiveObjectIcon: 'inactive-user' + objectSingels: 'People' objectCreate: 'Create new Customer' + referenceAttribute: 'member_ids' newObject: (e) => if e diff --git a/app/assets/javascripts/app/views/generic/object_search/item_object.jst.eco b/app/assets/javascripts/app/views/generic/object_search/item_object.jst.eco index 3a6f4ef10..2a78a7c13 100644 --- a/app/assets/javascripts/app/views/generic/object_search/item_object.jst.eco +++ b/app/assets/javascripts/app/views/generic/object_search/item_object.jst.eco @@ -1,4 +1,4 @@ -
  • +
  • <%- @Icon(@icon, 'recipientList-icon') %>
    diff --git a/app/assets/javascripts/app/views/generic/object_search/item_organization.jst.eco b/app/assets/javascripts/app/views/generic/object_search/item_organization.jst.eco index bac24f0e8..e1b3b7fd0 100644 --- a/app/assets/javascripts/app/views/generic/object_search/item_organization.jst.eco +++ b/app/assets/javascripts/app/views/generic/object_search/item_organization.jst.eco @@ -1,10 +1,17 @@
  • + <% if @organization.active is false: %> + <%- @Icon('inactive-organization', 'recipientList-icon') %> + <% else: %> <%- @Icon('organization', 'recipientList-icon') %> + <% end %>
    <%= @organization.displayName() %> - <%= @objectCount %> <%- @T(@objectSingels) %>
    + <% if @organization.active is false: %> +
    <%= @Ti('inactive') %>
    + <% end %> <%- @Icon('arrow-right', 'recipientList-arrow') %>
    • \ No newline at end of file diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css index 25821753e..3e9c6bfd8 100644 --- a/app/assets/stylesheets/svg-dimensions.css +++ b/app/assets/stylesheets/svg-dimensions.css @@ -42,6 +42,7 @@ .icon-horizontal-rule { width: 12px; height: 12px; } .icon-important { width: 16px; height: 16px; } .icon-in-process { width: 64px; height: 64px; } +.icon-inactive-organization { width: 16px; height: 16px; } .icon-inactive-user { width: 16px; height: 16px; } .icon-info { width: 5px; height: 11px; } .icon-italic { width: 12px; height: 12px; } diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 698534a6a..19233051e 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -6592,10 +6592,6 @@ footer { .dropdown li.is-active { background: hsl(205,90%,60%); - &.is-inactive { - background: none !important; - } - + li { box-shadow: none; } @@ -6742,21 +6738,6 @@ footer { display: flex; align-items: center; @extend .u-clickable; - - &.is-inactive { - cursor: not-allowed; - - &:hover, - &.is-active { - .recipientList-icon { - opacity: 0.2; - } - } - - .recipientList-name { - color: hsl(238,2%,56%); - } - } } .recipientList-entry .recipientList-iconSpacer { @@ -6765,6 +6746,7 @@ footer { display: flex; align-items: center; justify-content: center; + flex-shrink: 0; } .recipientList-icon { @@ -6790,8 +6772,13 @@ footer { } .recipientList-status { - color: hsl(238,2%,56%); opacity: 0.5; + margin: 0 10px; + flex-shrink: 1; + + &:last-child { + margin-right: 0; + } } .recipientList-arrow { diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg index 893555471..55e7dbe4e 100644 --- a/public/assets/images/icons.svg +++ b/public/assets/images/icons.svg @@ -311,6 +311,14 @@ + + + inactive-organization + + + + + inactive-user diff --git a/public/assets/images/icons/inactive-organization.svg b/public/assets/images/icons/inactive-organization.svg new file mode 100644 index 000000000..03b0d40c0 --- /dev/null +++ b/public/assets/images/icons/inactive-organization.svg @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch --> + <title>inactive-organization + Created with Sketch. + + + + + + \ No newline at end of file