From: Jan Szejko Date: Tue, 4 Apr 2017 15:04:31 +0000 (+0200) Subject: main menu X-Git-Url: https://git.mdrn.pl/emels.git/commitdiff_plain/7bb8da94cad821fc8ed4efdbb8ea484b408eef42?ds=sidebyside main menu --- diff --git a/emels/locale/pl/LC_MESSAGES/django.mo b/emels/locale/pl/LC_MESSAGES/django.mo new file mode 100644 index 0000000..0e7015e Binary files /dev/null and b/emels/locale/pl/LC_MESSAGES/django.mo differ diff --git a/emels/locale/pl/LC_MESSAGES/django.po b/emels/locale/pl/LC_MESSAGES/django.po new file mode 100644 index 0000000..9b0415f --- /dev/null +++ b/emels/locale/pl/LC_MESSAGES/django.po @@ -0,0 +1,51 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2017 +# This file is distributed under the same license as the Emels package. +# Jan Szejko , 2017. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-04 15:06+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Jan Szejko \n" +"Language-Team: LANGUAGE \n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" + +#: templates/404.html:4 templates/404.html:8 +msgid "Page not found" +msgstr "Nie znaleziono strony" + +#: templates/404.html:11 +msgid "The page you were looking for doesn't exist." +msgstr "Strona, której szukasz, nie istnieje." + +#: templates/base.html:8 +msgid "News" +msgstr "Aktualności" + +#: templates/base.html:9 +msgid "About" +msgstr "O projekcie" + +#: templates/base.html:10 +msgid "Partners" +msgstr "Partnerzy" + +#: templates/base.html:11 +msgid "Publications" +msgstr "Publikacje" + +#: templates/base.html:12 +msgid "Contact" +msgstr "Kontakt" + +#: templates/base.html:17 +msgid "Menu icons:" +msgstr "Ikonki w menu:" diff --git a/emels/static/css/base.css b/emels/static/css/base.css index 99182a2..b437e36 100644 --- a/emels/static/css/base.css +++ b/emels/static/css/base.css @@ -68,89 +68,39 @@ header.main { header.main nav a:before { content: " "; display: block; - margin-bottom: .8em; width: 2.75em; height: 2.125em; text-align: center; - margin: auto; - margin-bottom: .8em; } - header.main nav .menu-lekcje:before { - background: url(../img/menu/lekcje.png) no-repeat 0 0; + margin: auto auto .8em; } + header.main nav .menu-news:before { + background: url(../img/menu/news.png) no-repeat 0 0; background-size: 100%; } - header.main nav .menu-kompetencje:before { - background: url(../img/menu/katalog.png) no-repeat 0 0; + header.main nav .menu-about:before { + background: url(../img/menu/about.png) no-repeat 0 0; background-size: 100%; } - header.main nav .menu-wspolpraca:before { - background: url(../img/menu/wspolpraca.png) no-repeat 0 0; + header.main nav .menu-partners:before { + background: url(../img/menu/partners.png) no-repeat 0 0; background-size: 100%; } - header.main nav .menu-szkolenia:before { - background: url(../img/menu/szkolenia.png) no-repeat 0 0; + header.main nav .menu-publications:before { + background: url(../img/menu/publications.png) no-repeat 0 0; background-size: 100%; } - header.main nav .menu-wesprzyj:before { - background: url(../img/menu/wesprzyj.png) no-repeat 0 0; + header.main nav .menu-contact:before { + background: url(../img/menu/contact.png) no-repeat 0 0; background-size: 100%; } - header.main nav .menu-o-nas:before { - background: url(../img/menu/o-nas.png) no-repeat 0 0; + header.main nav .menu-news:hover:before { + background: url(../img/menu/news-active.png) no-repeat 0 0; background-size: 100%; } - header.main nav .menu-kontakt:before { - background: url(../img/menu/kontakt.png) no-repeat 0 0; + header.main nav .menu-about:hover:before { + background: url(../img/menu/about-active.png) no-repeat 0 0; background-size: 100%; } - header.main nav .menu-lekcje:hover:before { - background: url(../img/menu/lekcje_active.png) no-repeat 0 0; + header.main nav .menu-partners:hover:before { + background: url(../img/menu/partners-active.png) no-repeat 0 0; background-size: 100%; } - header.main nav .menu-kompetencje:hover:before { - background: url(../img/menu/katalog_active.png) no-repeat 0 0; + header.main nav .menu-publications:hover:before { + background: url(../img/menu/publications-active.png) no-repeat 0 0; background-size: 100%; } - header.main nav .menu-wspolpraca:hover:before { - background: url(../img/menu/wspolpraca_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-szkolenia:hover:before { - background: url(../img/menu/szkolenia_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-wesprzyj:hover:before { - background: url(../img/menu/wesprzyj_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-o-nas:hover:before { - background: url(../img/menu/o-nas_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-kontakt:hover:before { - background: url(../img/menu/kontakt_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-oc-program:before { - background: url(../img/menu/olimpiada/program.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-oc-harmonogram:before { - background: url(../img/menu/olimpiada/harmonogram.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-oc-regulamin:before { - background: url(../img/menu/olimpiada/regulamin.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-oc-literatura:before { - background: url(../img/menu/olimpiada/literatura.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-oc-komitet:before { - background: url(../img/menu/olimpiada/komitet.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-oc-kontakt:before { - background: url(../img/menu/olimpiada/kontakt.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-oc-program:hover:before { - background: url(../img/menu/olimpiada/program_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-oc-harmonogram:hover:before { - background: url(../img/menu/olimpiada/harmonogram_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-oc-regulamin:hover:before { - background: url(../img/menu/olimpiada/regulamin_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-oc-literatura:hover:before { - background: url(../img/menu/olimpiada/literatura_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-oc-komitet:hover:before { - background: url(../img/menu/olimpiada/komitet_active.png) no-repeat 0 0; - background-size: 100%; } - header.main nav .menu-oc-kontakt:hover:before { - background: url(../img/menu/olimpiada/kontakt_active.png) no-repeat 0 0; + header.main nav .menu-contact:hover:before { + background: url(../img/menu/contact-active.png) no-repeat 0 0; background-size: 100%; } header.main #tagline { clear: both; diff --git a/emels/static/css/base.scss b/emels/static/css/base.scss index 88d2033..9f3ca99 100644 --- a/emels/static/css/base.scss +++ b/emels/static/css/base.scss @@ -95,46 +95,22 @@ header.main { a:before { content: " "; display: block; - margin-bottom: .8em; width: 44*$px; height: 34*$px; - text-align:center; - margin: auto; - margin-bottom: .8em; + text-align: center; + margin: auto auto .8em; } - .menu-lekcje:before { background: url(../img/menu/lekcje.png) no-repeat 0 0; background-size: 100%;} - .menu-kompetencje:before { background: url(../img/menu/katalog.png) no-repeat 0 0; background-size: 100%;} - .menu-wspolpraca:before { background: url(../img/menu/wspolpraca.png) no-repeat 0 0; background-size: 100%;} - .menu-szkolenia:before { background: url(../img/menu/szkolenia.png) no-repeat 0 0; background-size: 100%;} - .menu-wesprzyj:before { background: url(../img/menu/wesprzyj.png) no-repeat 0 0; background-size: 100%;} - .menu-o-nas:before { background: url(../img/menu/o-nas.png) no-repeat 0 0; background-size: 100%;} - .menu-kontakt:before { background: url(../img/menu/kontakt.png) no-repeat 0 0; background-size: 100%;} - .menu-lekcje:hover:before { background: url(../img/menu/lekcje_active.png) no-repeat 0 0; background-size: 100%;} - .menu-kompetencje:hover:before { background: url(../img/menu/katalog_active.png) no-repeat 0 0; background-size: 100%;} - .menu-wspolpraca:hover:before { background: url(../img/menu/wspolpraca_active.png) no-repeat 0 0; background-size: 100%;} - .menu-szkolenia:hover:before { background: url(../img/menu/szkolenia_active.png) no-repeat 0 0; background-size: 100%;} - .menu-wesprzyj:hover:before { background: url(../img/menu/wesprzyj_active.png) no-repeat 0 0; background-size: 100%;} - .menu-o-nas:hover:before { background: url(../img/menu/o-nas_active.png) no-repeat 0 0; background-size: 100%;} - .menu-kontakt:hover:before { background: url(../img/menu/kontakt_active.png) no-repeat 0 0; background-size: 100%;} - - .menu-oc-program:before { background: url(../img/menu/olimpiada/program.png) no-repeat 0 0; background-size: 100%;} - .menu-oc-harmonogram:before { background: url(../img/menu/olimpiada/harmonogram.png) no-repeat 0 0; background-size: 100%;} - .menu-oc-regulamin:before { background: url(../img/menu/olimpiada/regulamin.png) no-repeat 0 0; background-size: 100%;} - .menu-oc-literatura:before { background: url(../img/menu/olimpiada/literatura.png) no-repeat 0 0; background-size: 100%;} - .menu-oc-komitet:before { background: url(../img/menu/olimpiada/komitet.png) no-repeat 0 0; background-size: 100%;} - .menu-oc-kontakt:before { background: url(../img/menu/olimpiada/kontakt.png) no-repeat 0 0; background-size: 100%;} - .menu-oc-program:hover:before { - background: url(../img/menu/olimpiada/program_active.png) no-repeat 0 0; background-size: 100%;} - .menu-oc-harmonogram:hover:before { - background: url(../img/menu/olimpiada/harmonogram_active.png) no-repeat 0 0; background-size: 100%;} - .menu-oc-regulamin:hover:before { - background: url(../img/menu/olimpiada/regulamin_active.png) no-repeat 0 0; background-size: 100%;} - .menu-oc-literatura:hover:before { - background: url(../img/menu/olimpiada/literatura_active.png) no-repeat 0 0; background-size: 100%;} - .menu-oc-komitet:hover:before { - background: url(../img/menu/olimpiada/komitet_active.png) no-repeat 0 0; background-size: 100%;} - .menu-oc-kontakt:hover:before { - background: url(../img/menu/olimpiada/kontakt_active.png) no-repeat 0 0; background-size: 100%;} + .menu-news:before { background: url(../img/menu/news.png) no-repeat 0 0; background-size: 100%;} + .menu-about:before { background: url(../img/menu/about.png) no-repeat 0 0; background-size: 100%;} + .menu-partners:before { background: url(../img/menu/partners.png) no-repeat 0 0; background-size: 100%;} + .menu-publications:before { background: url(../img/menu/publications.png) no-repeat 0 0; background-size: 100%;} + .menu-contact:before { background: url(../img/menu/contact.png) no-repeat 0 0; background-size: 100%;} + .menu-news:hover:before { background: url(../img/menu/news-active.png) no-repeat 0 0; background-size: 100%;} + .menu-about:hover:before { background: url(../img/menu/about-active.png) no-repeat 0 0; background-size: 100%;} + .menu-partners:hover:before { background: url(../img/menu/partners-active.png) no-repeat 0 0; background-size: 100%;} + .menu-publications:hover:before { background: url(../img/menu/publications-active.png) no-repeat 0 0; background-size: 100%;} + .menu-contact:hover:before { background: url(../img/menu/contact-active.png) no-repeat 0 0; background-size: 100%;} + } #tagline { diff --git a/emels/static/img/menu/about-active.png b/emels/static/img/menu/about-active.png new file mode 100644 index 0000000..c96881c Binary files /dev/null and b/emels/static/img/menu/about-active.png differ diff --git a/emels/static/img/menu/about.png b/emels/static/img/menu/about.png new file mode 100644 index 0000000..b55f9b2 Binary files /dev/null and b/emels/static/img/menu/about.png differ diff --git a/emels/static/img/menu/contact-active.png b/emels/static/img/menu/contact-active.png new file mode 100644 index 0000000..db8293c Binary files /dev/null and b/emels/static/img/menu/contact-active.png differ diff --git a/emels/static/img/menu/contact.png b/emels/static/img/menu/contact.png new file mode 100644 index 0000000..76e9105 Binary files /dev/null and b/emels/static/img/menu/contact.png differ diff --git a/emels/static/img/menu/katalog.png b/emels/static/img/menu/katalog.png deleted file mode 100644 index 106bdae..0000000 Binary files a/emels/static/img/menu/katalog.png and /dev/null differ diff --git a/emels/static/img/menu/katalog_active.png b/emels/static/img/menu/katalog_active.png deleted file mode 100644 index 5485b5e..0000000 Binary files a/emels/static/img/menu/katalog_active.png and /dev/null differ diff --git a/emels/static/img/menu/kontakt.png b/emels/static/img/menu/kontakt.png deleted file mode 100644 index 291865d..0000000 Binary files a/emels/static/img/menu/kontakt.png and /dev/null differ diff --git a/emels/static/img/menu/kontakt_active.png b/emels/static/img/menu/kontakt_active.png deleted file mode 100644 index 892da3c..0000000 Binary files a/emels/static/img/menu/kontakt_active.png and /dev/null differ diff --git a/emels/static/img/menu/lekcje.png b/emels/static/img/menu/lekcje.png deleted file mode 100644 index 9989280..0000000 Binary files a/emels/static/img/menu/lekcje.png and /dev/null differ diff --git a/emels/static/img/menu/lekcje_active.png b/emels/static/img/menu/lekcje_active.png deleted file mode 100644 index 47ed591..0000000 Binary files a/emels/static/img/menu/lekcje_active.png and /dev/null differ diff --git a/emels/static/img/menu/news-active.png b/emels/static/img/menu/news-active.png new file mode 100644 index 0000000..2c32e00 Binary files /dev/null and b/emels/static/img/menu/news-active.png differ diff --git a/emels/static/img/menu/news.png b/emels/static/img/menu/news.png new file mode 100644 index 0000000..d44ef00 Binary files /dev/null and b/emels/static/img/menu/news.png differ diff --git a/emels/static/img/menu/o-nas.png b/emels/static/img/menu/o-nas.png deleted file mode 100644 index 00dab37..0000000 Binary files a/emels/static/img/menu/o-nas.png and /dev/null differ diff --git a/emels/static/img/menu/o-nas_active.png b/emels/static/img/menu/o-nas_active.png deleted file mode 100644 index 1fc61e9..0000000 Binary files a/emels/static/img/menu/o-nas_active.png and /dev/null differ diff --git a/emels/static/img/menu/partners-active.png b/emels/static/img/menu/partners-active.png new file mode 100644 index 0000000..6131edb Binary files /dev/null and b/emels/static/img/menu/partners-active.png differ diff --git a/emels/static/img/menu/partners.png b/emels/static/img/menu/partners.png new file mode 100644 index 0000000..f1c8661 Binary files /dev/null and b/emels/static/img/menu/partners.png differ diff --git a/emels/static/img/menu/publications-active.png b/emels/static/img/menu/publications-active.png new file mode 100644 index 0000000..c60dd43 Binary files /dev/null and b/emels/static/img/menu/publications-active.png differ diff --git a/emels/static/img/menu/publications.png b/emels/static/img/menu/publications.png new file mode 100644 index 0000000..5896985 Binary files /dev/null and b/emels/static/img/menu/publications.png differ diff --git a/emels/static/img/menu/szkolenia.png b/emels/static/img/menu/szkolenia.png deleted file mode 100644 index 97f8362..0000000 Binary files a/emels/static/img/menu/szkolenia.png and /dev/null differ diff --git a/emels/static/img/menu/szkolenia_active.png b/emels/static/img/menu/szkolenia_active.png deleted file mode 100644 index 271eb8a..0000000 Binary files a/emels/static/img/menu/szkolenia_active.png and /dev/null differ diff --git a/emels/static/img/menu/wesprzyj.png b/emels/static/img/menu/wesprzyj.png deleted file mode 100644 index 5182a12..0000000 Binary files a/emels/static/img/menu/wesprzyj.png and /dev/null differ diff --git a/emels/static/img/menu/wesprzyj_active.png b/emels/static/img/menu/wesprzyj_active.png deleted file mode 100644 index 0402b9f..0000000 Binary files a/emels/static/img/menu/wesprzyj_active.png and /dev/null differ diff --git a/emels/static/img/menu/wspolpraca.png b/emels/static/img/menu/wspolpraca.png deleted file mode 100644 index af1aa43..0000000 Binary files a/emels/static/img/menu/wspolpraca.png and /dev/null differ diff --git a/emels/static/img/menu/wspolpraca_active.png b/emels/static/img/menu/wspolpraca_active.png deleted file mode 100644 index e849d30..0000000 Binary files a/emels/static/img/menu/wspolpraca_active.png and /dev/null differ diff --git a/emels/templates/base.html b/emels/templates/base.html index 45735a2..a2afdf5 100644 --- a/emels/templates/base.html +++ b/emels/templates/base.html @@ -2,17 +2,25 @@ {% load pipeline %} {% load i18n %} {% load sponsor_tags %} +{% load migdal_tags %} {% block top_navigation %} -
  • {% trans "News" %}
    • -
  • {% trans "About" %}
    • -
  • {% trans "Partners" %}
    • -
  • {% trans "Publications" %}
    • +
  • {% trans "News" %}
    • +
  • {% trans "About" %}
    • +
  • {% trans "Partners" %}
    • +
  • {% trans "Publications" %}
    • +
  • {% trans "Contact" %}
    • +{% endblock %} + +{% block copyrights %} +
    + {% trans "Menu icons:" %}: + Designed by Freepik and distributed by Flaticon {% endblock %} {% block sponsors %} - {% sponsor_page "footer" %} + {% sponsor_page "footer" %} {% endblock %} {% block extra_script %} diff --git a/emels/templates/base_super.html b/emels/templates/base_super.html index 547cb1e..9765598 100644 --- a/emels/templates/base_super.html +++ b/emels/templates/base_super.html @@ -26,10 +26,6 @@
    - {% if request.user.is_authenticated %} Wyloguj {% endif %}