From 70e66cb7dab921133e0d4ba60ce4f2e189ce7430 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Fri, 10 Feb 2017 19:35:13 +0200
Subject: [PATCH] Add preview button for rotations

---
 infoscreen/templates/infoscreen_admin.html |   6 ++++
 locale/en/LC_MESSAGES/django.mo            | Bin 378 -> 378 bytes
 locale/en/LC_MESSAGES/django.po            |  35 +++++++++++--------
 locale/fi/LC_MESSAGES/django.mo            | Bin 2772 -> 2807 bytes
 locale/fi/LC_MESSAGES/django.po            |  37 +++++++++++++--------
 5 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html
index caee090..ca4bb9c 100644
--- a/infoscreen/templates/infoscreen_admin.html
+++ b/infoscreen/templates/infoscreen_admin.html
@@ -66,18 +66,24 @@
                     <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>
 
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 56dcd95e949904fa3dae0ab4215221d61fff172c..9bc6b5fd2686523bfaebfd67c30741619ce0cc90 100644
GIT binary patch
delta 18
Zcmeyx^owaiKZl`#f{}rhq0z+Yj{!g72CD!7

delta 18
Zcmeyx^owaiKZk*tf}y3Aso})wj{!hg2D<<N

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 888e114..8eb532c 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-02-06 19:51+0200\n"
+"POT-Creation-Date: 2017-02-10 20:12+0200\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"
@@ -47,10 +47,10 @@ msgid "Add to rotation"
 msgstr ""
 
 #: infoscreen/templates/infoscreen_admin.html:39
-#: infoscreen/templates/infoscreen_admin.html:70
-#: infoscreen/templates/infoscreen_admin.html:75
-#: infoscreen/templates/infoscreen_admin.html:90
-#: infoscreen/templates/infoscreen_admin.html:94
+#: infoscreen/templates/infoscreen_admin.html:72
+#: infoscreen/templates/infoscreen_admin.html:79
+#: infoscreen/templates/infoscreen_admin.html:96
+#: infoscreen/templates/infoscreen_admin.html:100
 #: members/templates/member_list.html:63
 msgid "Delete"
 msgstr ""
@@ -72,32 +72,41 @@ msgid "Select rotation to edit"
 msgstr ""
 
 #: infoscreen/templates/infoscreen_admin.html:68
-#: infoscreen/templates/infoscreen_admin.html:84
+#: infoscreen/templates/infoscreen_admin.html:90
 msgid "Rotation"
 msgstr ""
 
 #: infoscreen/templates/infoscreen_admin.html:69
-#: infoscreen/templates/infoscreen_admin.html:74
+msgid "id"
+msgstr ""
+
+#: infoscreen/templates/infoscreen_admin.html:70
+#: infoscreen/templates/infoscreen_admin.html:77
 msgid "Select"
 msgstr ""
 
+#: infoscreen/templates/infoscreen_admin.html:71
 #: infoscreen/templates/infoscreen_admin.html:78
+msgid "Preview"
+msgstr ""
+
+#: infoscreen/templates/infoscreen_admin.html:82
 msgid "Name"
 msgstr ""
 
-#: infoscreen/templates/infoscreen_admin.html:79
+#: infoscreen/templates/infoscreen_admin.html:83
 msgid "Create new"
 msgstr ""
 
-#: infoscreen/templates/infoscreen_admin.html:85
+#: infoscreen/templates/infoscreen_admin.html:91
 msgid "Instances in currently selected rotation"
 msgstr ""
 
-#: infoscreen/templates/infoscreen_admin.html:88
+#: infoscreen/templates/infoscreen_admin.html:94
 msgid "Instance"
 msgstr ""
 
-#: infoscreen/templates/infoscreen_admin.html:89
+#: infoscreen/templates/infoscreen_admin.html:95
 msgid "Duration"
 msgstr ""
 
@@ -205,11 +214,11 @@ msgstr ""
 msgid "Member register of SIK ry"
 msgstr ""
 
-#: sikweb/settings-sample.py:141 sikweb/settings.py:146
+#: sikweb/settings-sample.py:146 sikweb/settings.py:146
 msgid "English"
 msgstr ""
 
-#: sikweb/settings-sample.py:142 sikweb/settings.py:147
+#: sikweb/settings-sample.py:147 sikweb/settings.py:147
 msgid "Finnish"
 msgstr ""
 
diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo
index 5459a1777f6765bd730135d8f95745a9759e177c..6943d15486f7ad6dabda949ab5a6447e041ec1f7 100644
GIT binary patch
delta 984
zcmXZaPe@cz6vy%NdQWE@Q<=$O98xqBEB`cqpuc1gHef9(QkbPh3@MHa|Dc;-Du^OP
zl1C7<s6`6{iBKYf%8d&bwTm`Fwg@Vrt%7a({^&m5yPtc{ynF7s@6MOxPO|bX5j-}o
zJWn&vl4sVBXM7s2fxs+=7o0=5m+>$*U>U3M7S`fj_xn87F@B22@FgnGCTiXmR-099
zmyQy8WQk%u60#I3aWhQ>+mQ*@<;FQw!c)%kc!2R`OyUG8-+erck5GBvVGVx7I@Y&!
z7x;===sPCx7pkzosGUVwU6nUt8aq%4&pP{21r4CyA4KIFMpD>K)WYMa!e%vQeY;JE
z+a5X>Fva)@s({y6j~{T1<N4&`C&{9C!8wE~{04H{3{4y>sP`67NAetXB(G4v*$)~m
z^asgpyQoS%8dYA4+DRPsUK%y8)5SBW_fEKRAL`2#umvw-D~_Q4Ru51coU7scEAWB<
zw=L4B;$_qVYp9ApJ2y}T{C4AQ)R6>y_daYyEqoO<zlh3r4fO>kk=yRjXrptn;{US>
z324GIB&RK+5-p>4{ucM+D(Y-EPz(P=PQ==IbTPCho=kYo@Ah)xxS#U6!+U;fyjMTF
z>ku9d-}sr9E_w%Dv;(uQuVc)IUa+s~2)&+_bZ~r6<jQ1eX0$XLUaEc{&1Kv2+0(iF
XN+MG9V}+^FvFp=QrE)18iIx8WkDXSB

delta 949
zcmXZaPe_zO7{~Evd*60-{l{)CTmE6yl3aDw%@h^IgF%4@^&o+S(n&=RB7q3zdJzPL
zf;YpWV;+R)qJrQt^CVPIARat)v%E-$3L^Uca9;ME&&<3t&pb1;zY<>(xs$lRW;|Km
za^5!~vtDfQD0td^vnX~r?_weCek{R<cp0a#0B79y1uUYyg01)x73U*r-Z6&Fa`v5y
z0-j?Y{zHBiA*uowQbaJ0Ot4bdu0jP&JMUl>?H)|vBUHRuti?rC+)d2KcUZ*ww(B|$
zPz!y+I3A%A`+?foZ&c<!SzO1fsDO>m7F0s*sPVnX6zfMVID|@Q)V0Sk%=$K?3eHg^
zaS^rfIu_#wPI4{VuD_Bf>d!d4Pzm=TKO3Ql;TUS%9O^2TQCIN-`Pm^wP78gdLTvkn
z%JdYK`A^h|{6UQi@sX+(qxzGmaVgiXL7hkjEATd^Z~*mpnnrE#v1_m9bN<xr8HF-_
zg<9Y(D&rmJdsG6SUHb%e6=&Fue^Co}a{ij%gNk<_bppev4Njo0W*RkaK6>wB$4hi5
zz*E%Do?{ulMorj7Ex3=|gjMtEp=sB68-qcwKGYmM@sgpsV9iU#8uZycw=ffY@R};p
w)NZ)mo7m*)y1r}>^RMVQt$r)*w_OUx!h3nmZI#)M&erT!UF3lmtVSpQ1OA&%mH+?%

diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
index dff19d9..ca0b6e7 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-02-06 19:51+0200\n"
+"POT-Creation-Date: 2017-02-10 20:12+0200\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"
@@ -48,10 +48,10 @@ msgid "Add to rotation"
 msgstr "Lisää rotaatioon"
 
 #: infoscreen/templates/infoscreen_admin.html:39
-#: infoscreen/templates/infoscreen_admin.html:70
-#: infoscreen/templates/infoscreen_admin.html:75
-#: infoscreen/templates/infoscreen_admin.html:90
-#: infoscreen/templates/infoscreen_admin.html:94
+#: infoscreen/templates/infoscreen_admin.html:72
+#: infoscreen/templates/infoscreen_admin.html:79
+#: infoscreen/templates/infoscreen_admin.html:96
+#: infoscreen/templates/infoscreen_admin.html:100
 #: members/templates/member_list.html:63
 msgid "Delete"
 msgstr "Poista"
@@ -73,32 +73,43 @@ msgid "Select rotation to edit"
 msgstr "Valitse muokattava rotaatio"
 
 #: infoscreen/templates/infoscreen_admin.html:68
-#: infoscreen/templates/infoscreen_admin.html:84
+#: infoscreen/templates/infoscreen_admin.html:90
 msgid "Rotation"
 msgstr "Rotaatio"
 
 #: infoscreen/templates/infoscreen_admin.html:69
-#: infoscreen/templates/infoscreen_admin.html:74
+#, fuzzy
+#| msgid "Paid"
+msgid "id"
+msgstr "Maksettu"
+
+#: infoscreen/templates/infoscreen_admin.html:70
+#: infoscreen/templates/infoscreen_admin.html:77
 msgid "Select"
 msgstr "Valitse"
 
+#: infoscreen/templates/infoscreen_admin.html:71
 #: infoscreen/templates/infoscreen_admin.html:78
+msgid "Preview"
+msgstr "Esikatsele"
+
+#: infoscreen/templates/infoscreen_admin.html:82
 msgid "Name"
 msgstr "Nimi"
 
-#: infoscreen/templates/infoscreen_admin.html:79
+#: infoscreen/templates/infoscreen_admin.html:83
 msgid "Create new"
 msgstr "Luo uusi"
 
-#: infoscreen/templates/infoscreen_admin.html:85
+#: infoscreen/templates/infoscreen_admin.html:91
 msgid "Instances in currently selected rotation"
 msgstr "Nykyisen rotaation diat"
 
-#: infoscreen/templates/infoscreen_admin.html:88
+#: infoscreen/templates/infoscreen_admin.html:94
 msgid "Instance"
 msgstr "Dia"
 
-#: infoscreen/templates/infoscreen_admin.html:89
+#: infoscreen/templates/infoscreen_admin.html:95
 msgid "Duration"
 msgstr "Kesto"
 
@@ -206,11 +217,11 @@ msgstr "Jäsenhakemus"
 msgid "Member register of SIK ry"
 msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri"
 
-#: sikweb/settings-sample.py:141 sikweb/settings.py:146
+#: sikweb/settings-sample.py:146 sikweb/settings.py:146
 msgid "English"
 msgstr "englanti"
 
-#: sikweb/settings-sample.py:142 sikweb/settings.py:147
+#: sikweb/settings-sample.py:147 sikweb/settings.py:147
 msgid "Finnish"
 msgstr "suomi"