Merge develop to branch

webapp/templates/contact.html

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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,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

@@ -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

@@ -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

@@ -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,