Add translations to password reset

Write password recovery emails in html
Add margin to footer
2017-10-31 22:34:27 +02:00 · 2017-10-31 22:34:27 +02:00 · 2017-10-31 22:27:51 +02:00 · 2017-10-31 22:24:37 +02:00 · 2017-10-31 22:24:15 +02:00 · 2017-10-31 22:23:36 +02:00
19 changed files with 1086 additions and 999 deletions
@@ -19,6 +19,7 @@ django-nose==1.4.4
 nose-exclude==0.5.0
 psycopg2==2.7.1
 django-bootstrap3==8.2.3
 django-bootstrap4==0.0.4
 django-tables2==1.6.1
 pycodestyle==2.3.1
 dealer==2.0.5
@@ -82,6 +82,7 @@ INSTALLED_APPS = [
    'rest_framework',
    'django_nose',
    'bootstrap3',
    'bootstrap4',
    'django_tables2',
    'auditlog',
    'phonenumber_field',
@@ -1,24 +1,8 @@
 footer {
    background-color: #f5f5f5;
    margin-top: 1vh;
 }
-/*footer .container .col .nav .nav-item {
+.ml-auto .nav-item {
-    display: inline-block;
+    padding: 1vh;
    margin-right: 3vh;
 }
 .lang-button {
    height: 4vh;
    width: 6vh;
    margin-left: 1vh;
    margin-right: 1vh;
 }
 .lang-select {
    width: 10rem;
    display: inline-block;
 }
 footer .lang-form {
    margin: 1rem auto 0;
 }*/
@@ -7,7 +7,7 @@
 <html>
    <head>
        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
        <meta name="description" content="Aalto-yliopiston Sähköinsinöörikilta ry">
        <meta name="author" content="Aalto-yliopiston Sähköinsinöörikilta ry">
@@ -7,7 +7,7 @@
    <div class="container">
        <div class="d-flex align-items-center justify-content-end">
            <div class="p-2">
-                <span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
+                <span><i class="fa fa-copyright"></i>{% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
            </div>
            <div class="p-2">
                <form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
@@ -28,44 +28,16 @@
            </div>
            <div class="ml-auto p-2">
                <span class="nav-item">
-                    <a href="/members"><i class="fa fa-group"></i></a>
+                    <a href="/members"><i class="fa fa-group fa-2x"></i></a>
                </span>
                <span class="nav-item">
-                    <a href="/infoscreen"><i class="fa fa-info"></i></a>
+                    <a href="/infoscreen"><i class="fa fa-info fa-2x"></i></a>
                </span>
                <span class="nav-item">
-                    <a href="/admin"><i class="fa fa-gears"></i></a>
+                    <a href="/admin"><i class="fa fa-gears fa-2x"></i></a>
                </span>
            </div>
        </div>
    </div>
 </footer>
 <!-- <form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
    <span>
        <input name="next" type="hidden" value="{{ redirect_to }}" />
        <select onchange="this.form.submit()" class="lang-select form-control" name="language">
            {% get_current_language as LANGUAGE_CODE %}
            {% get_available_languages as LANGUAGES %}
            {% get_language_info_list for LANGUAGES as languages %}
            {% for language in languages %}
            <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
                {{ language.name_local }} ({{ language.code }})
            </option>
            {% endfor %}
        </select>
    </span>
 </form>
 <span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
 -->
 <!-- <span class="nav-item">
    <a href="/members"><i class="fa fa-group"></i></a>
 </span>
 <span class="nav-item">
    <a href="/infoscreen"><i class="fa fa-info"></i></a>
 </span>
 <span class="nav-item">
    <a href="/admin"><i class="fa fa-gears"></i></a>
 </span> -->
@@ -1,8 +1,13 @@
 {% extends "password_reset/base.html" %}{% load i18n %}
 {% block title %}{% trans "New password set" %}{% endblock %}
 {% block content %}
-    <p>{% trans "Your password has successfully been reset. You can use it right now on the login page." %}</p>
+<div class="container">
-    <p><a href="/login">Log in</a></p>
+    <div class="d-flex justify-content-center">
        <p>{% trans "Your password has successfully been reset." %}</p>
    </div>
    <div class="d-flex justify-content-center">
        <p><a href="/login">{% trans "Log in" %}</a></p>
    </div>
 </div>
 {% endblock %}
@@ -0,0 +1,14 @@
 {% autoescape off %}
 {% load i18n %}
 {% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at{% endblocktrans %} {{ site.domain }}.
 {% blocktrans %}Please go to the following page and choose a new password:{% endblocktrans %}
 {% block reset_link %}
 {% if secure %}https {% else %}http{% endif %}://{{ site.domain }}{% url "password_reset_reset" token %}
 {% endblock %}
 {% blocktrans %}Your username, in case you've forgotten: {% endblocktrans %}{{ user.username }}
 {% blocktrans %}If you don't want to reset your password, simply ignore this email and it will stay unchanged.{% endblocktrans %}
 {% endautoescape %}
@@ -0,0 +1 @@
 {% load i18n %}{% blocktrans %}Password recovery on{% endblocktrans %} {{ site.domain }}
@@ -1,12 +1,18 @@
 {% extends "password_reset/base.html" %}
 {% load i18n %}
-
+{% load bootstrap4 %}
 {% block title %}{% trans "Password recovery" %}{% endblock %}
 {% block content %}
-	<form method="post" action="{{ url }}">
+<div class="container">
-		{% csrf_token %}
+	<div class="d-flex justify-content-center">
-		{{ form.as_p }}
+		<form method="post" action="{{ url }}" class="form">{% csrf_token %}
-		<p><input type="submit" value="{% trans "Send" %}"></p>
+			{% bootstrap_form form %}
 			{% buttons %}
 			<button type="submit" class="btn btn-primary">
 				{% trans "Send" %}
 			</button>
 			{% endbuttons %}
 		</form>
 	</div>
 </div>
 {% endblock %}
@@ -1,14 +1,28 @@
 {% extends "password_reset/base.html" %}{% load i18n %}
 {% load i18n %}
 {% load bootstrap4 %}
 {% block content %}
 <div class="container">
 		{% if invalid %}{% url "password_reset_recover" as recovery_url %}
 		<div class="d-flex justify-content-center">
 			<p>{% blocktrans %}Sorry, this password reset link is invalid. You can still <a href="{{ recovery_url }}">request a new one</a>.{% endblocktrans %}</p>
 		</div>
 		{% else %}
 			<div class="d-flex justify-content-center">
 				<p>{% blocktrans %}Hi, <strong>{{ username }}</strong>. Please choose your new password.{% endblocktrans %}</p>
-		<form method="post" action="{% url "password_reset_reset" token %}">
+			</div>
-			{% csrf_token %}
+			<div class="d-flex justify-content-center">
-			{{ form.as_p }}
+				<form method="post" action="{% url "password_reset_reset" token %}" class="form">{% csrf_token %}
-			<p><input type="submit" value="{% trans "Set new password" %}"></p>
+					{% bootstrap_form form %}
 					{% buttons %}
 					<button type="submit" class="btn btn-primary">
 						{% trans "Set new password" %}
 					</button>
 					{% endbuttons %}
 				</form>
 			</div>
 		{% endif %}
 </div>
 {% endblock %}
@@ -1,15 +0,0 @@
 {% autoescape off %}
 You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.
 Please go to the following page and choose a new password:
 {% block reset_link %}
 {{ protocol }}://{{ domain }}{% url django.contrib.auth.views.password_reset_confirm uidb36=uid, token=token %}
 {% endblock %}
 Your username, in case you've forgotten: {{ user.username }}
 Thanks for using our site!
 The {{ site_name }} team.
 {% endautoescape %}
@@ -1,8 +1,9 @@
 {% extends "password_reset/base.html" %}
 {% load i18n %}
 {% block title %}{% trans "Password recovery sent" %}{% endblock %}
 {% block content %}
 <div class="container">
 	<div class="d-flex justify-content-center">
 		<p>{% blocktrans with ago=timestamp|timesince %}An email was sent to <strong>{{ email }}</strong> {{ ago }} ago. Use the link in it to set a new password.{% endblocktrans %}</p>
-{% endblock %}
+	</div>
 </div>{% endblock %}
@@ -1,3 +1,3 @@
-/*.main_navigation .navbar-border .navbar-nav .nav-item {
+nav {
-    display: block;
+    margin-bottom: 2vh;
-}*/
+}
@@ -14,6 +14,11 @@
                <h5>Lisää vain vesi</h5>
            </div>
        </div>
        <div class="row">
            <div class="col">
                {% lorem %}
            </div>
        </div>
    </div>
 </div>
 {% endblock %}
@@ -1,6 +1,11 @@
 {% load i18n %}
 <link rel="stylesheet" href="/static/css/main_nav.css">
 <nav class="navbar navbar-toggleable-md navbar-light bg-faded">
    <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
        <span class="navbar-toggler-icon"></span>
    </button>
    <!-- <p class="navbar-brand">Kökkö</p> -->
    <div class="collapse navbar-collapse" id="navbarNavDropdown">
        <ul class="navbar-nav mx-auto">
            <li class="nav-item text-center">
                <a class="nav-link" href="/guild">{% trans "Guild" %}</a>
@@ -20,15 +25,16 @@
            <li class="nav-item text-center">
                <a class="nav-item nav-link" href="/contact">{% trans "Contact" %}</a>
            </li>
-        <li class="nav-item dropdown">
+            <li class="nav-item dropdown text-center">
                <a class="nav-link dropdown-toggle" id="corpDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                    {% trans "Corporate" %}
                </a>
-            <div class="dropdown-menu" aria-labelledby="corpDropdown">
+                <div class="dropdown-menu text-center" aria-labelledby="corpDropdown">
                    <a class="dropdown-item" href="/jobs">{% trans "Jobs" %}</a>
                    <a class="dropdown-item" href="/">Yritysdadaa</a>
                    <a class="dropdown-item" href="/">Something else here</a>
                </div>
            </li>
        </ul>
    </div>
 </nav>
Author	SHA1	Message	Date
Aarni Halinen	e83b4d4624	Add translations to password reset	2017-10-31 22:34:27 +02:00
Aarni Halinen	38225cabc8	Write password recovery emails in html	2017-10-31 22:34:27 +02:00
henu	08bb63ce1f	Add margin to footer	2017-10-31 22:27:51 +02:00
henu	72a93e1dfd	Merge branch 'develop' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-refactor-webapp-styles	2017-10-31 22:24:37 +02:00
henu	fa5597f7cf	Add centering back to navigation	2017-10-31 22:24:15 +02:00
henu	92ea427c53	Add copyright icon to footer	2017-10-31 22:23:36 +02:00
henu	abc2519bc7	Add collapse property for navbar	2017-10-31 22:18:30 +02:00
henu	87a0c68ef2	Update meta tag	2017-10-31 22:17:44 +02:00
henu	612b17960a	Make fa-icons larger and add padding between them	2017-10-31 22:16:52 +02:00
Aarni Halinen	7f21b7bba2	Add bootstrap4 to password recovery html	2017-10-31 21:37:19 +02:00
henu	8c116d58de	Remove unnecessary comments	2017-10-31 21:17:36 +02:00
		`@@ -0,0 +1 @@`
							`{% load i18n %}{% blocktrans %}Password recovery on{% endblocktrans %} {{ site.domain }}`