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

Make some styles

Browse Source
This commit is contained in:
Jan Tuomi
2017-10-11 23:14:37 +03:00
parent bb01b8ae7c
commit 4e53098e23
7 changed files with 75 additions and 77 deletions
Download Patch File Download Diff File 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
+30 -31
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-11 22:32+0300\n" "POT-Creation-Date: 2017-10-11 22:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,8 +116,7 @@ msgstr "Type"
#: infoscreen/templates/infoscreen_admin.html:116 #: infoscreen/templates/infoscreen_admin.html:116
#: infoscreen/templates/infoscreen_admin.html:132 #: infoscreen/templates/infoscreen_admin.html:132
#: infoscreen/templates/infoscreen_admin.html:138 #: infoscreen/templates/infoscreen_admin.html:138
#: members/templates/member_edit.html:20 #: members/templates/member_edit.html:20 members/templates/payment_edit.html:20
#: members/templates/payment_edit.html:20
msgid "Delete" msgid "Delete"
msgstr "Delete" msgstr "Delete"
@@ -169,8 +168,7 @@ msgid "id"
msgstr "id" msgstr "id"
#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:93 #: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:93
#: webapp/models.py:134 webapp/models.py:155 #: webapp/models.py:123 webapp/templates/kaehmy_list.html:40
#: webapp/templates/kaehmy_list.html:40
msgid "Name" msgid "Name"
msgstr "Name" msgstr "Name"
@@ -212,7 +210,7 @@ msgstr "First name"
msgid "Last name" msgid "Last name"
msgstr "Last name" msgstr "Last name"
#: members/models.py:16 webapp/models.py:135 webapp/models.py:156 #: members/models.py:16 webapp/models.py:124
#: webapp/templates/kaehmy_list.html:44 #: webapp/templates/kaehmy_list.html:44
msgid "Email" msgid "Email"
msgstr "Email" msgstr "Email"
@@ -295,8 +293,7 @@ msgid "Add member"
msgstr "Add member" msgstr "Add member"
#: members/templates/member_add.html:15 members/templates/member_edit.html:18 #: members/templates/member_add.html:15 members/templates/member_edit.html:18
#: members/templates/payment_add.html:20 #: members/templates/payment_add.html:20 members/templates/payment_edit.html:18
#: members/templates/payment_edit.html:18
msgid "Save" msgid "Save"
msgstr "Save" msgstr "Save"
@@ -393,8 +390,7 @@ msgstr "Yes, I'm sure"
msgid "Edit member" msgid "Edit member"
msgstr "Edit member" msgstr "Edit member"
#: members/templates/member_list.html:11 #: members/templates/member_list.html:11 members/templates/members_base.html:15
#: members/templates/members_base.html:15
msgid "Member register" msgid "Member register"
msgstr "Member register" msgstr "Member register"
@@ -404,13 +400,11 @@ msgstr "Member register"
msgid "Members in register:" msgid "Members in register:"
msgstr "Member register" msgstr "Member register"
#: members/templates/member_list.html:28 #: members/templates/member_list.html:28 members/templates/payment_list.html:25
#: members/templates/payment_list.html:25
msgid "Search" msgid "Search"
msgstr "" msgstr ""
#: members/templates/member_list.html:36 #: members/templates/member_list.html:36 members/templates/payment_list.html:33
#: members/templates/payment_list.html:33
msgid "Showing results for" msgid "Showing results for"
msgstr "" msgstr ""
@@ -435,8 +429,7 @@ msgstr "Add multiple"
msgid "List payments" msgid "List payments"
msgstr "List payments" msgstr "List payments"
#: members/templates/members_base.html:63 #: members/templates/members_base.html:63 members/templates/payment_add.html:13
#: members/templates/payment_add.html:13
msgid "Add payment" msgid "Add payment"
msgstr "Add payment" msgstr "Add payment"
@@ -617,7 +610,7 @@ msgstr "Rotation"
msgid "Registrations" msgid "Registrations"
msgstr "Rotations" msgstr "Rotations"
#: webapp/models.py:94 webapp/models.py:164 #: webapp/models.py:94 webapp/models.py:163
#, fuzzy #, fuzzy
#| msgid "Add member" #| msgid "Add member"
msgid "Board member" msgid "Board member"
@@ -639,49 +632,49 @@ msgstr "Duration"
msgid "Summary" msgid "Summary"
msgstr "" msgstr ""
#: webapp/models.py:136 #: webapp/models.py:137
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: webapp/models.py:138 #: webapp/models.py:139
msgid "Timestamp" msgid "Timestamp"
msgstr "" msgstr ""
#: webapp/models.py:158 webapp/models.py:217 #: webapp/models.py:157 webapp/models.py:216
msgid "Phone number" msgid "Phone number"
msgstr "" msgstr ""
#: webapp/models.py:159 #: webapp/models.py:158
msgid "Year" msgid "Year"
msgstr "" msgstr ""
#: webapp/models.py:160 #: webapp/models.py:159
msgid "Text" msgid "Text"
msgstr "" msgstr ""
#: webapp/models.py:162 #: webapp/models.py:161
msgid "Custom role name" msgid "Custom role name"
msgstr "" msgstr ""
#: webapp/models.py:172 #: webapp/models.py:171
#, fuzzy #, fuzzy
#| msgid "Member applications" #| msgid "Member applications"
msgid "Kaehmy application: {}" msgid "Kaehmy application: {}"
msgstr "Member applications" msgstr "Member applications"
#: webapp/models.py:202 #: webapp/models.py:201
msgid "Role" msgid "Role"
msgstr "" msgstr ""
#: webapp/models.py:204 #: webapp/models.py:203
msgid "Start date" msgid "Start date"
msgstr "" msgstr ""
#: webapp/models.py:205 #: webapp/models.py:204
msgid "End date" msgid "End date"
msgstr "" msgstr ""
#: webapp/models.py:215 #: webapp/models.py:214
msgid "Official" msgid "Official"
msgstr "" msgstr ""
@@ -758,11 +751,17 @@ msgstr "Add payment"
msgid "Reply" msgid "Reply"
msgstr "" msgstr ""
#: webapp/templates/kaehmy_navigation.html:16 #: webapp/templates/kaehmy_navigation.html:10
msgid "Apply" #, fuzzy
#| msgid "Total challenges:"
msgid "List kaehmys"
msgstr "Total challenges:"
#: webapp/templates/kaehmy_navigation.html:11
msgid "New kaehmy"
msgstr "" msgstr ""
#: webapp/templates/kaehmy_navigation.html:17 #: webapp/templates/kaehmy_navigation.html:12
#: webapp/templates/kaehmy_statistics.html:12 #: webapp/templates/kaehmy_statistics.html:12
msgid "Statistics" msgid "Statistics"
msgstr "" msgstr ""
locale/fi/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
locale/fi/LC_MESSAGES/django.po
+32 -32
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-11 22:32+0300\n" "POT-Creation-Date: 2017-10-11 22:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -117,8 +117,7 @@ msgstr "Tyyppi"
#: infoscreen/templates/infoscreen_admin.html:116 #: infoscreen/templates/infoscreen_admin.html:116
#: infoscreen/templates/infoscreen_admin.html:132 #: infoscreen/templates/infoscreen_admin.html:132
#: infoscreen/templates/infoscreen_admin.html:138 #: infoscreen/templates/infoscreen_admin.html:138
#: members/templates/member_edit.html:20 #: members/templates/member_edit.html:20 members/templates/payment_edit.html:20
#: members/templates/payment_edit.html:20
msgid "Delete" msgid "Delete"
msgstr "Poista" msgstr "Poista"
@@ -170,8 +169,7 @@ msgid "id"
msgstr "id" msgstr "id"
#: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:93 #: infoscreen/templates/infoscreen_admin.html:141 webapp/models.py:93
#: webapp/models.py:134 webapp/models.py:155 #: webapp/models.py:123 webapp/templates/kaehmy_list.html:40
#: webapp/templates/kaehmy_list.html:40
msgid "Name" msgid "Name"
msgstr "Nimi" msgstr "Nimi"
@@ -211,7 +209,7 @@ msgstr "Etunimi"
msgid "Last name" msgid "Last name"
msgstr "Sukunimi" msgstr "Sukunimi"
#: members/models.py:16 webapp/models.py:135 webapp/models.py:156 #: members/models.py:16 webapp/models.py:124
#: webapp/templates/kaehmy_list.html:44 #: webapp/templates/kaehmy_list.html:44
msgid "Email" msgid "Email"
msgstr "Sähköposti" msgstr "Sähköposti"
@@ -294,8 +292,7 @@ msgid "Add member"
msgstr "Lisää jäsen" msgstr "Lisää jäsen"
#: members/templates/member_add.html:15 members/templates/member_edit.html:18 #: members/templates/member_add.html:15 members/templates/member_edit.html:18
#: members/templates/payment_add.html:20 #: members/templates/payment_add.html:20 members/templates/payment_edit.html:18
#: members/templates/payment_edit.html:18
msgid "Save" msgid "Save"
msgstr "Tallenna" msgstr "Tallenna"
@@ -390,8 +387,7 @@ msgstr "Kyllä, olen varma"
msgid "Edit member" msgid "Edit member"
msgstr "Muokkaa jäsentä" msgstr "Muokkaa jäsentä"
#: members/templates/member_list.html:11 #: members/templates/member_list.html:11 members/templates/members_base.html:15
#: members/templates/members_base.html:15
msgid "Member register" msgid "Member register"
msgstr "Jäsenrekisteri" msgstr "Jäsenrekisteri"
@@ -399,13 +395,11 @@ msgstr "Jäsenrekisteri"
msgid "Members in register:" msgid "Members in register:"
msgstr "Jäseniä:" msgstr "Jäseniä:"
#: members/templates/member_list.html:28 #: members/templates/member_list.html:28 members/templates/payment_list.html:25
#: members/templates/payment_list.html:25
msgid "Search" msgid "Search"
msgstr "Hae" msgstr "Hae"
#: members/templates/member_list.html:36 #: members/templates/member_list.html:36 members/templates/payment_list.html:33
#: members/templates/payment_list.html:33
msgid "Showing results for" msgid "Showing results for"
msgstr "Näytetään tulokset haulle" msgstr "Näytetään tulokset haulle"
@@ -430,8 +424,7 @@ msgstr "Lisää useita"
msgid "List payments" msgid "List payments"
msgstr "Maksulistaus" msgstr "Maksulistaus"
#: members/templates/members_base.html:63 #: members/templates/members_base.html:63 members/templates/payment_add.html:13
#: members/templates/payment_add.html:13
msgid "Add payment" msgid "Add payment"
msgstr "Lisää maksu" msgstr "Lisää maksu"
@@ -602,7 +595,7 @@ msgstr "Ilmoittautuminen"
msgid "Registrations" msgid "Registrations"
msgstr "Ilmoittautumiset" msgstr "Ilmoittautumiset"
#: webapp/models.py:94 webapp/models.py:164 #: webapp/models.py:94 webapp/models.py:163
msgid "Board member" msgid "Board member"
msgstr "Hallituksen jäsen" msgstr "Hallituksen jäsen"
@@ -618,47 +611,47 @@ msgstr "Kuvaus"
msgid "Summary" msgid "Summary"
msgstr "Tiivistelmä" msgstr "Tiivistelmä"
#: webapp/models.py:136 #: webapp/models.py:137
msgid "Message" msgid "Message"
msgstr "Viesti" msgstr "Viesti"
#: webapp/models.py:138 #: webapp/models.py:139
msgid "Timestamp" msgid "Timestamp"
msgstr "Aikaleima" msgstr "Aikaleima"
#: webapp/models.py:158 webapp/models.py:217 #: webapp/models.py:157 webapp/models.py:216
msgid "Phone number" msgid "Phone number"
msgstr "Puhelinnumero" msgstr "Puhelinnumero"
#: webapp/models.py:159 #: webapp/models.py:158
msgid "Year" msgid "Year"
msgstr "Vuosi" msgstr "Vuosi"
#: webapp/models.py:160 #: webapp/models.py:159
msgid "Text" msgid "Text"
msgstr "Teksti" msgstr "Teksti"
#: webapp/models.py:162 #: webapp/models.py:161
msgid "Custom role name" msgid "Custom role name"
msgstr "Uusi virka" msgstr "Uusi virka"
#: webapp/models.py:172 #: webapp/models.py:171
msgid "Kaehmy application: {}" msgid "Kaehmy application: {}"
msgstr "Kaehmy: {}" msgstr "Kaehmy: {}"
#: webapp/models.py:202 #: webapp/models.py:201
msgid "Role" msgid "Role"
msgstr "Rooli" msgstr "Rooli"
#: webapp/models.py:204 #: webapp/models.py:203
msgid "Start date" msgid "Start date"
msgstr "Alkupäivämäärä" msgstr "Alkupäivämäärä"
#: webapp/models.py:205 #: webapp/models.py:204
msgid "End date" msgid "End date"
msgstr "Loppupäivämäärä" msgstr "Loppupäivämäärä"
#: webapp/models.py:215 #: webapp/models.py:214
msgid "Official" msgid "Official"
msgstr "Toimihenkilö" msgstr "Toimihenkilö"
@@ -731,11 +724,15 @@ msgstr "Kommentoi"
msgid "Reply" msgid "Reply"
msgstr "Vastaa" msgstr "Vastaa"
#: webapp/templates/kaehmy_navigation.html:16 #: webapp/templates/kaehmy_navigation.html:10
msgid "Apply" msgid "List kaehmys"
msgstr "Hakulomake" msgstr "Kaikki kaehmyt"
#: webapp/templates/kaehmy_navigation.html:17 #: webapp/templates/kaehmy_navigation.html:11
msgid "New kaehmy"
msgstr "Uusi kaehmy"
#: webapp/templates/kaehmy_navigation.html:12
#: webapp/templates/kaehmy_statistics.html:12 #: webapp/templates/kaehmy_statistics.html:12
msgid "Statistics" msgid "Statistics"
msgstr "Kaehmytilastot" msgstr "Kaehmytilastot"
@@ -788,5 +785,8 @@ msgstr "Kaikki haasteet"
msgid "Total challenges:" msgid "Total challenges:"
msgstr "Haasteita yhteensä:" msgstr "Haasteita yhteensä:"
#~ msgid "Apply"
#~ msgstr "Hakulomake"
#~ msgid "language" #~ msgid "language"
#~ msgstr "Kieli" #~ msgstr "Kieli"
webapp/models.py
+5
View File
@@ -186,6 +186,11 @@ class KaehmyForm(MessageParent):
return total return total
def all_roles(self):
presets = [r.name.capitalize() for r in self.preset_roles.all()]
customs = [r.name.capitalize() for r in self.custom_roles.all()]
return ', '.join(presets + customs)
class Role(PresetRole): class Role(PresetRole):
""" """
webapp/templates/kaehmy_list.html
+6 -12
View File
@@ -21,11 +21,11 @@
</script> </script>
<div> <div>
<div> <div>
<h2>{% trans "All kaehmys" %}</h2> <h2 style="padding-top: 1rem">{% trans "All kaehmys" %}</h2>
</div> </div>
<div> <div>
<h6>{% trans "Total kaehmys:" %} {{ application_count }}</h6> <h6 style="padding-bottom: 1rem">{% trans "Total kaehmys:" %} {{ application_count }}</h6>
</div> </div>
<div class="collapse" id="collapse_add_comment"> <div class="collapse" id="collapse_add_comment">
@@ -58,17 +58,11 @@
{% for application in applications %} {% for application in applications %}
<div class="card"> <div class="card">
<h4 class="card-header">{{ application.name }}</h4>
<div class="card-block"> <div class="card-block">
<h4 class="card-title">{{ application.name }}</h4> <h5 style="padding-bottom: 1rem" class="card-subtitle mb-2 text-muted">{{ application.all_roles }}</h5>
<h5 class=class="card-subtitle mb-2 text-muted">{% trans "Roles" %}:</h5>
{% for role in application.custom_roles.all %} <p class="card-text">{{ application.text }}</p>
<h6>{{ role.name }}</h6>
{% endfor %}
{% for role in application.preset_roles.all %}
<h6>{{ role.name }}</h6>
{% endfor %}
<p>{{ application.text }}</p>
{% if application.comment_count > 0 %} {% if application.comment_count > 0 %}
<a type="button" style="cursor: pointer" data-toggle="collapse" data-target="#collapse_{{ application.id }}" aria-expanded="false" aria-controls="collapse_{{ application.id }}"> <a type="button" style="cursor: pointer" data-toggle="collapse" data-target="#collapse_{{ application.id }}" aria-expanded="false" aria-controls="collapse_{{ application.id }}">
webapp/templates/kaehmy_navigation.html
+2 -2
View File
@@ -7,8 +7,8 @@
</button> </button>
<div class="collapse navbar-collapse" id="kaehmy_nav"> <div class="collapse navbar-collapse" id="kaehmy_nav">
<div class="navbar-nav"> <div class="navbar-nav">
<a class="nav-item nav-link" href="/">SIK</a> <a class="nav-item nav-link" href="/kaehmy">{% trans "List kaehmys" %}</a>
<a class="nav-item nav-link" href="/kaehmy/new">{% trans "Apply" %} <span class="sr-only">(current)</span></a> <a class="nav-item nav-link" href="/kaehmy/new">{% trans "New kaehmy" %} <span class="sr-only">(current)</span></a>
<a class="nav-item nav-link" href="/kaehmy/statistics">{% trans "Statistics" %}</a> <a class="nav-item nav-link" href="/kaehmy/statistics">{% trans "Statistics" %}</a>
</div> </div>
</div> </div>