diff --git a/blechreiz/database.sqlite b/blechreiz/database.sqlite deleted file mode 100644 index 32df647..0000000 Binary files a/blechreiz/database.sqlite and /dev/null differ diff --git a/eventplanner/templates/eventplanner/eventplanning_view.html b/eventplanner/templates/eventplanner/eventplanning_view.html index ee17e42..969e2a8 100644 --- a/eventplanner/templates/eventplanner/eventplanning_view.html +++ b/eventplanner/templates/eventplanner/eventplanning_view.html @@ -135,7 +135,7 @@ {% else %} {{ event.title }} {% endif %} - {{ event.date | date:"SHORT_DATE_FORMAT" }} + {{ event.date | date:"D, d.m.y" }} {% if event.time %} {{ event.time | time:"H:i" }} {% endif %} {% if event.meeting_time %} {{ event.meeting_time | time:"H:i" }} {% endif %} diff --git a/eventplanner/templates/eventplanner/events_grid.html b/eventplanner/templates/eventplanner/events_grid.html index 8089b43..503d834 100644 --- a/eventplanner/templates/eventplanner/events_grid.html +++ b/eventplanner/templates/eventplanner/events_grid.html @@ -55,7 +55,8 @@ {% endif %} $('.eventButton').tooltip() - + $('.infoColumn').tooltip() + $("button.eventButton").click( function (e) { e.preventDefault(); $(this).removeClass("btn-danger") @@ -150,7 +151,14 @@ {% for event in events %} {{ event.title }} - {% if event.location %} {{ event.location }}
{% endif %} {{ event.date | date:"SHORT_DATE_FORMAT" }} + +
+ + {% if event.location %} {{ event.location }}
{% endif %} + {{ event.date | date:"D, d.m.y" }} +
+ {% for p in event.participation %} diff --git a/website/static/css/coming-soon.css b/website/static/css/coming-soon.css index fd001d3..fbe9a8b 100644 --- a/website/static/css/coming-soon.css +++ b/website/static/css/coming-soon.css @@ -38,8 +38,11 @@ float: right; } #coming_soon .count .box{ + float: none; + display: inline-block; + text-align: center; - float: right; + /*float: right;*/ margin-left: -10px; } #coming_soon .count .first{ @@ -66,121 +69,6 @@ text-transform: uppercase; font-size: 13px; } -#coming_soon .email_wrapp .wrapp{ - background: #fff; - width: 98%; - margin: 0 auto 60px; - padding: 32px 0 21px; - height: 50px; - float: none; - border-radius: 0 0 4px 4px; - box-shadow: 1px 1px 2px 0px rgb(206, 206, 206); -} -#coming_soon .email_wrapp .line{ - margin-left: 0; -} -#coming_soon .email_wrapp .wrapp p{ - float: left; - font-size: 17px; - margin: 8px 0px 0px 48px; -} -#coming_soon .email_wrapp .wrapp input[type="text"]{ - float: left; - font-size: 16px; - border-radius: 3px; - height: 27px; - margin-bottom: 0; - width: 31.5%; - margin-left: 30px; -} -#coming_soon .email_wrapp .wrapp a.send{ - text-transform: uppercase; - color: #fff; - border: 0 none; - box-shadow: none; - margin: 0px 70px 0 0; - background: #1189D9; - font-weight: bold; - text-shadow: none; - padding: 8px 10px; - font-size: 14px; - float: right; - -webkit-transition: background linear .2s, box-shadow linear .2s; - -moz-transition: background linear .2s, box-shadow linear .2s; - -o-transition: background linear .2s, box-shadow linear .2s; - transition: background linear .2s, box-shadow linear .2s; -} -#coming_soon .email_wrapp .wrapp a.send:hover{ - background: #252528; -} -#coming_soon .social{ - text-align: center; - margin: 0px; -} -#coming_soon .social p{ - display: inline-block; - font-weight: bold; - font-size: 21px; - margin: 0 10px 0 0; - bottom: 9px; - position: relative; -} -#coming_soon .social a { - margin-left: 10px; - display: inline-block; -} -#coming_soon .social a span{ - display: inline-block; - width: 33px; - height: 33px; -} -#coming_soon .social span.ico1, -#coming_soon .social span.ico1h{ - background-position: 0px 0px; -} -#coming_soon .social span.ico2, -#coming_soon .social span.ico2h{ - background-position: -37px 0px; -} -#coming_soon .social span.ico3, -#coming_soon .social span.ico3h{ - background-position: -75px 0px; -} -#coming_soon .social span.ico4, -#coming_soon .social span.ico4h{ - background-position: -112px -1px; -} -#coming_soon .social span.ico5, -#coming_soon .social span.ico5h{ - background-position: -151px 0px; -} -#coming_soon .social span.ico6, -#coming_soon .social span.ico6h{ - background-position: -188px -1px; -} -#coming_soon .social span.ico7, -#coming_soon .social span.ico7h{ - background-position: -226px 0px; -} -#coming_soon .social a:hover span.icons{ - display: none; -} -#coming_soon .social a:hover span.iconsh{ - display: inline-block; -} -#coming_soon .social span.iconsh{ - display: none; -} -#coming_soon .icons{ - background: url('../img/socialicons2.png') no-repeat; - width: 265px; - height: 36px; -} -#coming_soon .iconsh{ - background: url('../img/socialicons_h.png') no-repeat; - width: 265px; - height: 36px; -} /* Responsive -------------------------------------------------- */ @@ -193,6 +81,7 @@ @media (max-width: 979px) { } /* Portrait tablet to landscape and desktop */ + @media (min-width: 768px) and (max-width: 979px) { #coming_soon .head{ padding-top: 80px; @@ -202,37 +91,26 @@ text-align: center; width: 37%; } - #coming_soon .count .box{ - margin: 0 0 13px 0; - } - #coming_soon .count .first{ - margin: 0; + #coming_soon #clock { + margin-top: 45px; } #coming_soon .count .circle{ - float: none; - display: inline-block; - } - #coming_soon .email_wrapp .wrapp{ - text-align: center; - height: auto; - padding: 30px 0 30px; + height: 73px; + width: 73px; } - #coming_soon .email_wrapp .wrapp p{ - float: none; - margin: 0 0 19px 0; + #coming_soon .count p{ + font-size: 10px; + } + #coming_soon .count .circle span{ + margin-top: 26px; + font-size: 30px; } #coming_soon .email_wrapp .wrapp input[type="text"]{ - float: none; - width: 43%; - margin: 0 1px 0 0; - } - #coming_soon .email_wrapp .wrapp a.send{ - float: none; - margin: 0 0 0 7px; + width: 70%; } } /* Landscape phone to portrait tablet */ -@media (max-width: 767px) { +@media (max-width: 768px) { #coming_soon .head{ text-align: center; background: none; @@ -269,26 +147,7 @@ #coming_soon .count p{ color: #333; } - #coming_soon .email_wrapp .wrapp{ - background: transparent; - box-shadow: none; - padding: 0; - width: 100%; - } - #coming_soon .email_wrapp .wrapp p{ - float: none; - margin: 0 0 20px 0; - } - #coming_soon .email_wrapp .wrapp input[type="text"]{ - float: left; - width: 77%; - margin-left: 0; - } - #coming_soon .email_wrapp .wrapp a.send{ - float: left; - margin-left: 22px; - margin-right: 0; - } + } /* Landscape phones and down */ @media (max-width: 480px) { @@ -296,6 +155,9 @@ height: 73px; width: 73px; } + #coming_soon .count p{ + font-size: 10px; + } #coming_soon .count .circle span{ margin-top: 26px; font-size: 30px; @@ -303,11 +165,4 @@ #coming_soon .email_wrapp .wrapp input[type="text"]{ width: 70%; } - #coming_soon .social p{ - display: block; - margin: 16px 0 3px 0; - } - #coming_soon .social a{ - margin-left: 0px; - } } diff --git a/website/static/css/concert_route.css b/website/static/css/concert_route.css index 6170387..3d5913f 100644 --- a/website/static/css/concert_route.css +++ b/website/static/css/concert_route.css @@ -1,3 +1,13 @@ + +#concert_route h4{ + margin: 0 0 10px 0; + /*color: #fff;*/ + font-size: 25px; + font-weight: normal; + line-height: 38px; + text-shadow: 1px 1px 0px #2A284D; +} + #map{ margin: 0; width: 100%; @@ -149,6 +159,20 @@ #concert_route .map .box_wrapp a.btn{ width: 65%; } + #map { + visibility:hidden; + height: 2px; + width : 2px; + } + #route_info_box + { + visibility: visible; + } + + #route_info_box a.btn + { + visibility:hidden; + } } /* Landscape phones and down */ @media (max-width: 480px) { diff --git a/website/templates/website/concert_route.html b/website/templates/website/concert_route.html index 038a0f0..15ddad9 100644 --- a/website/templates/website/concert_route.html +++ b/website/templates/website/concert_route.html @@ -176,7 +176,9 @@
-
Nächstes Konzert:
+

Nächstes Konzert

+ + + + + + + {% if nextConcert.meeting_time %} {% endif %} + + +
Ort: {{nextConcert.location}}
Datum: {{nextConcert.date | date:"D, d.m.y" }}
Uhrzeit: {{nextConcert.time | time:"H:i" }} Uhr
Treffen um: {{ nextConcert.meeting_time | time:"H:i" }} Uhr
Fahrzeit:
Strecke:
+ + + Schliessen
diff --git a/website/templates/website/event_countdown.html b/website/templates/website/event_countdown.html index 9514328..164048d 100644 --- a/website/templates/website/event_countdown.html +++ b/website/templates/website/event_countdown.html @@ -38,8 +38,8 @@

Der nächste Termin:

- {{countdown.event.title}} ist am {{countdown.event.date | date:"SHORT_DATE_FORMAT" }} - um {{countdown.event.displaytime | time:"H:i" }} + {{countdown.event.title}} am {{countdown.event.date | date:"D, d.m.y" }} + um {{countdown.event.displaytime | time:"H:i" }} Uhr in {{countdown.event.location}}
@@ -55,21 +55,21 @@

-
-
-

Sekunden

-
-
-

Minuten

+
+

Tage

Stunden

-
-

Tage

+
+

Minuten

+
+
+
+

Sekunden

diff --git a/website/templates/website/slider_intern_area.html b/website/templates/website/slider_intern_area.html index 35d8181..93cc107 100644 --- a/website/templates/website/slider_intern_area.html +++ b/website/templates/website/slider_intern_area.html @@ -52,6 +52,20 @@ border-radius: 8px; } + +@media (max-width: 979px) { + .slide .info a { + font-size: 22px; + } + + .slide .info .subtitle { + font-size: 16px; + } + .slide .info .subtitlebg { + font-size: 16px; + } +} + {% endaddtoblock %}