Merge pull request #11723 from opf/44962-re-think-and-harmonize-the-icon-used-for-premium-enterprise-features

[44962] Re-think and harmonize the icon used for premium/enterprise features

app/views/common/upsale.html.erb

@@ -52,7 +52,7 @@
                   aria: {label: t('admin.enterprise.buttons.upgrade')},
                   target: '_blank',
                   title: t('admin.enterprise.buttons.upgrade')}) do %>
-      <%= spot_icon('enterprise-badge') %>
+      <%= spot_icon('enterprise-addons enterprise-addons--button-icon') %>
       <span class="button--text"><%= t('admin.enterprise.buttons.upgrade') %></span>
     <% end %>
     <free-trial-button></free-trial-button>

app/views/homescreen/blocks/_upsale.html.erb

@@ -3,7 +3,7 @@
   <div class="widget-box--blocks--upsale-description">
     <div class="widget-box--blocks--upsale-title">
 
-      <%= spot_icon('enterprise-badge') %>
+      <%= spot_icon('enterprise-addons') %>
       <span><%= t('homescreen.blocks.upsale.title') %></span>
 
       <p class="widget-box--blocks--upsale-description">
@@ -29,7 +29,7 @@
       target: '_blank',
       title: t('homescreen.blocks.upsale.more_info')} do %>
     <span class="button--text"><%= t('homescreen.blocks.upsale.more_info') %></span>
-    <%= op_icon('button--icon icon-external-link') %>
+    <%= spot_icon('button--icon icon-external-link') %>
   <% end %>
 
   <%= link_to(OpenProject::Static::Links.links[:pricing][:href],
@@ -37,7 +37,7 @@
       aria: {label: t('admin.enterprise.buttons.upgrade')},
       target: '_blank',
       title: t('admin.enterprise.buttons.upgrade')}) do %>
-    <%= spot_icon('enterprise-badge') %>
+    <%= spot_icon('enterprise-addons enterprise-addons--button-icon') %>
     <span class="button--text"><%= t('admin.enterprise.buttons.upgrade') %></span>
   <% end %>
 

config/initializers/menus.rb

@@ -403,7 +403,7 @@ Redmine::MenuManager.map :admin_menu do |menu|
   menu.push :enterprise,
             { controller: '/enterprises', action: :show },
             caption: :label_enterprise_edition,
-            icon: 'icon2 icon-headset',
+            icon: 'icon2 icon-enterprise-addons',
             if: proc { User.current.admin? && OpenProject::Configuration.ee_manager_visible? }
 
   menu.push :admin_costs,

config/locales/en.yml

@@ -89,7 +89,7 @@ en:
       buttons:
         upgrade: "Upgrade now"
         contact: "Contact us for a demo"
-      enterprise_info_html: "is an Enterprise <span class='spot-icon spot-icon_enterprise-badge'></span> add-on."
+      enterprise_info_html: "is an Enterprise <span class='spot-icon spot-icon_enterprise-addons'></span> add-on."
       upgrade_info: "Please upgrade to a paid plan to activate and start using it in your team."
     journal_aggregation:
       explanation:

config/locales/js-en.yml

@@ -252,7 +252,7 @@ en:
           quick_overview: "Get a quick overview of project management and team collaboration with OpenProject Enterprise edition."
         upsale:
           become_hero: "Become a hero!"
-          enterprise_info_html: "%{feature_title} is an Enterprise <span class='spot-icon spot-icon_enterprise-badge'></span> add-on."
+          enterprise_info_html: "%{feature_title} is an Enterprise <span class='spot-icon spot-icon_enterprise-addons'></span> add-on."
           upgrade_info: "Please upgrade to a paid plan to activate and start using it in your team."
           benefits:
             description: "What are the benefits of the Enterprise on-premises edition?"

frontend/src/app/shared/components/enterprise-banner/enterprise-banner.component.html

@@ -8,7 +8,7 @@
     <img [src]="image.enterprise_edition" class="hidden-for-mobile op-enterprise-banner--image">
     <div class="op-toast--content">
       <div class="op-enterprise-banner--header">
-        <span class="spot-icon spot-icon_enterprise-badge"></span>
+        <span class="spot-icon spot-icon_enterprise-addons"></span>
         <span [textContent]="text.enterpriseFeature" class="op-enterprise-banner--title"></span>
         <button
           *ngIf="collapsible"
@@ -44,7 +44,7 @@
           [href]="pricingUrl"
           target=”_blank”
           class="button -highlight">
-          <span class="spot-icon spot-icon_enterprise-badge"></span>
+          <span class="spot-icon spot-icon_enterprise-addons enterprise-addons--button-icon"></span>
           {{ text.upgrade }}
         </a>
 

frontend/src/app/shared/components/enterprise-page/enterprise-page.component.html

@@ -43,7 +43,7 @@
     [attr.href]="text.upgrade_link"
     target="_blank"
     class="button -highlight">
