diff --git a/impuls/urls.py b/impuls/urls.py index 150341eb..86bfb8a8 100644 --- a/impuls/urls.py +++ b/impuls/urls.py @@ -18,7 +18,7 @@ from django.contrib import admin from django.urls import path from django.conf import settings -from website.views import newspage, post, about, search, home, contact, datenschutz, impressum, anmeldung +from website.views import newspage, post, about, search, home, contact, datenschutz, impressum, anmeldung, tagungsplan urlpatterns = [ path("", home, name = "homepage"), @@ -31,4 +31,5 @@ urlpatterns = [ path('datenschutz/', datenschutz, name = 'datenschutz'), path('impressum/', impressum, name = 'impressum'), path('anmeldung/', anmeldung, name = 'anmeldung'), + path('tagungsplan/', tagungsplan, name = 'tagungsplan'), ] diff --git a/static/css/style.css b/static/css/style.css index 2989810c..a5f67e7c 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -65,11 +65,12 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0} .dc-main,#main{transition:margin-left .4s} .dc-modal{z-index:3;display:none;padding-top:100px;position:fixed;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)} .dc-modal-content{margin:auto;background-color:#fff;position:relative;padding:0;outline:0;width:600px} -.dc-bar{width:100%;overflow:hidden}.dc-center .dc-bar{display:inline-block;width:auto} -.dc-bar .dc-bar-item{padding:8px 16px;float:left;width:auto;border:none;display:block;outline:0} +.dc-bar{width:100%;overflow:hidden}.dc-bar .dc-bar-item{padding:8px 16px;float:left;width:auto;border:none;display:block;outline:0} .dc-bar .dc-dropdown-hover,.dc-bar .dc-dropdown-click{position:static;float:left} .dc-bar .dc-button{white-space:normal;padding:16px} +.dc-bar {padding:1% 16px;float:left;width:100%;overflow:hidden;display:block}.dc-center .dc-bar{display:inline-block;width:auto} .dc-bar-block .dc-bar-item{width:100%;display:block;padding:8px 16px;text-align:left;border:none;white-space:normal;float:none;outline:0} +@media (max-width:561px){.dc-bar-item{float:none;width:100%;}} .dc-bar-block.dc-center .dc-bar-item{text-align:center}.dc-block{display:block;width:100%} .dc-responsive{display:block;overflow-x:auto} .dc-container:after,.dc-container:before,.dc-panel:after,.dc-panel:before,.dc-row:after,.dc-row:before,.dc-row-padding:after,.dc-row-padding:before, @@ -202,6 +203,8 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0} .dc-dark-green {background-color:#47B413!important} .dc-primary-background {background-color:#fde6a0!important} .dc-secondary-background {background-color:#995f5e!important} +.dc-page-background {background-color:#d2bf84!important} +.dc-formula-background {background-color:#c9b27e!important} /*divider*/ .editorial{display: block;width: 100%;height: 30px;max-height: 30px;margin: 0;z-index:5;bottom:0;position:absolute;left:0px;float:left;} @@ -214,3 +217,15 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0} @keyframes move-forever3 {0% {transform: translate(85px, 0%);}100% {transform: translate(-90px, 0%);}} @keyframes move-forever4 {0% {transform: translate(-90px, 0%);}100% {transform: translate(85px, 0%);}} + +/* table */ +.tg {border-collapse:collapse;border-spacing:0;margin:0px auto;} +.tg td{border-color:black;border-style:solid;border-width:1px;font-family:Arial, sans-serif;font-size:14px;overflow:hidden;padding:10px 5px;word-break:normal;} +.tg th{border-color:black;border-style:solid;border-width:1px;font-family:Arial, sans-serif;font-size:14px;font-weight:normal;overflow:hidden;padding:10px 5px;word-break:normal;} +.tg .tg-j1i3{border-color:inherit;position:-webkit-sticky;position:sticky;text-align:left;top:-1px;vertical-align:top;will-change:transform} +.tg .tg-jj9b{border-color:inherit;position:-webkit-sticky;position:sticky;text-align:left;top:-1px;vertical-align:middle;will-change:transform} +.tg .tg-c3ow{border-color:inherit;text-align:center;vertical-align:top} +.tg .tg-0pky{border-color:inherit;text-align:left;vertical-align:top} +.tg .tg-7btt{border-color:inherit;font-weight:bold;text-align:center;vertical-align:top} +.tg .tg-rvyq{border-color:inherit;font-style:italic;font-weight:bold;text-align:center;vertical-align:top} +@media screen and (max-width: 767px) {.tg {width: auto !important;}.tg col {width: auto !important;}.tg-wrap {overflow-x: auto;-webkit-overflow-scrolling: touch;margin: auto 0px;}} diff --git a/static/pictures/background-i.webp b/static/pictures/background-i.webp index 6a0c9e63..555ee10f 100644 Binary files a/static/pictures/background-i.webp and b/static/pictures/background-i.webp differ diff --git a/static/pictures/logo.webp b/static/pictures/logo.webp new file mode 100644 index 00000000..2b8d59b0 Binary files /dev/null and b/static/pictures/logo.webp differ diff --git a/templates/about_page.html b/templates/about_page.html index f69f17b1..f58a7b08 100644 --- a/templates/about_page.html +++ b/templates/about_page.html @@ -4,7 +4,7 @@

Über die Impuls-Tagung

-

+

