TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: TTMK/web2.0-backend:develop
Branches Tags
TTMK/web2.0-backend:main TTMK/web2.0-backend:production TTMK/web2.0-backend:develop TTMK/web2.0-backend:revert-7554c1e7 TTMK/web2.0-backend:master TTMK/web2.0-backend:feature/signup-allow-user-deletion TTMK/web2.0-backend:rewrite-publishable-db-models TTMK/web2.0-backend:bugfix/fix-feed-filters TTMK/web2.0-backend:clean-old-templates TTMK/web2.0-backend:feature-nobot TTMK/web2.0-backend:feature-expenses-claim TTMK/web2.0-backend:feature-member-emails TTMK/web2.0-backend:feature-coffee-history TTMK/web2.0-backend:feature-refactor-webapp-styles
...
pull from: TTMK/web2.0-backend:feature-refactor-webapp-styles
Branches Tags
TTMK/web2.0-backend:production TTMK/web2.0-backend:main TTMK/web2.0-backend:develop TTMK/web2.0-backend:revert-7554c1e7 TTMK/web2.0-backend:master TTMK/web2.0-backend:feature/signup-allow-user-deletion TTMK/web2.0-backend:rewrite-publishable-db-models TTMK/web2.0-backend:bugfix/fix-feed-filters TTMK/web2.0-backend:clean-old-templates TTMK/web2.0-backend:feature-nobot TTMK/web2.0-backend:feature-expenses-claim TTMK/web2.0-backend:feature-member-emails TTMK/web2.0-backend:feature-coffee-history TTMK/web2.0-backend:feature-refactor-webapp-styles

