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
efa13ca6
Commit
efa13ca6
authored
Aug 28, 2019
by
Natalia Tepluhina
Committed by
Tim Zallmann
Aug 28, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a tooltip to Add Designs button
parent
334b64fc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
2 deletions
+29
-2
ee/app/assets/javascripts/design_management/components/upload/button.vue
...avascripts/design_management/components/upload/button.vue
+15
-2
ee/changelogs/unreleased/12908-add-a-tooltip-to-add-designs-button-to-inform-users-of-image-rep.yml
...ip-to-add-designs-button-to-inform-users-of-image-rep.yml
+5
-0
ee/spec/frontend/design_management/components/upload/__snapshots__/button_spec.js.snap
...ement/components/upload/__snapshots__/button_spec.js.snap
+6
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
ee/app/assets/javascripts/design_management/components/upload/button.vue
View file @
efa13ca6
<
script
>
import
{
GlButton
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlLoadingIcon
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
export
default
{
components
:
{
GlButton
,
GlLoadingIcon
,
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
props
:
{
isSaving
:
{
type
:
Boolean
,
...
...
@@ -25,7 +28,17 @@ export default {
<
template
>
<div>
<gl-button
:disabled=
"isSaving"
variant=
"primary"
@
click=
"openFileUpload"
>
<gl-button
v-gl-tooltip
.
hover
:title=
"
s__(
'DesignManagement|Adding a design with the same filename replaces the file in a new version.',
)
"
:disabled=
"isSaving"
variant=
"primary"
@
click=
"openFileUpload"
>
{{
s__
(
'
DesignManagement|Add designs
'
)
}}
<gl-loading-icon
v-if=
"isSaving"
inline
class=
"ml-1"
/>
</gl-button>
...
...
ee/changelogs/unreleased/12908-add-a-tooltip-to-add-designs-button-to-inform-users-of-image-rep.yml
0 → 100644
View file @
efa13ca6
---
title
:
Add a tooltip to Add Designs button
merge_request
:
15471
author
:
type
:
feature
ee/spec/frontend/design_management/components/upload/__snapshots__/button_spec.js.snap
View file @
efa13ca6
...
...
@@ -5,6 +5,8 @@ exports[`Design management upload button component renders inverted upload desig
isinverted="true"
>
<glbutton-stub
data-original-title="Adding a design with the same filename replaces the file in a new version."
title=""
variant="primary"
>
...
...
@@ -26,7 +28,9 @@ exports[`Design management upload button component renders inverted upload desig
exports[`Design management upload button component renders loading icon 1`] = `
<div>
<glbutton-stub
data-original-title="Adding a design with the same filename replaces the file in a new version."
disabled="true"
title=""
variant="primary"
>
...
...
@@ -54,6 +58,8 @@ exports[`Design management upload button component renders loading icon 1`] = `
exports[`Design management upload button component renders upload design button 1`] = `
<div>
<glbutton-stub
data-original-title="Adding a design with the same filename replaces the file in a new version."
title=""
variant="primary"
>
...
...
locale/gitlab.pot
View file @
efa13ca6
...
...
@@ -4960,6 +4960,9 @@ msgstr ""
msgid "DesignManagement|Add designs"
msgstr ""
msgid "DesignManagement|Adding a design with the same filename replaces the file in a new version."
msgstr ""
msgid "DesignManagement|An error occurred while loading designs. Please try again."
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