agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-23 17:19:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5145 from overleaf/jk-de-ng-user-activate-page

Browse Source 
[web] Remove angular from /user/activate

GitOrigin-RevId: cbb2fbeafb0dfc6c1010c3e8b7eec890a81177d2
This commit is contained in:
Jakob Ackermann
2021-09-23 11:47:55 +02:00
committed by Copybot
parent 0f594db5a9
commit 9ae0d4a691
1 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
services/web/modules/user-activate/app/views/user/activate.pug
View File

@@ -1,7 +1,4 @@
extends ../../../../../app/views/layout
block append meta
meta(name="ol-passwordStrengthOptions" data-type="json" content=settings.passwordStrengthOptions)
extends ../../../../../app/views/layout-marketing
block content
main.content.content-alt#main-content
@@ -15,31 +12,45 @@ block content
.page-header
h1 #{translate("please_set_a_password")}
form(
async-form="activate",
data-ol-async-form
name="activationForm",
action="/user/password/set",
method="POST",
ng-cloak
)
div(data-ol-form-messages)
div.alert.alert-danger(
hidden
role="alert"
aria-live="assertive"
data-ol-custom-form-message='token-expired'
)
| #{translate("activation_token_expired")}
div.alert.alert-danger(
hidden
role="alert"
aria-live="assertive"
data-ol-custom-form-message='invalid-password'
)
| #{translate('invalid_password')}
input(name='_csrf', type='hidden', value=csrfToken)
input(
type="hidden",
name="passwordResetToken",
value=token
ng-non-bindable
)
.alert.alert-danger(ng-show="activationForm.response.error")
| #{translate("activation_token_expired")}
.form-group
label(for='email') #{translate("email")}
input.form-control(
aria-label="email",
type='email',
name='email',
placeholder="email@example.com"
placeholder="email@example.com",
value=email
required,
ng-model="email",
ng-model-options="{ updateOn: 'blur' }",
disabled
)
.form-group
@@ -48,16 +59,19 @@ block content
type='password',
name='password',
placeholder="********",
autocomplete="new-password",
autofocus,
required,
ng-model="password",
complex-password,
autofocus="true"
minlength=settings.passwordStrengthOptions.length.min,
maxlength=settings.passwordStrengthOptions.length.max
)
span.small.text-primary(ng-show="activationForm.password.$error.complexPassword", ng-bind-html="complexPasswordErrorMessage")
.actions
button.btn-primary.btn(
type='submit'
ng-disabled="activationForm.inflight || activationForm.password.$error.required|| activationForm.password.$error.complexPassword"
button.btn.btn-primary(
type='submit',
data-ol-disabled-inflight
aria-label=translate('activate')
)
span(ng-show="!activationForm.inflight") #{translate("activate")}
span(ng-show="activationForm.inflight") #{translate("activating")}…
span(data-ol-inflight="idle")
| #{translate('activate')}
span(hidden data-ol-inflight="pending")
| #{translate('activating')}…