Mobile login screen and translations

This commit is contained in:
Jan Tuomi
2017-05-28 22:03:02 +03:00
parent 362422b86b
commit cc9768b895
6 changed files with 116 additions and 76 deletions
Binary file not shown.
+48 -35
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-26 19:53+0300\n"
"POT-Creation-Date: 2017-05-28 21:51+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -50,7 +50,7 @@ msgid "External image"
msgstr "External image"
#: infoscreen/templates/infoscreen_admin.html:24
#: members/templates/members_base.html:69
#: members/templates/members_base.html:79
msgid "Log out"
msgstr "Log out"
@@ -239,7 +239,7 @@ msgstr "Error"
msgid "Back"
msgstr "Back"
#: members/templates/member_add.html:8 members/templates/members_base.html:45
#: members/templates/member_add.html:8 members/templates/members_base.html:55
msgid "Add member"
msgstr "Add member"
@@ -302,46 +302,47 @@ msgid "Download CSV"
msgstr "Download CSV"
#: members/templates/members_base.html:33
#: members/templates/members_base.html:42
msgid "Member register of SIK ry"
msgstr "Member register of SIK ry"
#: members/templates/members_base.html:42 webapp/templates/main_index.html:7
#: members/templates/members_base.html:52 webapp/templates/main_index.html:7
msgid "Members"
msgstr "Members"
#: members/templates/members_base.html:44
#: members/templates/members_base.html:54
msgid "List members"
msgstr "List members"
#: members/templates/members_base.html:46
#: members/templates/members_base.html:56
msgid "Add multiple"
msgstr "Add multiple"
#: members/templates/members_base.html:50
#: members/templates/members_base.html:60
msgid "Payments"
msgstr "Payments"
#: members/templates/members_base.html:52
#: members/templates/members_base.html:62
msgid "List payments"
msgstr "List payments"
#: members/templates/members_base.html:53 members/templates/payment_add.html:8
#: members/templates/members_base.html:63 members/templates/payment_add.html:8
msgid "Add payment"
msgstr "Add payment"
#: members/templates/members_base.html:57
#: members/templates/members_base.html:67
msgid "Applications"
msgstr "Applications"
#: members/templates/members_base.html:59
#: members/templates/members_base.html:69
msgid "List applications"
msgstr "List applications"
#: members/templates/members_base.html:60
#: members/templates/members_base.html:70
msgid "Application form"
msgstr "Application form"
#: members/templates/members_base.html:65 members/templates/settings.html:11
#: members/templates/members_base.html:75 members/templates/settings.html:11
msgid "Settings"
msgstr "Settings"
@@ -361,93 +362,93 @@ msgstr "Payment events"
msgid "Language"
msgstr "Language"
#: members/templates/settings.html:20 sikweb/settings-sample.py:177
#: members/templates/settings.html:20 sikweb/settings-sample.py:179
#: sikweb/settings.py:177
msgid "Finnish"
msgstr "Finnish"
#: members/templates/settings.html:21 sikweb/settings-sample.py:176
#: members/templates/settings.html:21 sikweb/settings-sample.py:178
#: sikweb/settings.py:176
msgid "English"
msgstr "English"
#: members/views.py:114 members/views.py:171 members/views.py:190
#: members/views.py:127 members/views.py:184 members/views.py:203
msgid "No member id specified"
msgstr "No member id specified"
#: members/views.py:136
#: members/views.py:149
msgid "Successfully added member"
msgstr "Successfully added member"
#: members/views.py:157
#: members/views.py:170
msgid "Successfully updated member"
msgstr "Successfully updated member"
#: members/views.py:161
#: members/views.py:174
msgid "Could not update member object"
msgstr "Could not update member object"
#: members/views.py:175
#: members/views.py:188
msgid "Successfully deleted member"
msgstr "Successfully deleted member"
#: members/views.py:181
#: members/views.py:194
msgid "Could not delete member object"
msgstr "Could not delete member object"
#: members/views.py:224 members/views.py:258 members/views.py:276
#: members/views.py:237 members/views.py:271 members/views.py:289
msgid "No application id specified"
msgstr "No application id specified"
#: members/views.py:245
#: members/views.py:258
msgid "Successfully accepted application"
msgstr "Successfully accepted application"
#: members/views.py:248
#: members/views.py:261
msgid "Could not accept application object"
msgstr "Could not accept application object"
#: members/views.py:262
#: members/views.py:275
msgid "Successfully deleted application"
msgstr "Successfully deleted application"
#: members/views.py:267
#: members/views.py:280
msgid "Could not delete application object"
msgstr "Could not delete application object"
#: members/views.py:331
#: members/views.py:344
msgid "Successfully added payment for member"
msgstr "Successfully added payment for member"
#: members/views.py:344 members/views.py:357 members/views.py:371
#: members/views.py:357 members/views.py:370 members/views.py:384
msgid "No payment id specified"
msgstr "No payment id specified"
#: members/views.py:375
#: members/views.py:388
msgid "Successfully deleted payment"
msgstr "Successfully deleted payment"
#: members/views.py:380
#: members/views.py:393
msgid "Could not delete payment object"
msgstr "Could not delete payment object"
#: members/views.py:395
#: members/views.py:408
msgid "Successfully updated payment"
msgstr "Successfully updated payment"
#: members/views.py:398
#: members/views.py:411
msgid "Could not update payment object"
msgstr "Could not update payment object"
#: members/views.py:415
#: members/views.py:428
msgid "Missing \"textfield\" POST request field"
msgstr "Missing \"textfield\" POST request field"
#: members/views.py:420
#: members/views.py:433
msgid "Successfully imported multiple members"
msgstr "Successfully imported multiple members"
#: members/views.py:423
#: members/views.py:436
msgid "Failed to import members"
msgstr "Failed to import members"
@@ -463,6 +464,18 @@ msgstr "SIK Admin"
msgid "Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr "Aalto-yliopiston Sähköinsinöörikilta ry"
#: webapp/templates/login.html:25 webapp/templates/login.html:27
msgid "Username"
msgstr "Username"
#: webapp/templates/login.html:31 webapp/templates/login.html:33
msgid "Password"
msgstr "Password"
#: webapp/templates/login.html:43
msgid "Log in"
msgstr "Log in"
#: webapp/templates/main_index.html:8
msgid "Infoscreen"
msgstr "Infoscreen"
Binary file not shown.
+48 -35
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-26 19:53+0300\n"
"POT-Creation-Date: 2017-05-28 21:51+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,7 +51,7 @@ msgid "External image"
msgstr "Ulkoinen kuva"
#: infoscreen/templates/infoscreen_admin.html:24
#: members/templates/members_base.html:69
#: members/templates/members_base.html:79
msgid "Log out"
msgstr "Kirjaudu ulos"
@@ -240,7 +240,7 @@ msgstr "Virhe"
msgid "Back"
msgstr "Takaisin"
#: members/templates/member_add.html:8 members/templates/members_base.html:45
#: members/templates/member_add.html:8 members/templates/members_base.html:55
msgid "Add member"
msgstr "Lisää jäsen"
@@ -306,46 +306,47 @@ msgid "Download CSV"
msgstr "Lataa CSV"
#: members/templates/members_base.html:33
#: members/templates/members_base.html:42
msgid "Member register of SIK ry"
msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri"
#: members/templates/members_base.html:42 webapp/templates/main_index.html:7
#: members/templates/members_base.html:52 webapp/templates/main_index.html:7
msgid "Members"
msgstr "Jäsenet"
#: members/templates/members_base.html:44
#: members/templates/members_base.html:54
msgid "List members"
msgstr "Jäsenlistaus"
#: members/templates/members_base.html:46
#: members/templates/members_base.html:56
msgid "Add multiple"
msgstr "Lisää useita"
#: members/templates/members_base.html:50
#: members/templates/members_base.html:60
msgid "Payments"
msgstr "Maksutapahtumat"
#: members/templates/members_base.html:52
#: members/templates/members_base.html:62
msgid "List payments"
msgstr "Maksulistaus"
#: members/templates/members_base.html:53 members/templates/payment_add.html:8
#: members/templates/members_base.html:63 members/templates/payment_add.html:8
msgid "Add payment"
msgstr "Lisää maksu"
#: members/templates/members_base.html:57
#: members/templates/members_base.html:67
msgid "Applications"
msgstr "Jäsenhakemukset"
#: members/templates/members_base.html:59
#: members/templates/members_base.html:69
msgid "List applications"
msgstr "Hakemuslistaus"
#: members/templates/members_base.html:60
#: members/templates/members_base.html:70
msgid "Application form"
msgstr "Jäsenhakemuslomake"
#: members/templates/members_base.html:65 members/templates/settings.html:11
#: members/templates/members_base.html:75 members/templates/settings.html:11
msgid "Settings"
msgstr "Asetukset"
@@ -365,93 +366,93 @@ msgstr "Maksutapahtumat"
msgid "Language"
msgstr "Kieli"
#: members/templates/settings.html:20 sikweb/settings-sample.py:177
#: members/templates/settings.html:20 sikweb/settings-sample.py:179
#: sikweb/settings.py:177
msgid "Finnish"
msgstr "suomi"
#: members/templates/settings.html:21 sikweb/settings-sample.py:176
#: members/templates/settings.html:21 sikweb/settings-sample.py:178
#: sikweb/settings.py:176
msgid "English"
msgstr "englanti"
#: members/views.py:114 members/views.py:171 members/views.py:190
#: members/views.py:127 members/views.py:184 members/views.py:203
msgid "No member id specified"
msgstr "Jäsenen ID ei määritelty"
#: members/views.py:136
#: members/views.py:149
msgid "Successfully added member"
msgstr "Onnistuneesti lisättiin jäsen"
#: members/views.py:157
#: members/views.py:170
msgid "Successfully updated member"
msgstr "Onnistuneesti päivitettiin jäsen"
#: members/views.py:161
#: members/views.py:174
msgid "Could not update member object"
msgstr "Jäsenobjektia ei voitu päivittää"
#: members/views.py:175
#: members/views.py:188
msgid "Successfully deleted member"
msgstr "Onnistuneesti poistettiin jäsen"
#: members/views.py:181
#: members/views.py:194
msgid "Could not delete member object"
msgstr "Jäsenobjektia ei voitu poistaa"
#: members/views.py:224 members/views.py:258 members/views.py:276
#: members/views.py:237 members/views.py:271 members/views.py:289
msgid "No application id specified"
msgstr "Hakemuksen ID ei määritelty"
#: members/views.py:245
#: members/views.py:258
msgid "Successfully accepted application"
msgstr "Onnistuneesti hyväksyttiin hakemus"
#: members/views.py:248
#: members/views.py:261
msgid "Could not accept application object"
msgstr "Hakemusobjektia ei voitu hyväksyä"
#: members/views.py:262
#: members/views.py:275
msgid "Successfully deleted application"
msgstr "Onnistuneesti poistettiin hakemus"
#: members/views.py:267
#: members/views.py:280
msgid "Could not delete application object"
msgstr "Hakemusobjektia ei voitu poistaa"
#: members/views.py:331
#: members/views.py:344
msgid "Successfully added payment for member"
msgstr "Onnistuneesti lisättiin maksutapahtuma jäsenelle"
#: members/views.py:344 members/views.py:357 members/views.py:371
#: members/views.py:357 members/views.py:370 members/views.py:384
msgid "No payment id specified"
msgstr "Maksutapahtuman ID ei määritelty"
#: members/views.py:375
#: members/views.py:388
msgid "Successfully deleted payment"
msgstr "Onnistuneesti poistettiin maksutapahtuma"
#: members/views.py:380
#: members/views.py:393
msgid "Could not delete payment object"
msgstr "Maksutapahtumaobjektia ei voitu poistaa"
#: members/views.py:395
#: members/views.py:408
msgid "Successfully updated payment"
msgstr "Onnistuneesti päivitettiin maksutapahtuma"
#: members/views.py:398
#: members/views.py:411
msgid "Could not update payment object"
msgstr "Maksutapahtumaobjektia ei voitu päivittää"
#: members/views.py:415
#: members/views.py:428
msgid "Missing \"textfield\" POST request field"
msgstr "Puuttuva \"textfield\" POST-kenttä"
#: members/views.py:420
#: members/views.py:433
msgid "Successfully imported multiple members"
msgstr "Onnistuneesti tuotu useita jäseniä"
#: members/views.py:423
#: members/views.py:436
msgid "Failed to import members"
msgstr "Jäsenten tuonti epäonnistui"
@@ -467,6 +468,18 @@ msgstr "SIK Hallintapaneeli"
msgid "Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr "Aalto-yliopiston Sähköinsinöörikilta ry"
#: webapp/templates/login.html:25 webapp/templates/login.html:27
msgid "Username"
msgstr "Käyttäjänimi"
#: webapp/templates/login.html:31 webapp/templates/login.html:33
msgid "Password"
msgstr "Salasana"
#: webapp/templates/login.html:43
msgid "Log in"
msgstr "Kirjaudu sisään"
#: webapp/templates/main_index.html:8
msgid "Infoscreen"
msgstr "Infonäyttö"
+14
View File
@@ -3,14 +3,28 @@ html {
height: 100%;
}
@media (max-width: 760px) {
html {
font-size: 24px;
}
}
@media (min-width: 760px) {
html {
font-size: 16px;
}
}
body {
max-width: 760px;
margin: auto;
font-size: 1rem;
}
h1 {
padding-bottom: 3rem;
padding-top: 3rem;
font-size: 3rem;
}
#content-body {
+6 -6
View File
@@ -5,8 +5,8 @@
<html>
<head>
<meta charset="utf-8">
<title>SIK - Login</title>
<meta name="viewport" charset="utf-8" content="width=device-width" />
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="{% static "js/lib/jquery-3.1.0.min.js" %}"></script>
@@ -22,15 +22,15 @@
<h1>SIK Admin</h1>
<form method="POST" class="form-horizontal" action=""> {% csrf_token %}
<div class="form-group row">
<label for="input-username" class="col-sm-2 col-form-label">Käyttäjätunnus</label>
<label for="input-username" class="col-sm-2 col-form-label">{% trans "Username" %}</label>
<div class="col-sm-10">
<input type="text" name="username" id="input-username" class="form-control" placeholder="Käyttäjätunnus"></input>
<input type="text" name="username" id="input-username" class="form-control" placeholder="{% trans "Username" %}"></input>
</div>
</div>
<div class="form-group row">
<label for="input-password" class="col-sm-2 col-form-label">Salasana</label>
<label for="input-password" class="col-sm-2 col-form-label">{% trans "Password" %}</label>
<div class="col-sm-10">
<input type="password" name="passwd" id="input-passwd" class="form-control" placeholder="Salasana"></input>
<input type="password" name="passwd" id="input-passwd" class="form-control" placeholder="{% trans "Password" %}"></input>
</div>
</div>
<div class="form-group row">
@@ -40,7 +40,7 @@
</div>
<div class="form-group row" id="login-button">
<div class="col-sm-2">
<button type="submit" class="btn btn-default">Kirjaudu</button>
<button type="submit" class="btn btn-primary">{% trans "Log in" %}</button>
</div>
</div>
</form>