diff --git a/bin/translate b/bin/translate new file mode 100755 index 0000000..4f1b5a9 --- /dev/null +++ b/bin/translate @@ -0,0 +1,2 @@ +#/bin/bash +bin/django makemessages --locale=de --locale=en --ignore=templates/cms/* --ignore=templates/aldryn_forms/* \ No newline at end of file diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo new file mode 100644 index 0000000..d106450 Binary files /dev/null and b/locale/de/LC_MESSAGES/django.mo differ diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po new file mode 100644 index 0000000..9635067 --- /dev/null +++ b/locale/de/LC_MESSAGES/django.po @@ -0,0 +1,319 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-27 12:11-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/portal/models.py:20 src/project/forms.py:10 +msgid "Vorname" +msgstr "" + +#: src/portal/models.py:21 src/project/forms.py:11 +msgid "Nachname" +msgstr "" + +#: src/portal/models.py:22 +msgid "Strasse" +msgstr "" + +#: src/portal/models.py:23 +msgid "PLZ" +msgstr "" + +#: src/portal/models.py:24 +msgid "Ort" +msgstr "" + +#: src/portal/models.py:25 src/project/forms.py:16 src/project/forms.py:17 +msgid "E-Mail" +msgstr "" + +#: src/portal/templates/portal/edit_form.html:11 +msgid "Speichern" +msgstr "" + +#: src/portal/templates/portal/edit_success.html:3 +msgid "Ihre Informationen wurden erfolgreich angepasst." +msgstr "" + +#: src/portal/templates/portal/edit_success.html:6 +msgid "Schliessen" +msgstr "" + +#: src/portal/templates/portal/information.html:12 +#: src/portal/templates/portal/information.html:34 +msgid "Zurück zur Übersicht" +msgstr "" + +#: src/portal/templates/portal/information.html:39 +msgid "Als gelesen markieren" +msgstr "" + +#: src/portal/templates/portal/overview.html:4 +msgid "Elementa Portal" +msgstr "" + +#: src/portal/templates/portal/overview.html:10 +msgid "Grüezi, " +msgstr "" + +#: src/portal/templates/portal/overview.html:11 +msgid "Willkommen in Ihrem persönlichen Portal der Tagesschule Elementa" +msgstr "" + +#: src/portal/templates/portal/overview.html:14 +msgid "Logout" +msgstr "" + +#: src/portal/templates/portal/overview.html:24 +#: src/project/templates/main.html:93 +msgid "Aktuell" +msgstr "" + +#: src/portal/templates/portal/overview.html:55 +msgid "Ältere laden" +msgstr "" + +#: src/portal/templates/portal/overview.html:63 +#: src/portal/templates/portal/overview.html:90 +msgid "Einstellungen" +msgstr "" + +#: src/portal/templates/portal/overview.html:73 +msgid "Ändern" +msgstr "" + +#: src/portal/templates/portal/overview.html:78 +msgid "Abbrechen" +msgstr "" + +#: src/portal/templates/portal/overview.html:96 +#: src/portal/templates/portal/overview.html:114 +msgid "Downloads" +msgstr "" + +#: src/portal/templates/portal/overview.html:102 +msgid "Suchbegriff eingeben" +msgstr "" + +#: src/portal/templates/portal/overview.html:103 +#: src/project/templates/project/includes/search_form.html:14 +msgid "Suchen" +msgstr "" + +#: src/portal/templates/registration/login.html:4 +#: src/project/templates/project/includes/header_button_menu.html:13 +msgid "Eltern-Login" +msgstr "" + +#: src/portal/templates/registration/login.html:11 +#: src/portal/templates/registration/login.html:31 +msgid "Login" +msgstr "" + +#: src/portal/urls.py:13 +msgid "^login/$" +msgstr "" + +#: src/portal/urls.py:15 +msgid "^logout/$" +msgstr "" + +#: src/portal/urls.py:17 +msgid "^account/change/password/$" +msgstr "" + +#: src/portal/urls.py:22 +msgid "^account/change/password/success/$" +msgstr "" + +#: src/portal/urls.py:26 +msgid "^account/edit/profile/$" +msgstr "" + +#: src/portal/urls.py:29 +msgid "^account/edit/profile/success/$" +msgstr "" + +#: src/portal/urls.py:33 +msgid "^information/(?P\\d+)/$" +msgstr "" + +#: src/portal/urls.py:36 +msgid "^$" +msgstr "" + +#: src/portal/views.py:51 +msgid "Benutzerdaten" +msgstr "" + +#: src/portal/views.py:52 +msgid "Passwort" +msgstr "" + +#: src/project/forms.py:53 +msgid "Diese E-Mail-Adresse wurde bereits registriert." +msgstr "" + +#: src/project/forms.py:57 +msgid "" +"Leider ist ein Fehler aufgetreten, bitte versuchen sie es später nochmals." +msgstr "" + +#: src/project/templates/404.html:4 src/project/templates/404.html:7 +msgid "Seite nicht gefunden" +msgstr "" + +#: src/project/templates/404.html:13 +msgid "Die Seite wurde leider nicht gefunden." +msgstr "" + +#: src/project/templates/404.html:15 src/project/templates/500.html:16 +msgid "Zurück zur Startseite" +msgstr "" + +#: src/project/templates/404.html:16 src/project/templates/500.html:17 +msgid "Zur Suche" +msgstr "" + +#: src/project/templates/404.html:18 src/project/templates/500.html:19 +msgid "Nehmen Sie mit uns Kontakt auf" +msgstr "" + +#: src/project/templates/500.html:4 src/project/templates/500.html:7 +msgid "Ein Fehler ist aufgetreten" +msgstr "" + +#: src/project/templates/500.html:13 +msgid "Beim Aufrufen der Seite ist ein Fehler aufgetreten." +msgstr "" + +#: src/project/templates/500.html:15 +msgid "Seite neu laden" +msgstr "" + +#: src/project/templates/main.html:61 +msgid "Mehr erfahren" +msgstr "" + +#: src/project/templates/main.html:73 +msgid "Stärken stärken. Lernen lernen." +msgstr "" + +#: src/project/templates/main.html:84 +#: src/project/templates/project/search.html:6 +msgid "Suche" +msgstr "" + +#: src/project/templates/main.html:104 +msgid "Menü" +msgstr "" + +#: src/project/templates/main.html:128 +#: src/project/templates/project/includes/navigation.html:13 +msgid "Kontakt aufnehmen" +msgstr "" + +#: src/project/templates/project/includes/meta_navigation.html:12 +msgid "One Day" +msgstr "" + +#: src/project/templates/project/includes/meta_navigation.html:23 +msgid "News" +msgstr "" + +#: src/project/templates/project/includes/meta_navigation.html:34 +msgid "Kalender" +msgstr "" + +#: src/project/templates/project/includes/meta_navigation.html:42 +msgid "Standort & Kontakt" +msgstr "" + +#: src/project/templates/project/includes/page_item.html:35 +msgid "Mehr" +msgstr "" + +#: src/project/templates/project/includes/search_form.html:10 +msgid "Elementa entdecken..." +msgstr "" + +#: src/project/templates/project/includes/search_form.html:21 +#, python-format +msgid "" +"\n" +" %(amount)s Resultate für «%(q)s»:\n" +" " +msgstr "" + +#: src/project/templates/project/includes/search_form.html:26 +#, python-format +msgid "" +"\n" +" Leider wurden keine Resultate mit " +"dem Begriff «%(q)s» gefunden.
\n" +" Sie erreichen uns auch über andere " +"Kanäle:\n" +" " +msgstr "" + +#: src/project/templates/project/includes/search_form.html:31 +msgid "Zum Kontakt" +msgstr "" + +#: src/project/templates/project/newsletter/subscription_form.html:6 +msgid "Ihre Angaben wurden erfolgreich übermittelt. Vielen Dank!" +msgstr "" + +#: src/project/templates/project/newsletter/subscription_form.html:41 +msgid "Absenden" +msgstr "" + +#: src/project/templates/project/plugins/contact/journey_calculator.html:10 +msgid "Ihr Wohnort" +msgstr "" + +#: src/project/templates/project/plugins/contact/journey_calculator.html:11 +msgid "Min" +msgstr "" + +#: src/project/templates/project/plugins/contact/journey_calculator.html:14 +msgid "Bitte wählen Sie einen der vorgeschlagenen Orte aus." +msgstr "" + +#: src/project/templates/project/plugins/content/reference_list_item.html:14 +#: src/project/templates/project/plugins/content/video.html:8 +msgid "Video Abspielen" +msgstr "" + +#: src/project/templates/project/plugins/content/slider.html:30 +#: src/project/templates/project/plugins/content/text_slider.html:18 +msgid "Nächster Slide" +msgstr "" + +#: src/project/templates/project/plugins/content/slider.html:35 +#: src/project/templates/project/plugins/content/text_slider.html:22 +msgid "Vorheriger Slide" +msgstr "" + +#: src/project/templates/project/plugins/content/slider_item.html:12 +msgid "Qualifikationen" +msgstr "" + +#: src/project/urls.py:9 +msgid "^suche/" +msgstr "" diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo new file mode 100644 index 0000000..0d0e8cc Binary files /dev/null and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po new file mode 100644 index 0000000..c4564d1 --- /dev/null +++ b/locale/en/LC_MESSAGES/django.po @@ -0,0 +1,323 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-27 12:11-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/portal/models.py:20 src/project/forms.py:10 +msgid "Vorname" +msgstr "First Name" + +#: src/portal/models.py:21 src/project/forms.py:11 +msgid "Nachname" +msgstr "Last Name" + +#: src/portal/models.py:22 +msgid "Strasse" +msgstr "Street" + +#: src/portal/models.py:23 +msgid "PLZ" +msgstr "ZIP" + +#: src/portal/models.py:24 +msgid "Ort" +msgstr "Place" + +#: src/portal/models.py:25 src/project/forms.py:16 src/project/forms.py:17 +msgid "E-Mail" +msgstr "" + +#: src/portal/templates/portal/edit_form.html:11 +msgid "Speichern" +msgstr "Save" + +#: src/portal/templates/portal/edit_success.html:3 +msgid "Ihre Informationen wurden erfolgreich angepasst." +msgstr "Your information has been successfully altered." + +#: src/portal/templates/portal/edit_success.html:6 +msgid "Schliessen" +msgstr "Close" + +#: src/portal/templates/portal/information.html:12 +#: src/portal/templates/portal/information.html:34 +msgid "Zurück zur Übersicht" +msgstr "Back to the overview" + +#: src/portal/templates/portal/information.html:39 +msgid "Als gelesen markieren" +msgstr "Mark as read" + +#: src/portal/templates/portal/overview.html:4 +msgid "Elementa Portal" +msgstr "" + +#: src/portal/templates/portal/overview.html:10 +msgid "Grüezi, " +msgstr "Hello, " + +#: src/portal/templates/portal/overview.html:11 +msgid "Willkommen in Ihrem persönlichen Portal der Tagesschule Elementa" +msgstr "Welcome to your personal portal of the Tagesschule Elementa" + +#: src/portal/templates/portal/overview.html:14 +msgid "Logout" +msgstr "" + +#: src/portal/templates/portal/overview.html:24 +#: src/project/templates/main.html:93 +msgid "Aktuell" +msgstr "News" + +#: src/portal/templates/portal/overview.html:55 +msgid "Ältere laden" +msgstr "Load older" + +#: src/portal/templates/portal/overview.html:63 +#: src/portal/templates/portal/overview.html:90 +msgid "Einstellungen" +msgstr "Settings" + +#: src/portal/templates/portal/overview.html:73 +msgid "Ändern" +msgstr "Change" + +#: src/portal/templates/portal/overview.html:78 +msgid "Abbrechen" +msgstr "Abort" + +#: src/portal/templates/portal/overview.html:96 +#: src/portal/templates/portal/overview.html:114 +msgid "Downloads" +msgstr "" + +#: src/portal/templates/portal/overview.html:102 +msgid "Suchbegriff eingeben" +msgstr "Enter search term" + +#: src/portal/templates/portal/overview.html:103 +#: src/project/templates/project/includes/search_form.html:14 +msgid "Suchen" +msgstr "Search" + +#: src/portal/templates/registration/login.html:4 +#: src/project/templates/project/includes/header_button_menu.html:13 +msgid "Eltern-Login" +msgstr "Parent-Login" + +#: src/portal/templates/registration/login.html:11 +#: src/portal/templates/registration/login.html:31 +msgid "Login" +msgstr "" + +#: src/portal/urls.py:13 +msgid "^login/$" +msgstr "" + +#: src/portal/urls.py:15 +msgid "^logout/$" +msgstr "" + +#: src/portal/urls.py:17 +msgid "^account/change/password/$" +msgstr "" + +#: src/portal/urls.py:22 +msgid "^account/change/password/success/$" +msgstr "" + +#: src/portal/urls.py:26 +msgid "^account/edit/profile/$" +msgstr "" + +#: src/portal/urls.py:29 +msgid "^account/edit/profile/success/$" +msgstr "" + +#: src/portal/urls.py:33 +msgid "^information/(?P\\d+)/$" +msgstr "" + +#: src/portal/urls.py:36 +msgid "^$" +msgstr "" + +#: src/portal/views.py:51 +msgid "Benutzerdaten" +msgstr "User details" + +#: src/portal/views.py:52 +msgid "Passwort" +msgstr "Password" + +#: src/project/forms.py:53 +msgid "Diese E-Mail-Adresse wurde bereits registriert." +msgstr "This e-mail address has already been registered." + +#: src/project/forms.py:57 +msgid "" +"Leider ist ein Fehler aufgetreten, bitte versuchen sie es später nochmals." +msgstr "Unfortunately an error has occurred, please try again later." + +#: src/project/templates/404.html:4 src/project/templates/404.html:7 +msgid "Seite nicht gefunden" +msgstr "Page not found" + +#: src/project/templates/404.html:13 +msgid "Die Seite wurde leider nicht gefunden." +msgstr "Sorry, the page was not found." + +#: src/project/templates/404.html:15 src/project/templates/500.html:16 +msgid "Zurück zur Startseite" +msgstr "Back to the homepage" + +#: src/project/templates/404.html:16 src/project/templates/500.html:17 +msgid "Zur Suche" +msgstr "Go to search" + +#: src/project/templates/404.html:18 src/project/templates/500.html:19 +msgid "Nehmen Sie mit uns Kontakt auf" +msgstr "Get in touch with us" + +#: src/project/templates/500.html:4 src/project/templates/500.html:7 +msgid "Ein Fehler ist aufgetreten" +msgstr "An error has occurred" + +#: src/project/templates/500.html:13 +msgid "Beim Aufrufen der Seite ist ein Fehler aufgetreten." +msgstr "An error occurred while calling up the page." + +#: src/project/templates/500.html:15 +msgid "Seite neu laden" +msgstr "Reload page" + +#: src/project/templates/main.html:61 +msgid "Mehr erfahren" +msgstr "Learn more" + +#: src/project/templates/main.html:73 +msgid "Stärken stärken. Lernen lernen." +msgstr "Strengthen strengths. Learn to learn." + +#: src/project/templates/main.html:84 +#: src/project/templates/project/search.html:6 +msgid "Suche" +msgstr "Search" + +#: src/project/templates/main.html:104 +msgid "Menü" +msgstr "Menu" + +#: src/project/templates/main.html:128 +#: src/project/templates/project/includes/navigation.html:13 +msgid "Kontakt aufnehmen" +msgstr "Get in touch" + +#: src/project/templates/project/includes/meta_navigation.html:12 +msgid "One Day" +msgstr "" + +#: src/project/templates/project/includes/meta_navigation.html:23 +msgid "News" +msgstr "" + +#: src/project/templates/project/includes/meta_navigation.html:34 +msgid "Kalender" +msgstr "Calendar" + +#: src/project/templates/project/includes/meta_navigation.html:42 +msgid "Standort & Kontakt" +msgstr "Location & Contact" + +#: src/project/templates/project/includes/page_item.html:35 +msgid "Mehr" +msgstr "More" + +#: src/project/templates/project/includes/search_form.html:10 +msgid "Elementa entdecken..." +msgstr "Discover Elementa..." + +#: src/project/templates/project/includes/search_form.html:21 +#, python-format +msgid "" +"\n" +" %(amount)s Resultate für «%(q)s»:\n" +" " +msgstr "" +"\n" +"%(amount)s Results for «%(q)s»:\n" + +#: src/project/templates/project/includes/search_form.html:26 +#, python-format +msgid "" +"\n" +" Leider wurden keine Resultate mit " +"dem Begriff «%(q)s» gefunden.
\n" +" Sie erreichen uns auch über andere " +"Kanäle:\n" +" " +msgstr "" +"\n" +"Unfortunately, no results were found with the term «%(q)s».
\n" +"You can also reach us via other Channels:\n" + +#: src/project/templates/project/includes/search_form.html:31 +msgid "Zum Kontakt" +msgstr "To the contact page" + +#: src/project/templates/project/newsletter/subscription_form.html:6 +msgid "Ihre Angaben wurden erfolgreich übermittelt. Vielen Dank!" +msgstr "Your information has been successfully submitted. Thank you very much!" + +#: src/project/templates/project/newsletter/subscription_form.html:41 +msgid "Absenden" +msgstr "Send" + +#: src/project/templates/project/plugins/contact/journey_calculator.html:10 +msgid "Ihr Wohnort" +msgstr "Your location" + +#: src/project/templates/project/plugins/contact/journey_calculator.html:11 +msgid "Min" +msgstr "min" + +#: src/project/templates/project/plugins/contact/journey_calculator.html:14 +msgid "Bitte wählen Sie einen der vorgeschlagenen Orte aus." +msgstr "Please select one of the suggested locations." + +#: src/project/templates/project/plugins/content/reference_list_item.html:14 +#: src/project/templates/project/plugins/content/video.html:8 +msgid "Video Abspielen" +msgstr "Play Video" + +#: src/project/templates/project/plugins/content/slider.html:30 +#: src/project/templates/project/plugins/content/text_slider.html:18 +msgid "Nächster Slide" +msgstr "Next Slide" + +#: src/project/templates/project/plugins/content/slider.html:35 +#: src/project/templates/project/plugins/content/text_slider.html:22 +msgid "Vorheriger Slide" +msgstr "Previous Slide" + +#: src/project/templates/project/plugins/content/slider_item.html:12 +msgid "Qualifikationen" +msgstr "+ualifications" + +#: src/project/urls.py:9 +msgid "^suche/" +msgstr "^search/" diff --git a/private/js/modules/search_contest.js b/private/js/modules/search_contest.js new file mode 100644 index 0000000..16d3bf6 --- /dev/null +++ b/private/js/modules/search_contest.js @@ -0,0 +1,8 @@ +$(function() { + var $body = $('body'); + + $body.on('click', '.search__contest__item', function(event) { + event.preventDefault(); + $(this).hide(); + }); +}); \ No newline at end of file diff --git a/private/scss/_config.scss b/private/scss/_config.scss index dee7afa..1223528 100644 --- a/private/scss/_config.scss +++ b/private/scss/_config.scss @@ -10,7 +10,11 @@ $black: #000000; $green: #98C53A; +$violet: rgba(149, 72, 200, 0.66); $red: rgba(200, 0, 0, 0.66); +$blue: rgba(65, 93, 200, 0.66); +$yellow: rgba(200, 198, 36, 0.66); +$lime: rgba(131, 200, 81, 0.66); $default_font_family: 'Muli', sans-serif; $default_font_size: 16px; diff --git a/private/scss/main.scss b/private/scss/main.scss index 25a1b74..3627c76 100644 --- a/private/scss/main.scss +++ b/private/scss/main.scss @@ -8,6 +8,7 @@ @import "modules/_notification.scss"; @import "modules/_footer.scss"; @import "modules/_search.scss"; +@import "modules/_search_contest.scss"; @import "modules/_navigation.scss"; @import "modules/_pages.scss"; @import "modules/_contact.scss"; diff --git a/private/scss/modules/_search_contest.scss b/private/scss/modules/_search_contest.scss new file mode 100644 index 0000000..7d2c18a --- /dev/null +++ b/private/scss/modules/_search_contest.scss @@ -0,0 +1,189 @@ +.search__contest__item { + display: block; + width: 50px; + height: 50px; + position: absolute; + z-index: 100; + &.data_id_0 { + left: 100%; + margin-left: 15px; + top: 60%; + @media screen and (max-width: $medium_breakpoint) { + margin-left: -15px; + } + } + &.data_id_1 { + right: 100%; + margin-right: 15px; + top: 30%; + .position { + right: auto; + left: 90%; + } + @media screen and (max-width: $medium_breakpoint) { + margin-right: -15px; + } + } + &.data_id_2 { + left: 100%; + margin-left: 15px; + top: 40%; + @media screen and (max-width: $medium_breakpoint) { + margin-left: -15px; + } + } + &.data_id_4 { + left: 100%; + margin-left: 15px; + top: 80%; + @media screen and (max-width: $medium_breakpoint) { + margin-left: -15px; + } + } + &.data_id_5 { + right: 100%; + margin-right: 15px; + top: 20%; + .position { + right: auto; + left: 90%; + } + @media screen and (max-width: $medium_breakpoint) { + margin-right: -15px; + } + } +} + +.letter { + display: block; + position: absolute; + top: 0; + left: 0; + width: 50px; + height: 50px; + text-align: center; + line-height: 50px; + font-size: 22px; + font-weight: 900; + color: $white; + z-index: 5; +} + +.position { + display: block; + position: absolute; + top: 90%; + right: 90%; + font-size: 12px; + color: $dark_gray; +} + +.flower { + position: relative; + width: 50px; + height: 50px; + z-index: 2; +} + +.flower:after { + position: absolute; + content: ''; + left: 0; + right: 0; + top: 0; + bottom: 0; + background: $red; + border-radius: 50%; + width: 30%; + height: 30%; + margin: auto; + .data_id_1 & { + background: $blue; + } + .data_id_2 & { + background: $yellow; + } + .data_id_3 & { + background: $violet; + } + .data_id_4 & { + background: $lime; + } +} + +.flower .petal { + width: 100%; + height: 100%; + position: absolute; + transform: rotate(72deg); +} + +.flower .petal::before, .flower .petal::after { + content: ''; + position: absolute; + width: 60%; + height: 60%; + background: $red; + border-radius: 0 100px; + top: 50%; + left: 50%; + margin-left: -20%; + margin-top: -20%; + transform-origin: 33% 33%; + .data_id_1 & { + background: $blue; + } + .data_id_2 & { + background: $yellow; + } + .data_id_3 & { + background: $violet; + } + .data_id_4 & { + background: $lime; + } +} + +.flower .petal::after { + transform: rotate(36deg) +} + +.flower.petal5 .petal { + transform: rotate(144deg); +} + +.flower.petal5 .petal:after { + transform: rotate(-72deg); +} + +.flower.petal5 > .petal:after { + content: none; +} + +.flower.petal6 .petal { + transform: rotate(120deg); +} + +.flower.petal6 .petal:after { + transform: rotate(60deg); +} + +.flower.petal8 .petal { + transform: rotate(90deg); +} + +.flower.petal8 .petal:after { + transform: rotate(45deg); + width: 56%; + height: 56%; +} + +.flower.roundpetal .petal:before, .flower.roundpetal .petal:after { + width: 30%; + margin-left: -15%; + margin-top: 0; + top: 0; + height: 50%; + border-radius: 50% 50% 0 0; + transform-origin: 50% 100%; +} \ No newline at end of file diff --git a/src/portal/admin.py b/src/portal/admin.py index cacaa80..261cc50 100644 --- a/src/portal/admin.py +++ b/src/portal/admin.py @@ -17,7 +17,7 @@ class UserAdmin(BaseUserAdmin): inlines = [ProfileInline] fieldsets = ( (None, {'fields': ('username', 'email', 'password')}), - (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser', 'groups')}), + ('Permissions', {'fields': ('is_active', 'is_staff', 'is_superuser', 'groups')}), ) @@ -33,8 +33,8 @@ class InformationAdmin(TranslatableAdmin): readonly_fields = ('informed_users',) fieldsets = ( (None, {'fields': ('title', 'published', 'image', 'cropping')}), - (_('Permissions'), {'fields': ('groups',)}), - (_('Information'), {'fields': ('informed_users',)}), + ('Permissions', {'fields': ('groups',)}), + ('Information', {'fields': ('informed_users',)}), ) diff --git a/src/portal/models.py b/src/portal/models.py index f8116e6..f41fa1e 100644 --- a/src/portal/models.py +++ b/src/portal/models.py @@ -48,7 +48,7 @@ class Information(TranslatableModel): informed_users = models.ManyToManyField(User, verbose_name='Als gelesen markiert von:', null=True, blank=True) translations = TranslatedFields( - title=models.CharField(max_length=100, verbose_name=_('Title')), + title=models.CharField(max_length=100, verbose_name='Title'), ) class Meta: diff --git a/src/portal/templates/portal/overview.html b/src/portal/templates/portal/overview.html index 09870c8..26c9d63 100644 --- a/src/portal/templates/portal/overview.html +++ b/src/portal/templates/portal/overview.html @@ -1,7 +1,7 @@ {% extends 'main.html' %} {% load i18n static cms_tags %} -{% block title %}{% trans 'Mitgliederbereich' %}{% endblock %} +{% block title %}{% trans 'Elementa Portal' %}{% endblock %} {% block content %}
diff --git a/src/portal/templates/registration/login.html b/src/portal/templates/registration/login.html index 465f99c..6dcab0b 100644 --- a/src/portal/templates/registration/login.html +++ b/src/portal/templates/registration/login.html @@ -1,7 +1,7 @@ {% extends 'project/dialog.html' %} {% load i18n %} -{% block title %}{% trans 'Mitgliederbereich' %}{% endblock %} +{% block title %}{% trans 'Eltern-Login' %}{% endblock %} {% block extra_meta %} diff --git a/src/project/cms_plugins.py b/src/project/cms_plugins.py index 53473aa..6d1793f 100644 --- a/src/project/cms_plugins.py +++ b/src/project/cms_plugins.py @@ -202,7 +202,8 @@ plugin_pool.unregister_plugin(_FormPlugin) class FormPlugin(_FormPlugin): module = 'Content' name = 'Form' - child_classes = ['TextField', 'TextAreaField', 'EmailField', 'RadioSelectField', 'MultipleSelectField', 'SubmitButton'] + child_classes = ['TextField', 'TextAreaField', 'EmailField', 'RadioSelectField', 'MultipleSelectField', + 'SubmitButton'] class SocialMediaListItemInlineAdmin(admin.TabularInline): diff --git a/src/project/context_processors.py b/src/project/context_processors.py index 8a7d5ca..395669b 100644 --- a/src/project/context_processors.py +++ b/src/project/context_processors.py @@ -5,7 +5,17 @@ from project.models import Notification def search_form(request): - return {'search_form': ModelSearchForm} + egg_pages = ( + (81, 'C', 1), + (83, 'R', 2), + (95, 'E', 3), + (105, 'D', 4), + (99, 'O', 5), + ) + return { + 'egg_pages': egg_pages, + 'search_form': ModelSearchForm + } def notification(request): diff --git a/src/project/templates/project/content.html b/src/project/templates/project/content.html index 834b34b..eaa3b3b 100644 --- a/src/project/templates/project/content.html +++ b/src/project/templates/project/content.html @@ -30,6 +30,28 @@ {% block content_main %} {% placeholder 'content' %} {% endblock %} + + {% for page, letter, position in egg_pages %} + {% if page == request.current_page.pk %} + + {{ letter }} + {{ position }} + +
+
+
+
+
+
+
+
+
+
+
+
+ + {% endif %} + {% endfor %}
diff --git a/src/project/templates/project/includes/pagination.html b/src/project/templates/project/includes/pagination.html deleted file mode 100644 index 942b4f7..0000000 --- a/src/project/templates/project/includes/pagination.html +++ /dev/null @@ -1,29 +0,0 @@ -{% load i18n spurl %} - -{% if page_obj.has_other_pages %} - -
- {% with from=page_obj.start_index until=page_obj.end_index count=page_obj.paginator.count %} -

