From 9974b3c02c1bf27e88e63c38438689d9efd9d162 Mon Sep 17 00:00:00 2001
From: Juhana Luomanen <juhana.luomanen@aalto.fi>
Date: Sat, 27 May 2017 13:00:30 +0300
Subject: [PATCH 01/13] Add tabs for slides and rotations

---
 infoscreen/templates/infoscreen_admin.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index b9e550c..6f5f241 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -31,6 +31,10 @@
                     <h1>{% trans "Infoscreen Admin Pane" %}</h1>
                 </div>
             </div>
+            <ul class="nav nav-tabs" role="tablist">
+                <li class="active"><a data-toggle="tab" href="#slides" role="tab">Slides</a></li>
+                <li class="nav-item"><a data-toggle="tab" href="#rotations " role="tab">Rotations</a></li>
+            </ul>
             <div class="row" ng-controller="infoadmin_ctrl">
                 <div class="col-xs-12 col-md-6">
                     <h2>{% trans "Info items" %}</h2>

From 700896e3f8fa1a3cb65dcd7c856ad3885efaf485 Mon Sep 17 00:00:00 2001
From: Juhana Luomanen <juhana.luomanen@aalto.fi>
Date: Sat, 27 May 2017 13:33:03 +0300
Subject: [PATCH 02/13] Move slides and rotations under tabs

---
 infoscreen/templates/infoscreen_admin.html | 160 +++++++++++----------
 1 file changed, 86 insertions(+), 74 deletions(-)

diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index 6f5f241..032550f 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -35,82 +35,94 @@
                 <li class="active"><a data-toggle="tab" href="#slides" role="tab">Slides</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#rotations " role="tab">Rotations</a></li>
             </ul>
-            <div class="row" ng-controller="infoadmin_ctrl">
-                <div class="col-xs-12 col-md-6">
-                    <h2>{% trans "Info items" %}</h2>
-                    <div>{% trans "Infoitems available for rotations" %}</div>
-                    <table class="table table-striped">
-                        <tr>
-                            <th>{% trans "Item" %}</th>
-                            <th>{% trans "Type" %}</th>
-                            <th>{% trans "Set duration" %}</th>
-                            <th>{% trans "Add to rotation" %}</th>
-                            <th>{% trans "Delete" %}</th>
-                        </tr>
-                        <tr ng-repeat="i in infoitems | orderBy:['display_name','name']">
-                            <td>{$ i.name $}</td>
-                            <td>{$ i.display_name $}</td>
-                            <td><input type="number" min="1" max="60" class="form-control" ng-model="i.duration"></input></td>
-                            <td><input type="button" class="btn btn-success" ng-click="createInstance(selected_rot.id, i.id, i.item_type, i.duration);" value="{% trans "Add" %}"></input></td>
-                            <td><input type="button" class="btn btn-danger" ng-click="deleteItem(i.item_type, i.id);" value="{% trans "Delete" %}"></input></td>
-                        </tr>
-                    </table>
-                    <h2>{% trans "Create new item" %}</h2>
-                    <table class="table table-striped">
-                        <tr>
-                            <td>{% trans "Item type" %}</td>
-                            <td>
-                                <select class="form-control form-control-sm" ng-model="createtype", ng-options="t.name for t in infotypes">
-                                    <option value=""></option>
-                                </select>
-                            </td>
-                        </tr>
-                    </table>
-                    <div ng-include="createtype.create_template_url"></div>
-                </div>
-                <div class="col-xs-12 col-md-6">
-                    <h2>{% trans "Rotations" %}</h2>
-                    <div>
-                        {% trans "Select rotation to edit" %}:
-                    </div>
-                    <table class="table table-striped">
-                        <tr>
-                            <th>{% trans "Rotation" %}</th>
-                            <th>{% trans "id" %}</th>
-                            <th>{% trans "Select" %}</th>
-                            <th>{% trans "Preview" %}</th>
-                            <th>{% trans "Delete" %}</th>
-                        </tr>
-                        <tr ng-repeat="r in rotations">
-                            <td>{$ r.name $}</td>
-                            <td>{$ r.id $}</td>
-                            <td><input type="button" class="btn btn-info" ng-click="selectRotation(r.id)" value="{% trans "Select" %}"></td>
-                            <td><a href="/infoscreen/{$ r.id $}"><input type="button" class="btn btn-primary" value="{% trans "Preview" %}"></a></td>
-                            <td><input type="button" class="btn btn-danger" ng-click="deleteRotation(r.id)" value="{% trans "Delete" %}"></input></td>
-                        </tr>
-                        <tr>
-                            <td><input type="text" class="form-control" ng-model="r.name" placeholder="{% trans "Name" %}"></input></td>
-                            <td><input type="button" class="btn btn-success" ng-click="createRotation(r.name)" value="{% trans "Create new" %}"></input></td>
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                        </tr>
-                    </table>
+            <div class="tab-content">
+                <div id="slides" class="tab-pane active">
+                    <div class="row" ng-controller="infoadmin_ctrl">
+                        <div class="col-xs-12 col-md-6">
+                            <h2>{% trans "Create new item" %}</h2>
+                            <table class="table table-striped">
+                                <tr>
+                                    <td>{% trans "Item type" %}</td>
+                                    <td>
+                                        <select class="form-control form-control-sm" ng-model="createtype", ng-options="t.name for t in infotypes">
+                                            <option value=""></option>
+                                        </select>
+                                    </td>
+                                </tr>
+                            </table>
+                            <div ng-include="createtype.create_template_url"></div>
+                        </div>
+                        <div class="col-xs-12 col-md-6">
+                            <h2>{% trans "Info items" %}</h2>
+                            <div>{% trans "Infoitems available for rotations" %}</div>
+                            <table class="table table-striped">
+                                <tr>
+                                    <th>{% trans "Item" %}</th>
+                                    <th>{% trans "Type" %}</th>
+                                    <th>{% trans "Set duration" %}</th>
+                                    <th>{% trans "Add to rotation" %}</th>
+                                    <th>{% trans "Delete" %}</th>
+                                </tr>
+                                <tr ng-repeat="i in infoitems | orderBy:['display_name','name']">
+                                    <td>{$ i.name $}</td>
+                                    <td>{$ i.display_name $}</td>
+                                    <td><input type="number" min="1" max="60" class="form-control" ng-model="i.duration"></input></td>
+                                    <td><input type="button" class="btn btn-success" ng-click="createInstance(selected_rot.id, i.id, i.item_type, i.duration);" value="{% trans "Add" %}"></input></td>
+                                    <td><input type="button" class="btn btn-danger" ng-click="deleteItem(i.item_type, i.id);" value="{% trans "Delete" %}"></input></td>
+                                </tr>
+                            </table>
 
-                    <h2>{% trans "Rotation" %}: {$ selected_rot.name $}</h2>
-                    <div>{% trans "Instances in currently selected rotation" %}:</div>
-                    <table class="table table-striped">
-                        <tr>
-                            <th>{% trans "Instance" %}</th>
-                            <th>{% trans "Duration" %}</th>
-                            <th>{% trans "Delete" %}</th>
-                        </tr>
-                        <tr ng-repeat="i in selected_rot.instances">
-                            <td>{$ i.item.name $}</td><td>{$ i.duration $} s</td>
-                            <td><input type="button" ng-click="deleteInstance(i.id);" value="{% trans "Delete" %}" class="btn btn-danger"></input></td>
-                        </tr>
-                    </table>
+                        </div>
+                    </div>
                 </div>
+                <div id="rotations" class="tab-pane">
+                    <div class="col-xs-12 col-md-6" ng-controller="infoadmin_ctrl">
+                        <h2>{% trans "Rotations" %}</h2>
+                        <div>
+                            {% trans "Select rotation to edit" %}:
+                        </div>
+                        <table class="table table-striped">
+                            <tr>
+                                <th>{% trans "Rotation" %}</th>
+                                <th>{% trans "id" %}</th>
+                                <th>{% trans "Select" %}</th>
+                                <th>{% trans "Preview" %}</th>
+                                <th>{% trans "Delete" %}</th>
+                            </tr>
+                            <tr ng-repeat="r in rotations">
+                                <td>{$ r.name $}</td>
+                                <td>{$ r.id $}</td>
+                                <td><input type="button" class="btn btn-info" ng-click="selectRotation(r.id)" value="{% trans "Select" %}"></td>
+                                <td><a href="/infoscreen/{$ r.id $}"><input type="button" class="btn btn-primary" value="{% trans "Preview" %}"></a></td>
+                                <td><input type="button" class="btn btn-danger" ng-click="deleteRotation(r.id)" value="{% trans "Delete" %}"></input></td>
+                            </tr>
+                            <tr>
+                                <td><input type="text" class="form-control" ng-model="r.name" placeholder="{% trans "Name" %}"></input></td>
+                                <td><input type="button" class="btn btn-success" ng-click="createRotation(r.name)" value="{% trans "Create new" %}"></input></td>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                            </tr>
+                        </table>
+                    </div>
+
+                    <div class="col-xs-12 col-md-6">
+                        <h2>{% trans "Rotation" %}: {$ selected_rot.name $}</h2>
+                        <div>{% trans "Instances in currently selected rotation" %}:</div>
+                        <table class="table table-striped">
+                            <tr>
+                                <th>{% trans "Instance" %}</th>
+                                <th>{% trans "Duration" %}</th>
+                                <th>{% trans "Delete" %}</th>
+                            </tr>
+                            <tr ng-repeat="i in selected_rot.instances">
+                                <td>{$ i.item.name $}</td><td>{$ i.duration $} s</td>
+                                <td><input type="button" ng-click="deleteInstance(i.id);" value="{% trans "Delete" %}" class="btn btn-danger"></input></td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+            </div>
             </div>
             <div style="margin-top: 100px;">
                 {% include "footer.html" %}

From 3e2fb90a16de767fa62b4ec4d7bd82d6e9ff12d2 Mon Sep 17 00:00:00 2001
From: Juhana Luomanen <juhana.luomanen@aalto.fi>
Date: Sat, 27 May 2017 13:53:33 +0300
Subject: [PATCH 03/13] Add tab for rotation management

