From 7c27365f1e654cc9178d93c4bca3fd573a38a92f Mon Sep 17 00:00:00 2001
From: henu <henri.varjotie@aalto.fi>
Date: Wed, 27 Sep 2017 19:24:30 +0300
Subject: [PATCH] Add views and urls for jobs and freshmen

---
 webapp/templates/guild.html      |  7 ++++++-
 webapp/templates/navigation.html | 14 +++++++-------
 webapp/urls.py                   |  7 +++++++
 webapp/views.py                  | 12 ++++++++++++
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/webapp/templates/guild.html b/webapp/templates/guild.html
index 3570195..9daddfc 100644
--- a/webapp/templates/guild.html
+++ b/webapp/templates/guild.html
@@ -1,5 +1,10 @@
+{% extends "base.html" %}
+{% block content %}
+
 {% load i18n %}
 
 <div class="guild_div">
-    <h2>{% "Kilta" %}</h2>
+    <h2>{% trans "Kilta" %}</h2>
 </div>
+
+{% endblock %}
diff --git a/webapp/templates/navigation.html b/webapp/templates/navigation.html
index 92fbfcf..6d85699 100644
--- a/webapp/templates/navigation.html
+++ b/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="/kalenteri">{% 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>
diff --git a/webapp/urls.py b/webapp/urls.py
index cb847d5..6084ece 100644
--- a/webapp/urls.py
+++ b/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
@@ -11,6 +12,8 @@ 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
 
 urlpatterns = [
     # main
@@ -24,6 +27,10 @@ urlpatterns = [
     # git revision
     url(r'^about', about_view),
     url(r'^guild', guild_view),
+    url(r'^freshmen', freshmen_view),
+
+    # corporate
+    url(r'^jobs', jobs_view),
 
     # ohlhafv
     url(r'^ohlhafv$', ohlhafv_view),
diff --git a/webapp/views.py b/webapp/views.py
index 5684fbb..f6d2e6a 100644
--- a/webapp/views.py
+++ b/webapp/views.py
@@ -69,6 +69,18 @@ def guild_view(request, *args, **kwargs):
     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 ohlhafv_view(request, *args, **kwargs):
     """Render Ohlhafv form page."""