Im Fokus der Im·Puls Tagung liegt die Suche nach der eigenen Lebensaufgabe. Die eigenen LebensIm·Pulse zu finden und zu greifen ist gerade für junge Erwachsene eine drängende Frage. Es scheint an der Zeit den eigenen Weg zu gehen, doch wonach soll ich ihn ausrichten? Der Antwort dieser Frage näher zu kommen findet alljährlich die Im·Puls-Tagung zu wechselnden Themen statt.

{% endblock content %} diff --git a/templates/anmeldung.html b/templates/anmeldung.html index 6e5c551d..7d4079d2 100644 --- a/templates/anmeldung.html +++ b/templates/anmeldung.html @@ -1,75 +1,75 @@ {% extends 'base.html' %} -{% block title%}Anmeldung{% endblock title %} +{% block title%}Anmeldung - {% endblock title %} {% include static %} {% block content %}

Anmeldung

-
+
{% csrf_token %}
{{ register_form.non_field_errors }} -
+
{{ register_form.name.errors }}
{{ register_form.name }}
-
+
{{ register_form.mail.errors }}
{{register_form.mail }}
-
+
{{ register_form.phone.errors }}
{{ register_form.phone }}
-
+
{{ register_form.rate_reduced.errors }}
{{ register_form.rate_reduced }}
-
+
{{ register_form.address_street.errors }}
{{register_form.address_street }}
{{ register_form.address_plz.errors }}
{{register_form.address_plz }}
-
+
{{ register_form.address_town.errors }}
{{register_form.address_town }}
-
+
{{ register_form.birthdate.errors }}
{{register_form.birthdate }}
-
+
{{ register_form.gender.errors }}
-
+
{{ register_form.food.errors }}
{{register_form.food }}
-
+
{{ register_form.music.errors }}
{{register_form.music }}
-
+
{{ register_form.cake.errors }}
{{register_form.cake }}
-
+
{{ register_form.publish_address.errors }}
{{register_form.publish_address }}
-
+
{{ register_form.publish_phone.errors }}
{{register_form.publish_phone }}
-
-
+
+
{{ register_form.info.errors }}
{{register_form.info }}
@@ -81,7 +81,7 @@
-

Hinweise

+

Hinweise

diff --git a/templates/base.html b/templates/base.html index dbf7cb89..0f7fca5e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,16 +2,17 @@ -{% block title %}{% endblock title %}Denkena Consulting +{% block title %}{% endblock title %}Im·Puls - + + -
+
{% include "navbar.html" %} {% block content %} {% endblock content %} diff --git a/templates/contact.html b/templates/contact.html index b1610c87..50556117 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -5,11 +5,16 @@

Kontakt

-
-

Tagungsbüro

+
+
+

Tagungsbüro

Mail: buero@im-puls.org
 +

Eine Telefonnummer des Tagungsbüros wird an alle Teilnehmer versendet.

+

Das Tagungsbüro ist die zentrale Stelle für alle Kontaktanfragen. Sie können Sich gerne mit all Ihrer Anfragen an uns wenden. Selbstverständlich werden wir all Ihre Daten sicher und verschwiegen behandeln.

+Träger und verantwortliche Stelle ist die Christengemeinschaft. +
-
+

Anonymes Kontaktformular

{% csrf_token %} @@ -34,4 +39,5 @@
+
{% endblock content %} diff --git a/templates/homepage.html b/templates/homepage.html index 3e9185f0..65df15a9 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -2,11 +2,12 @@ {% load static %} {% block content %} -
+

Geistige IDEALE
&
irdische REALITÄT

-IM-PULS 2024 +Im·Puls 2024
+Die aktuelle Tagung findet vom 14. Februar, 17:00, bis zum 18. Februar, 12:30, in Stuttgart statt.
diff --git a/templates/navbar.html b/templates/navbar.html index 26a4b8bb..a6e8ff85 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -1,9 +1,11 @@
-
+
Home News Über uns +Tagungsplan Kontakt +Anmeldung
diff --git a/templates/tagungsplan.html b/templates/tagungsplan.html new file mode 100644 index 00000000..e35aead9 --- /dev/null +++ b/templates/tagungsplan.html @@ -0,0 +1,78 @@ +{% extends 'base.html' %} +{% block title %}Tagesplan - {{block.super}}{% endblock title %} +{% block content %} +
+

Ablaufplan der Tagung

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ZeitMittwochDonnerstagFreitagSamstagSonntag
6:45












Auftakt		Wecken
7:15Eurythmie & ImPuls-Vertiefung
8:00Die Menschenweihehandung
9:00Frühstück


10:00		Beginn: Gemeinsames Singen, dann Vortrag und im Anschluss ein gemeinsames Plenum zur Reflektion des VortragesEnde: 12:30
"Ideale & Illusionen"
Daniel Hafner
"Das Geistige im irdischen Goetheanismus"
Martin Merckens
"Wie lerne ich zu tun, was ich will?"
Marco Bindelli
13:00Mittagessen
15:30Arbeitsgruppen
17:00freie Initiativen
18:30Abendbrot
20:00Abendprogramm
21:30ImPuls-Vertiefung
---Nachtcafe
+
+
+{% endblock content %} diff --git a/website/views.py b/website/views.py index 973847bb..70799a7f 100644 --- a/website/views.py +++ b/website/views.py @@ -73,6 +73,9 @@ def datenschutz(request): def impressum(request): return render(request, 'impressum.html') +def tagungsplan(request): + return render(request, 'tagungsplan.html') + def anmeldung(request): if request.method == 'POST': register_form = RegisterForm(request.POST)