11 Commits
develop ... feature-refactor-webapp-styles

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
19 changed files with 1086 additions and 999 deletions
Expand all files Collapse all files
locale/en/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
locale/en/LC_MESSAGES/django.po
+337 -294
View File
File diff suppressed because it is too large Load Diff
locale/fi/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
locale/fi/LC_MESSAGES/django.po
+629 -580
View File
File diff suppressed because it is too large Load Diff
requirements.txt
+1
View File
@@ -19,6 +19,7 @@ django-nose==1.4.4
nose-exclude==0.5.0 nose-exclude==0.5.0
psycopg2==2.7.1 psycopg2==2.7.1
django-bootstrap3==8.2.3 django-bootstrap3==8.2.3
django-bootstrap4==0.0.4
django-tables2==1.6.1 django-tables2==1.6.1
pycodestyle==2.3.1 pycodestyle==2.3.1
dealer==2.0.5 dealer==2.0.5
sikweb/base.py
+1
View File
@@ -82,6 +82,7 @@ INSTALLED_APPS = [
'rest_framework', 'rest_framework',
'django_nose', 'django_nose',
'bootstrap3', 'bootstrap3',
'bootstrap4',
'django_tables2', 'django_tables2',
'auditlog', 'auditlog',
'phonenumber_field', 'phonenumber_field',
static/css/footer.css
+3 -19
View File
@@ -1,24 +1,8 @@
footer { footer {
background-color: #f5f5f5; 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;
}*/
templates/base.html
+1 -1
View File
@@ -7,7 +7,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <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="description" content="Aalto-yliopiston Sähköinsinöörikilta ry">
<meta name="author" content="Aalto-yliopiston Sähköinsinöörikilta ry"> <meta name="author" content="Aalto-yliopiston Sähköinsinöörikilta ry">
templates/footer.html
+4 -32
View File
@@ -7,7 +7,7 @@
<div class="container"> <div class="container">
<div class="d-flex align-items-center justify-content-end"> <div class="d-flex align-items-center justify-content-end">
<div class="p-2"> <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>
<div class="p-2"> <div class="p-2">
<form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %} <form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
@@ -28,44 +28,16 @@
</div> </div>
<div class="ml-auto p-2"> <div class="ml-auto p-2">
<span class="nav-item"> <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>
<span class="nav-item"> <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>
<span class="nav-item"> <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> </span>
</div> </div>
</div> </div>
</div> </div>
</footer> </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> -->
templates/password_reset/recovery_done.html
+9 -4
View File
@@ -1,8 +1,13 @@
{% extends "password_reset/base.html" %}{% load i18n %} {% extends "password_reset/base.html" %}{% load i18n %}
{% block title %}{% trans "New password set" %}{% endblock %}
{% block content %} {% 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 %} {% endblock %}
templates/password_reset/recovery_email.txt
+14
View File
@@ -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 %}
templates/password_reset/recovery_email_subject.txt
+1
View File
@@ -0,0 +1 @@
{% load i18n %}{% blocktrans %}Password recovery on{% endblocktrans %} {{ site.domain }}
templates/password_reset/recovery_form.html
+13 -7
View File
@@ -1,12 +1,18 @@
{% extends "password_reset/base.html" %} {% extends "password_reset/base.html" %}
{% load i18n %} {% load i18n %}
{% load bootstrap4 %}
{% block title %}{% trans "Password recovery" %}{% endblock %}
{% block content %} {% 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 %}
</form> {% buttons %}
<button type="submit" class="btn btn-primary">
{% trans "Send" %}
</button>
{% endbuttons %}
</form>
</div>
</div>
{% endblock %} {% endblock %}
templates/password_reset/reset.html
+24 -10
View File
@@ -1,14 +1,28 @@
{% extends "password_reset/base.html" %}{% load i18n %} {% extends "password_reset/base.html" %}{% load i18n %}
{% load i18n %}
{% load bootstrap4 %}
{% block content %} {% block content %}
{% if invalid %}{% url "password_reset_recover" as recovery_url %} <div class="container">
<p>{% blocktrans %}Sorry, this password reset link is invalid. You can still <a href="{{ recovery_url }}">request a new one</a>.{% endblocktrans %}</p> {% if invalid %}{% url "password_reset_recover" as recovery_url %}
{% else %} <div class="d-flex justify-content-center">
<p>{% blocktrans %}Hi, <strong>{{ username }}</strong>. Please choose your new password.{% endblocktrans %}</p> <p>{% blocktrans %}Sorry, this password reset link is invalid. You can still <a href="{{ recovery_url }}">request a new one</a>.{% endblocktrans %}</p>
<form method="post" action="{% url "password_reset_reset" token %}"> </div>
{% csrf_token %} {% else %}
{{ form.as_p }} <div class="d-flex justify-content-center">
<p><input type="submit" value="{% trans "Set new password" %}"></p> <p>{% blocktrans %}Hi, <strong>{{ username }}</strong>. Please choose your new password.{% endblocktrans %}</p>
</form> </div>
{% endif %} <div class="d-flex justify-content-center">
<form method="post" action="{% url "password_reset_reset" token %}" class="form">{% csrf_token %}
{% bootstrap_form form %}
{% buttons %}
<button type="submit" class="btn btn-primary">
{% trans "Set new password" %}
</button>
{% endbuttons %}
</form>
</div>
{% endif %}
</div>
{% endblock %} {% endblock %}
templates/password_reset/reset_mail.html
-15
View File
@@ -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 %}
templates/password_reset/reset_sent.html
+5 -4
View File
@@ -1,8 +1,9 @@
{% extends "password_reset/base.html" %} {% extends "password_reset/base.html" %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans "Password recovery sent" %}{% endblock %}
{% block content %} {% block content %}
<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> <div class="container">
{% endblock %} <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>
</div>
</div>{% endblock %}
webapp/static/css/main_nav.css
+3 -3
View File
@@ -1,3 +1,3 @@
/*.main_navigation .navbar-border .navbar-nav .nav-item { nav {
display: block; margin-bottom: 2vh;
}*/ }
webapp/templates/main_index.html
+5
View File
@@ -14,6 +14,11 @@
<h5>Lisää vain vesi</h5> <h5>Lisää vain vesi</h5>
</div> </div>
</div> </div>
<div class="row">
<div class="col">
{% lorem %}
</div>
</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
webapp/templates/navigation.html
+36 -30
View File
@@ -1,34 +1,40 @@
{% load i18n %} {% load i18n %}
<link rel="stylesheet" href="/static/css/main_nav.css"> <link rel="stylesheet" href="/static/css/main_nav.css">
<nav class="navbar navbar-toggleable-md navbar-light bg-faded"> <nav class="navbar navbar-toggleable-md navbar-light bg-faded">
<ul class="navbar-nav mx-auto"> <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">
<li class="nav-item text-center"> <span class="navbar-toggler-icon"></span>
<a class="nav-link" href="/guild">{% trans "Guild" %}</a> </button>
</li> <!-- <p class="navbar-brand">Kökkö</p> -->
<li class="nav-item text-center"> <div class="collapse navbar-collapse" id="navbarNavDropdown">
<a class="nav-link" href="/freshmen">{% trans "Freshmen" %}</a> <ul class="navbar-nav mx-auto">
</li> <li class="nav-item text-center">
<li class="nav-item text-center"> <a class="nav-link" href="/guild">{% trans "Guild" %}</a>
<a class="nav-link" href="/event_calendar">{% trans "Event calendar" %}</a> </li>
</li> <li class="nav-item text-center">
<li class="nav-item text-center"> <a class="nav-link" href="/freshmen">{% trans "Freshmen" %}</a>
<a class="nav-link" href="/international">{% trans "International" %}</a> </li>
</li> <li class="nav-item text-center">
<li class="nav-item text-center"> <a class="nav-link" href="/event_calendar">{% trans "Event calendar" %}</a>
<a class="nav-link" href="/sosso">{% trans "Sössö" %}</a> </li>
</li> <li class="nav-item text-center">
<li class="nav-item text-center"> <a class="nav-link" href="/international">{% trans "International" %}</a>
<a class="nav-item nav-link" href="/contact">{% trans "Contact" %}</a> </li>
</li> <li class="nav-item text-center">
<li class="nav-item dropdown"> <a class="nav-link" href="/sosso">{% trans "Sössö" %}</a>
<a class="nav-link dropdown-toggle" id="corpDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> </li>
{% trans "Corporate" %} <li class="nav-item text-center">
</a> <a class="nav-item nav-link" href="/contact">{% trans "Contact" %}</a>
<div class="dropdown-menu" aria-labelledby="corpDropdown"> </li>
<a class="dropdown-item" href="/jobs">{% trans "Jobs" %}</a> <li class="nav-item dropdown text-center">
<a class="dropdown-item" href="/">Yritysdadaa</a> <a class="nav-link dropdown-toggle" id="corpDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="dropdown-item" href="/">Something else here</a> {% trans "Corporate" %}
</div> </a>
</li> <div class="dropdown-menu text-center" aria-labelledby="corpDropdown">
</ul> <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> </nav>