-    <span class="spot-icon spot-icon_enterprise-badge"></span>
+    <span class="spot-icon spot-icon_enterprise-addons enterprise-addons--button-icon"></span>
     {{ text.upgrade }}
   </a>
   <free-trial-button></free-trial-button>

frontend/src/app/shared/components/sidemenu/sidemenu.component.html

@@ -73,7 +73,7 @@
   <span
     class="op-sidemenu--item-title"
   >{{ item.title }}
-    <span class="op-sidemenu--enterprise-badge spot-icon spot-icon_enterprise-badge" *ngIf="noEEToken && item.isEnterprise"></span>
+    <span class="op-sidemenu--enterprise-badge spot-icon spot-icon_enterprise-addons" *ngIf="noEEToken && item.isEnterprise"></span>
   </span>
   <span class="op-bubble op-bubble_alt_highlighting" *ngIf="item.count">{{ item.count }}</span>
 </ng-template>

frontend/src/app/spot/icon-font/src/dropdown.svg

@@ -1,3 +1,3 @@
 <svg width="8" height="4" viewBox="0 0 8 4" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0 0L4 4L8 0" fill="black"/>
+  <path d="M0 0L4 4L8 0" fill="black"/>
 </svg>

frontend/src/app/spot/icon-font/src/enterprise-addons.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" version="1.1" id="svg11">
+  <defs/>
+  <path id="path9" fill="#000000" d="M8,16 C3.582,16 0,12.418 0,8 C0,3.582 3.582,0 8,0 C12.418,0 16,3.582 16,8 C16,12.418 12.418,16 8,16 Z M6.343,9.095 L7.85,13.404 C7.899,13.542 8.091,13.542 8.14,13.404 L9.647,9.095 C9.682,8.997 9.608,8.888 9.499,8.888 L6.486,8.888 C6.378,8.888 6.304,8.992 6.338,9.095 Z M3.433,9.144 L6.806,13.202 C6.914,13.335 7.126,13.217 7.072,13.054 L5.663,8.997 C5.644,8.933 5.585,8.893 5.516,8.893 L3.551,8.893 C3.418,8.893 3.349,9.046 3.433,9.144 Z M10.332,8.992 L8.923,13.049 C8.869,13.212 9.076,13.33 9.189,13.197 L12.562,9.14 C12.646,9.041 12.572,8.889 12.444,8.889 L10.479,8.889 C10.415,8.889 10.356,8.928 10.332,8.992 Z M9.051,6.525 C9.027,6.466 8.973,6.426 8.908,6.426 L7.087,6.426 C7.023,6.426 6.964,6.466 6.944,6.525 L6.353,8.066 C6.313,8.165 6.387,8.273 6.496,8.273 L9.499,8.273 C9.608,8.273 9.682,8.165 9.642,8.066 Z M6.254,6.633 C6.294,6.535 6.22,6.426 6.111,6.426 L4.61,6.426 C4.516,6.426 4.423,6.49 4.363,6.549 L3.383,8.037 C3.315,8.14 3.388,8.278 3.512,8.278 L5.521,8.278 C5.585,8.278 5.644,8.239 5.663,8.179 L5.663,8.175 Z M12.612,8.032 L11.632,6.544 C11.568,6.481 11.479,6.421 11.385,6.421 L9.884,6.421 C9.775,6.421 9.701,6.53 9.741,6.628 L10.332,8.17 C10.356,8.229 10.41,8.268 10.475,8.268 L12.484,8.268 L12.484,8.273 C12.607,8.273 12.681,8.135 12.612,8.032 Z M8.047,3.24 C8.042,3.211 8.017,3.196 7.988,3.201 C7.968,3.201 7.953,3.221 7.948,3.24 C7.791,4.048 7.682,4.161 6.875,4.314 C6.845,4.319 6.831,4.343 6.835,4.373 C6.835,4.393 6.855,4.407 6.875,4.412 C7.682,4.57 7.796,4.678 7.948,5.486 C7.953,5.515 7.978,5.53 8.007,5.525 C8.027,5.525 8.042,5.505 8.047,5.486 C8.204,4.678 8.313,4.565 9.12,4.412 C9.15,4.407 9.165,4.383 9.16,4.353 C9.16,4.333 9.14,4.319 9.12,4.314 C8.313,4.156 8.199,4.048 8.047,3.24 Z M3.886,5.417 C3.078,5.259 2.965,5.151 2.812,4.343 C2.807,4.314 2.783,4.299 2.753,4.304 C2.734,4.304 2.719,4.324 2.714,4.343 C2.556,5.151 2.448,5.264 1.64,5.417 C1.611,5.422 1.596,5.446 1.601,5.476 C1.601,5.496 1.621,5.51 1.64,5.515 C2.448,5.673 2.561,5.781 2.714,6.589 C2.719,6.618 2.743,6.633 2.773,6.628 C2.793,6.628 2.807,6.609 2.812,6.589 C2.97,5.781 3.078,5.668 3.886,5.515 C3.915,5.51 3.93,5.486 3.925,5.456 C3.925,5.437 3.906,5.422 3.886,5.417 Z M13.286,4.343 C13.281,4.314 13.257,4.299 13.227,4.304 C13.208,4.304 13.193,4.324 13.188,4.343 C13.03,5.151 12.922,5.264 12.114,5.417 C12.085,5.422 12.07,5.446 12.075,5.476 C12.075,5.496 12.095,5.51 12.114,5.515 C12.922,5.673 13.035,5.781 13.188,6.589 C13.193,6.618 13.217,6.633 13.247,6.628 C13.267,6.628 13.281,6.609 13.286,6.589 C13.444,5.781 13.552,5.668 14.36,5.515 C14.389,5.51 14.404,5.486 14.399,5.456 C14.399,5.437 14.379,5.422 14.36,5.417 C13.552,5.259 13.439,5.151 13.286,4.343 Z"/>
+</svg>
+

