ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Hide registration, redirect to correct page after reset, style reset

This commit is contained in:
Christian Cueni 2019-10-08 10:14:57 +02:00
parent 31de68e3d0
commit c396c34be2
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/pages/login.vue
View File

@ -59,10 +59,10 @@
<button class="button button--primary button--big actions__submit" data-cy="login-button">Anmelden</button>
<a class="actions__reset text-link" href="/accounts/password_reset/">Passwort vergessen?</a>
</div>
<div class="registration">
<!--div class="registration">
<p class="registration__text">Haben Sie noch kein Konto?</p>
<a class="registration__link text-link" href="/accounts/password_reset/">Jetzt registrieren</a>
</div>
</div-->
</form>
</div>
</template>

6
server/core/settings.py
View File

@ -173,8 +173,10 @@ else:
},
]
LOGOUT_REDIRECT_URL = '/'
LOGIN_REDIRECT_URL = '/'
LOGOUT_REDIRECT_URL = '/login'
LOGIN_REDIRECT_URL = '/login'
LOGIN_URL = LOGIN_REDIRECT_URL
# Internationalization
# https://docs.djangoproject.com/en/1.11/topics/i18n/

3
server/core/static/styles/main.scss
View File

@ -132,6 +132,9 @@ input[type=text], input[type=password], input[type=email], select {
border: 1px solid #f0f0f0;
max-width: 100%;
background-color: #ffffff;
font-size: 16px;
font-family: "Montserrat", Arial, sans-serif;
font-weight: 400;
}
.reset__form button {

2
server/core/templates/registration/password_reset_complete.html
View File

@ -7,6 +7,6 @@
<div class="reset">
<h2 class="reset__heading">{% trans 'Passwort zurücksetzen abgeschlossen' %}</h2>
<p class="reset__text">{% trans 'Ihr Passwort wurde zurückgesetzt. Sie können sich nun auf der Loginseite anmelden.' %}</p>
<p class="reset__text"><a href="{% url "login" %}">{% trans 'Einloggen' %}</a></p>
<p class="reset__text"><a href="/login">{% trans 'Einloggen' %}</a></p>
</div>
{% endblock %}

2
server/core/templates/registration/set_password_complete.html
View File

@ -7,6 +7,6 @@
<div class="reset">
<h2 class="reset__heading">{% trans 'Sie haben es geschafft' %}</h2>
<p class="reset__text">% trans 'Ihr Passwort wurde erfolgreich gespeichert. Sie können sich nun anmelden.' %}</p>
<p class="reset__text"><a href="{% url "login" %}">{% trans 'Jetzt anmelden' %}</a></p>
<p class="reset__text"><a href="/login">{% trans 'Jetzt anmelden' %}</a></p>
</div>
{% endblock %}