diff --git a/impuls/__pycache__/urls.cpython-311.pyc b/impuls/__pycache__/urls.cpython-311.pyc index 5c74ed12..d591439e 100644 Binary files a/impuls/__pycache__/urls.cpython-311.pyc and b/impuls/__pycache__/urls.cpython-311.pyc differ diff --git a/static/css/style.css b/static/css/style.css index aa243028..0f5c4d4f 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,5 +1,6 @@ html{box-sizing:border-box}*,*:before,*:after{box-sizing:inherit} .wrapper{min-height:100%;display:grid;grid-template-rows:auto 1fr auto;} +.dc-responsive{display:block;overflow-x:auto} html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0} body{margin:0;font-weight:500;-webkit-font-smoothing:antialiased;} article,aside,details,figcaption,figure,footer,header,main,menu,nav,section{display:block}summary{display:list-item} @@ -65,14 +66,19 @@ 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} +@media (min-width:562px) {.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 .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 .dc-button{white-space:normal;padding:16px} .dc-pushdown{padding-bottom:55px}} +@media (max-width:561px){.dc-bar{padding:1% 16px;float:left;width:100%;overflow:hidden;display:block;float:center}.dc-center .dc-bar{display:inline-block;width:auto} +.dc-bar-item{padding:1% 16px;float:left;width:16%;border:none;display:block;outline:0} +.dc-bar-item{float:none;width:100%;} +.dc-pushdown{padding-bottom:201px}} +@media (max-width:500px){.dc-pushdown{padding-bottom:180px}} + + .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} .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, .dc-cell-row:before,.dc-cell-row:after,.dc-clear:after,.dc-clear:before,.dc-bar:before,.dc-bar:after{content:"";display:table;clear:both} .dc-col,.dc-half,.dc-third,.dc-twothird,.dc-threequarter,.dc-quarter{float:left;width:100%} @@ -218,6 +224,13 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0} @keyframes move-forever4 {0% {transform: translate(-90px, 0%);}100% {transform: translate(85px, 0%);}} +/* image gallery */ +div.gallery{margin:5px;border:1px solid #ccc;float:left;height:195px;width:180px;overflow-x:hidden} +div.gallery:hover{border:1px solid #777;} +div.gallery img {width:100%;height:auto;} +div.desc{padding:15px;text-align:center;} + + /* 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;} @@ -228,4 +241,4 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0} .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;}} +@media screen and (max-width: 767px) {.tg {width: auto !important;table-layout:fixed;width:100%}.tg col {width: auto !important;}.tg-wrap {overflow-x: auto;-webkit-overflow-scrolling: touch;margin: auto 0px;}} diff --git a/static/pictures/2017.webp b/static/pictures/2017.webp new file mode 100644 index 00000000..d6d2c60c Binary files /dev/null and b/static/pictures/2017.webp differ diff --git a/static/pictures/2018.webp b/static/pictures/2018.webp new file mode 100644 index 00000000..6a18c2ee Binary files /dev/null and b/static/pictures/2018.webp differ diff --git a/static/pictures/2019.webp b/static/pictures/2019.webp new file mode 100644 index 00000000..99e0d8de Binary files /dev/null and b/static/pictures/2019.webp differ diff --git a/static/pictures/2020.webp b/static/pictures/2020.webp new file mode 100644 index 00000000..2e6f21f2 Binary files /dev/null and b/static/pictures/2020.webp differ diff --git a/static/pictures/2021.webp b/static/pictures/2021.webp new file mode 100644 index 00000000..9e05495c Binary files /dev/null and b/static/pictures/2021.webp differ diff --git a/static/pictures/2022.webp b/static/pictures/2022.webp new file mode 100644 index 00000000..91c2fde3 Binary files /dev/null and b/static/pictures/2022.webp differ diff --git a/static/pictures/2023.webp b/static/pictures/2023.webp new file mode 100644 index 00000000..d10d9aed Binary files /dev/null and b/static/pictures/2023.webp differ diff --git a/templates/about_page.html b/templates/about_page.html index f58a7b08..4467ce4b 100644 --- a/templates/about_page.html +++ b/templates/about_page.html @@ -1,10 +1,42 @@ {% extends 'base.html' %} +{% load static %} {% block title %}Über uns - {{block.super}}{% endblock title %} {% block content %}

Ü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 7d4079d2..2d7d250c 100644 --- a/templates/anmeldung.html +++ b/templates/anmeldung.html @@ -3,7 +3,7 @@ {% include static %} {% block content %} -
+

Anmeldung

@@ -80,10 +80,19 @@
-
+

Hinweise

    -
  1. +
  2. Preise bei Anmeldung vor Weihnachten: 70€ regulär, 40€ ermäßigt.
    3. +
  3. Preise bei Anmeldung nach Weihnachten: 80€ regulär, 50€ ermäßigt.
    4. +
  4. Grundsätzlich soll jedem die Teilnahme ermöglicht werden, wer den Beitrag also nicht aufbringen kann ist trotzdem herzlich eingeladen. Details sind mit dem Tagungsbüro zu vereinbaren.
    5. +
  5. Stornierung bis 1 Monat vor Tagungsbeginn mit vollständiger Erstattung möglich.
    6. +
  6. Bei Stornierung bis 2 Wochen vor Tagungsbeginn werden 50% des Beitrages erstattet.
    7. +
  7. Bei Stornierung ab 2 Wochen vor Tagungsbeginn können keine gewöhnlichen Stornierungen mehr vorgenommen werden.
    8. +
  8. Zu jeder Zeit kann eine Stornierung aus wichtigem Grund vorgenommen werden. Dies ist mit dem Tagungsbüro abzusprechen, die Erstattung richtet sich nach Einzelfall.
    9. +
  9. Die finanzielle Aufstellung der Tagung wird auf der Website transparent bekannt gegeben.
    10. +
  10. Während der Tagung ist für umfassende Verpflegung gesorgt, grundsätzlich wird vegetarisch gekocht. Besondere Bedürfnisse sind bei der Anmeldung anzugeben.
    11. +
  11. Die Tagung findet in der Gemeinde Stuttgart-Mitte statt: Werfmershalde 19, 70190 Stuttgart
diff --git a/templates/base.html b/templates/base.html index 0f7fca5e..8e47c3e7 100644 --- a/templates/base.html +++ b/templates/base.html @@ -12,7 +12,7 @@ -
+
{% include "navbar.html" %} {% block content %} {% endblock content %} diff --git a/templates/navbar.html b/templates/navbar.html index a6e8ff85..118b247c 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -1,5 +1,5 @@
-
+
Home News Über uns @@ -8,4 +8,4 @@ Anmeldung
-
+
diff --git a/templates/tagungsplan.html b/templates/tagungsplan.html index e35aead9..cf77534a 100644 --- a/templates/tagungsplan.html +++ b/templates/tagungsplan.html @@ -1,9 +1,9 @@ {% extends 'base.html' %} {% block title %}Tagesplan - {{block.super}}{% endblock title %} {% block content %} -
+

Ablaufplan der Tagung

-
+
diff --git a/website/__pycache__/models.cpython-311.pyc b/website/__pycache__/models.cpython-311.pyc index 57f96491..64b43e57 100644 Binary files a/website/__pycache__/models.cpython-311.pyc and b/website/__pycache__/models.cpython-311.pyc differ diff --git a/website/__pycache__/views.cpython-311.pyc b/website/__pycache__/views.cpython-311.pyc index 236ce65c..858bfe78 100644 Binary files a/website/__pycache__/views.cpython-311.pyc and b/website/__pycache__/views.cpython-311.pyc differ diff --git a/website/migrations/0012_alter_registrant_message.py b/website/migrations/0012_alter_registrant_message.py new file mode 100644 index 00000000..99ef43fe --- /dev/null +++ b/website/migrations/0012_alter_registrant_message.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.6 on 2023-11-03 16:23 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('website', '0011_alter_registrant_payed'), + ] + + operations = [ + migrations.AlterField( + model_name='registrant', + name='message', + field=models.CharField(blank=True, max_length=2100), + ), + ] diff --git a/website/migrations/__pycache__/0012_alter_registrant_message.cpython-311.pyc b/website/migrations/__pycache__/0012_alter_registrant_message.cpython-311.pyc new file mode 100644 index 00000000..dcb94a73 Binary files /dev/null and b/website/migrations/__pycache__/0012_alter_registrant_message.cpython-311.pyc differ diff --git a/website/models.py b/website/models.py index 7291060e..a8938fdb 100644 --- a/website/models.py +++ b/website/models.py @@ -64,7 +64,7 @@ class Registrant(models.Model): publish_address = models.BooleanField() publish_phone = models.BooleanField() info = models.CharField(max_length=777,blank=True) - message = models.TextField(max_length=2100,blank=True) + message = models.CharField(max_length=2100,blank=True) timestamp = models.DateTimeField(auto_now_add=True) payed = models.BooleanField(default=False)