Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
be0168ef
Commit
be0168ef
authored
Nov 05, 2020
by
Alper Akgun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enhance and add close icon to "thank you" banner
parent
e6b32c6f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
5 deletions
+19
-5
app/assets/javascripts/groups/index.js
app/assets/javascripts/groups/index.js
+4
-0
ee/app/assets/javascripts/subscriptions/groups/edit/index.js
ee/app/assets/javascripts/subscriptions/groups/edit/index.js
+4
-0
ee/app/views/shared/_thanks_for_purchase_banner.html.haml
ee/app/views/shared/_thanks_for_purchase_banner.html.haml
+8
-5
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/assets/javascripts/groups/index.js
View file @
be0168ef
import
Vue
from
'
vue
'
;
import
{
GlToast
}
from
'
@gitlab/ui
'
;
import
UserCallout
from
'
~/user_callout
'
;
import
{
parseBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
Translate
from
'
../vue_shared/translate
'
;
import
GroupFilterableList
from
'
./groups_filterable_list
'
;
...
...
@@ -17,6 +18,9 @@ export default (containerId = 'js-groups-tree', endpoint, action = '') => {
const
containerEl
=
document
.
getElementById
(
containerId
);
let
dataEl
;
// eslint-disable-next-line no-new
new
UserCallout
();
// Don't do anything if element doesn't exist (No groups)
// This is for when the user enters directly to the page via URL
if
(
!
containerEl
)
{
...
...
ee/app/assets/javascripts/subscriptions/groups/edit/index.js
View file @
be0168ef
import
Vue
from
'
vue
'
;
import
{
STEPS
,
SUBSCRIPTON_FLOW_STEPS
}
from
'
ee/registrations/constants
'
;
import
ProgressBar
from
'
ee/registrations/components/progress_bar.vue
'
;
import
UserCallout
from
'
~/user_callout
'
;
export
default
()
=>
{
// eslint-disable-next-line no-new
new
UserCallout
();
const
el
=
document
.
getElementById
(
'
progress-bar
'
);
if
(
!
el
)
return
null
;
...
...
ee/app/views/shared/_thanks_for_purchase_banner.html.haml
View file @
be0168ef
%section
.gl-banner.gl-banner-introduction
.gl-p-3.px-lg-6
.gl-banner-illustration
.gl-display-flex
=
image_tag
(
'illustrations/illustration-congratulation-purchase.svg'
,
class:
'mw-xs'
)
.gl-banner-content.gl-
display-flex.gl-flex-direction-column.gl-justify-content-center
%h3
=
_
(
'Thanks for your purchase!'
)
%section
.gl-banner.gl-banner-introduction
{
data:
{
uid:
'purchase_success_banner_dismissed'
}
}
.gl-banner-illustration
=
image_tag
(
'illustrations/illustration-congratulation-purchase.svg'
,
alt:
_
(
'Successful purchase image'
)
)
.gl-banner-content.gl-
my-auto
%h3
.gl-banner-title
=
_
(
'Thanks for your purchase!'
)
-
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
}
%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'
)
locale/gitlab.pot
View file @
be0168ef
...
...
@@ -25911,6 +25911,9 @@ msgstr ""
msgid "Succeeded"
msgstr ""
msgid "Successful purchase image"
msgstr ""
msgid "Successfully activated"
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment