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

Merge develop to branch

Browse Source
This commit is contained in:
Jan Tuomi
2017-09-28 23:42:51 +03:00
parent 8f06190bd0 ff801f5e08
commit bfc462a332
14 changed files with 216 additions and 48 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
+42 -25
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-28 22:57+0300\n"
"POT-Creation-Date: 2017-09-28 23:40+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"
@@ -81,10 +81,8 @@ msgid "Create new item"
msgstr "Create new item"
#: infoscreen/templates/infoscreen_admin.html:50
#, fuzzy
#| msgid "Create new item"
msgid "Create a new item by type"
msgstr "Create new item"
msgstr "Create a new item by type"
#: infoscreen/templates/infoscreen_admin.html:53
msgid "Item type"
@@ -532,12 +530,6 @@ msgstr "Could not update payment object"
msgid "Missing \"textfield\" POST request field"
msgstr "Missing \"textfield\" POST request field"
#: templates/admin/base_site.html:33
#, fuzzy
#| msgid "Language"
msgid "language"
msgstr "Language"
#: templates/admin/base_site.html:43
msgid "Go"
msgstr ""
@@ -654,6 +646,30 @@ msgstr "SIK Admin"
msgid "Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr "Aalto-yliopiston Sähköinsinöörikilta ry"
#: webapp/templates/contact.html:7 webapp/templates/navigation.html:32
msgid "Contact"
msgstr "Contact"
#: webapp/templates/event_calendar.html:7 webapp/templates/navigation.html:29
msgid "Event calendar"
msgstr "Event calendar"
#: webapp/templates/freshmen.html:7 webapp/templates/navigation.html:16
msgid "Freshmen"
msgstr "Freshmen"
#: webapp/templates/guild.html:7
msgid "Kilta"
msgstr "Guild"
#: webapp/templates/international.html:7 webapp/templates/navigation.html:30
msgid "International"
msgstr "International"
#: webapp/templates/jobs.html:7 webapp/templates/navigation.html:20
msgid "Jobs"
msgstr "Jobs"
#: webapp/templates/login.html:25 webapp/templates/login.html:27
msgid "Username"
msgstr "Username"
@@ -674,37 +690,38 @@ msgstr "Infoscreen"
msgid "Admin tools"
msgstr "Admin tools"
#: webapp/templates/navigation.html:29
msgid "Event calendar"
msgstr "Event calendar"
#: webapp/templates/navigation.html:15
msgid "Guild"
msgstr "Guild"
#: webapp/templates/navigation.html:30
msgid "International"
msgstr "International"
#: webapp/templates/navigation.html:18
msgid "Corporate"
msgstr "Corporate"
#: webapp/templates/navigation.html:31
#: webapp/templates/navigation.html:31 webapp/templates/sosso.html:7
msgid "Sössö"
msgstr "Sössö"
#: webapp/templates/navigation.html:32
msgid "Contact"
msgstr "Contact"
#: webapp/templates/ohlhafv.html:8
msgid "Ohlhafv"
msgstr ""
msgstr "Ohlhafv"
#: webapp/templates/ohlhafv.html:15
msgid "Challenge"
msgstr ""
msgstr "Challenge"
#: webapp/templates/ohlhafv_list.html:11
msgid "All challenges"
msgstr ""
msgstr "All challenges"
#: webapp/templates/ohlhafv_list.html:15
msgid "Total challenges:"
msgstr ""
msgstr "Total challenges:"
#, fuzzy
#~| msgid "Language"
#~ msgid "language"
#~ msgstr "Language"
#~ msgid "Successfully imported multiple members"
#~ msgstr "Successfully imported multiple members"
locale/fi/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
locale/fi/LC_MESSAGES/django.po
+35 -16
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-28 22:57+0300\n"
"POT-Creation-Date: 2017-09-28 23:40+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"
@@ -522,10 +522,6 @@ msgstr "Maksutapahtumaobjektia ei voitu päivittää"
msgid "Missing \"textfield\" POST request field"
msgstr "Puuttuva \"textfield\" POST-kenttä"
#: templates/admin/base_site.html:33
msgid "language"
msgstr "Kieli"
#: templates/admin/base_site.html:43
msgid "Go"
msgstr "Vaihda"
@@ -630,6 +626,30 @@ msgstr "SIK Hallintapaneeli"
msgid "Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr "Aalto-yliopiston Sähköinsinöörikilta ry"
#: webapp/templates/contact.html:7 webapp/templates/navigation.html:32
msgid "Contact"
msgstr "Yhteystiedot"
#: webapp/templates/event_calendar.html:7 webapp/templates/navigation.html:29
msgid "Event calendar"
msgstr "Tapahtumakalenteri"
#: webapp/templates/freshmen.html:7 webapp/templates/navigation.html:16
msgid "Freshmen"
msgstr "Fuksit"
#: webapp/templates/guild.html:7
msgid "Kilta"
msgstr ""
#: webapp/templates/international.html:7 webapp/templates/navigation.html:30
msgid "International"
msgstr "International"
#: webapp/templates/jobs.html:7 webapp/templates/navigation.html:20
msgid "Jobs"
msgstr "Työpaikat"
#: webapp/templates/login.html:25 webapp/templates/login.html:27
msgid "Username"
msgstr "Käyttäjänimi"
@@ -650,22 +670,18 @@ msgstr "Infonäyttö"
msgid "Admin tools"
msgstr "Hallintatyökalut"
#: webapp/templates/navigation.html:29
msgid "Event calendar"
msgstr "Tapahtumakalenteri"
#: webapp/templates/navigation.html:15
msgid "Guild"
msgstr "Kilta"
#: webapp/templates/navigation.html:30
msgid "International"
msgstr "International"
#: webapp/templates/navigation.html:18
msgid "Corporate"
msgstr "Yritys"
#: webapp/templates/navigation.html:31
#: webapp/templates/navigation.html:31 webapp/templates/sosso.html:7
msgid "Sössö"
msgstr "Sössö"
#: webapp/templates/navigation.html:32
msgid "Contact"
msgstr "Yhteystiedot"
#: webapp/templates/ohlhafv.html:8
msgid "Ohlhafv"
msgstr "Øhlhäfv"
@@ -681,3 +697,6 @@ msgstr "Kaikki haasteet"
#: webapp/templates/ohlhafv_list.html:15
msgid "Total challenges:"
msgstr "Haasteita yhteensä:"
#~ msgid "language"
#~ msgstr "Kieli"
webapp/templates/contact.html
+10
View File
@@ -0,0 +1,10 @@
{% extends "base.html" %}
{% block content %}
{% load i18n %}
<div class="contact_div">
<h2>{% trans "Contact" %}</h2>
</div>
{% endblock %}
webapp/templates/event_calendar.html
+10
View File
@@ -0,0 +1,10 @@
{% extends "base.html" %}
{% block content %}
{% load i18n %}
<div class="event_calendar_div">
<h2>{% trans "Event calendar" %}</h2>
</div>
{% endblock %}
webapp/templates/freshmen.html
+10
View File
@@ -0,0 +1,10 @@
{% extends "base.html" %}
{% block content %}
{% load i18n %}
<div class="freshmen_div">
<h2>{% trans "Freshmen" %}</h2>
</div>
{% endblock %}
webapp/templates/guild.html
+10
View File
@@ -0,0 +1,10 @@
{% extends "base.html" %}
{% block content %}
{% load i18n %}
<div class="guild_div">
<h2>{% trans "Kilta" %}</h2>
</div>
{% endblock %}
webapp/templates/international.html
+10
View File
@@ -0,0 +1,10 @@
{% extends "base.html" %}
{% block content %}
{% load i18n %}
<div class="international_div">
<h2>{% trans "International" %}</h2>
</div>
{% endblock %}
webapp/templates/jobs.html
+10
View File
@@ -0,0 +1,10 @@
{% extends "base.html" %}
{% block content %}
{% load i18n %}
<div class="jobs_div">
<h2>{% trans "Jobs" %}</h2>
</div>
{% endblock %}
webapp/templates/navigation.html
+7 -7
View File
@@ -7,17 +7,17 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</button>
</div>
<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="active"><a href="/">SIK<span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-home"></span></a></li>
<li><a href="/kilta">Kilta</a></li>
<li><a href="/fuksit">Fuksit</a></li>
<li><a href="/guild">{% trans "Guild" %}</a></li>
<li><a href="/freshmen">{% trans "Freshmen" %}</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Yritykset<span class="caret"></span><span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-user"></span></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Corporate" %}<span class="caret"></span><span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-user"></span></a>
<ul class="dropdown-menu forAnimate" role="menu">
<li><a href="#">Työpaikat</a></li>
<li><a href="/jobs">{% trans "Jobs" %}</a></li>
<li><a href="#">Yritysdadaa</a></li>
<li><a href="#">Lisää yritysdadaa</a></li>
<li class="divider"></li>
@@ -25,8 +25,8 @@
<li class="divider"></li>
<li><a href="#">Informes</a></li>
</ul>
</li>
<li ><a href="/kalenteri">{% trans "Event calendar" %}<span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-th-list"></span></a></li>
</li>
<li ><a href="/event_calendar">{% trans "Event calendar" %}<span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-th-list"></span></a></li>
<li ><a href="/international">{% trans "International" %}<span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-tags"></span></a></li>
<li ><a href="/sosso">{% trans "Sössö" %}</a></li>
<li ><a href="/contact">{% trans "Contact" %}<span class="pull-right hidden-xs showopacity glyphicon glyphicon-book"></span></a></li>
webapp/templates/sosso.html
+10
View File
@@ -0,0 +1,10 @@
{% extends "base.html" %}
{% block content %}
{% load i18n %}
<div class="sosso_div">
<h2>{% trans "Sössö" %}</h2>
</div>
{% endblock %}
webapp/urls.py
+17
View File
@@ -1,6 +1,7 @@
"""Webapp urls."""
from django.conf.urls import url
# from django.utils.translation import ugettext_lazy as _
from webapp.views import main_index
from webapp.views import admin_index
@@ -10,6 +11,13 @@ from webapp.views import about_view
from webapp.views import ohlhafv_view
from webapp.views import ohlhafv_submit
from webapp.views import ohlhafv_list
from webapp.views import guild_view
from webapp.views import freshmen_view
from webapp.views import jobs_view
from webapp.views import event_calendar_view
from webapp.views import international_view
from webapp.views import sosso_view
from webapp.views import contact_view
urlpatterns = [
# main
@@ -22,6 +30,15 @@ urlpatterns = [
# git revision
url(r'^about', about_view),
url(r'^guild', guild_view),
url(r'^freshmen', freshmen_view),
url(r'^event_calendar', event_calendar_view),
url(r'^international', international_view),
url(r'^sosso', sosso_view),
url(r'^contact', contact_view),
# corporate
url(r'^jobs', jobs_view),
# ohlhafv
url(r'^ohlhafv$', ohlhafv_view),
webapp/views.py
+45
View File
@@ -64,8 +64,51 @@ def about_view(request, *args, **kwargs):
return render(request, "about.html", {})
@require_http_methods(["GET"])
def guild_view(request, *args, **kwargs):
"""Render "Guild" page."""
return render(request, "guild.html", {})
@require_http_methods(["GET"])
def freshmen_view(request, *args, **kwargs):
"""Render "Freshmen" page."""
return render(request, "freshmen.html", {})
@require_http_methods(["GET"])
def jobs_view(request, *args, **kwargs):
"""Render "Jobs" page."""
return render(request, "jobs.html", {})
@require_http_methods(["GET"])
def event_calendar_view(request, *args, **kwargs):
"""Render "Event calendar" page."""
return render(request, "event_calendar.html", {})
@require_http_methods(["GET"])
def international_view(request, *args, **kwargs):
"""Render "International" page."""
return render(request, "international.html", {})
@require_http_methods(["GET"])
def sosso_view(request, *args, **kwargs):
"""Render "Sössö" page."""
return render(request, "sosso.html", {})
@require_http_methods(["GET"])
def contact_view(request, *args, **kwargs):
"""Render "Contact" page."""
return render(request, "contact.html", {})
@require_http_methods(["GET"])
def ohlhafv_view(request, *args, **kwargs):
"""Render Ohlhafv form page."""
form = OhlhafvForm()
return render(request, 'ohlhafv.html', {'form': form})
@@ -73,6 +116,7 @@ def ohlhafv_view(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["POST"])
def ohlhafv_submit(request, *args, **kwargs):
"""Submit Ohlhafv form."""
form = OhlhafvForm(request.POST)
if form.is_valid():
form.save()
@@ -86,6 +130,7 @@ def ohlhafv_submit(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["GET"])
def ohlhafv_list(request, *args, **kwargs):
"""Present Ohlhafv challenges list."""
challenges = OhlhafvChallenge.objects.all()
table = OhlhafvTable(challenges,