---
 infoscreen/templates/infoscreen_admin.html | 58 ++++++++++++++++++++--
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index 032550f..04e80d9 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -34,6 +34,8 @@
             <ul class="nav nav-tabs" role="tablist">
                 <li class="active"><a data-toggle="tab" href="#slides" role="tab">Slides</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#rotations " role="tab">Rotations</a></li>
+                <li class="nav-item"><a data-toggle="tab" href="#deleterot " role="tab">Manage Rotations</a></li>
+
             </ul>
             <div class="tab-content">
                 <div id="slides" class="tab-pane active">
@@ -59,15 +61,11 @@
                                 <tr>
                                     <th>{% trans "Item" %}</th>
                                     <th>{% trans "Type" %}</th>
-                                    <th>{% trans "Set duration" %}</th>
-                                    <th>{% trans "Add to rotation" %}</th>
                                     <th>{% trans "Delete" %}</th>
                                 </tr>
                                 <tr ng-repeat="i in infoitems | orderBy:['display_name','name']">
                                     <td>{$ i.name $}</td>
                                     <td>{$ i.display_name $}</td>
-                                    <td><input type="number" min="1" max="60" class="form-control" ng-model="i.duration"></input></td>
-                                    <td><input type="button" class="btn btn-success" ng-click="createInstance(selected_rot.id, i.id, i.item_type, i.duration);" value="{% trans "Add" %}"></input></td>
                                     <td><input type="button" class="btn btn-danger" ng-click="deleteItem(i.item_type, i.id);" value="{% trans "Delete" %}"></input></td>
                                 </tr>
                             </table>
@@ -75,7 +73,28 @@
                         </div>
                     </div>
                 </div>
-                <div id="rotations" class="tab-pane">
+                <div id="rotations" class="tab-pane" ng-controller="infoadmin_ctrl">
+                    <div class="col-xs-12 col-md-6">
+                        <h2>{% trans "Info items" %}</h2>
+                        <div>{% trans "Infoitems available for rotations" %}</div>
+                        <table class="table table-striped">
+                            <tr>
+                                <th>{% trans "Item" %}</th>
+                                <th>{% trans "Type" %}</th>
+                                <th>{% trans "Set duration" %}</th>
+                                <th>{% trans "Add to rotation" %}</th>
+                                <th>{% trans "Delete" %}</th>
+                            </tr>
+                            <tr ng-repeat="i in infoitems | orderBy:['display_name','name']">
+                                <td>{$ i.name $}</td>
+                                <td>{$ i.display_name $}</td>
+                                <td><input type="number" min="1" max="60" class="form-control" ng-model="i.duration"></input></td>
+                                <td><input type="button" class="btn btn-success" ng-click="createInstance(selected_rot.id, i.id, i.item_type, i.duration);" value="{% trans "Add" %}"></input></td>
+                                <td><input type="button" class="btn btn-danger" ng-click="deleteItem(i.item_type, i.id);" value="{% trans "Delete" %}"></input></td>
+                            </tr>
+                        </table>
+
+                    </div>
                     <div class="col-xs-12 col-md-6" ng-controller="infoadmin_ctrl">
                         <h2>{% trans "Rotations" %}</h2>
                         <div>
@@ -106,6 +125,7 @@
                         </table>
                     </div>
 
+
                     <div class="col-xs-12 col-md-6">
                         <h2>{% trans "Rotation" %}: {$ selected_rot.name $}</h2>
                         <div>{% trans "Instances in currently selected rotation" %}:</div>
@@ -122,6 +142,34 @@
                         </table>
                     </div>
                 </div>
+                <div id="deleterot" class="tab-pane">
+                    <div class="col-xs-12 col-md-6" ng-controller="infoadmin_ctrl">
+                        <h2>{% trans "Rotations" %}</h2>
+                        <div>
+                            {% trans "Select rotation to edit" %}:
+                        </div>
+                        <table class="table table-striped">
+                            <tr>
+                                <th>{% trans "Rotation" %}</th>
+                                <th>{% trans "id" %}</th>
+                                <th>{% trans "Preview" %}</th>
+                                <th>{% trans "Delete" %}</th>
+                            </tr>
+                            <tr ng-repeat="r in rotations">
+                                <td>{$ r.name $}</td>
+                                <td>{$ r.id $}</td>
+                                <td><a href="/infoscreen/{$ r.id $}"><input type="button" class="btn btn-primary" value="{% trans "Preview" %}"></a></td>
+                                <td><input type="button" class="btn btn-danger" ng-click="deleteRotation(r.id)" value="{% trans "Delete" %}"></input></td>
+                            </tr>
+                            <tr>
+                                <td><input type="text" class="form-control" ng-model="r.name" placeholder="{% trans "Name" %}"></input></td>
+                                <td><input type="button" class="btn btn-success" ng-click="createRotation(r.name)" value="{% trans "Create new" %}"></input></td>
+                                <td></td>
+                                <td></td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
             </div>
             </div>
             <div style="margin-top: 100px;">

From 1cc936674c86ae5a56df0db00d548cb38e55c916 Mon Sep 17 00:00:00 2001
From: Juhana Luomanen <juhana.luomanen@aalto.fi>
Date: Sat, 27 May 2017 15:11:16 +0300
Subject: [PATCH 04/13] Modify rotation tab to a dropdown menu

---
 infoscreen/templates/infoscreen_admin.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index 04e80d9..307769e 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -25,7 +25,7 @@
                 </form>
             </div>
         </div>
-        <div class="container">
+        <div class="container" ng-controller="infoadmin_ctrl">
             <div class="row">
                 <div class="col-md-12">
                     <h1>{% trans "Infoscreen Admin Pane" %}</h1>
@@ -33,9 +33,12 @@
             </div>
             <ul class="nav nav-tabs" role="tablist">
                 <li class="active"><a data-toggle="tab" href="#slides" role="tab">Slides</a></li>
-                <li class="nav-item"><a data-toggle="tab" href="#rotations " role="tab">Rotations</a></li>
+                <li class="dropdown">
+                    <a data-toggle="dropdown" href="#">Rotations<span class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                        <li ng-repeat="r in rotations"><a href="#rotations" ng-click="selectRotation(r.id)" data-toggle="tab">{$ r.name $}</a></li>
+                    </ul>
                 <li class="nav-item"><a data-toggle="tab" href="#deleterot " role="tab">Manage Rotations</a></li>
-
             </ul>
             <div class="tab-content">
                 <div id="slides" class="tab-pane active">
@@ -143,7 +146,8 @@
                     </div>
                 </div>
                 <div id="deleterot" class="tab-pane">
-                    <div class="col-xs-12 col-md-6" ng-controller="infoadmin_ctrl">
+                    <div class="col-xs-12 c
+                                <td></td>ol-md-6" ng-controller="infoadmin_ctrl">
                         <h2>{% trans "Rotations" %}</h2>
                         <div>
                             {% trans "Select rotation to edit" %}:

From d06bdd7e23fa535b3057e3d606794b9bdf5b9fcc Mon Sep 17 00:00:00 2001
From: Juhana Luomanen <juhana.luomanen@aalto.fi>
Date: Sun, 28 May 2017 14:42:44 +0300
Subject: [PATCH 05/13] Fix header width

---
 infoscreen/static/css/infoscreen_admin.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/infoscreen/static/css/infoscreen_admin.css b/infoscreen/static/css/infoscreen_admin.css
index 6031fcd..a7284e4 100644
--- a/infoscreen/static/css/infoscreen_admin.css
+++ b/infoscreen/static/css/infoscreen_admin.css
@@ -2,4 +2,8 @@ td{
 max-width:12vw;
 overflow:hidden;
 word-wrap:break-word;
-}
\ No newline at end of file
+}
+
+#header{
+    max-width: 100%;
+}

From d3d721abeb65ea0e6c7a957ecd832b11c4f411c5 Mon Sep 17 00:00:00 2001
From: Juhana Luomanen <juhana.luomanen@aalto.fi>
Date: Sun, 28 May 2017 14:43:39 +0300
Subject: [PATCH 06/13] Make infoadmin tabs more descriptive

---
 infoscreen/templates/infoscreen_admin.html | 41 ++++------------------
 1 file changed, 7 insertions(+), 34 deletions(-)

diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index 307769e..d48c475 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -32,13 +32,14 @@
                 </div>
             </div>
             <ul class="nav nav-tabs" role="tablist">
-                <li class="active"><a data-toggle="tab" href="#slides" role="tab">Slides</a></li>
+                <li class="active"><a data-toggle="tab" href="#slides" role="tab">Manage Slides</a></li>
                 <li class="dropdown">
-                    <a data-toggle="dropdown" href="#">Rotations<span class="caret"></span></a>
+                    <a data-toggle="dropdown" href="#">Manage Rotations<span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li ng-repeat="r in rotations"><a href="#rotations" ng-click="selectRotation(r.id)" data-toggle="tab">{$ r.name $}</a></li>
+                        <li class="divider">
+                        <li class="nav-item"><a data-toggle="tab" href="#deleterot" role="tab">Create/Delete</a></li>
                     </ul>
-                <li class="nav-item"><a data-toggle="tab" href="#deleterot " role="tab">Manage Rotations</a></li>
             </ul>
             <div class="tab-content">
                 <div id="slides" class="tab-pane active">
@@ -98,39 +99,11 @@
                         </table>
 
                     </div>
-                    <div class="col-xs-12 col-md-6" ng-controller="infoadmin_ctrl">
-                        <h2>{% trans "Rotations" %}</h2>
-                        <div>
-                            {% trans "Select rotation to edit" %}:
-                        </div>
-                        <table class="table table-striped">
-                            <tr>
-                                <th>{% trans "Rotation" %}</th>
-                                <th>{% trans "id" %}</th>
-                                <th>{% trans "Select" %}</th>
-                                <th>{% trans "Preview" %}</th>
-                                <th>{% trans "Delete" %}</th>
-                            </tr>
-                            <tr ng-repeat="r in rotations">
-                                <td>{$ r.name $}</td>
-                                <td>{$ r.id $}</td>
-                                <td><input type="button" class="btn btn-info" ng-click="selectRotation(r.id)" value="{% trans "Select" %}"></td>
-                                <td><a href="/infoscreen/{$ r.id $}"><input type="button" class="btn btn-primary" value="{% trans "Preview" %}"></a></td>
-                                <td><input type="button" class="btn btn-danger" ng-click="deleteRotation(r.id)" value="{% trans "Delete" %}"></input></td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" class="form-control" ng-model="r.name" placeholder="{% trans "Name" %}"></input></td>
-                                <td><input type="button" class="btn btn-success" ng-click="createRotation(r.name)" value="{% trans "Create new" %}"></input></td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                            </tr>
-                        </table>
-                    </div>
-
 
                     <div class="col-xs-12 col-md-6">
