Commit 2c4cdee7 authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch...

Merge branch '271539-add-a-close-button-to-the-thanks-for-your-purchase-banner-or-and-other-refactorings' into 'master'

Enhance and add close icon to "thank you" banner

See merge request gitlab-org/gitlab!46755
parents 624da315 be0168ef
import Vue from 'vue'; import Vue from 'vue';
import { GlToast } from '@gitlab/ui'; import { GlToast } from '@gitlab/ui';
import UserCallout from '~/user_callout';
import { parseBoolean } from '~/lib/utils/common_utils'; import { parseBoolean } from '~/lib/utils/common_utils';
import Translate from '../vue_shared/translate'; import Translate from '../vue_shared/translate';
import GroupFilterableList from './groups_filterable_list'; import GroupFilterableList from './groups_filterable_list';
...@@ -17,6 +18,9 @@ export default (containerId = 'js-groups-tree', endpoint, action = '') => { ...@@ -17,6 +18,9 @@ export default (containerId = 'js-groups-tree', endpoint, action = '') => {
const containerEl = document.getElementById(containerId); const containerEl = document.getElementById(containerId);
let dataEl; let dataEl;
// eslint-disable-next-line no-new
new UserCallout();
// Don't do anything if element doesn't exist (No groups) // Don't do anything if element doesn't exist (No groups)
// This is for when the user enters directly to the page via URL // This is for when the user enters directly to the page via URL
if (!containerEl) { if (!containerEl) {
......
import Vue from 'vue'; import Vue from 'vue';
import { STEPS, SUBSCRIPTON_FLOW_STEPS } from 'ee/registrations/constants'; import { STEPS, SUBSCRIPTON_FLOW_STEPS } from 'ee/registrations/constants';
import ProgressBar from 'ee/registrations/components/progress_bar.vue'; import ProgressBar from 'ee/registrations/components/progress_bar.vue';
import UserCallout from '~/user_callout';
export default () => { export default () => {
// eslint-disable-next-line no-new
new UserCallout();
const el = document.getElementById('progress-bar'); const el = document.getElementById('progress-bar');
if (!el) return null; if (!el) return null;
......
%section.gl-banner.gl-banner-introduction.gl-p-3.px-lg-6 %section.gl-banner.gl-banner-introduction{ data: { uid: 'purchase_success_banner_dismissed' } }
.gl-banner-illustration.gl-display-flex .gl-banner-illustration
= image_tag('illustrations/illustration-congratulation-purchase.svg', class: 'mw-xs') = image_tag('illustrations/illustration-congratulation-purchase.svg', alt: _('Successful purchase image'))
.gl-banner-content.gl-display-flex.gl-flex-direction-column.gl-justify-content-center .gl-banner-content.gl-my-auto
%h3= _('Thanks for your purchase!') %h3.gl-banner-title= _('Thanks for your purchase!')
- number_of_users = n_('1 user', '%{num} users', quantity) % { num: quantity } - number_of_users = n_('1 user', '%{num} users', quantity) % { num: quantity }
%p= _('You have successfully purchased a %{plan} plan subscription for %{seats}. You’ll receive a receipt via email.') % { plan: plan_title, seats: number_of_users } %p= _('You have successfully purchased a %{plan} plan subscription for %{seats}. You’ll receive a receipt via email.') % { plan: plan_title, seats: number_of_users }
%button.gl-banner-close.close.js-close-session.js-close-callout{ type: 'button', 'aria-label' => _('Dismiss') }
= sprite_icon('close', size: 16, css_class: 'dismiss-icon')
...@@ -25958,6 +25958,9 @@ msgstr "" ...@@ -25958,6 +25958,9 @@ msgstr ""
msgid "Succeeded" msgid "Succeeded"
msgstr "" msgstr ""
msgid "Successful purchase image"
msgstr ""
msgid "Successfully activated" msgid "Successfully activated"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment