Merge branch 'develop' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into develop

3 years ago · 038e6b0950
4 changed files with 36 additions and 29 deletions
--- a/korektury/templates/korektury/opraf.html
+++ b/korektury/templates/korektury/opraf.html
@ -4,10 +4,11 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  <link rel="stylesheet" title="opraf-css" type="text/css" media="screen, projection" href="{% static "korektury/opraf.css"%}" />
+    <link href="{% static 'css/rozliseni.css' %}?version=1" rel="stylesheet">
  <script src="{% static "korektury/opraf.js"%}"></script>
 	<title>Korektury {{pdf.nazev}}</title>
 </head>
-<body {% if pdf.status == 'zanaseni'%} class="comitting" {% elif pdf.status == 'zastarale' %} class="deprecated" {% endif %} onload='place_comments()'>
+<body class="{{ LOCAL_TEST_PROD }}web{% if pdf.status == 'zanaseni'%} comitting{% elif pdf.status == 'zastarale' %} deprecated{% endif %}" onload='place_comments()'>
 	<h1>Korektury {{pdf.nazev}}</h1>
 	{% if pdf.status == 'zanaseni' %} <h2> Probíhá zanášení korektur, zvažte, zda chcete přidávat nové </h2> {% endif %}
 	{% if pdf.status == 'zastarale' %} <h2> Toto PDF je již zastaralé, nepřidávejte nové korektury </h2> {% endif %}
--- 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;
-}
--- a/mamweb/static/css/rozliseni.css
+++ 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;
+}
--- a/mamweb/templates/admin/base_site.html
+++ b/mamweb/templates/admin/base_site.html
@ -4,8 +4,11 @@
 {% block extrahead %}
 <link rel="shortcut icon" href="{% static 'favicon.ico' %}" type="image/x-icon">
 <script src="{% static 'js/jquery-1.11.1.js' %}"></script>
+<link href="{% static 'css/rozliseni.css' %}?version=1" rel="stylesheet">
 {% endblock %}

+{% block bodyclass %}{{ LOCAL_TEST_PROD }}web{% endblock %}
+
 {% block branding %}
 <h1 id="site-name"><a href="/"> M&M GWP web </a></h1>
 {% endblock %}