{% blocktrans %}{{ from }} – {{ until }} of {{ count }} {{ obj_string }} are displayed{% endblocktrans %}

- {% endwith %} -
    - {% if page_obj.has_previous %} - - {% endif %} - {% for page_num in page_obj.page_range %} - {% if page_num %} - {% if page_obj.number == page_num %} -
  • {{ page_num }}
    • - {% else %} -
  • {{ page_num }}
    • - {% endif %} - {% else %} -
  • ...
    • - {% endif %} - {% endfor %} - {% if page_obj.has_next %} - - {% endif %} -
-
-{% endif %} \ No newline at end of file diff --git a/src/project/templates/project/newsletter/subscription_form.html b/src/project/templates/project/newsletter/subscription_form.html index 148c3be..cb51ffb 100644 --- a/src/project/templates/project/newsletter/subscription_form.html +++ b/src/project/templates/project/newsletter/subscription_form.html @@ -3,9 +3,7 @@
{% if success %}

- {% blocktrans %} - Ihre Angaben wurden erfolgreich übermittelt. Vielen Dank! - {% endblocktrans %} + {% trans 'Ihre Angaben wurden erfolgreich übermittelt. Vielen Dank!' %}

{% else %} {% if form.non_field_errors %} diff --git a/templates/aldryn_forms/form.html b/templates/aldryn_forms/form.html index 53d9817..83afa7c 100644 --- a/templates/aldryn_forms/form.html +++ b/templates/aldryn_forms/form.html @@ -16,9 +16,7 @@ {% if instance.success_message %} {{ instance.success_message }} {% else %} - {% blocktrans %} - Ihre Angaben wurden erfolgreich übermittelt. Vielen Dank! - {% endblocktrans %} + {% trans 'Ihre Angaben wurden erfolgreich übermittelt. Vielen Dank!' %} {% endif %}

{% endif %}