mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20215 from nextcloud/bug/19939/password-reset-arrow 

Align password reset arrow
This commit is contained in:
Roeland Jago Douma 2020-04-02 19:23:15 +02:00 committed by GitHub
parent 40bcdb7899 531b1288e4
commit 12d193241f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/js/dist/login.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/login.js.map vendored
View File

File diff suppressed because one or more lines are too long

96
core/src/components/login/ResetPassword.vue
View File

@ -21,54 +21,56 @@
<template>
<form @submit.prevent="submit">
<p>
<input id="user"
v-model="user"
type="text"
name="user"
:placeholder="t('core', 'Username or email')"
:aria-label="t('core', 'Username or email')"
required
@change="updateUsername">
<!--<?php p($_['user_autofocus'] ? 'autofocus' : ''); ?>
autocomplete="<?php p($_['login_form_autocomplete']); ?>" autocapitalize="none" autocorrect="off"-->
<label for="user" class="infield">{{ t('core', 'Username or email') }}</label>
</p>
<div id="reset-password-wrapper">
<input id="reset-password-submit"
type="submit"
class="login primary"
title=""
:value="t('core', 'Reset password')">
<div class="submit-icon"
:class="{
'icon-confirm-white': !loading,
'icon-loading-small': loading && invertedColors,
'icon-loading-small-dark': loading && !invertedColors,
}" />
</div>
<p v-if="message === 'send-success'"
class="update">
{{ t('core', 'A password reset message has been sent to the e-mail address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help.') }}
<br>
{{ t('core', 'If it is not there ask your local administrator.') }}
</p>
<p v-else-if="message === 'send-error'"
class="update warning">
{{ t('core', 'Couldn\'t send reset email. Please contact your administrator.') }}
</p>
<p v-else-if="message === 'reset-error'"
class="update warning">
{{ t('core', 'Password can not be changed. Please contact your administrator.') }}
</p>
<p v-else-if="message"
class="update"
:class="{warning: error}" />
<fieldset>
<p>
<input id="user"
v-model="user"
type="text"
name="user"
:placeholder="t('core', 'Username or email')"
:aria-label="t('core', 'Username or email')"
required
@change="updateUsername">
<!--<?php p($_['user_autofocus'] ? 'autofocus' : ''); ?>
autocomplete="<?php p($_['login_form_autocomplete']); ?>" autocapitalize="none" autocorrect="off"-->
<label for="user" class="infield">{{ t('core', 'Username or email') }}</label>
</p>
<div id="reset-password-wrapper">
<input id="reset-password-submit"
type="submit"
class="login primary"
title=""
:value="t('core', 'Reset password')">
<div class="submit-icon"
:class="{
'icon-confirm-white': !loading,
'icon-loading-small': loading && invertedColors,
'icon-loading-small-dark': loading && !invertedColors,
}" />
</div>
<p v-if="message === 'send-success'"
class="update">
{{ t('core', 'A password reset message has been sent to the e-mail address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help.') }}
<br>
{{ t('core', 'If it is not there ask your local administrator.') }}
</p>
<p v-else-if="message === 'send-error'"
class="update warning">
{{ t('core', 'Couldn\'t send reset email. Please contact your administrator.') }}
</p>
<p v-else-if="message === 'reset-error'"
class="update warning">
{{ t('core', 'Password can not be changed. Please contact your administrator.') }}
</p>
<p v-else-if="message"
class="update"
:class="{warning: error}" />
<a href="#"
@click.prevent="$emit('abort')">
{{ t('core', 'Back to login') }}
</a>
<a href="#"
@click.prevent="$emit('abort')">
{{ t('core', 'Back to login') }}
</a>
</fieldset>
</form>
</template>