-                        <h2>{% trans "Rotation" %}: {$ selected_rot.name $}</h2>
+                        <div class="row">
+                        <h2>{% trans "Rotation" %}: {$ selected_rot.name $}<a href="/infoscreen/{$ selected_rot.id $}"><input type="button" class="btn btn-primary pull-right" value="{% trans "Preview" %}"></a></td></h2>
+
                         <div>{% trans "Instances in currently selected rotation" %}:</div>
                         <table class="table table-striped">
                             <tr>

From ca9d8751313d7b9d7fd349bc294b517d7d7472ea Mon Sep 17 00:00:00 2001
From: Juhana Luomanen <juhana.luomanen@aalto.fi>
Date: Sun, 28 May 2017 15:32:57 +0300
Subject: [PATCH 07/13] Add missing div

---
 infoscreen/templates/infoscreen_admin.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index d48c475..3128cf6 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -118,6 +118,7 @@
                         </table>
                     </div>
                 </div>
+            </div>
                 <div id="deleterot" class="tab-pane">
                     <div class="col-xs-12 c
                                 <td></td>ol-md-6" ng-controller="infoadmin_ctrl">

From 013bbeae7af8efe674ddf79f52a5351f1aebcda3 Mon Sep 17 00:00:00 2001
From: Juhana Luomanen <juhana.luomanen@aalto.fi>
Date: Mon, 29 May 2017 09:54:12 +0300
Subject: [PATCH 08/13] Add some localizations

---
 infoscreen/templates/infoscreen_admin.html |   6 +-
 locale/en/LC_MESSAGES/django.mo            | Bin 6615 -> 6679 bytes
 locale/en/LC_MESSAGES/django.po            | 181 +++++++++++----------
 locale/fi/LC_MESSAGES/django.mo            | Bin 7111 -> 7234 bytes
 locale/fi/LC_MESSAGES/django.po            | 181 +++++++++++----------
 5 files changed, 201 insertions(+), 167 deletions(-)

diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index 3128cf6..6fd4ead 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -32,13 +32,13 @@
                 </div>
             </div>
             <ul class="nav nav-tabs" role="tablist">
-                <li class="active"><a data-toggle="tab" href="#slides" role="tab">Manage Slides</a></li>
+                <li class="active"><a data-toggle="tab" href="#slides" role="tab">{% trans "Manage Slides" %}</a></li>
                 <li class="dropdown">
-                    <a data-toggle="dropdown" href="#">Manage Rotations<span class="caret"></span></a>
+                    <a data-toggle="dropdown" href="#">{% trans "Manage Rotations" %}<span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li ng-repeat="r in rotations"><a href="#rotations" ng-click="selectRotation(r.id)" data-toggle="tab">{$ r.name $}</a></li>
                         <li class="divider">
-                        <li class="nav-item"><a data-toggle="tab" href="#deleterot" role="tab">Create/Delete</a></li>
+                        <li class="nav-item"><a data-toggle="tab" href="#deleterot" role="tab">{% trans "Create/Delete" %}</a></li>
                     </ul>
             </ul>
             <div class="tab-content">
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 9435ae5ef9e12ea3d5ec99f139a1e130cfe04347..8c684b3eee97072aafb9b5b4d66df72b8fae93f8 100644
GIT binary patch
literal 6679
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

literal 6615
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

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index b9ee95d..9633481 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-26 19:53+0300\n"
+"POT-Creation-Date: 2017-05-28 16:37+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"
@@ -58,99 +58,113 @@ msgstr "Log out"
 msgid "Infoscreen Admin Pane"
 msgstr "Infoscreen Admin Pane"
 
-#: infoscreen/templates/infoscreen_admin.html:36
+#: infoscreen/templates/infoscreen_admin.html:35
+msgid "Manage Slides"
+msgstr ""
+
+#: infoscreen/templates/infoscreen_admin.html:37
+msgid "Manage Rotations"
+msgstr "Manage Rotations"
+
+#: infoscreen/templates/infoscreen_admin.html:41
+msgid "Create/Delete"
+msgstr "Create/Delete"
+
+#: infoscreen/templates/infoscreen_admin.html:48
+msgid "Create new item"
+msgstr "Create new item"
+
+#: infoscreen/templates/infoscreen_admin.html:51
+msgid "Item type"
+msgstr "Item type"
+
+#: infoscreen/templates/infoscreen_admin.html:62
+#: infoscreen/templates/infoscreen_admin.html:82
 msgid "Info items"
 msgstr "Info items"
 
-#: infoscreen/templates/infoscreen_admin.html:37
+#: infoscreen/templates/infoscreen_admin.html:63
+#: infoscreen/templates/infoscreen_admin.html:83
 msgid "Infoitems available for rotations"
 msgstr "Infoitems available for rotations"
 
-#: infoscreen/templates/infoscreen_admin.html:40
+#: infoscreen/templates/infoscreen_admin.html:66
+#: infoscreen/templates/infoscreen_admin.html:86
 msgid "Item"
 msgstr "Item"
 
-#: infoscreen/templates/infoscreen_admin.html:41
+#: infoscreen/templates/infoscreen_admin.html:67
+#: infoscreen/templates/infoscreen_admin.html:87
 msgid "Type"
 msgstr "Type"
 
-#: infoscreen/templates/infoscreen_admin.html:42
-msgid "Set duration"
-msgstr "Set duration"
-
-#: infoscreen/templates/infoscreen_admin.html:43
-msgid "Add to rotation"
-msgstr "Add to rotation"
-
-#: infoscreen/templates/infoscreen_admin.html:44
-#: infoscreen/templates/infoscreen_admin.html:51
-#: infoscreen/templates/infoscreen_admin.html:78
-#: infoscreen/templates/infoscreen_admin.html:85
-#: infoscreen/templates/infoscreen_admin.html:102
-#: infoscreen/templates/infoscreen_admin.html:106
+#: infoscreen/templates/infoscreen_admin.html:68
+#: infoscreen/templates/infoscreen_admin.html:73
+#: infoscreen/templates/infoscreen_admin.html:90
+#: infoscreen/templates/infoscreen_admin.html:97
+#: infoscreen/templates/infoscreen_admin.html:112
+#: infoscreen/templates/infoscreen_admin.html:116
+#: infoscreen/templates/infoscreen_admin.html:134
+#: infoscreen/templates/infoscreen_admin.html:140
 #: members/templates/member_edit.html:20 members/templates/payment_edit.html:20
 msgid "Delete"
 msgstr "Delete"
 
-#: infoscreen/templates/infoscreen_admin.html:50
+#: infoscreen/templates/infoscreen_admin.html:88
+msgid "Set duration"
+msgstr "Set duration"
+
+#: infoscreen/templates/infoscreen_admin.html:89
+msgid "Add to rotation"
+msgstr "Add to rotation"
+
+#: infoscreen/templates/infoscreen_admin.html:96
 msgid "Add"
 msgstr "Add"
 
-#: infoscreen/templates/infoscreen_admin.html:54
-msgid "Create new item"
-msgstr "Create new item"
-
-#: infoscreen/templates/infoscreen_admin.html:57
-msgid "Item type"
-msgstr "Item type"
-
-#: infoscreen/templates/infoscreen_admin.html:68
-msgid "Rotations"
-msgstr "Rotations"
-
-#: infoscreen/templates/infoscreen_admin.html:70
-msgid "Select rotation to edit"
-msgstr "Select rotation to edit"
-
-#: infoscreen/templates/infoscreen_admin.html:74
-#: infoscreen/templates/infoscreen_admin.html:96
+#: infoscreen/templates/infoscreen_admin.html:105
+#: infoscreen/templates/infoscreen_admin.html:131
 msgid "Rotation"
 msgstr "Rotation"
 
-#: infoscreen/templates/infoscreen_admin.html:75
-msgid "id"
-msgstr "id"
-
-#: infoscreen/templates/infoscreen_admin.html:76
-#: infoscreen/templates/infoscreen_admin.html:83
-msgid "Select"
-msgstr "Select"
-
-#: infoscreen/templates/infoscreen_admin.html:77
-#: infoscreen/templates/infoscreen_admin.html:84
+#: infoscreen/templates/infoscreen_admin.html:105
+#: infoscreen/templates/infoscreen_admin.html:133
+#: infoscreen/templates/infoscreen_admin.html:139
 msgid "Preview"
 msgstr "Preview"
 
-#: infoscreen/templates/infoscreen_admin.html:88
-msgid "Name"
-msgstr "Name"
-
-#: infoscreen/templates/infoscreen_admin.html:89
-msgid "Create new"
-msgstr "Create new"
-
-#: infoscreen/templates/infoscreen_admin.html:97
+#: infoscreen/templates/infoscreen_admin.html:107
 msgid "Instances in currently selected rotation"
 msgstr "Instances in currently selected rotation"
 
-#: infoscreen/templates/infoscreen_admin.html:100
+#: infoscreen/templates/infoscreen_admin.html:110
 msgid "Instance"
 msgstr "Instance"
 
-#: infoscreen/templates/infoscreen_admin.html:101
+#: infoscreen/templates/infoscreen_admin.html:111
 msgid "Duration"
 msgstr "Duration"
 
+#: infoscreen/templates/infoscreen_admin.html:125
+msgid "Rotations"
+msgstr "Rotations"
+
+#: infoscreen/templates/infoscreen_admin.html:127
+msgid "Select rotation to edit"
+msgstr "Select rotation to edit"
+
+#: infoscreen/templates/infoscreen_admin.html:132
+msgid "id"
+msgstr "id"
+
+#: infoscreen/templates/infoscreen_admin.html:143
+msgid "Name"
+msgstr "Name"
+
+#: infoscreen/templates/infoscreen_admin.html:144
+msgid "Create new"
+msgstr "Create new"
+
 #: members/models.py:16
 msgid "First name"
 msgstr "First name"
@@ -361,93 +375,93 @@ msgstr "Payment events"
 msgid "Language"
 msgstr "Language"
 
-#: members/templates/settings.html:20 sikweb/settings-sample.py:177
+#: members/templates/settings.html:20 sikweb/settings-sample.py:178
 #: sikweb/settings.py:177
 msgid "Finnish"
 msgstr "Finnish"
 
-#: members/templates/settings.html:21 sikweb/settings-sample.py:176
+#: members/templates/settings.html:21 sikweb/settings-sample.py:177
 #: sikweb/settings.py:176
 msgid "English"
 msgstr "English"
 
-#: members/views.py:114 members/views.py:171 members/views.py:190
+#: members/views.py:121 members/views.py:178 members/views.py:197
 msgid "No member id specified"
 msgstr "No member id specified"
 
-#: members/views.py:136
+#: members/views.py:143
 msgid "Successfully added member"
 msgstr "Successfully added member"
 
-#: members/views.py:157
+#: members/views.py:164
 msgid "Successfully updated member"
 msgstr "Successfully updated member"
 
-#: members/views.py:161
+#: members/views.py:168
 msgid "Could not update member object"
 msgstr "Could not update member object"
 
-#: members/views.py:175
+#: members/views.py:182
 msgid "Successfully deleted member"
 msgstr "Successfully deleted member"
 
-#: members/views.py:181
+#: members/views.py:188
 msgid "Could not delete member object"
 msgstr "Could not delete member object"
 
-#: members/views.py:224 members/views.py:258 members/views.py:276
+#: members/views.py:231 members/views.py:265 members/views.py:283
 msgid "No application id specified"
 msgstr "No application id specified"
 
-#: members/views.py:245
+#: members/views.py:252
 msgid "Successfully accepted application"
 msgstr "Successfully accepted application"
 
-#: members/views.py:248
+#: members/views.py:255
 msgid "Could not accept application object"
 msgstr "Could not accept application object"
 
-#: members/views.py:262
+#: members/views.py:269
 msgid "Successfully deleted application"
 msgstr "Successfully deleted application"
 
-#: members/views.py:267
+#: members/views.py:274
 msgid "Could not delete application object"
 msgstr "Could not delete application object"
 
-#: members/views.py:331
+#: members/views.py:338
 msgid "Successfully added payment for member"
 msgstr "Successfully added payment for member"
 
-#: members/views.py:344 members/views.py:357 members/views.py:371
+#: members/views.py:351 members/views.py:364 members/views.py:378
 msgid "No payment id specified"
 msgstr "No payment id specified"
 
-#: members/views.py:375
+#: members/views.py:382
 msgid "Successfully deleted payment"
 msgstr "Successfully deleted payment"
 
-#: members/views.py:380
+#: members/views.py:387
 msgid "Could not delete payment object"
 msgstr "Could not delete payment object"
 
-#: members/views.py:395
+#: members/views.py:402
 msgid "Successfully updated payment"
 msgstr "Successfully updated payment"
 
-#: members/views.py:398
+#: members/views.py:405
 msgid "Could not update payment object"
 msgstr "Could not update payment object"
 
-#: members/views.py:415
+#: members/views.py:422
 msgid "Missing \"textfield\" POST request field"
 msgstr "Missing \"textfield\" POST request field"
 
-#: members/views.py:420
+#: members/views.py:427
 msgid "Successfully imported multiple members"
 msgstr "Successfully imported multiple members"
 
-#: members/views.py:423
+#: members/views.py:430
 msgid "Failed to import members"
 msgstr "Failed to import members"
 
@@ -486,3 +500,6 @@ msgstr "Sössö"
 #: webapp/templates/navigation.html:32
 msgid "Contact"
 msgstr "Contact"
