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 @@ -
+
-
+

{% trans "Create new item" %}

+
{% trans "Create a new item by type" %}
@@ -101,7 +102,6 @@
-

{% trans "Rotation" %}: {$ selected_rot.name $}

{% trans "Instances in currently selected rotation" %}:
{% trans "Item type" %}
@@ -117,7 +117,6 @@
-
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 8c684b3..a51bcac 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ 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 \n" "Language-Team: LANGUAGE \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 0cc41b1..ca7e32c 100644 Binary files a/locale/fi/LC_MESSAGES/django.mo and b/locale/fi/LC_MESSAGES/django.mo differ 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 \n" "Language-Team: LANGUAGE \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"