Merge branch 'feature-kaehmy' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-kaehmy

webapp/templates/kaehmy.html

@@ -3,6 +3,10 @@
 {% load bootstrap3 %}
 {% load i18n %}
 
+{% block navigation %}
+    {% include "kaehmy_navigation.html" %}
+{% endblock %}
+
 {% block content %}
 <div>
     <h3>{% trans "Kaehmy" %}</h3>

webapp/templates/kaehmy_list.html

@@ -4,6 +4,7 @@
 {% load i18n %}
 
 {% block navigation %}
+    {% include "kaehmy_navigation.html" %}
 {% endblock %}
 
 {% block content %}

webapp/templates/kaehmy_navigation.html

@@ -0,0 +1,22 @@
+{% load i18n %}
+<div>
+    <nav class="navbar navbar-default sidebar" role="navigation">
+    <div class="container-fluid">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            </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="/kaehmy/new">{% trans "Apply" %}</a></li>
+                <li ><a href="/kaehmy/statistics">{% trans "Statistics" %}</a></li>
+            </ul>
+        </div>
+    </div>
+    </nav>
+</div>