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] 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"