From ad9e96f9ccb22db2a1a5bcd3701c100f26eeffc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81bastiaan=20Versteeg?= Date: Mon, 12 Sep 2016 17:09:19 +0200 Subject: [PATCH] Fix login page style and change texts & translations --- .../locale/nl/LC_MESSAGES/django.mo | Bin 10052 -> 11001 bytes .../locale/nl/LC_MESSAGES/django.po | 225 +++++++++++------- website/thaliawebsite/static/css/skin.less | 11 + website/thaliawebsite/templates/403.html | 2 +- website/thaliawebsite/templates/404.html | 2 +- website/thaliawebsite/templates/500.html | 2 +- .../templates/registration/login.html | 65 +++-- 7 files changed, 196 insertions(+), 111 deletions(-) diff --git a/website/thaliawebsite/locale/nl/LC_MESSAGES/django.mo b/website/thaliawebsite/locale/nl/LC_MESSAGES/django.mo index bf331626e698443ef968991819d87e31a79d85ee..b5d0f39bc7de5383c5a5cf2ea6c76f5cb3618223 100644 GIT binary patch delta 2730 zcmY+ETWl0n7{^abi_$`A!GabnhntAdwM7vqU_qb=w6ucN@PKBzd%8QYJ5y(7TQ!;* zqsCi|$qI=t-a^p$;3eyWCPWQU6B9KWFNr=FBpUCDmuP|-UU?W6_nFDoDJ8Xw3$Yc6>t*Uc?EGpvIaUIdrI`(O{e z7`_89C2C*83;3SVREgLkC`DI7Dc%5O;164^8=EVf2c>8QlmT6E30wzf!%furKg@lw63L<_$x=t8BnoY z0Tt@a@FWU);Q`IFdM$hm%A@yT!u+RD9_=JAGVmtY1|6Ku{9Ta8JjS3regSsC*P!%$ z+eZ8~@ke#Q%&RD9f|oNs2g>4JC zif|2!bWZaGorQGTpbpvqrD!WuBzD1da1cu2gH;}a^86{Nb+5oV@HKc3{17gKLtK?^ zQgkQO`d4j*??D+bae|I=^h1@uSNRWA5!GXzBG3pG%DGS*yPynO5BJsJC6wV$ao1$X zvyjKU&P(gQg8GmA1hwv8h{F@6esSeK&wwhDl~DJ$2a;aX2emN+DF-tKWx&Hwh98DH z@JXm*J__%}pf}*QT4ZUZCLSUjWWgMTio|i)r2GFF9aZZ$P@et;^(UNqX+_ausAB1W z3iWz;3I&_st$cT1M%rK*o)3S4OrLHl+9k-f2+Pf8M8>M^MpC-}3Xd$(U#%ZeTaCyF zMMPe&K-949OzW=pIw19X`nS8OI<^Dq->|j%tw^d746_Q6LrT-cE?!q6gUDpNf{r}e zI63e?ZvS8ZI{I4>MGdD7(KemPdSoYJkv)hCcrUUNQCof;8bm3+1W{2>w)1q#)qJVo`VigC$<|!@ zx!$$});%8gU^PigQII~au{e%_Vbw2k%Kw5Ig*wB<8`x#q|T@-i)XE|b&z}XY-uq2Q~?9?3_(F!*+qH|SeXT#t?#~wH4$9@=eZ1ob? zZC7=6UDeTfW?kv8)_-c&mQKyNxNTcxanljjk+7K9a5U=@vg(3VxpnT{Q<|=E<1RWV z>qdN+FCA{%IE8hkkJ_$lxzS7KlJStFTJpiZ(t>$MmJI}1m(TcFXR~fND*6YBcHnsh z8;;oVGdoh{Xc@-&u=)J z>C*D{r447zDfhSER@0-}Ae&*qX58&gne+qCCe9AKgZ_bocv#7+a#~HP%X=fkPUZ*M z@`npPuWQU2Icj7{{Nr#c5Z^7-Q?k%Gxqn?d)u)th2*`&@CF>hQ?hOP^qqlMi^vm7KxHd zf+R!}jK^v8N{ERVO^i8u;f0F{q6RMv#*3L4@gqcx7eI_L3kv@Jr^P3I&hLHSbI$X9 zx;*{)WcA0^z=9!TXg8YonHAuk02k!a3bR%4GQ1J`Z!r4{hF}NuHJUZSE;s}?z?Le0W` zP>vpl3Zw*OZw^v4s~%wS0s*`N$H*WY=hNcGV@xE;*a4`F7NCaaU8q(pLj7NyfpYL0 zRO>Fo0K5j5u^YI>Y!myd8)^ZJ^qFz&1p}&H^el`a^&Dw^H_Cfn$+W)%jiPdpMisdv zj}D_Ll-MnSO2*Lj=xy2{ccL2X>!N_w2Ko1-zXor36s`WrNWc?iEm5|cQ4QoqRAp8r zlHnW|?hpUt z&kkgqdpjfU^PPwMPD^By^I&Ak`6zPSJ-BYfw`zK}G*1MjO0iUlK2R*pIG3W`PB^yS c9gjWJ5ZtbS6im+jH~xLVJ>NI&bKK\n" "Language-Team: \n" "Language: nl\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.8.8\n" #: admin.py:5 msgid "Thalia administration" @@ -42,7 +42,7 @@ msgstr "Bestuur" msgid "Committees" msgstr "Commissies" -#: menus.py:8 menus.py:10 +#: menus.py:8 menus.py:11 msgid "Members" msgstr "Leden" @@ -50,115 +50,169 @@ msgstr "Leden" msgid "Documents" msgstr "Documenten" -#: menus.py:11 templates/singlepages/sister_associations.html:4 -#: templates/singlepages/sister_associations.html:17 +#: menus.py:10 +msgid "Merchandise" +msgstr "Merchandise" + +#: menus.py:12 templates/singlepages/sister_associations.html:15 msgid "Sister Associations" msgstr "Zusterverenigingen" -#: menus.py:12 templates/singlepages/become_a_member.html:4 -#: templates/singlepages/become_a_member.html:7 +#: menus.py:13 templates/singlepages/become_a_member.html:5 msgid "Become a Member" msgstr "Lid Worden" -#: menus.py:13 +#: menus.py:14 msgid "Thabloid" msgstr "Thabloid" -#: menus.py:15 +#: menus.py:16 msgid "For Members" msgstr "Voor Leden" -#: menus.py:16 +#: menus.py:18 msgid "Photos" msgstr "Foto's" -#: menus.py:17 +#: menus.py:19 msgid "Statistics" msgstr "Statistieken" -#: menus.py:18 +#: menus.py:20 msgid "Become Active" msgstr "Actief Worden" -#: menus.py:19 +#: menus.py:21 msgid "Wiki" msgstr "Wiki" -#: menus.py:21 +#: menus.py:23 msgid "Calendar" msgstr "Agenda" -#: menus.py:22 +#: menus.py:24 msgid "Career" msgstr "Carrière" -#: menus.py:23 +#: menus.py:25 msgid "Partners" msgstr "Sponsoren" -#: menus.py:24 +#: menus.py:26 msgid "Vacancies" msgstr "Vacatures" -#: menus.py:26 +#: menus.py:28 msgid "Education" msgstr "Onderwijs" -#: menus.py:27 +#: menus.py:29 msgid "Book Sale" msgstr "Boekverkoop" -#: menus.py:28 +#: menus.py:30 msgid "Course Overview" msgstr "Vakkenoverzicht" -#: menus.py:29 +#: menus.py:31 msgid "Submit Exam" msgstr "Tentamen Insturen" -#: menus.py:30 +#: menus.py:32 msgid "Submit Summary" msgstr "Samenvatting Insturen" -#: menus.py:32 templates/singlepages/contact.html:4 -#: templates/singlepages/contact.html:7 +#: menus.py:34 templates/singlepages/contact.html:5 msgid "Contact" msgstr "Contact" -#: settings/settings.py:138 +#: settings/settings.py:149 msgid "English" msgstr "Engels" -#: settings/settings.py:139 +#: settings/settings.py:150 msgid "Dutch" msgstr "Nederlands" -#: templates/base.html:9 templates/base.html:88 templates/base.html:125 +#: templates/400.html:4 +msgid "400: Bad request" +msgstr "" + +#: templates/403.html:4 +msgid "403: Permission denied." +msgstr "" + +#: templates/404.html:4 +msgid "404: Page not found." +msgstr "" + +#: templates/500.html:4 +msgid "" +"500: Internal server error. Thalia's website committee has been notified." +msgstr "" + +#: templates/base.html:9 templates/base.html:161 msgid "Study Association Thalia" msgstr "Studievereniging Thalia" -#: templates/base.html:160 templates/registration/login.html:7 -#: templates/registration/login.html:28 +#: templates/base.html:68 templates/registration/login.html:7 +#: templates/registration/login.html:46 msgid "Login" msgstr "Inloggen" -#: templates/registration/login.html:12 -msgid "" -"\n" -"

Your account does not have access to this page. To proceed, " -"please\n" -" log in with an account that has access.

\n" -" " -msgstr "" +#: templates/base.html:77 +msgid "Edit Profile" +msgstr "Bewerk profiel" + +#: templates/base.html:78 +msgid "Profile Picture" +msgstr "Profielafbeelding" + +#: templates/base.html:80 +msgid "Log Out" +msgstr "Uitloggen" -#: templates/registration/login.html:17 +#: templates/error.html:7 +msgid "Error" +msgstr "Fout" + +#: templates/error.html:10 +msgid "An error occurred." +msgstr "Er is een fout opgetreden." + +#: templates/registration/login.html:10 +msgid "Log in" +msgstr "Inloggen" + +#: templates/registration/login.html:14 msgid "" -"\n" -"

Please log in to see this page.

\n" -" " +"Your account does not have access to this page. To proceed, please log in " +"with an account that has access." msgstr "" +"Je hebt geen toegang tot deze pagina. Om verder te gaan moet je inloggen met " +"een account dat de juiste permissies heeft." -#: templates/singlepages/become_a_member.html:9 +#: templates/registration/login.html:18 +msgid "Please log in to see this page." +msgstr "Log in om deze pagina te bekijken." + +#: templates/registration/login.html:27 +msgid "Invalid username or password." +msgstr "Ongeldige gebruikersnaam of wachtwoord." + +#: templates/registration/login.html:38 +msgid "Username" +msgstr "Gebruikersnaam" + +#: templates/registration/login.html:42 +msgid "Password" +msgstr "Wachtwoord" + +#: templates/registration/login.html:47 +msgid "Forgot password" +msgstr "Wachtwoord vergeten" + +#: templates/singlepages/become_a_member.html:7 msgid "" "Thalia is the study association for Computing Science and Information " "Sciences students at the Radboud University in Nijmegen. Thalia organises a " @@ -174,11 +228,11 @@ msgstr "" "en kun je met korting je studieboeken bestellen. Kortom, geen reden om niet " "lid te worden!" -#: templates/singlepages/become_a_member.html:11 +#: templates/singlepages/become_a_member.html:9 msgid "How do I become a member?" msgstr "Hoe kan ik lid worden?" -#: templates/singlepages/become_a_member.html:13 +#: templates/singlepages/become_a_member.html:11 msgid "" "You can become a member of Thalia at any time during the year. Membership " "costs € 7.50 per year, or € 30 for your entire study duration. To become a " @@ -196,7 +250,7 @@ msgstr "" "bij bestuurskamer Let wel op: Je kunt alleen lid worden wanneer je " "informatica of informatiekunde studeert aan de Radboud Universiteit." -#: templates/singlepages/become_a_member.html:15 +#: templates/singlepages/become_a_member.html:13 msgid "" "I'm not a Computing Science and Information Sciences student at the Radboud " "University, but I do want to attend your events. Now what?" @@ -204,7 +258,7 @@ msgstr "" "Ik studeer geen Informatica of Informatiekunde (aan de Radboud " "Universiteit), maar ik wil wel naar jullie activiteiten gaan. Wat nu?" -#: templates/singlepages/become_a_member.html:17 +#: templates/singlepages/become_a_member.html:15 msgid "" "It is still possible to be associated with Thalia, even if you do not study " "Computing Science or Information Sciences (anymore): You can become a " @@ -224,7 +278,7 @@ msgstr "" "kun je allemaal invullen op het begunstigerformulier, dat af te halen is in " "de bestuurskamer of hieronder te downloaden is." -#: templates/singlepages/become_a_member.html:19 +#: templates/singlepages/become_a_member.html:17 msgid "" "Payment for membership or sponsorship can be made both in cash or by " "authorised direct debit. To authorise direct debit, use the form that is " @@ -238,12 +292,11 @@ msgstr "" "en/of je lidmaatschap dan kun je altijd mailen naar info@thalia.nu!" -#: templates/singlepages/become_active.html:4 -#: templates/singlepages/become_active.html:7 +#: templates/singlepages/become_active.html:5 msgid "Become active" msgstr "Actief worden" -#: templates/singlepages/become_active.html:9 +#: templates/singlepages/become_active.html:7 msgid "" "Throughout the year, Thalia organizes a wide variety of activities, both " "educational (such as symposiums and programming contests) as well as social " @@ -263,7 +316,7 @@ msgstr "" "onderhouden, of foto's maken op evenementen. Ongeveer 50 - 60 leden zetten " "zich ieder jaar in om geweldige activiteiten te organiseren voor alle leden." -#: templates/singlepages/become_active.html:11 +#: templates/singlepages/become_active.html:9 msgid "" "Does it seem like fun to join a committee and do your bit to contribute to " "the association? Then become a member of one of the committees! You can do " @@ -277,7 +330,7 @@ msgstr "" "\">intern@thalia.nu, een Facebookbericht te sturen of een bestuurs- of " "commissielid persoonlijk aan te spreken." -#: templates/singlepages/become_active.html:13 +#: templates/singlepages/become_active.html:11 msgid "" "Are you not sure if being part of a committee is for you? You can always sit " "in on a meeting to see if you like it. Again, feel free to ask committee " @@ -289,119 +342,123 @@ msgstr "" "kunt ook commissieleden of het bestuur persoonlijk aanspreken. De commissies " "zijn altijd op zoek naar nieuwe enthousiaste leden!" -#: templates/singlepages/contact.html:11 +#: templates/singlepages/contact.html:9 msgid "Faculty:" msgstr "Faculteit:" -#: templates/singlepages/contact.html:12 +#: templates/singlepages/contact.html:10 msgid "Faculty of Science" msgstr "Faculteit der Natuurwetenschappen, Wiskunde & Informatica" -#: templates/singlepages/contact.html:15 +#: templates/singlepages/contact.html:13 msgid "Room:" msgstr "Kamer:" -#: templates/singlepages/contact.html:19 +#: templates/singlepages/contact.html:17 msgid "Address:" msgstr "Adres:" -#: templates/singlepages/contact.html:20 +#: templates/singlepages/contact.html:18 msgid "Board room: HG00.150 (above the north-canteen)" msgstr "Bestuurskamer: HG00.150 (boven de noordkantine)" -#: templates/singlepages/contact.html:23 +#: templates/singlepages/contact.html:21 msgid "Postal address:" msgstr "Postadres:" -#: templates/singlepages/contact.html:27 +#: templates/singlepages/contact.html:25 msgid "Telephone:" msgstr "Telefoon:" -#: templates/singlepages/contact.html:31 +#: templates/singlepages/contact.html:29 msgid "Voicemailbox:" msgstr "Voicemailbox:" -#: templates/singlepages/contact.html:35 +#: templates/singlepages/contact.html:33 msgid "Email:" msgstr "E-mail:" -#: templates/singlepages/contact.html:37 +#: templates/singlepages/contact.html:35 msgid "general" msgstr "algemeen" -#: templates/singlepages/contact.html:38 +#: templates/singlepages/contact.html:36 msgid "communication w.r.t. promoting your company (activities)" msgstr "communicatie over het promoten van uw bedrijf(sactiviteiten)" -#: templates/singlepages/contact.html:50 +#: templates/singlepages/contact.html:40 +msgid "Kamer van Koophandel" +msgstr "Chamber of Commerce" + +#: templates/singlepages/contact.html:48 msgid "VAT number:" msgstr "BTW-nummer:" -#: templates/singlepages/sister_associations.html:7 +#: templates/singlepages/sister_associations.html:5 msgid "Associations of the Radboud University Science Faculty" msgstr "Bètaverenigingen van de Radboud Universiteit" -#: templates/singlepages/sister_associations.html:9 +#: templates/singlepages/sister_associations.html:7 msgid "(Medical) Biology" msgstr "(Medische) Biologie" -#: templates/singlepages/sister_associations.html:10 +#: templates/singlepages/sister_associations.html:8 msgid "Artificial Intelligence" msgstr "Kunstmatige Intelligentie" -#: templates/singlepages/sister_associations.html:11 +#: templates/singlepages/sister_associations.html:9 msgid "Mathematics" msgstr "Wiskunde" -#: templates/singlepages/sister_associations.html:12 +#: templates/singlepages/sister_associations.html:10 msgid "Science" msgstr "Science" -#: templates/singlepages/sister_associations.html:13 +#: templates/singlepages/sister_associations.html:11 msgid "Physics and Astronomy" msgstr "Natuur- en Sterrekunde" -#: templates/singlepages/sister_associations.html:14 +#: templates/singlepages/sister_associations.html:12 msgid "Science faculty umbrella association" msgstr "Overkoepelende bètavereniging" -#: templates/singlepages/sister_associations.html:15 +#: templates/singlepages/sister_associations.html:13 msgid "Molecular Sciences" msgstr "Moleculaire Wetenschappen" -#: templates/singlepages/sister_associations.html:19 -#: templates/singlepages/sister_associations.html:26 +#: templates/singlepages/sister_associations.html:17 +#: templates/singlepages/sister_associations.html:24 msgid "University of Twente" msgstr "Universiteit Twente" -#: templates/singlepages/sister_associations.html:20 -#: templates/singlepages/sister_associations.html:28 +#: templates/singlepages/sister_associations.html:18 +#: templates/singlepages/sister_associations.html:26 msgid "Utrecht University" msgstr "Universiteit Utrecht" -#: templates/singlepages/sister_associations.html:21 +#: templates/singlepages/sister_associations.html:19 msgid "Delft University of Technology" msgstr "Technische Universiteit Delft" +#: templates/singlepages/sister_associations.html:20 #: templates/singlepages/sister_associations.html:22 -#: templates/singlepages/sister_associations.html:24 msgid "University of Groningen" msgstr "Rijksuniversiteit Groningen" -#: templates/singlepages/sister_associations.html:23 +#: templates/singlepages/sister_associations.html:21 msgid "Leiden University" msgstr "Universiteit Leiden" -#: templates/singlepages/sister_associations.html:25 +#: templates/singlepages/sister_associations.html:23 msgid "Eindhoven University of Technology" msgstr "Technische Universiteit Eindhoven" -#: templates/singlepages/sister_associations.html:27 -#: templates/singlepages/sister_associations.html:30 +#: templates/singlepages/sister_associations.html:25 +#: templates/singlepages/sister_associations.html:28 msgid "University of Amsterdam" msgstr "Universiteit van Amsterdam" -#: templates/singlepages/sister_associations.html:29 +#: templates/singlepages/sister_associations.html:27 msgid "VU University Amsterdam" msgstr "Vrije Universiteit Amsterdam" diff --git a/website/thaliawebsite/static/css/skin.less b/website/thaliawebsite/static/css/skin.less index 5f2f221e..75e09318 100644 --- a/website/thaliawebsite/static/css/skin.less +++ b/website/thaliawebsite/static/css/skin.less @@ -221,6 +221,12 @@ body { } } + .btn { + &.login { + margin-right: 0px; + } + } + /* -------------------------------------------------------------------------------- / [8.1] CONTENT COMMON / -------------------------------------------------------------------------------- */ @@ -408,3 +414,8 @@ body { .pagination a, .pagination-info { color: @background-color; } + +/* -------------------------------------------------------------------------------- / + DJANGO LOGIN FORM +/ -------------------------------------------------------------------------------- */ + diff --git a/website/thaliawebsite/templates/403.html b/website/thaliawebsite/templates/403.html index 9cf300a5..5821fb1a 100644 --- a/website/thaliawebsite/templates/403.html +++ b/website/thaliawebsite/templates/403.html @@ -1,7 +1,7 @@ {% extends "error.html" %} {% load i18n %} -{% block error_message %}{% trans "403: Permision denied." %}
+{% block error_message %}{% trans "403: Permission denied." %}
{{ exception }} {% endblock %} diff --git a/website/thaliawebsite/templates/404.html b/website/thaliawebsite/templates/404.html index 29f69170..feca03b1 100644 --- a/website/thaliawebsite/templates/404.html +++ b/website/thaliawebsite/templates/404.html @@ -1,6 +1,6 @@ {% extends "error.html" %} {% load i18n %} -{% block error_message %}{% trans "404: page not found." %}
+{% block error_message %}{% trans "404: Page not found." %}
{% endblock %} diff --git a/website/thaliawebsite/templates/500.html b/website/thaliawebsite/templates/500.html index d05963f3..fece6e7b 100644 --- a/website/thaliawebsite/templates/500.html +++ b/website/thaliawebsite/templates/500.html @@ -1,4 +1,4 @@ {% extends "error.html" %} {% load i18n %} -{% block error_message %}{% trans "500: internal server error. Thalia's website committee has been notified." %}{% endblock %} +{% block error_message %}{% trans "500: Internal server error. Thalia's website committee has been notified." %}{% endblock %} diff --git a/website/thaliawebsite/templates/registration/login.html b/website/thaliawebsite/templates/registration/login.html index 1897af2a..d853fd1e 100644 --- a/website/thaliawebsite/templates/registration/login.html +++ b/website/thaliawebsite/templates/registration/login.html @@ -6,28 +6,45 @@ {% block title %}{% trans "Login" %}{% endblock %} {% block body %} -

{% trans "Log in" %}

- {% if next %} - {% if user.is_authenticated %} - {% blocktrans %} -

Your account does not have access to this page. To proceed, please - log in with an account that has access.

- {% endblocktrans %} - {% else %} - {% blocktrans %} -

Please log in to see this page.

- {% endblocktrans %} - {% endif %} - {% endif %} -
-
- {% csrf_token %} - - {{ form }} -
- - -
- -
+

{% trans "Log in" %}

+{% if next %} +

+{% if user.is_authenticated %} +{% blocktrans trimmed %} +Your account does not have access to this page. To proceed, please log in with an account that has access. +{% endblocktrans %} +{% else %} +{% blocktrans trimmed %} +Please log in to see this page. +{% endblocktrans %} +{% endif %} +

+{% endif %} + +{% if form.errors %} +
+ {% trans "Invalid username or password." %} + +
+{% endif %} + +
+
+ {% csrf_token %} + + +
+ +
+ +
+ +
+ +
+ + {% trans "Forgot password" %} +
+
+
{% endblock %} -- GitLab