+
+#~ msgid "Select"
+#~ msgstr "Select"
diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo
index e85684ae0c3277efd2ef78fd8bfe940ed65dc2bc..0cc41b157f62d6fcce183fac827593eb4fb6ca53 100644
GIT binary patch
delta 2594
zcmZ|QU2Kz89LMp~t-2Q{Wvjx*2DXfiX{QqhTZhPaS#^R_WMilUvCukOYRj@3R7jc$
zLCk<*B2fumObHjujE0&RH5x=>W2TEncd<B)Bp5MErZE~^ywLBjJ-*y{vVTA4JTK=t
z=YP)gEYp16pZd1UdBRZoh$`ZAzA-OieE~m|!$rn~@j1-kPgsa=7w0^O++sdKAAW{c
z<E%Yyt}%wHabgL&kUvw!kIR^psj~<CIF}P`s0+7XJ?_MtaR{CGK3<FGZToZ7SSN4=
zeuLHMrW4tWi?9c8z^85dWVW3$<{c^;;UqF5a|!i;Ur`<B(a?j7QEeA$hVzk2%pz1q
ze5mV|qbAaVjKyp~UDu6Q;Vx7^5w&@~>7z0S_o6yJWZOqk9i75*d>wV;$EX31qwbqT
zb$r<#pFuC}S=+AUqU&kbq6WGO>o9;Rt}$^c8u@-?dCdT7O$Sjo4B6u^SzpCcj*p^d
z_5rG&G1LGjQ3JndkN<+2n9}Qp0#v3eU95iv6(23#7{FTWKn*B~mG~6S!xK0kM^V>b
zK>9YHq6Ydkmf<CP{)#>RCu(Aaj7pZF`mdTx{?(z^9%w<$Xf>+Cji`}#p>FI!r8bNj
z__J7p!|1^bYQUFKZ<CWWX+mDq@pjbl5USsS6cx?nFmjJMjvCo8Dy3&I58uMw4qiL#
zrCm)PM{p38fu`$n*9TBb*NHydikip))N_uYu7AOrdX0)6bQYDmbI3Eym#DS+9yPF8
zT#m);q}#C-)$u;mW;}?>&=4wvFXIY4gL)08(1Th>y@p;~s`q~_l_eaAU_Bl~b^IQx
zqYJ1Je_@Y*hb*W0(Y9w%smx;?HGm@2+u%mcxB@jHueA}?UjR#ZzUiW(2L@3$Mp2pA
zgPPd^RECbBGI9zR;+v@J$59XZ3f1uxY6+*UKclYy4K*P*@3J!B!F--?)==S`X+u3|
zn@(U9HKVv~KZ$zae$;@ULCtIs_25@f_m83;^sa4ZknEcYROY5p8T$iMTH8FfvQD`1
z4y?v(Mo_ywiki_8)J&d7?dCUdF^-`II)m!xcWdE-+!wGMmB}Tjej8BN`xlUZrF5M=
z(T(bOhi&geeL@eSZa9t_`AK_z7`3@ZP$?b9+i(Uoa4(&Ca6Q&x2({Oaq6U7plKkI9
zWr715nO;t<Wf5v%rKktip!P&P>UC^I2kMPjNvJ53HQ8G3AC~^<+(Kwm-$f_`j}ng)
zaYFr+X#IPLdkK{o!Lpd0#N9*}5g<AV70q%P(MSXd4Ne2oeo;vf_hoDBCtPjof1~U)
z5L#wUG^I5Cw`{hJFh*>h<;;D}a2ugaZ6{QA5!!qzO9?GgH}L?WvWd`l;349EB1Ci$
zDlA1RyJOYR&R$DsgRLQMCGH`16U~H5AK@n+A^xw_a)Q<Tr);G5m~A!TRziD0Z(O_H
ze-*tRt;9MtDB5)Ei7iBwU_WKc4u0<>v}Yb9S_luJvWK{l;Cp2FSZ2SHdOdpy6(6Cu
zW0e}V=v$C2i}~F^ROg!J;q>;RC-Ms#+QPALGMpYOx#(CJj0bzep3RA5Fd0e2`%Opg
zKxZrx3iqc+=F~aTldc~e1%A)6rj?B?=}hT|&ccsQH*88o`jhE_c~=}Y?ZH?q5|1Y$
c*>2QNBpEdS9t}kj(O`OSdCZZXu9$NC1()0Cz5oCK

delta 2453
zcmYk-Urd%&9KiAO2BMVw5kw6vUQ5UlG$KGC6|Bgj(j-DHO-v!hV%e0sdM_HSi{_sh
z#atJevo*8}eW&Y!)=C#$c+)6X&AGL7+T0qgnyuEK@Au`nb@u+A&pC(ZIsc!B&zFof
zq%IU?4+T;`F_(BND+DX1Pvt_|lpDfU?8Y%1!)dtp#z}{fN5Uaoh(|C7zl!zWBEN8+
z%XGYqH{ows5JD<bvZ9bnA<ji_ti~#A!fNcrY#hQoJQ&L#qGSCC>+mGrj#r}vG<GZH
zS}eykvAi==rvLq99N}?fL}3(d@GRQl*RlK^I<p^;U%0}>mG~XK?;msmS&WXp!%XzP
zBu>F<wB6cRZpM8253OWuc(oPSg*McKb8rBCa34C*Vf4PkXu~IB{l_?u^66N<ge8<G
z(1GUg&;l$#s=^XXIr26#Y-?yo_p%dxU|p==9NmF4sNapw><zS`A#{L;(TN<zVmyJa
z=off1o<r}Oz)JihpZ#|L<=j<<^Kllo;B4$dALvJ(2?OZBUdJNb8~^@(tRF!ql8%0Y
zwm*gr>@3>uc&xu#!1_Cr2`X&(?|5Sl>u*DO=#tJxXV8ch*nvrW6&?6N^zAu?&TKr^
z{~7CNv1|^Y7M)NN@~5yOMaB_!pi8+HZ@?bxON6iudntdzbVqP0>*`8eLGQnYZrPNX
zldoScI*~fGqh;v*ZP8Bjxh?1lrgoB{k1&Yt**oaSj^e#Iip}^7+Hf@|%0pO>u23tw
zg6&v`Yth$l4<_*h`r3`-9r!EG$1?W0%J;v8j19klHncmIUqf~yycx^yqDy!L?f4ja
z`cI)V9YrT{CVCDtD}}au4eckJ1K@LcSmgJon2a;3M3<%pU5Vv*3wEFnyo7c%fHs^$
zw{B1L0DAv0+Tkg5=BLpu`Vsks%UtZ|U+d{V<nfX_qZ#OpWoU=x=!h%OnJq#)Zb2JZ
zg?6+dmbarT^a{F#DRc$*;Zl4LZSMkls4rvY{m<oSJMw(=G*{tmxDp*$AKK8a=pg!q
z8$ws^5ZdrD^!}6R3Vs^v$I+ELkG6j?)`wEo--dEaCm$?9XHbqdScx8{#pqIY;63;<
zI)e`|iC^LZ{0Ti=MfBnX8t^V$kG4064rC8Hz_-g-e>)tZ!q?$A`ud&01g;}`2|I5g
zx(Nqh+Cn(ECy7>~iE#ENmwz7dxCK%jaW~=i^$@OR0}-Af9x@Y?qjmu9zv+3RI+L5c
zJOPizvU_UUK~xdWd>OHlFl{){om-q*Jy{5g(KUFMs31IP{lpT&)3uE-c@WkTZNz=V
zCZdyQBuwmGcrcTjJkBwjIS30WyhuEKz0wz)7e14=bM@FhKr|Cc;{WMU3YCQatTz&m
z5ZT0X!Y`2rrGwZ^JVmT0Ozp&~OpcET-Wl`H;r+hgU9o~MSmqPNvCnLFJ-YdP7{VID
z!~qI5#3I6zV)DbzdB~iwhtYS=<ldP)Vb@bFnXN=0vBJvqVD7H0^t8P16X`@jWg?v{
j{5dhTK3UV)R9BlWDf%oseQDN2BK_B#zC?Os>BYo<ii*Z9

diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
index 1abf0c5..099e1c4 100644
--- a/locale/fi/LC_MESSAGES/django.po
+++ b/locale/fi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-26 19:53+0300\n"
+"POT-Creation-Date: 2017-05-28 16:39+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"
@@ -59,99 +59,113 @@ msgstr "Kirjaudu ulos"
 msgid "Infoscreen Admin Pane"
 msgstr "Infonäyttöjen hallintapaneeli"
 
-#: infoscreen/templates/infoscreen_admin.html:36
+#: infoscreen/templates/infoscreen_admin.html:35
+msgid "Manage Slides"
+msgstr "Hallinnoi dioja"
+
+#: infoscreen/templates/infoscreen_admin.html:37
+msgid "Manage Rotations"
+msgstr "Hallinnoi Rotaatioita"
+
+#: infoscreen/templates/infoscreen_admin.html:41
+msgid "Create/Delete"
+msgstr "Lisää/Poista"
+
+#: infoscreen/templates/infoscreen_admin.html:48
+msgid "Create new item"
+msgstr "Luo uusi dia"
+
+#: infoscreen/templates/infoscreen_admin.html:51
+msgid "Item type"
+msgstr "Diatyyppi"
+
+#: infoscreen/templates/infoscreen_admin.html:62
+#: infoscreen/templates/infoscreen_admin.html:82
 msgid "Info items"
 msgstr "Diat"
 
-#: infoscreen/templates/infoscreen_admin.html:37
+#: infoscreen/templates/infoscreen_admin.html:63
+#: infoscreen/templates/infoscreen_admin.html:83
 msgid "Infoitems available for rotations"
 msgstr "Rotaatioon lisättävät diat"
 
-#: infoscreen/templates/infoscreen_admin.html:40
+#: infoscreen/templates/infoscreen_admin.html:66
+#: infoscreen/templates/infoscreen_admin.html:86
 msgid "Item"
 msgstr "Dia"
 
-#: infoscreen/templates/infoscreen_admin.html:41
+#: infoscreen/templates/infoscreen_admin.html:67
+#: infoscreen/templates/infoscreen_admin.html:87
 msgid "Type"
 msgstr "Tyyppi"
 
-#: infoscreen/templates/infoscreen_admin.html:42
-msgid "Set duration"
-msgstr "Aseta kesto"
-
-#: infoscreen/templates/infoscreen_admin.html:43
-msgid "Add to rotation"
-msgstr "Lisää rotaatioon"
-
-#: infoscreen/templates/infoscreen_admin.html:44
-#: infoscreen/templates/infoscreen_admin.html:51
-#: infoscreen/templates/infoscreen_admin.html:78
-#: infoscreen/templates/infoscreen_admin.html:85
-#: infoscreen/templates/infoscreen_admin.html:102
-#: infoscreen/templates/infoscreen_admin.html:106
+#: infoscreen/templates/infoscreen_admin.html:68
+#: infoscreen/templates/infoscreen_admin.html:73
+#: infoscreen/templates/infoscreen_admin.html:90
+#: infoscreen/templates/infoscreen_admin.html:97
+#: infoscreen/templates/infoscreen_admin.html:112
+#: infoscreen/templates/infoscreen_admin.html:116
+#: infoscreen/templates/infoscreen_admin.html:134
+#: infoscreen/templates/infoscreen_admin.html:140
 #: members/templates/member_edit.html:20 members/templates/payment_edit.html:20
 msgid "Delete"
 msgstr "Poista"
 
-#: infoscreen/templates/infoscreen_admin.html:50
+#: infoscreen/templates/infoscreen_admin.html:88
+msgid "Set duration"
+msgstr "Aseta kesto"
+
+#: infoscreen/templates/infoscreen_admin.html:89
+msgid "Add to rotation"
+msgstr "Lisää rotaatioon"
+
+#: infoscreen/templates/infoscreen_admin.html:96
 msgid "Add"
 msgstr "Lisää"
 
-#: infoscreen/templates/infoscreen_admin.html:54
-msgid "Create new item"
-msgstr "Luo uusi dia"
-
-#: infoscreen/templates/infoscreen_admin.html:57
-msgid "Item type"
-msgstr "Diatyyppi"
-
-#: infoscreen/templates/infoscreen_admin.html:68
-msgid "Rotations"
-msgstr "Rotaatiot"
-
-#: infoscreen/templates/infoscreen_admin.html:70
-msgid "Select rotation to edit"
-msgstr "Valitse muokattava rotaatio"
-
-#: infoscreen/templates/infoscreen_admin.html:74
-#: infoscreen/templates/infoscreen_admin.html:96
+#: infoscreen/templates/infoscreen_admin.html:105
+#: infoscreen/templates/infoscreen_admin.html:131
 msgid "Rotation"
 msgstr "Rotaatio"
 
-#: infoscreen/templates/infoscreen_admin.html:75
-msgid "id"
-msgstr "id"
-
-#: infoscreen/templates/infoscreen_admin.html:76
-#: infoscreen/templates/infoscreen_admin.html:83
-msgid "Select"
-msgstr "Valitse"
-
-#: infoscreen/templates/infoscreen_admin.html:77
-#: infoscreen/templates/infoscreen_admin.html:84
+#: infoscreen/templates/infoscreen_admin.html:105
+#: infoscreen/templates/infoscreen_admin.html:133
+#: infoscreen/templates/infoscreen_admin.html:139
 msgid "Preview"
 msgstr "Esikatsele"
 
-#: infoscreen/templates/infoscreen_admin.html:88
-msgid "Name"
-msgstr "Nimi"
-
-#: infoscreen/templates/infoscreen_admin.html:89
-msgid "Create new"
-msgstr "Luo uusi"
-
-#: infoscreen/templates/infoscreen_admin.html:97
+#: infoscreen/templates/infoscreen_admin.html:107
 msgid "Instances in currently selected rotation"
 msgstr "Nykyisen rotaation diat"
 
-#: infoscreen/templates/infoscreen_admin.html:100
+#: infoscreen/templates/infoscreen_admin.html:110
 msgid "Instance"
 msgstr "Dia"
 
-#: infoscreen/templates/infoscreen_admin.html:101
+#: infoscreen/templates/infoscreen_admin.html:111
 msgid "Duration"
 msgstr "Kesto"
 
+#: infoscreen/templates/infoscreen_admin.html:125
+msgid "Rotations"
+msgstr "Rotaatiot"
+
+#: infoscreen/templates/infoscreen_admin.html:127
+msgid "Select rotation to edit"
+msgstr "Valitse muokattava rotaatio"
+
+#: infoscreen/templates/infoscreen_admin.html:132
+msgid "id"
+msgstr "id"
+
+#: infoscreen/templates/infoscreen_admin.html:143
+msgid "Name"
+msgstr "Nimi"
+
+#: infoscreen/templates/infoscreen_admin.html:144
+msgid "Create new"
+msgstr "Luo uusi"
+
 #: members/models.py:16
 msgid "First name"
 msgstr "Etunimi"
@@ -365,93 +379,93 @@ msgstr "Maksutapahtumat"
 msgid "Language"
 msgstr "Kieli"
 
-#: members/templates/settings.html:20 sikweb/settings-sample.py:177
+#: members/templates/settings.html:20 sikweb/settings-sample.py:178
 #: sikweb/settings.py:177
 msgid "Finnish"
 msgstr "suomi"
 
-#: members/templates/settings.html:21 sikweb/settings-sample.py:176
+#: members/templates/settings.html:21 sikweb/settings-sample.py:177
 #: sikweb/settings.py:176
 msgid "English"
 msgstr "englanti"
 
-#: members/views.py:114 members/views.py:171 members/views.py:190
+#: members/views.py:121 members/views.py:178 members/views.py:197
 msgid "No member id specified"
 msgstr "Jäsenen ID ei määritelty"
 
-#: members/views.py:136
+#: members/views.py:143
 msgid "Successfully added member"
 msgstr "Onnistuneesti lisättiin jäsen"
 
-#: members/views.py:157
+#: members/views.py:164
 msgid "Successfully updated member"
 msgstr "Onnistuneesti päivitettiin jäsen"
 
-#: members/views.py:161
+#: members/views.py:168
 msgid "Could not update member object"
 msgstr "Jäsenobjektia ei voitu päivittää"
 
-#: members/views.py:175
+#: members/views.py:182
 msgid "Successfully deleted member"
 msgstr "Onnistuneesti poistettiin jäsen"
 
-#: members/views.py:181
+#: members/views.py:188
 msgid "Could not delete member object"
 msgstr "Jäsenobjektia ei voitu poistaa"
 
-#: members/views.py:224 members/views.py:258 members/views.py:276
+#: members/views.py:231 members/views.py:265 members/views.py:283
 msgid "No application id specified"
 msgstr "Hakemuksen ID ei määritelty"
 
-#: members/views.py:245
+#: members/views.py:252
 msgid "Successfully accepted application"
 msgstr "Onnistuneesti hyväksyttiin hakemus"
 
-#: members/views.py:248
+#: members/views.py:255
 msgid "Could not accept application object"
 msgstr "Hakemusobjektia ei voitu hyväksyä"
 
-#: members/views.py:262
+#: members/views.py:269
 msgid "Successfully deleted application"
 msgstr "Onnistuneesti poistettiin hakemus"
 
-#: members/views.py:267
+#: members/views.py:274
 msgid "Could not delete application object"
 msgstr "Hakemusobjektia ei voitu poistaa"
 
-#: members/views.py:331
+#: members/views.py:338
 msgid "Successfully added payment for member"
 msgstr "Onnistuneesti lisättiin maksutapahtuma jäsenelle"
 
-#: members/views.py:344 members/views.py:357 members/views.py:371
+#: members/views.py:351 members/views.py:364 members/views.py:378
 msgid "No payment id specified"
 msgstr "Maksutapahtuman ID ei määritelty"
 
-#: members/views.py:375
+#: members/views.py:382
 msgid "Successfully deleted payment"
 msgstr "Onnistuneesti poistettiin maksutapahtuma"
 
-#: members/views.py:380
+#: members/views.py:387
 msgid "Could not delete payment object"
 msgstr "Maksutapahtumaobjektia ei voitu poistaa"
 
-#: members/views.py:395
+#: members/views.py:402
 msgid "Successfully updated payment"
 msgstr "Onnistuneesti päivitettiin maksutapahtuma"
 
-#: members/views.py:398
+#: members/views.py:405
 msgid "Could not update payment object"
 msgstr "Maksutapahtumaobjektia ei voitu päivittää"
 
-#: members/views.py:415
+#: members/views.py:422
 msgid "Missing \"textfield\" POST request field"
 msgstr "Puuttuva \"textfield\" POST-kenttä"
 
-#: members/views.py:420
+#: members/views.py:427
 msgid "Successfully imported multiple members"
 msgstr "Onnistuneesti tuotu useita jäseniä"
 
-#: members/views.py:423
+#: members/views.py:430
 msgid "Failed to import members"
 msgstr "Jäsenten tuonti epäonnistui"
 
@@ -490,3 +504,6 @@ msgstr "Sössö"
 #: webapp/templates/navigation.html:32
 msgid "Contact"
 msgstr "Yhteystiedot"
+
+#~ msgid "Select"
+#~ msgstr "Valitse"

From bb769583f26ec5fbb00e42d08d1afd7cc80d9f8d Mon Sep 17 00:00:00 2001
From: Juhana Luomanen <juhana.luomanen@aalto.fi>
Date: Mon, 29 May 2017 11:41:39 +0300
Subject: [PATCH 09/13] Modify the order of infoitems

---
 infoscreen/templates/infoscreen_admin.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index 6fd4ead..7ab1d90 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -50,7 +50,7 @@
                                 <tr>
                                     <td>{% trans "Item type" %}</td>
                                     <td>
-                                        <select class="form-control form-control-sm" ng-model="createtype", ng-options="t.name for t in infotypes">
+                                        <select class="form-control form-control-sm" ng-model="createtype", ng-options="t.name for t in infotypes | orderBy: 'name'">
                                             <option value=""></option>
                                         </select>
                                     </td>
@@ -102,8 +102,7 @@
 
                     <div class="col-xs-12 col-md-6">
                         <div class="row">
-                        <h2>{% trans "Rotation" %}: {$ selected_rot.name $}<a href="/infoscreen/{$ selected_rot.id $}"><input type="button" class="btn btn-primary pull-right" value="{% trans "Preview" %}"></a></td></h2>
-
+                        <h2>{% trans "Rotation" %}: {$ selected_rot.name $}<a href="/infoscreen/{$ selected_rot.id $}"><input type="button" class="btn btn-primary pull-right" value="{% trans "Preview" %}"></a></h2>
                         <div>{% trans "Instances in currently selected rotation" %}:</div>
                         <table class="table table-striped">
                             <tr>

From 08c919ded3c24ff53e2e92db6568a90d3b758b35 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Tue, 30 May 2017 20:23:17 +0300
Subject: [PATCH 10/13] Implement responsive styles for mobile

---
 infoscreen/static/css/infoscreen_admin.css | 44 +++++++++++++++++++---
 infoscreen/templates/infoscreen_admin.html |  2 +-
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/infoscreen/static/css/infoscreen_admin.css b/infoscreen/static/css/infoscreen_admin.css
index a7284e4..e108cf3 100644
--- a/infoscreen/static/css/infoscreen_admin.css
+++ b/infoscreen/static/css/infoscreen_admin.css
@@ -1,9 +1,43 @@
-td{
-max-width:12vw;
-overflow:hidden;
-word-wrap:break-word;
+html {
+  font-size: 16px;
 }
 
-#header{
+body {
+  padding: 1.5rem;
+  margin: 0.5rem;
+}
+
+tbody {
+  border: 1px solid #ddd;
+}
+
+@media (min-width: 760px) {
+  body {
+    font-size: 1rem;
+  }
+}
+
+@media (max-width: 760px) {
+  body {
+    font-size: 1rem;
+  }
+  h1 {
+    font-size: 3rem;
+  }
+  h2 {
+    font-size: 2rem;
+  }
+  .logout-button {
+    margin: 0;
+  }
+}
+
+td {
+  max-width: 12vw;
+  overflow: hidden;
+  word-wrap: break-word;
+}
+
+#header {
     max-width: 100%;
 }
diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index 7ab1d90..63ce124 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -4,7 +4,7 @@
 <!DOCTYPE html>
 <html ng-app="infoAdmin">
     <head>
-        <meta charset="utf-8">
+        <meta charset="utf-8" name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1" />
         <title>Infoscreen admin</title>
         <script src="{% static "js/lib/angular.js" %}"></script>
         <script src="{% static "js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-all.js" %}"></script>

From c9f768a5b675085452c9b725592b7ed5db174ab3 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Tue, 30 May 2017 20:36:18 +0300
Subject: [PATCH 11/13] Translations and some styles

---
 infoscreen/static/css/infoscreen_admin.css |   4 ++
 infoscreen/templates/infoscreen_admin.html |   7 ++-
 locale/en/LC_MESSAGES/django.mo            | Bin 6679 -> 6679 bytes
 locale/en/LC_MESSAGES/django.po            |  48 ++++++++++++---------
 locale/fi/LC_MESSAGES/django.mo            | Bin 7234 -> 7332 bytes
 locale/fi/LC_MESSAGES/django.po            |  46 +++++++++++---------
 6 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/infoscreen/static/css/infoscreen_admin.css b/infoscreen/static/css/infoscreen_admin.css
index e108cf3..8869711 100644
--- a/infoscreen/static/css/infoscreen_admin.css
+++ b/infoscreen/static/css/infoscreen_admin.css
@@ -11,6 +11,10 @@ tbody {
   border: 1px solid #ddd;
 }
 
+div {
+  margin-bottom: 0.5rem;
+}
+
 @media (min-width: 760px) {
   body {
     font-size: 1rem;
diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index 63ce124..1b92925 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -41,11 +41,12 @@
                         <li class="nav-item"><a data-toggle="tab" href="#deleterot" role="tab">{% trans "Create/Delete" %}</a></li>
                     </ul>
             </ul>
-            <div class="tab-content">
+            <div class="tab-content row">
                 <div id="slides" class="tab-pane active">
-                    <div class="row" ng-controller="infoadmin_ctrl">
+                    <div ng-controller="infoadmin_ctrl">
                         <div class="col-xs-12 col-md-6">
                             <h2>{% trans "Create new item" %}</h2>
+                            <div>{% trans "Create a new item by type" %}</div>
                             <table class="table table-striped">
                                 <tr>
                                     <td>{% trans "Item type" %}</td>
@@ -101,7 +102,6 @@
                     </div>
 
                     <div class="col-xs-12 col-md-6">
-                        <div class="row">
                         <h2>{% trans "Rotation" %}: {$ selected_rot.name $}<a href="/infoscreen/{$ selected_rot.id $}"><input type="button" class="btn btn-primary pull-right" value="{% trans "Preview" %}"></a></h2>
                         <div>{% trans "Instances in currently selected rotation" %}:</div>
                         <table class="table table-striped">
@@ -117,7 +117,6 @@
                         </table>
                     </div>
                 </div>
-            </div>
                 <div id="deleterot" class="tab-pane">
                     <div class="col-xs-12 c
                                 <td></td>ol-md-6" ng-controller="infoadmin_ctrl">
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 8c684b3eee97072aafb9b5b4d66df72b8fae93f8..a51bcacb22eefee0a91dae8c5ec9fe08dbe9215a 100644
GIT binary patch
delta 21
ccmbPkGTmfDp&*B`fr62Nm9f$0O2K&?07$9^H~;_u

delta 21
ccmbPkGTmfDp&*Bmg@U1(m9hEeO2K&?07*v%NdN!<

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 9633481..5dee4f9 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 16:37+0300\n"
+"POT-Creation-Date: 2017-05-30 20:32+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"
@@ -74,34 +74,40 @@ msgstr "Create/Delete"
 msgid "Create new item"
 msgstr "Create new item"
 
-#: infoscreen/templates/infoscreen_admin.html:51
+#: infoscreen/templates/infoscreen_admin.html:49
+#, fuzzy
+#| msgid "Create new item"
+msgid "Create a new item by type"
+msgstr "Create new item"
+
+#: infoscreen/templates/infoscreen_admin.html:52
 msgid "Item type"
 msgstr "Item type"
 
-#: infoscreen/templates/infoscreen_admin.html:62
-#: infoscreen/templates/infoscreen_admin.html:82
+#: infoscreen/templates/infoscreen_admin.html:63
+#: infoscreen/templates/infoscreen_admin.html:83
 msgid "Info items"
 msgstr "Info items"
 
-#: infoscreen/templates/infoscreen_admin.html:63
-#: infoscreen/templates/infoscreen_admin.html:83
+#: infoscreen/templates/infoscreen_admin.html:64
+#: infoscreen/templates/infoscreen_admin.html:84
 msgid "Infoitems available for rotations"
 msgstr "Infoitems available for rotations"
 
-#: infoscreen/templates/infoscreen_admin.html:66
-#: infoscreen/templates/infoscreen_admin.html:86
+#: infoscreen/templates/infoscreen_admin.html:67
+#: infoscreen/templates/infoscreen_admin.html:87
 msgid "Item"
 msgstr "Item"
 
-#: infoscreen/templates/infoscreen_admin.html:67
-#: infoscreen/templates/infoscreen_admin.html:87
+#: infoscreen/templates/infoscreen_admin.html:68
+#: infoscreen/templates/infoscreen_admin.html:88
 msgid "Type"
 msgstr "Type"
 
-#: infoscreen/templates/infoscreen_admin.html:68
-#: infoscreen/templates/infoscreen_admin.html:73
-#: infoscreen/templates/infoscreen_admin.html:90
-#: infoscreen/templates/infoscreen_admin.html:97
+#: infoscreen/templates/infoscreen_admin.html:69
+#: infoscreen/templates/infoscreen_admin.html:74
+#: infoscreen/templates/infoscreen_admin.html:91
+#: infoscreen/templates/infoscreen_admin.html:98
 #: infoscreen/templates/infoscreen_admin.html:112
 #: infoscreen/templates/infoscreen_admin.html:116
 #: infoscreen/templates/infoscreen_admin.html:134
@@ -110,24 +116,24 @@ msgstr "Type"
 msgid "Delete"
 msgstr "Delete"
 
-#: infoscreen/templates/infoscreen_admin.html:88
+#: infoscreen/templates/infoscreen_admin.html:89
 msgid "Set duration"
 msgstr "Set duration"
 
-#: infoscreen/templates/infoscreen_admin.html:89
+#: infoscreen/templates/infoscreen_admin.html:90
 msgid "Add to rotation"
 msgstr "Add to rotation"
 
-#: infoscreen/templates/infoscreen_admin.html:96
+#: infoscreen/templates/infoscreen_admin.html:97
 msgid "Add"
 msgstr "Add"
 
-#: infoscreen/templates/infoscreen_admin.html:105
+#: infoscreen/templates/infoscreen_admin.html:106
 #: infoscreen/templates/infoscreen_admin.html:131
 msgid "Rotation"
 msgstr "Rotation"
 
-#: infoscreen/templates/infoscreen_admin.html:105
+#: infoscreen/templates/infoscreen_admin.html:106
 #: infoscreen/templates/infoscreen_admin.html:133
 #: infoscreen/templates/infoscreen_admin.html:139
 msgid "Preview"
@@ -376,12 +382,12 @@ msgid "Language"
 msgstr "Language"
 
 #: members/templates/settings.html:20 sikweb/settings-sample.py:178
-#: sikweb/settings.py:177
+#: sikweb/settings.py:178
 msgid "Finnish"
 msgstr "Finnish"
 
 #: members/templates/settings.html:21 sikweb/settings-sample.py:177
-#: sikweb/settings.py:176
+#: sikweb/settings.py:177
 msgid "English"
 msgstr "English"
 
diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo
index 0cc41b157f62d6fcce183fac827593eb4fb6ca53..ca7e32c4c9876be22de1a819c991a82f9578f872 100644
GIT binary patch
delta 2573
zcmYk;drZ}39LMo50t$r)Cz0}~{m48ZLY+WB#7v1S6$;HVC6wDqkxPV75vyY{qq#2Y
z4_dYPN6yQZt=Z0Ix8;^By9`VHqna&RQyOavyRWva-k;xj*m&0W_xe50`Td^f`&@q5
z$z=!2qoaYOA)|B?^N2SR&GzGp8C)pGQq3ax7JiJ`SD2;Xcg}I-75fF3;2$_0bFPfH
z=OIm2fN5BU{AX2MW|>8;)-^O>20yf;9()`Na32=p+n9u7I1_(#^}kTLUd9qk=H-Q0
z;oOc3s1M+^c)-<9`t_*U_uO2=4+-?DOoK>f7D5eF%0&ZIp%SQe^$n<*Zb7=R2Gq)Q
zpq_geHKBeaH+vTK+{>7Zhj0et+fmmL!*uHJqB{P>)xSV>G>TW_B~(HwJgkH>Q11n~
zsN;Os9>yH%6|P>7S=4u;5`6-rdE5+gL!WjGmH7!|yKNY?x2I7roOSKzofk2a_6gL?
zv~22UCMv-oD)EJ`eJN^Um3S4doyGohZ}nWX1s$jt2Qh>%pb|QcL3|(Q;8&Q96R78>
zGYUCaIx5lm7{Czf_j1?18a1(X&P^GtzXsSwgF0+R)%#I1+JoxwIaKB^p*q-)TG}J1
z#6QJFcmX|3Wm%MPKI*GlgPKsYYv1SE4@bFC$HS;hKSTPkbErfvpq6wTr{SO2mSFZb
z?w}rF9bd=Os1<m0cKrE4)Yc8*5_|<Uk&jU0e2#iP`lY)WLk;vhYU!qNQW(RsP<xe&
zN~{8xVl`Ialc<hAKpn<Ys1-VkTETCy1jkXI<pTE4!%F0Hj9N1{xik#m^>`Eu@J##x
zyNv#xvOnrDgvz`a)n17l16%Lvb*L3>K_$|L`YL)+Gw(-DY`~ZOAL2$G9zhLo9M$nK
z>ctV%ikw5ua16ClKciOWU!0EtzD+$JMh#So>USk-D{Gt^QO|G2G=2ZQ+^`h(6l%{7
zAbr|l)IcX(`v_`AXI%X}YQRxc!WU69`w2Dhf2jA<IiZ@^JXC!#vKv;0Q7v5!H(IiK
z)E>8>+I#V4+>8E-picb=YDN>Nnf!)2?U{4UuERo9qP3`gwmNsA{t`ZhTFIy9vj6J%
zMH=+NtEeSCh-!Za)$xa}{w=D5A5hQ#ic0(+_j@7_>yV|PRy2%7Sc^)006jc}d3Y+w
z`s>hLqCuI@=3~vrGE@RhsJ(1MCAJ$i;2`QuJdgS;U&91cY4ES{i;|dHc2T*TAYZE_
zG8y025zC0l(&BEkXIj38h(=-!p=56-w2x(kKE*{u2cfN4O)Mu=n3JCzyW>wvZ7OZV
zPC_dg<#YFo4&KzV)m6HYFVHr+dZ|;Zr9-CWT~Fx1s)XbCR~E(p<I{;b#5Uqq;zmM+
zm5thc+|>G2vj?%2(CJjUA&&pA-ksd9b#-xvyZ5ll-G{KA&=%>B&P~KEg!Vc@=x|Rh
z)r{{S7@fv@iQ5Q$QYxzmoq?4^646YQ6ZaGPABuYjeI0iZDk}&bN}ZF*qBGJ(>~IYg
zxPho6nutxSxJ;HpZrWXCGj1n}i3eQUVk{uG5H+qXH?}vmE-}#Pbw(cXT6-cLUQ?gf
z)7KS=eVta4oKhV2io(l_i(*-UH<Plxmexjo?CWan^tvM5y}NrNk@oh+*n4xHN&X*K
CE!bE9

delta 2490
zcmZ|QZA_L`7{Ku(LIPnZRH%^gfFK2CiXxbaZ<J~FCPIZ}Dr8`hY;C>h_RMr;L&dgS
z<?I9H{NS*fw6$tA=Ul8=tX6zrS*y)9n;W%OE7phl|DWg7`qCNK^E>B$Irll&Irq)6
zhBNiaZwoRH2TBi7LL8eI!pm4Qi66?ooDe$j1suYkFdN^^O?w)-C47R__!(Y?<MDX7
zJOrvC6Z0@1`3oid<cE+9Rq;SQPT|BV^ui5TgIjP8_F*P|h?DV5Y=4f9bp#jUH&~8^
zbfSxJCbr?V_)KgcNwt$9yhp_mjv^xp7tja%iguhq!w2W0?R<2GMaU&#CYq6I^tuJ;
zL>iE>gf-}OEtrK{(SAB@^Zd|5<qCWf?fALaK7e*~6sO@y^u~|T0S}}1jiMc2jK{|?
zL3=#5i@E43+Lh=)mtYk(VUlY?Hx);|3t8T<8(q_0^oG88{FUhIIF;iA=*&Js`#FaW
za1<T*_wo2I=)_EKAxuIuU7XMQPp48%%Nv`p64#*vdIF2_X}lT_V-XIZ*PliD4xgd}
z{Td7KLOlO_JpLCtv1~@A1!(^zQ^>y^CgOnxbVf_j4%eb1Z$@uyLsQ#<4*Yqnz<w;n
zA#}hO(YGm+G&!LJdVDo{ydCX#can-T*@xT{4xuCKM^kznGw>bUK7rQ`x6v*qk0-Df
z%|P9i>Fb-&rCX2H*osbM5Bi+_==Co}lW$P*L8s8vokpG!zC_pR2XtWLxBzq6NjG65
z+VM_wGwww*)Q4v9Ra}V2(bw=imZIzEYnZ^<zW>Xq%;G>N*5E<3;}6h|&Y~m!A|C$^
zS<didY>%U<%wQcIKo0sg6rwYpj!q~MtwsB5!aSZInyL7}&FGC?XeM@`Guwk^=pdSr
zqj(Lzjb1;DKIkj7<MZeeUW)#VUjG|9p+eqeGf;{Xd45<%g>zvQ`k;-Tz%Fz~-Ld@?
z`oLZ2fS*NY){8#)HT3=g^g-{(_7IZ&FoI_85}L6;G3nZ7u$4Vgh&N+7rZR%=_AYcr
z`_Y-ai0<aMunf<k106&A`6HS=BmD)OhGudW+V5QS`uZ8<-;}P1CtA>sH^uf&^b@)l
zz2Oi#@+0wlKf1Y2peY^3`8b9SJV9rrxDu<d9o=gO(1D*SCjZw{8R38<^W}6cbI^fJ
zMITs!?ui=ob!@~5=o_(^u$ak;R4x4v%YQmI5N_&Q2{Z68@fguf*iWA8-$vX)SRN%<
zmav7mjc6vCi1mcUS<WMBiOqzAb71Zl%j3kIsT%tUm&W=(n4P(V%j`sxrs==sp4jNX
z&RAzT(_b^(NSLVy2+LN&&1acSxJ)g?y@cg1!tcQS#N9+Yv5v5?6v@<%wc*ZQPPoCA
z5jPUI6WfVJgr$e5CmtgHuT*k^)%>@trS?c{)nO~)Uhs`u?fY->^=Kqk*r2%SRuUVC
zE`t4(Dx3Jdg>cW@M>G(ngk=YD9l`e~@UcvNC4D`&5teGgw_}NoSo{{GN*TXvi1KtZ
kJUDnVr)}b3+2lD{+4Jj5=hZE)Z5V7Vcr$abq9~d5H?eEJ+W-In

diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
index 099e1c4..e4796e3 100644
--- a/locale/fi/LC_MESSAGES/django.po
+++ b/locale/fi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-28 16:39+0300\n"
+"POT-Creation-Date: 2017-05-30 20:32+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"
@@ -75,34 +75,38 @@ msgstr "Lisää/Poista"
 msgid "Create new item"
 msgstr "Luo uusi dia"
 
-#: infoscreen/templates/infoscreen_admin.html:51
+#: infoscreen/templates/infoscreen_admin.html:49
+msgid "Create a new item by type"
+msgstr "Luo uusi dia tyypin perusteella"
+
+#: infoscreen/templates/infoscreen_admin.html:52
 msgid "Item type"
 msgstr "Diatyyppi"
 
-#: infoscreen/templates/infoscreen_admin.html:62
-#: infoscreen/templates/infoscreen_admin.html:82
+#: infoscreen/templates/infoscreen_admin.html:63
+#: infoscreen/templates/infoscreen_admin.html:83
 msgid "Info items"
 msgstr "Diat"
 
-#: infoscreen/templates/infoscreen_admin.html:63
-#: infoscreen/templates/infoscreen_admin.html:83
+#: infoscreen/templates/infoscreen_admin.html:64
+#: infoscreen/templates/infoscreen_admin.html:84
 msgid "Infoitems available for rotations"
 msgstr "Rotaatioon lisättävät diat"
 
-#: infoscreen/templates/infoscreen_admin.html:66
-#: infoscreen/templates/infoscreen_admin.html:86
+#: infoscreen/templates/infoscreen_admin.html:67
+#: infoscreen/templates/infoscreen_admin.html:87
 msgid "Item"
 msgstr "Dia"
 
-#: infoscreen/templates/infoscreen_admin.html:67
-#: infoscreen/templates/infoscreen_admin.html:87
+#: infoscreen/templates/infoscreen_admin.html:68
+#: infoscreen/templates/infoscreen_admin.html:88
 msgid "Type"
 msgstr "Tyyppi"
 
-#: infoscreen/templates/infoscreen_admin.html:68
-#: infoscreen/templates/infoscreen_admin.html:73
-#: infoscreen/templates/infoscreen_admin.html:90
-#: infoscreen/templates/infoscreen_admin.html:97
+#: infoscreen/templates/infoscreen_admin.html:69
+#: infoscreen/templates/infoscreen_admin.html:74
+#: infoscreen/templates/infoscreen_admin.html:91
+#: infoscreen/templates/infoscreen_admin.html:98
 #: infoscreen/templates/infoscreen_admin.html:112
 #: infoscreen/templates/infoscreen_admin.html:116
 #: infoscreen/templates/infoscreen_admin.html:134
@@ -111,24 +115,24 @@ msgstr "Tyyppi"
 msgid "Delete"
 msgstr "Poista"
 
-#: infoscreen/templates/infoscreen_admin.html:88
+#: infoscreen/templates/infoscreen_admin.html:89
 msgid "Set duration"
 msgstr "Aseta kesto"
 
-#: infoscreen/templates/infoscreen_admin.html:89
+#: infoscreen/templates/infoscreen_admin.html:90
 msgid "Add to rotation"
 msgstr "Lisää rotaatioon"
 
-#: infoscreen/templates/infoscreen_admin.html:96
+#: infoscreen/templates/infoscreen_admin.html:97
 msgid "Add"
 msgstr "Lisää"
 
-#: infoscreen/templates/infoscreen_admin.html:105
+#: infoscreen/templates/infoscreen_admin.html:106
 #: infoscreen/templates/infoscreen_admin.html:131
 msgid "Rotation"
 msgstr "Rotaatio"
 
-#: infoscreen/templates/infoscreen_admin.html:105
+#: infoscreen/templates/infoscreen_admin.html:106
 #: infoscreen/templates/infoscreen_admin.html:133
 #: infoscreen/templates/infoscreen_admin.html:139
 msgid "Preview"
@@ -380,12 +384,12 @@ msgid "Language"
 msgstr "Kieli"
 
 #: members/templates/settings.html:20 sikweb/settings-sample.py:178
-#: sikweb/settings.py:177
+#: sikweb/settings.py:178
 msgid "Finnish"
 msgstr "suomi"
 
 #: members/templates/settings.html:21 sikweb/settings-sample.py:177
-#: sikweb/settings.py:176
+#: sikweb/settings.py:177
 msgid "English"
 msgstr "englanti"
 

From 77c69036587737857e21340b158cbc400167562d Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Tue, 30 May 2017 21:29:06 +0300
Subject: [PATCH 12/13] More mobile styles :smile:

---
 infoscreen/static/css/infoscreen_admin.css | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/infoscreen/static/css/infoscreen_admin.css b/infoscreen/static/css/infoscreen_admin.css
index 8869711..f4ceb48 100644
--- a/infoscreen/static/css/infoscreen_admin.css
+++ b/infoscreen/static/css/infoscreen_admin.css
@@ -15,6 +15,12 @@ div {
   margin-bottom: 0.5rem;
 }
 
+td {
+  max-width: 12vw;
+  overflow: hidden;
+  word-wrap: break-word;
+}
+
 @media (min-width: 760px) {
   body {
     font-size: 1rem;
@@ -23,24 +29,26 @@ div {
 
 @media (max-width: 760px) {
   body {
-    font-size: 1rem;
+    font-size: 0.7rem;
+    padding: 0;
   }
   h1 {
-    font-size: 3rem;
+    font-size: 2.5rem;
   }
   h2 {
-    font-size: 2rem;
+    font-size: 1.5rem;
   }
   .logout-button {
     margin: 0;
   }
+  table>tbody>tr>td,
+  table>tbody>tr>th {
+    white-space: normal;
+    padding: 0.2rem !important;
+    max-width: 100%;
+  }
 }
 
-td {
-  max-width: 12vw;
-  overflow: hidden;
-  word-wrap: break-word;
-}
 
 #header {
     max-width: 100%;

From c3b1510bb8a5c6c233fa586d185714bbf1f3520d Mon Sep 17 00:00:00 2001
From: Juhana Luomanen <juhana.luomanen@aalto.fi>
Date: Thu, 1 Jun 2017 17:38:25 +0300
Subject: [PATCH 13/13] Add settings tab for changing language

---
 infoscreen/templates/infoscreen_admin.html | 27 +++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index 1b92925..7517f22 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -40,6 +40,7 @@
                         <li class="divider">
                         <li class="nav-item"><a data-toggle="tab" href="#deleterot" role="tab">{% trans "Create/Delete" %}</a></li>
                     </ul>
+                <li><a data-toggle="tab" href="#settings" role="tab">{% trans "Settings" %}</a></li>
             </ul>
             <div class="tab-content row">
                 <div id="slides" class="tab-pane active">
@@ -118,8 +119,7 @@
                     </div>
                 </div>
                 <div id="deleterot" class="tab-pane">
-                    <div class="col-xs-12 c
-                                <td></td>ol-md-6" ng-controller="infoadmin_ctrl">
+                    <div class="col-xs-12 " ng-controller="infoadmin_ctrl">
                         <h2>{% trans "Rotations" %}</h2>
                         <div>
                             {% trans "Select rotation to edit" %}:
@@ -146,7 +146,28 @@
                         </table>
                     </div>
                 </div>
-            </div>
+                <div id="settings" class="tab-pane">
+                    <div>
+                        <div class="col-md-12">
+                            <h2>{% trans "Settings" %}</h2>
+                        </div>
+
+                        <form action="/i18n/setlang/" method="post" class="form-group"> {% csrf_token %}
+                            <div class="col-md-12">
+                                <h4>{% trans "Language" %}</h4>
+                            </div>
+                            <div class="col-md-6">
+                                <select name="language" class="form-control">
+                                    <option value="fi" {% if LANGUAGE_CODE == "fi" %} selected {% endif %}>{% trans "Finnish" %}</option>
+                                    <option value="en" {% if LANGUAGE_CODE == "en" %} selected {% endif %}>{% trans "English" %}</option>
+                                </select>
+                            </div>
+                            <div class="col-md-3">
+                                <input type="submit" class="btn btn-success">
+                            </div>
+                        </form>
+                    </div>
+                </div>
             </div>
             <div style="margin-top: 100px;">
                 {% include "footer.html" %}