diff --git a/mamweb/settings_local.py b/mamweb/settings_local.py index a11617d0..e7709461 100644 --- a/mamweb/settings_local.py +++ b/mamweb/settings_local.py @@ -73,11 +73,11 @@ LOGGING = { }, 'loggers': { # Vypisovani databazovych dotazu do konzole - 'django.db.backends': { - 'level': 'DEBUG', - 'handlers': ['console'], - 'propagate': False, - }, + #'django.db.backends': { + # 'level': 'DEBUG', + # 'handlers': ['console'], + # 'propagate': False, + #}, '': { 'handlers': ['console'], 'level': 'DEBUG', diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index 6e5b9488..dad505b8 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -3,6 +3,16 @@ body { font-family: 'Open Sans', sans-serif; font-weight: 400; + background-color: #fffbf6; +} + +div.container { + width: 970px; + margin: auto; +} + +a { + color: #6f2509; } .org-logged-in .mam-text-plugin { @@ -44,7 +54,6 @@ table .border-b { } div.container { - background-color: #fff8eb; padding: 0px; } @@ -65,33 +74,53 @@ h1 { /* Headline & Header */ +#title { /*dělá blbosti šířka, je to kvůli fixed pozici, zatím natvrdo, vyřešit*/ + height: 55px; + width: 970px; + position: fixed; + z-index: 10; + background-color: #e84e10; + filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4)); + + font-size: 200%; + color: #fffbf6; + font-weight: 400; + font-variant: small-caps; + text-align: center; + text-decoration: bold; + padding-top: 8px +} + + #header { position: relative; - font-size: 250%; - background: url("../images/header-bg-uvod.jpg") no-repeat center top; - height: 255px; - top: -1px; + background: url("../images/uvod.jpg") no-repeat center top; + background-size: 100%; + top: 58px; } +/*todo: rozumné fotky*/ -#header.cojemam { background-image: url("../images/header-bg-uvod.jpg"); } -#header.soustredeni { background-image: url("../images/header-bg-soustredeni.jpg"); } -#header.zadani { background-image: url("../images/header-bg-zadani.jpg"); } -#header.clanky { background-image: url("../images/header-bg-clanek.jpg"); } -#header.archiv { background-image: url("../images/header-bg-archiv.jpg"); } +#header.cojemam { background-image: url("../images/uvod.jpg");} +#header.soustredeni { background-image: url("../images/noc.jpg");} +#header.zadani { background-image: url("../images/noc.jpg");} +#header.clanky { background-image: url("../images/stiny.jpg");} +#header.archiv { background-image: url("../images/ohen.jpg");} + +#header.NOC {background-image: url("../images/uvod.jpg");} +#header.NOCcojemam { background-image: url("../images/noc.jpg");} +#header.NOCsoustredeni { background-image: url("../images/stiny.jpg");} +#header.NOCzaani { background-image: url("../images/ohen.jpg");} +#header.NOCclanky { background-image: url("../images/ohen.jpg");} +#header.NOCarchiv { background-image: url("../images/uvod.jpg");} -#header.NOC {background-image: url("../images/header-bg-uvod-NOC.jpg"); } -#header.NOCcojemam { background-image: url("../images/header-bg-uvod-NOC.jpg"); } -#header.NOCsoustredeni { background-image: url("../images/header-bg-soustredeni-NOC.jpg"); } -#header.NOCzadani { background-image: url("../images/header-bg-zadani-NOC.jpg"); } -#header.NOCclanky { background-image: url("../images/header-bg-clanek-NOC.jpg"); } -#header.NOCarchiv { background-image: url("../images/header-bg-archiv-NOC.jpg"); } #header img.logo { - position: absolute; - top: 40px; - left: 55px; + position: absolute center; + width: 100%; + filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4)); } + /* #header h1 { font-size: 130%; @@ -101,6 +130,7 @@ h1 { height: 110px; } */ + #header img.header { margin: -25px 20px 0px 0px; height: 145px; @@ -108,6 +138,7 @@ h1 { visibility: hidden; } + /* Menu */ div.menu.mobile { @@ -118,10 +149,8 @@ div.menu.desktop { } div.menu { position: relative; - top: -10px; - z-index: 10; - background: url("../images/menu-bg.png") no-repeat left top; height: 60px; + top: 12px; } div.menu ul { padding: 0px; @@ -145,21 +174,20 @@ div.menu li { div.menu a { display: block; padding: 8px 10px; - color: #006400; + color: #6f2509; height: 48px; } div.menu a:hover { - background: url("../images/menu-bg-selected.png") no-repeat left -7px; - background-size: 100% 68px; + color: black; text-decoration: none; - color: #003c00; + /*background: url("../images/menu-selected.svg") no-repeat center -4px;*/ } + div.menu li.selected a { - background: url("../images/menu-bg-selected.png") no-repeat left -7px; - background-size: 100% 68px; + /*background: url("../images/menu-selected.svg") no-repeat center -4px; + background-size: 98% 68px;*/ text-decoration: none; - color: #003c00; - z-index: 15px; + color: black; } h1 a:hover { @@ -168,35 +196,39 @@ h1 a:hover { #submenu { position: relative; - top: -15px; - background: url("../images/submenu-bg.png") no-repeat left top; - height: 60px; + top: 4px; + background: url("../images/submenu.svg") no-repeat left top; + background-size: 100%; + filter: drop-shadow(0px 5px 5px rgba(0, 0, 0, 0.4)); + width: 100%; } + #submenu ul { - padding: 0px 15px; + padding: 10px 30px; font-size: 120%; font-weight: 400; } #submenu li { padding: 4px 20px; display: inline-block; - height: 40px; + height: 60px; } #submenu li>a { - color: #003c00; + color: #f9d59e; text-decoration: none; } #submenu li>a:hover { color: #3c003c; } +/* #submenu li.selected { - background: url("../images/submenu-bg-selected.png") no-repeat center; + background: url("../images/submenu-bg-selected.png") no-repeat center -11px; background-size: 150% 150%; } #submenu li.selected>a { color: #3c003c; } -/*#submenu li:first-child { +#submenu li:first-child { border-top-left-radius: 7px; border-top-right-radius: 7px; padding-top: 8px; @@ -226,15 +258,10 @@ div.zadani_azad_termin { **********/ #footer { - background: url("../images/footer-bg-top.png") no-repeat top center; + background: url("../images/footer.svg") no-repeat top center; background-color: #ffd546; padding: 20px 30px 0px 30px; - min-height: 210px; -} - -#footer-extra { - background: url("../images/footer-bg-bottom.png") no-repeat bottom center; - height: 39px; + width: 100%; } #footer p.license { @@ -275,8 +302,6 @@ div.zadani_azad_termin { background-size: 100% 100%; } #header img.logo { - top: 27px; - left: 35px; height: 140px; } div.menu li { diff --git a/mamweb/static/images/header-bg-archiv-NOC.jpg b/mamweb/static/images/header-bg-archiv-NOC.jpg deleted file mode 100644 index 6f00a321..00000000 Binary files a/mamweb/static/images/header-bg-archiv-NOC.jpg and /dev/null differ diff --git a/mamweb/static/images/header-bg-archiv.jpg b/mamweb/static/images/header-bg-archiv.jpg deleted file mode 100644 index 43ddd41e..00000000 Binary files a/mamweb/static/images/header-bg-archiv.jpg and /dev/null differ diff --git a/mamweb/static/images/header-bg-clanek-NOC.jpg b/mamweb/static/images/header-bg-clanek-NOC.jpg deleted file mode 100644 index 6c21cf02..00000000 Binary files a/mamweb/static/images/header-bg-clanek-NOC.jpg and /dev/null differ diff --git a/mamweb/static/images/header-bg-clanek.jpg b/mamweb/static/images/header-bg-clanek.jpg deleted file mode 100644 index 29077929..00000000 Binary files a/mamweb/static/images/header-bg-clanek.jpg and /dev/null differ diff --git a/mamweb/static/images/header-bg-odevzdat-NOC.jpg b/mamweb/static/images/header-bg-odevzdat-NOC.jpg deleted file mode 100644 index 3697993b..00000000 Binary files a/mamweb/static/images/header-bg-odevzdat-NOC.jpg and /dev/null differ diff --git a/mamweb/static/images/header-bg-soustredeni-NOC.jpg b/mamweb/static/images/header-bg-soustredeni-NOC.jpg deleted file mode 100644 index 0a4fdfe0..00000000 Binary files a/mamweb/static/images/header-bg-soustredeni-NOC.jpg and /dev/null differ diff --git a/mamweb/static/images/header-bg-soustredeni.jpg b/mamweb/static/images/header-bg-soustredeni.jpg deleted file mode 100644 index a9b0b8fe..00000000 Binary files a/mamweb/static/images/header-bg-soustredeni.jpg and /dev/null differ diff --git a/mamweb/static/images/header-bg-uvod-NOC.jpg b/mamweb/static/images/header-bg-uvod-NOC.jpg deleted file mode 100644 index f2fe6c07..00000000 Binary files a/mamweb/static/images/header-bg-uvod-NOC.jpg and /dev/null differ diff --git a/mamweb/static/images/header-bg-uvod.jpg b/mamweb/static/images/header-bg-uvod.jpg deleted file mode 100644 index cf55ebcf..00000000 Binary files a/mamweb/static/images/header-bg-uvod.jpg and /dev/null differ diff --git a/mamweb/static/images/header-bg-zadani-NOC.jpg b/mamweb/static/images/header-bg-zadani-NOC.jpg deleted file mode 100644 index fa2c27b3..00000000 Binary files a/mamweb/static/images/header-bg-zadani-NOC.jpg and /dev/null differ diff --git a/mamweb/static/images/header-bg-zadani.jpg b/mamweb/static/images/header-bg-zadani.jpg deleted file mode 100644 index 2c8a82fb..00000000 Binary files a/mamweb/static/images/header-bg-zadani.jpg and /dev/null differ diff --git a/mamweb/static/images/header-bg.jpg b/mamweb/static/images/header-bg.jpg deleted file mode 100644 index b6e22870..00000000 Binary files a/mamweb/static/images/header-bg.jpg and /dev/null differ diff --git a/mamweb/static/images/logo.png b/mamweb/static/images/logo.png deleted file mode 100644 index 28b388bf..00000000 Binary files a/mamweb/static/images/logo.png and /dev/null differ diff --git a/mamweb/static/images/menu-bg-selected.png b/mamweb/static/images/menu-bg-selected.png deleted file mode 100644 index 91a2009a..00000000 Binary files a/mamweb/static/images/menu-bg-selected.png and /dev/null differ diff --git a/mamweb/static/images/menu-bg.png b/mamweb/static/images/menu-bg.png deleted file mode 100644 index 9088147d..00000000 Binary files a/mamweb/static/images/menu-bg.png and /dev/null differ diff --git a/mamweb/static/images/submenu-bg-selected.png b/mamweb/static/images/submenu-bg-selected.png deleted file mode 100644 index 81d1c817..00000000 Binary files a/mamweb/static/images/submenu-bg-selected.png and /dev/null differ diff --git a/mamweb/static/images/submenu-bg.png b/mamweb/static/images/submenu-bg.png deleted file mode 100644 index 9db66aa4..00000000 Binary files a/mamweb/static/images/submenu-bg.png and /dev/null differ diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index aeb5f51b..d5ce1da1 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -4,7 +4,7 @@ {% block title %}{% block nadpis1a %}{% endblock %} – Korespondenční seminář M&M{% endblock title %} - + {% render_block "css" %} @@ -34,8 +34,11 @@ + +
+ {% if user.is_staff %} -
+ {% endif %} -
+
+
M&M - korepsondenční seminář a časopis MFF UK
 @@ -109,10 +113,11 @@

Korespondenční seminář M&M organizují převážně studenti MFF UK. Organizaci semináře a vydávání časopisu podporuje Jednota českých matematiků a fyziků.

-
+
+ diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html index 0b9c62ac..1d07deae 100644 --- a/seminar/templates/seminar/cojemam/organizatori.html +++ b/seminar/templates/seminar/cojemam/organizatori.html @@ -26,7 +26,7 @@ {% for org in object_list %}

{{org.osoba.jmeno}} - {% if org.prezdivka %} + {% if org.osoba.prezdivka %} „{{org.osoba.prezdivka}}“ {% endif %} {{org.osoba.prijmeni}} @@ -55,11 +55,14 @@ {% if org.skola %}
  • {{org.studuje}} na {{org.skola}} {% endif %} + {% if org.osoba.email %}
  • Pošta: {# zobrazeni e-mailu (na jednom radku, aby nevznikaly mezery navic) #} - {% for znak in org.osoba.email %}{% if znak == '@' %} <zavináč> {% elif znak == '.' %} <tečka> {% else %}{{znak}}{% endif %}{% endfor %} + {% for znak in org.osoba.email %}{% if znak == '@' %} <at> {% elif znak == '.' %} <dot> {% else %}{{znak}}{% endif %}{% endfor %} {% endif %} + + {# {{org.strucny_popis_organizatora}} #}