frontend/src/global_styles/common/menu/menu.sass

@@ -3,6 +3,11 @@
   flex-direction: column
 
   &--item
+    &-title
+      white-space: nowrap
+      font-weight: 400
+      overflow: hidden
+      text-overflow: ellipsis
 
     &-action
       display: block
@@ -10,10 +15,7 @@
       line-height: 32px
       text-decoration: none
       padding: 0px 13px 0px 10px
-      white-space: nowrap
       font-weight: 400
-      overflow: hidden
-      text-overflow: ellipsis
       color: var(--context-menu-unselected-font-color)
 
       &:focus

frontend/src/global_styles/content/_enterprise.sass

@@ -54,6 +54,12 @@
   width: 200px
   margin: auto
 
+.enterprise-addons--button-icon
+  font-size: 1rem !important
+
+.spot-icon_enterprise-addons
+  color: $spot-color-feedback-warning-dark
+
 @media screen and (max-width: 679px)
   .upsale-notification
     max-width: none

frontend/src/global_styles/fonts/_openproject_icon_font.lsg

@@ -91,6 +91,7 @@
 <li><span class="icon icon-duplicate"></span>duplicate</li>
 <li><span class="icon icon-edit"></span>edit</li>
 <li><span class="icon icon-email-alert"></span>email-alert</li>
+<li><span class="icon icon-enterprise-addons"></span>enterprise-addons</li>
 <li><span class="icon icon-enterprise-badge"></span>enterprise-badge</li>
 <li><span class="icon icon-enterprise"></span>enterprise</li>
 <li><span class="icon icon-enumerations"></span>enumerations</li>

frontend/src/global_styles/layout/_main_menu.sass

@@ -226,8 +226,10 @@ a.main-menu--parent-node
         display: list-item
         .main-menu--children-menu-header
           display: none
-    .spot-icon_enterprise-badge
+    .spot-icon_enterprise-addons
       margin-left: 0.25rem
+      color: $spot-color-feedback-warning-dark
+      font-size: 1rem
 .hidden-navigation
   .main-menu
     width: var(--main-menu-folded-width)

lib/redmine/menu_manager/menu_helper.rb

@@ -170,7 +170,7 @@ module Redmine::MenuManager::MenuHelper
                              lang: menu_item_locale(item)) do
       title_text = ''.html_safe + caption + badge_for(item)
       if item.enterprise_feature.present? && !EnterpriseToken.allows_to?(item.enterprise_feature)
-        title_text << (' '.html_safe + spot_icon('enterprise-badge'))
+        title_text << (' '.html_safe + spot_icon('enterprise-addons'))
       end
       title_text
     end

modules/boards/lib/open_project/boards/engine.rb

@@ -43,8 +43,7 @@ module OpenProject::Boards
            { controller: '/boards/boards', action: :index },
            caption: :'boards.label_boards',
            after: :work_packages,
-           icon: 'icon2 icon-boards',
-           enterprise_feature: 'board_view'
+           icon: 'icon2 icon-boards'
 
       menu :project_menu,
            :board_menu,

modules/two_factor_authentication/lib/open_project/two_factor_authentication/engine.rb

@@ -34,8 +34,7 @@ module OpenProject::TwoFactorAuthentication
                     { controller: '/two_factor_authentication/two_factor_settings', action: :show },
                     caption: ->(*) { I18n.t('two_factor_authentication.label_two_factor_authentication') },
                     parent: :authentication,
-                    if: ->(*) { ::OpenProject::TwoFactorAuthentication::TokenStrategyManager.configurable_by_ui? },
-                    enterprise_feature: 'two_factor_authentication'
+                    if: ->(*) { ::OpenProject::TwoFactorAuthentication::TokenStrategyManager.configurable_by_ui? }
              end
 
     patches %i[User]