From fb6a7b59abd31de1c3a541dfc0513fb2c40d032c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 29 Nov 2021 22:34:39 +0100 Subject: [PATCH 1/2] =?UTF-8?q?P=C5=99id=C3=A1n=C3=AD=20zv=C3=BDraz=C5=88o?= =?UTF-8?q?v=C3=A1n=C3=AD=20i=20do=20adminu.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/static/css/mamweb.css | 30 ++------------------------- mamweb/static/css/rozliseni.css | 29 ++++++++++++++++++++++++++ mamweb/templates/admin/base_site.html | 3 +++ 3 files changed, 34 insertions(+), 28 deletions(-) create mode 100644 mamweb/static/css/rozliseni.css diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index 5a879a37..fd686e98 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -1,3 +1,5 @@ +@import url("rozliseni.css"); + @font-face { font-family: 'OpenSans'; src: url("../fonts/OpenSans/OpenSans-Regular.ttf"); @@ -1182,31 +1184,3 @@ div.gdpr { label[for=id_skola] { font-weight: bold; } - -.localweb { - border-left: 20px solid greenyellow; - border-right: 20px solid greenyellow; -} - -.localweb .login-bar { - margin-left: -20px; -} - -.testweb { - border-left: 20px solid darkorange; - border-right: 20px solid darkorange; -} - -.testweb .login-bar { - margin-left: -20px; -} - -/* Produkční web z pohledu superuživatele */ -.suprodweb { - border-left: 20px solid red; - border-right: 20px solid red; -} - -.suprodweb .login-bar { - margin-left: -20px; -} diff --git a/mamweb/static/css/rozliseni.css b/mamweb/static/css/rozliseni.css new file mode 100644 index 00000000..baf2d837 --- /dev/null +++ b/mamweb/static/css/rozliseni.css @@ -0,0 +1,29 @@ +/* Rozlišení mezi lokálním, test a produkčním webem */ + +.localweb { + border-left: 20px solid greenyellow; + border-right: 20px solid greenyellow; +} + +.localweb .login-bar { + margin-left: -20px; +} + +.testweb { + border-left: 20px solid darkorange; + border-right: 20px solid darkorange; +} + +.testweb .login-bar { + margin-left: -20px; +} + +/* Produkční web z pohledu superuživatele */ +.suprodweb { + border-left: 20px solid red; + border-right: 20px solid red; +} + +.suprodweb .login-bar { + margin-left: -20px; +} diff --git a/mamweb/templates/admin/base_site.html b/mamweb/templates/admin/base_site.html index 7e8707ef..6bb544d7 100644 --- a/mamweb/templates/admin/base_site.html +++ b/mamweb/templates/admin/base_site.html @@ -4,8 +4,11 @@ {% block extrahead %} + {% endblock %} +{% block bodyclass %}{{ LOCAL_TEST_PROD }}web{% endblock %} + {% block branding %}

M&M GWP web

{% endblock %} From e10944f7d8be0339616d373b3a9a37b1fb5e5b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 29 Nov 2021 22:35:00 +0100 Subject: [PATCH 2/2] =?UTF-8?q?P=C5=99id=C3=A1n=C3=AD=20zv=C3=BDraz=C5=88o?= =?UTF-8?q?v=C3=A1n=C3=AD=20i=20do=20korekturov=C3=A1tka.=20Tam=20ale=20d?= =?UTF-8?q?=C4=9Bl=C3=A1=20trochu=20paseku=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- korektury/templates/korektury/opraf.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/korektury/templates/korektury/opraf.html b/korektury/templates/korektury/opraf.html index 02af7d56..2dbc528b 100644 --- a/korektury/templates/korektury/opraf.html +++ b/korektury/templates/korektury/opraf.html @@ -4,10 +4,11 @@ + Korektury {{pdf.nazev}} - +

Korektury {{pdf.nazev}}

{% if pdf.status == 'zanaseni' %}

Probíhá zanášení korektur, zvažte, zda chcete přidávat nové

{% endif %} {% if pdf.status == 'zastarale' %}

Toto PDF je již zastaralé, nepřidávejte nové korektury

{% endif %}