diff --git a/css/backoffice/base/_base.scss b/css/backoffice/base/_base.scss index 6c13b0c924..41e4de6f52 100644 --- a/css/backoffice/base/_base.scss +++ b/css/backoffice/base/_base.scss @@ -20,6 +20,8 @@ $ibo-hyperlink-color: $ibo-color-primary-500 !default; $ibo-hyperlink-color--on-hover: $ibo-color-primary-600 !default; $ibo-hyperlink-color--on-active: $ibo-color-primary-700 !default; +$ibo-svg-illustration--fill: $ibo-color-primary-500 !default; + :root{ --ibo-hyperlink-color: #{$ibo-hyperlink-color}; --ibo-hyperlink-color--on-hover: #{$ibo-hyperlink-color--on-hover}; @@ -51,4 +53,8 @@ a{ &:active{ color: var(--ibo-hyperlink-color--on-active); } +} + +.ibo-svg-illustration--container>svg *[fill="#6c63ff"]{ + fill: $ibo-svg-illustration--fill; } \ No newline at end of file diff --git a/css/backoffice/components/_global-search.scss b/css/backoffice/components/_global-search.scss index 68614e0c99..90ce3a1ff7 100644 --- a/css/backoffice/components/_global-search.scss +++ b/css/backoffice/components/_global-search.scss @@ -51,6 +51,7 @@ $ibo-global-search--compartment-element-image--width: 20px !default; $ibo-global-search--compartment--placeholder-image--margin-top: 24px !default; $ibo-global-search--compartment--placeholder-image--margin-bottom: 16px !default; +$ibo-global-search--compartment--placeholder-image--margin-y: auto !default; $ibo-global-search--compartment--placeholder-image--width: 66% !default; $ibo-global-search--compartment--placeholder-hint--padding-x: 8px !default; @@ -187,10 +188,12 @@ $ibo-global-search--compartment--placeholder-hint--text-color: $ibo-color-grey-7 display: flex; flex-direction: column; } -.ibo-global-search--compartment--placeholder-image{ +.ibo-global-search--compartment--placeholder-image>svg{ width: $ibo-global-search--compartment--placeholder-image--width; - margin-top: $ibo-global-search--compartment--placeholder-image--margin-top; - margin-bottom: $ibo-global-search--compartment--placeholder-image--margin-bottom; + height: inherit; + margin: $ibo-global-search--compartment--placeholder-image--margin-top $ibo-global-search--compartment--placeholder-image--margin-y $ibo-global-search--compartment--placeholder-image--margin-bottom $ibo-global-search--compartment--placeholder-image--margin-y; + display: flex; + } .ibo-global-search--compartment--placeholder-hint{ text-align: justify; diff --git a/css/backoffice/components/_newsroom-menu.scss b/css/backoffice/components/_newsroom-menu.scss index fe736a5905..9dad290c5d 100644 --- a/css/backoffice/components/_newsroom-menu.scss +++ b/css/backoffice/components/_newsroom-menu.scss @@ -82,7 +82,9 @@ img.ibo-navigation-menu--notifications--item--image:not([src=""]) ~ i.ibo-naviga .ibo-popover-menu--item--no-message{ text-align: center; } -.ibo-popover-menu--item--no-message--image{ - display: block; - padding: 5px; +.ibo-popover-menu--item--no-message--image>svg{ + display: flex; + width: 100%; + height: inherit; + margin: 10px 0px; } diff --git a/css/backoffice/components/_quick-create.scss b/css/backoffice/components/_quick-create.scss index 541587ff31..830579dcfb 100644 --- a/css/backoffice/components/_quick-create.scss +++ b/css/backoffice/components/_quick-create.scss @@ -55,6 +55,7 @@ $ibo-quick-create--compartment-element-image--width: 20px !default; $ibo-quick-create--compartment--placeholder-image--margin-top: 24px !default; $ibo-quick-create--compartment--placeholder-image--margin-bottom: 16px !default; +$ibo-quick-create--compartment--placeholder-image--margin-x: auto !default; $ibo-quick-create--compartment--placeholder-image--width: 66% !default; $ibo-quick-create--compartment--placeholder-hint--padding-x: 8px !default; @@ -210,10 +211,11 @@ $ibo-quick-create--compartment--placeholder-hint--text-color: $ibo-color-grey-70 display: flex; flex-direction: column; } -.ibo-quick-create--compartment--placeholder-image{ +.ibo-quick-create--compartment--placeholder-image>svg{ width: $ibo-quick-create--compartment--placeholder-image--width; - margin-top: $ibo-quick-create--compartment--placeholder-image--margin-top; - margin-bottom: $ibo-quick-create--compartment--placeholder-image--margin-bottom; + height: inherit; + margin: $ibo-quick-create--compartment--placeholder-image--margin-top $ibo-quick-create--compartment--placeholder-image--margin-x $ibo-quick-create--compartment--placeholder-image--margin-bottom $ibo-quick-create--compartment--placeholder-image--margin-x; + display: flex; } .ibo-quick-create--compartment--placeholder-hint{ text-align: justify; diff --git a/js/newsroom_menu.js b/js/newsroom_menu.js index d9067cc674..cb1d4e04d1 100644 --- a/js/newsroom_menu.js +++ b/js/newsroom_menu.js @@ -195,7 +195,8 @@ $(function() }, _buildNoMessageItem: function() { - return '
' + this.options.labels.no_message + 'TODO
'; + return '
' + this.options.labels.no_message + + '
' + this.options.no_message_icon + '
'; }, _buildSingleShowAllMessagesItem: function() { diff --git a/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php b/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php index b7f7f48b10..a1d1522549 100644 --- a/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php +++ b/sources/application/UI/Component/PopoverMenu/NewsroomMenu/NewsroomMenuFactory.php @@ -82,6 +82,7 @@ class NewsroomMenuFactory $sPlaceholderImageUrl= 'far fa-envelope'; $aParams = array( 'image_icon' => $sImageUrl, + 'no_message_icon' => file_get_contents(APPROOT.'images/illustrations/undraw_empty.svg'), 'placeholder_image_icon' => $sPlaceholderImageUrl, 'cache_uuid' => 'itop-newsroom-'.UserRights::GetUserId().'-'.md5(APPROOT), 'providers' => $aProviderParams, diff --git a/templates/components/global-search/layout.html.twig b/templates/components/global-search/layout.html.twig index b7c5a25204..b85a747639 100644 --- a/templates/components/global-search/layout.html.twig +++ b/templates/components/global-search/layout.html.twig @@ -9,7 +9,7 @@ {{ 'UI:Component:GlobalSearch:Recents:Title'|dict_s }}
- {% if oUIBlock.GetLastQueries()|length > 0 %} + {% if oUIBlock.GetLastQueries()|length > 12 %} {% for aQuery in oUIBlock.GetLastQueries() %} {% if aQuery.icon_url is defined %} @@ -20,7 +20,9 @@ {% endfor %} {% else %}
- +
+ {{ source("illustrations/global-search-empty-history.svg") }} +
{{ 'UI:Component:GlobalSearch:LastQueries:NoQuery:Placeholder'|dict_s }}
{% endif %} diff --git a/templates/components/quick-create/layout.html.twig b/templates/components/quick-create/layout.html.twig index 4762769e98..beedd2a898 100644 --- a/templates/components/quick-create/layout.html.twig +++ b/templates/components/quick-create/layout.html.twig @@ -26,7 +26,10 @@ {% endfor %} {% else %}
- +
+ {{ source("illustrations/quick-create-empty-history.svg") }} +
+
{{ 'UI:Component:QuickCreate:LastClasses:NoClass:Placeholder'|dict_s }}
{% endif %}