Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
123b186e
Commit
123b186e
authored
Aug 19, 2021
by
Eric Rosenbaum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
display password error tooltip inside modal
parent
7df59213
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
9 deletions
+28
-9
src/views/studio/l10n.json
src/views/studio/l10n.json
+1
-0
src/views/studio/modals/transfer-host-confirmation.jsx
src/views/studio/modals/transfer-host-confirmation.jsx
+17
-9
src/views/studio/modals/transfer-host-modal.scss
src/views/studio/modals/transfer-host-modal.scss
+10
-0
No files found.
src/views/studio/l10n.json
View file @
123b186e
...
...
@@ -100,6 +100,7 @@
"studio.transfer.confirmWithPassword"
:
"To confirm changing the studio host, please enter your password."
,
"studio.transfer.forgotPassword"
:
"Forgot password?"
,
"studio.transfer.alert.somethingWentWrong"
:
"Something went wrong transferring this studio to a new host."
,
"studio.transfer.alert.wasntTheRightPassword"
:
"Hmm, that wasn’t the right password."
,
"studio.remove"
:
"Remove"
,
"studio.promote"
:
"Promote"
,
...
...
src/views/studio/modals/transfer-host-confirmation.jsx
View file @
123b186e
...
...
@@ -7,6 +7,7 @@ import ModalInnerContent from '../../../components/modal/base/modal-inner-conten
import
TransferHostTile
from
'
./transfer-host-tile.jsx
'
;
import
Form
from
'
../../../components/forms/form.jsx
'
;
import
ValidationMessage
from
'
../../../components/forms/validation-message.jsx
'
;
import
{
managers
}
from
'
../lib/redux-modules
'
;
...
...
@@ -73,6 +74,7 @@ const TransferHostConfirmation = ({
className=
"transfer-form"
onSubmit=
{
handleSubmit
}
// eslint-disable-line react/jsx-no-bind
>
<
div
className=
"transfer-password-row"
>
<
input
className=
"transfer-password-input"
required
...
...
@@ -82,6 +84,12 @@ const TransferHostConfirmation = ({
value=
{
passwordInputValue
}
onChange=
{
handleChangePasswordInput
}
// eslint-disable-line react/jsx-no-bind
/>
<
ValidationMessage
className=
"transfer-password-validation"
message=
{
<
FormattedMessage
id=
"studio.transfer.alert.wasntTheRightPassword"
/>
}
mode=
"error"
/>
</
div
>
<
div
className=
"transfer-forgot-link"
>
<
a
href=
"/accounts/password_reset/"
...
...
src/views/studio/modals/transfer-host-modal.scss
View file @
123b186e
...
...
@@ -140,9 +140,19 @@
border-radius
:
.5rem
;
padding
:
0
.5rem
1rem
;
font-size
:
1
.5rem
;
}
.transfer-password-row
{
display
:
flex
;
align-items
:
center
;
margin-bottom
:
1rem
;
}
.transfer-password-validation
{
position
:
relative
;
transform
:
translate
(
1rem
,
0
);
}
.col-sm-9
.input
{
font-size
:
1
.5rem
;
width
:
50%
;
...
...
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