diff --git a/mamweb/context_processors.py b/mamweb/context_processors.py new file mode 100644 index 00000000..ec6481df --- /dev/null +++ b/mamweb/context_processors.py @@ -0,0 +1,12 @@ + +from datetime import datetime, date + +def vzhled(request): + ''' Podle casu prida do templatu, zdali je nebo neni noc ''' + hodin = datetime.now().hour + if (hodin <= 6) or (hodin >= 20): + noc = True + else: + noc = False + return {'noc' : noc} + diff --git a/mamweb/middleware.py b/mamweb/middleware.py new file mode 100644 index 00000000..1bc0b4fa --- /dev/null +++ b/mamweb/middleware.py @@ -0,0 +1,36 @@ + +from django.http import HttpResponse +from datetime import datetime, date + +class vzhled: + + def process_request(self, request): + return None + + def process_view(self, request, view_func, view_args, view_kwargs): + #print "====== process_request ======" + #print view_func + #print view_args + #print view_kwargs + #print "=============================" + return None + + def process_template_response(self, request, response): + hodin = datetime.now().hour + if (hodin <= 6) or (hodin >= 14): # TODO 20 + response.context_data['noc'] = True + else: + response.context_data['noc'] = False + return response + + def process_response(self, request, response): + #hodin = datetime.now().hour + #if (hodin <= 6) or (hodin >= 14): # TODO 20 + #response.context_data['noc'] = True + #else: + #response.context_data['noc'] = False + return response + + + ##def process_exception(request, exception): + #pass diff --git a/mamweb/settings_common.py b/mamweb/settings_common.py index a46085cf..345bbc3b 100644 --- a/mamweb/settings_common.py +++ b/mamweb/settings_common.py @@ -78,6 +78,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.tz', 'sekizai.context_processors.sekizai', 'django.core.context_processors.static', + 'mamweb.context_processors.vzhled', ) INSTALLED_APPS = ( diff --git a/mamweb/settings_test.py b/mamweb/settings_test.py index f18a419f..cf4c593f 100644 --- a/mamweb/settings_test.py +++ b/mamweb/settings_test.py @@ -25,11 +25,11 @@ INSTALLED_APPS += ( SECRET_KEY = ')^u=i65*zmr_k53a*@f4q_+ji^o@!pgpef*5&8c7zzv9l+zo)n' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = False -TEMPLATE_DEBUG = True +TEMPLATE_DEBUG = False -ALLOWED_HOSTS = ['*.mam.mff.cuni.cz'] +ALLOWED_HOSTS = ['*.mam.mff.cuni.cz', 'atrey.karlin.mff.cuni.cz', 'mam.mff.cuni.cz'] # Database # https://docs.djangoproject.com/en/1.7/ref/settings/#databases @@ -45,6 +45,14 @@ DATABASES = { }, } +import os + +SERVER_EMAIL = 'mamweb-test-errors@mam.mff.cuni.cz' +ADMINS = [ + ('Petr Pecha', 'nejlepsitextovyeditorjevim@gmail.com'), +] + + diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index 73adcb29..2d0a283f 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -58,16 +58,24 @@ h2 { #header { position: relative; font-size: 250%; - background: url("../images/header-bg-uvod.png") no-repeat center top; + background: url("../images/header-bg-uvod.jpg") no-repeat center top; height: 255px; top: -1px; } -#header.cojemam { background-image: url("../images/header-bg-uvod.png"); } -#header.soustredeni { background-image: url("../images/header-bg-soustredeni.png"); } -#header.zadani { background-image: url("../images/header-bg-zadani.png"); } -#header.clanky { background-image: url("../images/header-bg-clanek.png"); } -#header.archiv { background-image: url("../images/header-bg-archiv.png"); } + +#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.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; diff --git a/mamweb/static/images/header-bg-archiv-NOC.jpg b/mamweb/static/images/header-bg-archiv-NOC.jpg new file mode 100644 index 00000000..d3732d92 Binary files /dev/null and b/mamweb/static/images/header-bg-archiv-NOC.jpg differ diff --git a/mamweb/static/images/header-bg-archiv.jpg b/mamweb/static/images/header-bg-archiv.jpg new file mode 100644 index 00000000..6f00a321 Binary files /dev/null and b/mamweb/static/images/header-bg-archiv.jpg differ diff --git a/mamweb/static/images/header-bg-archiv.png b/mamweb/static/images/header-bg-archiv.png deleted file mode 100644 index 32870431..00000000 Binary files a/mamweb/static/images/header-bg-archiv.png and /dev/null differ diff --git a/mamweb/static/images/header-bg-clanek-NOC.jpg b/mamweb/static/images/header-bg-clanek-NOC.jpg new file mode 100644 index 00000000..6c21cf02 Binary files /dev/null and b/mamweb/static/images/header-bg-clanek-NOC.jpg differ diff --git a/mamweb/static/images/header-bg-clanek.jpg b/mamweb/static/images/header-bg-clanek.jpg new file mode 100644 index 00000000..29077929 Binary files /dev/null and b/mamweb/static/images/header-bg-clanek.jpg differ diff --git a/mamweb/static/images/header-bg-clanek.png b/mamweb/static/images/header-bg-clanek.png deleted file mode 100644 index 95576fe6..00000000 Binary files a/mamweb/static/images/header-bg-clanek.png and /dev/null differ diff --git a/mamweb/static/images/header-bg-odevzdat-NOC.jpg b/mamweb/static/images/header-bg-odevzdat-NOC.jpg new file mode 100644 index 00000000..3697993b Binary files /dev/null and b/mamweb/static/images/header-bg-odevzdat-NOC.jpg differ diff --git a/mamweb/static/images/header-bg-soustredeni-NOC.jpg b/mamweb/static/images/header-bg-soustredeni-NOC.jpg new file mode 100644 index 00000000..f950069c Binary files /dev/null and b/mamweb/static/images/header-bg-soustredeni-NOC.jpg differ diff --git a/mamweb/static/images/header-bg-soustredeni.jpg b/mamweb/static/images/header-bg-soustredeni.jpg new file mode 100644 index 00000000..a4f4121f Binary files /dev/null and b/mamweb/static/images/header-bg-soustredeni.jpg differ diff --git a/mamweb/static/images/header-bg-soustredeni.png b/mamweb/static/images/header-bg-soustredeni.png deleted file mode 100644 index 00df5e42..00000000 Binary files a/mamweb/static/images/header-bg-soustredeni.png and /dev/null differ diff --git a/mamweb/static/images/header-bg-uvod-NOC.jpg b/mamweb/static/images/header-bg-uvod-NOC.jpg new file mode 100644 index 00000000..6963bf83 Binary files /dev/null and b/mamweb/static/images/header-bg-uvod-NOC.jpg differ diff --git a/mamweb/static/images/header-bg-uvod.jpg b/mamweb/static/images/header-bg-uvod.jpg new file mode 100644 index 00000000..0236ce5e Binary files /dev/null and b/mamweb/static/images/header-bg-uvod.jpg differ diff --git a/mamweb/static/images/header-bg-uvod.png b/mamweb/static/images/header-bg-uvod.png deleted file mode 100644 index 532d9941..00000000 Binary files a/mamweb/static/images/header-bg-uvod.png and /dev/null differ diff --git a/mamweb/static/images/header-bg-zadani-NOC.jpg b/mamweb/static/images/header-bg-zadani-NOC.jpg new file mode 100644 index 00000000..fa2c27b3 Binary files /dev/null and b/mamweb/static/images/header-bg-zadani-NOC.jpg differ diff --git a/mamweb/static/images/header-bg-zadani.jpg b/mamweb/static/images/header-bg-zadani.jpg new file mode 100644 index 00000000..e06a3d02 Binary files /dev/null and b/mamweb/static/images/header-bg-zadani.jpg differ diff --git a/mamweb/static/images/header-bg-zadani.png b/mamweb/static/images/header-bg-zadani.png deleted file mode 100644 index 291c46bb..00000000 Binary files a/mamweb/static/images/header-bg-zadani.png and /dev/null differ diff --git a/mamweb/static/images/header-bg.jpg b/mamweb/static/images/header-bg.jpg new file mode 100644 index 00000000..b6e22870 Binary files /dev/null and b/mamweb/static/images/header-bg.jpg differ diff --git a/mamweb/static/images/header-bg.png b/mamweb/static/images/header-bg.png deleted file mode 100644 index eeb35d6b..00000000 Binary files a/mamweb/static/images/header-bg.png and /dev/null differ diff --git a/mamweb/templates/400.html b/mamweb/templates/400.html new file mode 100644 index 00000000..6c1c7b93 --- /dev/null +++ b/mamweb/templates/400.html @@ -0,0 +1,19 @@ +{% extends "base.html" %} + +{% load staticfiles %} + +{% block content %} +
+ Chybička se vloudila. + Zkuste přejít na titulní stránku + nebo se podívat na aktuální zadání. +
+ +{% endblock %} + diff --git a/mamweb/templates/403.html b/mamweb/templates/403.html new file mode 100644 index 00000000..873f599e --- /dev/null +++ b/mamweb/templates/403.html @@ -0,0 +1,19 @@ +{% extends "base.html" %} + +{% load staticfiles %} + +{% block content %} ++ Tady pravděpodobně nemáte co dělat. + Zkuste přejít na titulní stránku + nebo se podívat na aktuální zadání. +
+ +{% endblock %} + diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index 6073ac99..a97d5168 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -48,7 +48,7 @@# - | Jméno - | R. - | Odjakživa - {% for c in rocnik.verejna_cisla %} - {% if c.verejna_vysledkovka %} - | - {{c.rocnik.rocnik}}.{{ c.cislo }} - {% endif %} - {% endfor %} - | Celkem - - {% for rv in vysledkovka %} - |
---|---|---|---|---|---|
{% autoescape off %}{{ rv.poradi }}{% endautoescape %} - | - {% if rv.titul %} - {{ rv.titul }}MM - {% endif %} - {{ rv.resitel.plne_jmeno }} - | {{ rv.resitel.rocnik }} - | {{ rv.body_odjakziva }} - {% for b in rv.body_cisla %} - | {{ b }} - {% endfor %} - | {{ rv.body_rocnik }} - |
# + | Jméno + | R. + | Odjakživa + {% for c in rocnik.verejna_cisla %} + {% if c.verejna_vysledkovka %} + | + {{c.rocnik.rocnik}}.{{ c.cislo }} + {% endif %} + {% endfor %} + | Celkem + +{% for rv in vysledkovka %} + |
---|---|---|---|---|---|
{% autoescape off %}{{ rv.poradi }}{% endautoescape %} + | + {% if rv.titul %} + {{ rv.titul }}MM + {% endif %} + {{ rv.resitel.plne_jmeno }} + | {{ rv.resitel.rocnik }} + | {{ rv.body_odjakziva }} + {% for b in rv.body_cisla %} + | {{ b }} + {% endfor %} + | {{ rv.body_rocnik }} + |