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

Add hot new designs to Ohlhafv 🔥

Browse Source
This commit is contained in:
Jan Tuomi
2018-01-25 18:31:06 +02:00
parent 9df62a1247
commit 78ba2d7afa
10 changed files with 177 additions and 98 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
+37 -44
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-01-24 19:03+0200\n"
"POT-Creation-Date: 2018-01-25 16:56+0200\n"
"PO-Revision-Date: 2017-11-02 23:09+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -162,8 +162,7 @@ msgid "id"
msgstr "id"
#: infoscreen/templates/infoscreen_admin.html:140 webapp/models.py:110
#: webapp/models.py:143 webapp/templates/form_listAll.html:36
#: webapp/templates/kaehmy/kaehmy_list.html:36
#: webapp/models.py:143 webapp/templates/kaehmy/kaehmy_list.html:36
msgid "Name"
msgstr "Name"
@@ -192,7 +191,6 @@ msgid "Last name"
msgstr "Last name"
#: members/models.py:16 webapp/models.py:144
#: webapp/templates/form_listAll.html:40
#: webapp/templates/kaehmy/kaehmy_list.html:40
msgid "Email"
msgstr "Email"
@@ -285,7 +283,6 @@ msgstr "Don't forget to pay your membership fee!"
#: members/templates/member_add_many.html:55
#: members/templates/member_add_many_confirm.html:22
#: templates/password_reset/recovery_form.html:10
#: webapp/templates/form_listAll.html:48
#: webapp/templates/kaehmy/kaehmy_list.html:48
msgid "Send"
msgstr "Send"
@@ -947,43 +944,6 @@ msgstr "Contact"
msgid "Event calendar"
msgstr "Event calendar"
#: webapp/templates/form_listAll.html:24 webapp/templates/form_listAll.html:59
#: webapp/templates/kaehmy/kaehmy_list.html:24
#: webapp/templates/kaehmy/kaehmy_list.html:59
msgid "All kaehmys"
msgstr "All applications"
#: webapp/templates/form_listAll.html:32
#: webapp/templates/kaehmy/kaehmy_list.html:32
msgid "Commenting on post by "
msgstr ""
#: webapp/templates/form_listAll.html:44
#: webapp/templates/kaehmy/kaehmy_list.html:44
msgid "Comment"
msgstr ""
#: webapp/templates/form_listAll.html:57
#: webapp/templates/kaehmy/kaehmy_list.html:57
msgid "Filter kaehmys"
msgstr "Filter kaehmys"
#: webapp/templates/form_listAll.html:70
#: webapp/templates/kaehmy/kaehmy_list.html:70
#: webapp/templates/kaehmy/kaehmy_statistics.html:18
msgid "Total kaehmys:"
msgstr "Total applications:"
#: webapp/templates/form_listAll.html:88
#: webapp/templates/kaehmy/kaehmy_list.html:88
msgid "Show comments"
msgstr ""
#: webapp/templates/form_listAll.html:94
#: webapp/templates/kaehmy/kaehmy_list.html:94
msgid "Add comment"
msgstr ""
#: webapp/templates/guild.html:10
msgid "Kilta"
msgstr "Guild"
@@ -1069,6 +1029,36 @@ msgstr ""
msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
#: webapp/templates/kaehmy/kaehmy_list.html:24
#: webapp/templates/kaehmy/kaehmy_list.html:59
msgid "All kaehmys"
msgstr "All applications"
#: webapp/templates/kaehmy/kaehmy_list.html:32
msgid "Commenting on post by "
msgstr ""
#: webapp/templates/kaehmy/kaehmy_list.html:44
msgid "Comment"
msgstr ""
#: webapp/templates/kaehmy/kaehmy_list.html:57
msgid "Filter kaehmys"
msgstr "Filter kaehmys"
#: webapp/templates/kaehmy/kaehmy_list.html:70
#: webapp/templates/kaehmy/kaehmy_statistics.html:18
msgid "Total kaehmys:"
msgstr "Total applications:"
#: webapp/templates/kaehmy/kaehmy_list.html:88
msgid "Show comments"
msgstr ""
#: webapp/templates/kaehmy/kaehmy_list.html:94
msgid "Add comment"
msgstr ""
#: webapp/templates/kaehmy/kaehmy_message.html:11
msgid "Reply"
msgstr ""
@@ -1135,13 +1125,16 @@ msgid "List challenges"
msgstr "All challenges"
#: webapp/templates/ohlhafv/new.html:12
msgid "Ohlhafv"
msgstr "Øhlhäfv"
msgid "Challenge your foe(s) to combat!"
msgstr ""
#: webapp/templates/ohlhafv/new.html:19
msgid "Challenge"
msgstr "Challenge"
#~ msgid "Ohlhafv"
#~ msgstr "Øhlhäfv"
#~ msgid "Infoscreen"
#~ msgstr "Infoscreen"
locale/fi/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
locale/fi/LC_MESSAGES/django.po
+38 -49
View File
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-01-24 19:03+0200\n"
"POT-Creation-Date: 2018-01-25 16:56+0200\n"
"PO-Revision-Date: 2017-11-02 23:04+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -163,8 +163,7 @@ msgid "id"
msgstr "id"
#: infoscreen/templates/infoscreen_admin.html:140 webapp/models.py:110
#: webapp/models.py:143 webapp/templates/form_listAll.html:36
#: webapp/templates/kaehmy/kaehmy_list.html:36
#: webapp/models.py:143 webapp/templates/kaehmy/kaehmy_list.html:36
msgid "Name"
msgstr "Nimi"
@@ -193,7 +192,6 @@ msgid "Last name"
msgstr "Sukunimi"
#: members/models.py:16 webapp/models.py:144
#: webapp/templates/form_listAll.html:40
#: webapp/templates/kaehmy/kaehmy_list.html:40
msgid "Email"
msgstr "Sähköposti"
@@ -286,7 +284,6 @@ msgstr "Muista myös maksaa jäsenmaksusi!"
#: members/templates/member_add_many.html:55
#: members/templates/member_add_many_confirm.html:22
#: templates/password_reset/recovery_form.html:10
#: webapp/templates/form_listAll.html:48
#: webapp/templates/kaehmy/kaehmy_list.html:48
msgid "Send"
msgstr "Lähetä"
@@ -944,43 +941,6 @@ msgstr "Yhteystiedot"
msgid "Event calendar"
msgstr "Tapahtumakalenteri"
#: webapp/templates/form_listAll.html:24 webapp/templates/form_listAll.html:59
#: webapp/templates/kaehmy/kaehmy_list.html:24
#: webapp/templates/kaehmy/kaehmy_list.html:59
msgid "All kaehmys"
msgstr "Kaikki kaehmyt"
#: webapp/templates/form_listAll.html:32
#: webapp/templates/kaehmy/kaehmy_list.html:32
msgid "Commenting on post by "
msgstr "Kommentoidaan viestiin lähettäjältä "
#: webapp/templates/form_listAll.html:44
#: webapp/templates/kaehmy/kaehmy_list.html:44
msgid "Comment"
msgstr "Kommentti"
#: webapp/templates/form_listAll.html:57
#: webapp/templates/kaehmy/kaehmy_list.html:57
msgid "Filter kaehmys"
msgstr "Rajaa kaehmyjä"
#: webapp/templates/form_listAll.html:70
#: webapp/templates/kaehmy/kaehmy_list.html:70
#: webapp/templates/kaehmy/kaehmy_statistics.html:18
msgid "Total kaehmys:"
msgstr "Kaehmyjä yhteensä:"
#: webapp/templates/form_listAll.html:88
#: webapp/templates/kaehmy/kaehmy_list.html:88
msgid "Show comments"
msgstr "Näytä kommentit"
#: webapp/templates/form_listAll.html:94
#: webapp/templates/kaehmy/kaehmy_list.html:94
msgid "Add comment"
msgstr "Kommentoi"
#: webapp/templates/guild.html:10
msgid "Kilta"
msgstr "Kilta"
@@ -1069,6 +1029,36 @@ msgstr "Etusivulle"
msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
#: webapp/templates/kaehmy/kaehmy_list.html:24
#: webapp/templates/kaehmy/kaehmy_list.html:59
msgid "All kaehmys"
msgstr "Kaikki kaehmyt"
#: webapp/templates/kaehmy/kaehmy_list.html:32
msgid "Commenting on post by "
msgstr "Kommentoidaan viestiin lähettäjältä "
#: webapp/templates/kaehmy/kaehmy_list.html:44
msgid "Comment"
msgstr "Kommentti"
#: webapp/templates/kaehmy/kaehmy_list.html:57
msgid "Filter kaehmys"
msgstr "Rajaa kaehmyjä"
#: webapp/templates/kaehmy/kaehmy_list.html:70
#: webapp/templates/kaehmy/kaehmy_statistics.html:18
msgid "Total kaehmys:"
msgstr "Kaehmyjä yhteensä:"
#: webapp/templates/kaehmy/kaehmy_list.html:88
msgid "Show comments"
msgstr "Näytä kommentit"
#: webapp/templates/kaehmy/kaehmy_list.html:94
msgid "Add comment"
msgstr "Kommentoi"
#: webapp/templates/kaehmy/kaehmy_message.html:11
msgid "Reply"
msgstr "Vastaa"
@@ -1095,16 +1085,12 @@ msgid "Are you perhaps looking for one of the following?"
msgstr "Etsitkö kenties jotain näistä?"
#: webapp/templates/main_index.html:24
#, fuzzy
#| msgid "Infoscreen Admin Pane"
msgid "Infoscreen admin pane"
msgstr "Infonäyttöjen hallintapaneeli"
#: webapp/templates/main_index.html:26
#, fuzzy
#| msgid "Kaehmy application: {}"
msgid "Kaehmy application"
msgstr "Kaehmy: {}"
msgstr "Kaehmyt"
#: webapp/templates/navigation.html:6
msgid "Guild"
@@ -1135,13 +1121,16 @@ msgid "List challenges"
msgstr "Kaikki haasteet"
#: webapp/templates/ohlhafv/new.html:12
msgid "Ohlhafv"
msgstr "Øhlhäfv"
msgid "Challenge your foe(s) to combat!"
msgstr "Haasta kaverisi mittelöön!"
#: webapp/templates/ohlhafv/new.html:19
msgid "Challenge"
msgstr "Haasta"
#~ msgid "Ohlhafv"
#~ msgstr "Øhlhäfv"
#~ msgid "Infoscreen"
#~ msgstr "Infonäyttö"
webapp/static/css/kaehmy_nav.css
+1 -1
View File
@@ -7,5 +7,5 @@
}
.navbar-light .navbar-nav .nav-link {
color: #102a40;
color: black;
}
webapp/static/css/ohlhafv/base.css
+95
View File
@@ -0,0 +1,95 @@
html, body {
background-color: rgb(252, 225, 69);
}
body {
padding: 0 1rem 0;
}
.bg-faded, .form-control {
/*background-color: rgb(252, 225, 69);*/
border-color: black;
color: black;
border-radius: 0;
box-shadow: 10px 10px rgba(0, 0, 0, 0.5);
}
.form-control:focus {
border-color: black;
outline-style: solid;
outline-color: black;
outline-width: 2px;
}
.form-control::placeholder {
color: rgb(63, 63, 63);
}
.form-group label {
color: black;
}
footer {
color: black;
}
footer select.form-control {
box-shadow: 0 0;
}
h3 {
padding: 2rem 0 2rem;
color: black;
}
.navbar {
border-radius: 0;
background-color: rgb(252, 225, 69);
box-shadow: 0 0;
}
.btn.btn-primary {
border-color: black;
background-color: white;
border-radius: 0;
color: black;
margin-top: 1rem;
box-shadow: 10px 10px rgba(0, 0, 0, 0.5);
}
.btn.btn-primary:hover {
outline-style: solid;
outline-color: black;
outline-width: 2px;
}
.card {
background-color: rgb(252, 225, 69);
border-color: black;
border-radius: 0;
box-shadow: 10px 10px rgba(0, 0, 0, 0.5);
margin-bottom: 2rem;
}
.card-header {
border-width: 0 0 1px 0;
border-style: solid;
border-color: black;
/*background-color: rgb(252, 225, 69);*/
}
.card h5 {
color: black;
}
.card p {
color: black;
}
h6 {
color: black;
}
webapp/static/img/heevi_banner.svg
+2 -2
View File
@@ -2,9 +2,9 @@
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1920px"
height="600px" viewBox="0 0 1920 600" enable-background="new 0 0 1920 600" xml:space="preserve">
height="600px" viewBox="0 0 1920 600" xml:space="preserve">
<g id="Layer_1">
<rect fill="#FCE145" stroke="#000000" stroke-miterlimit="10" width="1920" height="1080"/>
<rect fill="#FCE145" stroke-miterlimit="10" width="1920" height="600"/>
<circle fill="#FFFFFF" cx="665.65" cy="525.563" r="7.936"/>
<circle fill="#FFFFFF" cx="681.691" cy="506.813" r="5.123"/>
<circle fill="#FFFFFF" cx="136.777" cy="141.821" r="6.566"/>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

webapp/templates/ohlhafv/base.html
+2
View File
@@ -3,7 +3,9 @@
{% load static %}
{% load i18n %}
{% block header %}
<link rel="stylesheet" href="/static/css/ohlhafv/base.css">
{% include "ohlhafv/header.html" %}
{% endblock header %}
webapp/templates/ohlhafv/list.html
+1 -1
View File
@@ -5,7 +5,7 @@
{% block content %}
<div>
<h2 style="padding-top: 1rem">{% trans "All challenges" %}</h2>
<h3>{% trans "All challenges" %}</h3>
</div>
<div>
webapp/templates/ohlhafv/new.html
+1 -1
View File
@@ -9,7 +9,7 @@
{% block content %}
<div>
<h3>{% trans "Ohlhafv" %}</h3>
<h3>{% trans "Challenge your foe(s) to combat!" %}</h3>
<div id="input_form">
<form name="ohlhafvForm" action="/ohlhafv/submit/" method="post" class="form">{% csrf_token %}