diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index 520e7b71..1987391b 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -58,10 +58,17 @@ h2 { #header { position: relative; font-size: 250%; - background: url("../images/header-bg.png") no-repeat left top; - height: 353px; + background: url("../images/header-bg-uvod.png") no-repeat center top; + height: 255px; top: -1px; } + +#header.cojemam { background: url("../images/header-bg-uvod.png") no-repeat center top; } +#header.soustredeni { background: url("../images/header-bg-soustredeni.png") no-repeat center top; } +#header.zadani { background: url("../images/header-bg-zadani.png") no-repeat center top; } +#header.clanky { background: url("../images/header-bg-clanek.png") no-repeat center top; } +#header.archiv { background: url("../images/header-bg-archiv.png") no-repeat center top; } + #header img.logo { position: absolute; top: 20px; @@ -85,9 +92,10 @@ h2 { #menu { position: relative; - top: -1px; - background: url("../images/menu-bg-vertical.png") no-repeat left top, url("../images/menu-bg-horizontal.png") repeat-x left top; - background-color: #ffb52d; + top: -10px; + z-index: 10; + background: url("../images/menu-bg.png") no-repeat left top; + height: 60px; } #menu ul { padding: 0px; @@ -97,12 +105,12 @@ h2 { display: inline-block; border-radius: 0px; - padding: 0px; + padding: 6px 0px 0px 0px; width: 16.66%; min-width: 140px; text-align: center; - font-size: 130%; + font-size: 140%; font-weight: 400; font-variant: small-caps; border-bottom-left-radius: 8px; @@ -112,24 +120,27 @@ h2 { display: block; padding: 8px 10px; color: #006400; + height: 48px; } #menu a:hover { - background: url("../images/submenu-bg-vertical.png") no-repeat left top, url("../images/submenu-bg-horizontal.png") repeat-x left top; - background-color: #ffa500; + background: url("../images/menu-bg-selected.png") no-repeat left -7px; + background-size: 100% 68px; text-decoration: none; color: #003c00; } -#menu li.selected { - border-bottom-left-radius: 0px; - border-bottom-right-radius: 0px; - background-color:#cc9024; +#menu li.selected a { + background: url("../images/menu-bg-selected.png") no-repeat left -7px; + background-size: 100% 68px; + text-decoration: none; + color: #003c00; + z-index: 15px; } #submenu { position: relative; - top: -1px; - background: url("../images/submenu-bg-vertical.png") no-repeat left top, url("../images/submenu-bg-horizontal.png") repeat-x left top; - background-color: #ffa500; + top: -15px; + background: url("../images/submenu-bg.png") no-repeat left top; + height: 60px; } #submenu ul { padding: 0px 15px; @@ -137,8 +148,9 @@ h2 { font-weight: 400; } #submenu li { - padding: 6px 20px; + padding: 4px 20px; display: inline-block; + height: 40px; } #submenu li>a { color: #003c00; @@ -148,8 +160,11 @@ h2 { color: #3c003c; } #submenu li.selected { - background-color: #cc8400; - + background: url("../images/submenu-bg-selected.png") no-repeat center; + background-size: 150% 150%; +} +#submenu li.selected>a { + color: #3c003c; } /*#submenu li:first-child { border-top-left-radius: 7px; @@ -175,3 +190,34 @@ div.zadani_azad_termin { font-size: large; font-weight: bold } + +/********** + * Footer +**********/ + +#footer { + background: url("../images/footer-bg.png") no-repeat -100px 0px; + padding: 20px 30px; + height: 210px; +} + +#footer p.license { + text-align: center; + font-weight: 400; +} + +#footer p.organize { + text-align: center; + margin-top: 40px; + margin-left: 90px; +} + +#footer img.logo-left { + padding: 30px 0px; + float: left; +} + +#footer img.logo-right { + float: right; +} + diff --git a/mamweb/static/images/footer-bg.png b/mamweb/static/images/footer-bg.png new file mode 100644 index 00000000..66c7d03a Binary files /dev/null and b/mamweb/static/images/footer-bg.png differ diff --git a/mamweb/static/images/header-bg-archiv.png b/mamweb/static/images/header-bg-archiv.png new file mode 100644 index 00000000..32870431 Binary files /dev/null and b/mamweb/static/images/header-bg-archiv.png differ diff --git a/mamweb/static/images/header-bg-clanek.png b/mamweb/static/images/header-bg-clanek.png new file mode 100644 index 00000000..95576fe6 Binary files /dev/null and b/mamweb/static/images/header-bg-clanek.png differ diff --git a/mamweb/static/images/header-bg-uvod.png b/mamweb/static/images/header-bg-uvod.png new file mode 100644 index 00000000..532d9941 Binary files /dev/null and b/mamweb/static/images/header-bg-uvod.png differ diff --git a/mamweb/static/images/header-bg-zadani.png b/mamweb/static/images/header-bg-zadani.png new file mode 100644 index 00000000..291c46bb Binary files /dev/null and b/mamweb/static/images/header-bg-zadani.png differ diff --git a/mamweb/static/images/logo-jcmf.png b/mamweb/static/images/logo-jcmf.png new file mode 100644 index 00000000..9dec6f4c Binary files /dev/null and b/mamweb/static/images/logo-jcmf.png differ diff --git a/mamweb/static/images/logo-mff.png b/mamweb/static/images/logo-mff.png new file mode 100644 index 00000000..4231e9b5 Binary files /dev/null and b/mamweb/static/images/logo-mff.png differ diff --git a/mamweb/static/images/logo.png b/mamweb/static/images/logo.png index 1af2dd66..f7cbcd1c 100644 Binary files a/mamweb/static/images/logo.png and b/mamweb/static/images/logo.png differ diff --git a/mamweb/static/images/menu-bg-horizontal.png b/mamweb/static/images/menu-bg-horizontal.png deleted file mode 100644 index f746bef3..00000000 Binary files a/mamweb/static/images/menu-bg-horizontal.png and /dev/null differ diff --git a/mamweb/static/images/menu-bg-selected.png b/mamweb/static/images/menu-bg-selected.png new file mode 100644 index 00000000..91a2009a Binary files /dev/null and b/mamweb/static/images/menu-bg-selected.png differ diff --git a/mamweb/static/images/menu-bg-vertical.png b/mamweb/static/images/menu-bg-vertical.png deleted file mode 100644 index 767752cc..00000000 Binary files a/mamweb/static/images/menu-bg-vertical.png and /dev/null differ diff --git a/mamweb/static/images/menu-bg.png b/mamweb/static/images/menu-bg.png new file mode 100644 index 00000000..9088147d Binary files /dev/null and b/mamweb/static/images/menu-bg.png differ diff --git a/mamweb/static/images/submenu-bg-horizontal.png b/mamweb/static/images/submenu-bg-horizontal.png deleted file mode 100644 index 1d7001aa..00000000 Binary files a/mamweb/static/images/submenu-bg-horizontal.png and /dev/null differ diff --git a/mamweb/static/images/submenu-bg-selected.png b/mamweb/static/images/submenu-bg-selected.png new file mode 100644 index 00000000..81d1c817 Binary files /dev/null and b/mamweb/static/images/submenu-bg-selected.png differ diff --git a/mamweb/static/images/submenu-bg-vertical.png b/mamweb/static/images/submenu-bg-vertical.png deleted file mode 100644 index 11537ee1..00000000 Binary files a/mamweb/static/images/submenu-bg-vertical.png and /dev/null differ diff --git a/mamweb/static/images/submenu-bg.png b/mamweb/static/images/submenu-bg.png new file mode 100644 index 00000000..9db66aa4 Binary files /dev/null and b/mamweb/static/images/submenu-bg.png differ diff --git a/mamweb/templates/base.html b/mamweb/templates/base.html index c61ff124..d5bdcc17 100644 --- a/mamweb/templates/base.html +++ b/mamweb/templates/base.html @@ -74,10 +74,8 @@
- + {% block submenu %} + {% endblock %}
@@ -86,6 +84,16 @@ {% endblock content %}
+
+
+ +
+
diff --git a/seminar/models.py b/seminar/models.py index f831b496..0041b8a7 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -579,7 +579,7 @@ class Soustredeni(SeminarModelBase): db_table = 'seminar_soustredeni' verbose_name = u'Soustředění' verbose_name_plural = u'Soustředění' - ordering = ['rocnik__rocnik', 'datum_zacatku'] + ordering = ['-rocnik__rocnik', '-datum_zacatku'] # Interní ID id = models.AutoField(primary_key = True) diff --git a/seminar/templates/seminar/archiv/submenu.html b/seminar/templates/seminar/archiv/submenu.html index a0c63c37..c4951f50 100644 --- a/seminar/templates/seminar/archiv/submenu.html +++ b/seminar/templates/seminar/archiv/submenu.html @@ -1,11 +1,13 @@ {% with "/archiv" as cesta %} + {% endwith %} diff --git a/seminar/templates/seminar/clanky/submenu.html b/seminar/templates/seminar/clanky/submenu.html index 2c70a5da..5f0d78a2 100644 --- a/seminar/templates/seminar/clanky/submenu.html +++ b/seminar/templates/seminar/clanky/submenu.html @@ -1,11 +1,13 @@ {% with "/clanky" as cesta %} + {% endwith %} diff --git a/seminar/templates/seminar/cojemam/submenu.html b/seminar/templates/seminar/cojemam/submenu.html index a86e8f74..18b6901a 100644 --- a/seminar/templates/seminar/cojemam/submenu.html +++ b/seminar/templates/seminar/cojemam/submenu.html @@ -1,11 +1,13 @@ {% with "/co-je-MaM" as cesta %} + {% endwith %} diff --git a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html index 020c78b6..a6672c95 100644 --- a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html +++ b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html @@ -9,13 +9,13 @@ {# zmena fotky #}{% block header %}soustredeni{% endblock %} -{% block content %}{% if user.is_authenticated %}{# PRACUJE SE STRANKA #} +{% block nadpis1a %}{% block nadpis1b %} + Soustředění +{% endblock %}{% endblock %} + +{% block content %} +{#% if user.is_authenticated %#}{# PRACUJE SE STRANKA #} -

- {% block nadpis1a %}{% block nadpis1b %} - Soustředění - {% endblock %}{% endblock %} -

{# Projdi vsechna soustredeni #} {% for soustredeni in object_list %} @@ -29,30 +29,36 @@ že jste přihlášení.
{% endif %} {# misto soustredeni TODO upravit#} - {% if soustredeni.misto %}

- Soustředění v {{soustredeni.misto}} - od {{soustredeni.datum_zacatku}} do {{soustredeni.datum_konce}} - při {{soustredeni.rocnik.rocnik}}. ročníku M&M + {{soustredeni.get_typ_display}} + {{soustredeni.misto}}

+ + {% if user.is_authenticated %} + {# popis soustredeni #} + {% if soustredeni.text %} + {% autoescape off %}{{soustredeni.text}}{% endautoescape %} + {% endif %} + {# Účastníci #} +

Soustředění se zúčastnili tito účastníci:

+ {% endif %} - {# popis soustredeni #} - {% if soustredeni.text %} - {% autoescape off %}{{soustredeni.text}}{% endautoescape %} - {% endif %} - {# Účastníci #} -

Soustředění se zúčastnili tito účastníci:

- {% endif %} {% empty %} Žádná soustředění zatím neproběhla! {% endfor %} -{% else %}{% include 'seminar/pracuje_se.html' %}{% endif %}{% endblock %} +{#% else %}{% include 'seminar/pracuje_se.html' %}{% endif %#} + +{% endblock %} diff --git a/seminar/templates/seminar/soustredeni/submenu.html b/seminar/templates/seminar/soustredeni/submenu.html index d3ef4b18..a507a2fb 100644 --- a/seminar/templates/seminar/soustredeni/submenu.html +++ b/seminar/templates/seminar/soustredeni/submenu.html @@ -1,9 +1,11 @@ {% with "/soustredeni" as cesta %} + {% endwith %} diff --git a/seminar/templates/seminar/zadani/submenu.html b/seminar/templates/seminar/zadani/submenu.html index 0352c77c..84de5d67 100644 --- a/seminar/templates/seminar/zadani/submenu.html +++ b/seminar/templates/seminar/zadani/submenu.html @@ -1,10 +1,12 @@ {% with "/zadani" as cesta %} + {% endwith %}