replace the badge icon with the new add-ons icon and set the styles for it to change the color

pull/11723/head
bsatarnejad 2 years ago
parent 8969129000
commit a7ae4d072a
  1. 2
      app/views/common/upsale.html.erb
  2. 3
      app/views/homescreen/blocks/_upsale.html.erb
  3. 2
      config/locales/en.yml
  4. 2
      config/locales/js-en.yml
  5. 4
      frontend/src/app/shared/components/enterprise-banner/enterprise-banner.component.html
  6. 2
      frontend/src/app/shared/components/enterprise-page/enterprise-page.component.html
  7. 2
      frontend/src/app/shared/components/sidemenu/sidemenu.component.html
  8. 3
      frontend/src/global_styles/content/_enterprise.sass
  9. 3
      frontend/src/global_styles/layout/_main_menu.sass
  10. 2
      lib/redmine/menu_manager/menu_helper.rb

@ -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') %>
<span class="button--text"><%= t('admin.enterprise.buttons.upgrade') %></span>
<% end %>
<free-trial-button></free-trial-button>

@ -3,7 +3,6 @@
<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>
@ -38,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') %>
<span class="button--text"><%= t('admin.enterprise.buttons.upgrade') %></span>
<% end %>

@ -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> feature."
enterprise_info_html: "is an Enterprise <span class='spot-icon spot-icon_enterprise-addons'></span> feature."
upgrade_info: "Please upgrade to a paid plan to activate and start using it in your team."
journal_aggregation:
explanation:

@ -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> feature."
enterprise_info_html: "%{feature_title} is an Enterprise <span class='spot-icon spot-icon_enterprise-addons'></span> feature."
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?"

@ -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"></span>
{{ text.upgrade }}
</a>

@ -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"></span>
{{ text.upgrade }}
</a>
<free-trial-button></free-trial-button>

@ -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>

@ -54,6 +54,9 @@
width: 200px
margin: auto
.spot-icon_enterprise-addons
color: $spot-color-feedback-warning-dark
@media screen and (max-width: 679px)
.upsale-notification
max-width: none

@ -226,8 +226,9 @@ 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
.hidden-navigation
.main-menu
width: var(--main-menu-folded-width)

@ -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

Loading…
Cancel
Save