From 6361751dd037202c5786d86b73da19a761cdb6a9 Mon Sep 17 00:00:00 2001 From: Lars Moelleken Date: Tue, 4 Nov 2014 00:05:03 +0100 Subject: [PATCH] [+]: added "inc_plan.twig" --- app/controllers/index.controller.php | 2 +- app/controllers/ticket.controller.php | 13 +- app/storage/db/test.s3db | Bin 5120 -> 5120 bytes app/views/inc_plan.twig | 152 +++++++++++++++++++++++ app/views/tpl_base.twig | 52 ++++++-- app/views/tpl_index.twig | 154 +---------------------- app/views/tpl_termine.twig | 4 +- app/views/tpl_tickets.twig | 172 ++++++++++++++------------ web/css-min/app.css | 4 +- web/css-min/app.css.map | 2 +- web/css/app.css | 4 +- web/css/app.css.map | 2 +- web/js-min/app.js | 4 +- web/js-min/app.js.map | 2 +- web/js-min/bootstrap.js | 2 +- web/js-min/bootstrap.min.js | 2 +- web/js-min/plugins.js | 2 +- web/js/app.js | 2 +- web/scss/_base.scss | 2 +- web/scss/modules/_plan.scss | 4 + 20 files changed, 321 insertions(+), 260 deletions(-) create mode 100644 app/views/inc_plan.twig diff --git a/app/controllers/index.controller.php b/app/controllers/index.controller.php index 42adb87..a8de2e5 100644 --- a/app/controllers/index.controller.php +++ b/app/controllers/index.controller.php @@ -5,6 +5,6 @@ // home $app->get( '/', function () use ($app) { - $app->render('tpl_index.twig'); + $app->render('tpl_index.twig', array('page_template' => 'tpl_index', 'page_id' => 1)); } )->name('home'); diff --git a/app/controllers/ticket.controller.php b/app/controllers/ticket.controller.php index b379b39..c545579 100644 --- a/app/controllers/ticket.controller.php +++ b/app/controllers/ticket.controller.php @@ -9,16 +9,23 @@ $data = array(); $data['tickets'] = $tickets->getAll(); - $app->render('tpl_buy_overview.twig', array('data' => $data)); + $app->render('tpl_buy_overview.twig', array('page_template' => 'tpl_buy_overview', 'data' => $data)); } )->name('tickets'); $app->get( '/tickets', function () use ($app) { - $app->render('tpl_tickets.twig'); + $app->render('tpl_tickets.twig', array('page_template' => 'tpl_tickets')); } )->name('tickets'); + +$app->get( + '/tickets/:plan+', function ($plan) use ($app) { + $app->render('tpl_tickets.twig', array('page_template' => 'tpl_tickets', 'plan' => $plan)); + } +)->name('ticket_plan'); + // POST routes // buy @@ -43,7 +50,7 @@ try { R::store($tickets); R::commit(); - $app->flash('success', 'Nice to hear from you!'); + $app->flash('success', 'Deine Bestellung wurde gespeichert!'); } catch (Exception $e) { R::rollback(); diff --git a/app/storage/db/test.s3db b/app/storage/db/test.s3db index 0e73e015b2b6756d6e9a82275f1c4eb3449fe59e..1ae856827d65d2100be8d12e4f42ef985eeb7040 100644 GIT binary patch delta 325 zcmZqBXwaA-EvU-Cz`zQ`Fd#8e$5>RALH8LGFY_t}7RFEprmf5oOy-QClLc9B2m{4l zGcW+j#&{NXacODBX3@zpjK^3)Tq8m@Ycd_;WMtd?hFgL~fQ{)01M?2%0%jGa4@|e1 zj%*fW*}zmU!p6RJLH8LGFY_t}7RDe3rmf5oOy-P1lLc9B2mr-i zGcYtJv9OCvOEWf0PmX6i#_s7C;_B`iv{{qs5GNz^<~Q6DEL_aYS`5s)m`j+oHVd-I zF!OjYb2Aw8@`}py>N8I^5H^xv*!sxO$Xw3=2n}7BxEXB0lCsQ`YlQVA7 +
+
+
+
+
05,00 €
+
(ohne Spende)
+ +
+
+
+
10,00 €
+
(Spende: 5,00 €)
+ +
+
+
+
12,50 €
+
(ohne Spende)
+ +
+
+
+
17,50 €
+
(Spende: 5,00 €)
+ +
+
+
+ +{% else %} +
+
+
+
+
+
05,00 €
+
(ohne Spende)
+ Kaufen +
+
+
+
10,00 €
+
(Spende: 5,00 €)
+ Kaufen +
+
+
+
12,50 €
+
(ohne Spende)
+ Kaufen +
+
+
+
17,50 €
+
(Spende: 5,00 €)
+ Kaufen +
+
+
+
+{% endif %} + +
+
+ 08.11.2014 (Ticket für eine Person) +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+ 09.11.2014 (Ticket für eine Person) +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+ Spende (5,00 €) +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+ Tasse + kostenfrei Kaffee und Tee +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +

+ Die Tickets beinhaltet einen kostenfreien Zugang zu der Ausstellung des LVR Rheinischen Industriemuseums. +

\ No newline at end of file diff --git a/app/views/tpl_base.twig b/app/views/tpl_base.twig index 19ee24e..56f122f 100644 --- a/app/views/tpl_base.twig +++ b/app/views/tpl_base.twig @@ -10,7 +10,7 @@ {% block head %} - + {% block head_meta %} @@ -20,8 +20,8 @@ {# CSS #} {% block head_css %} - - + + {% endblock %} {% flush %} @@ -31,11 +31,11 @@ - - + + - + @@ -55,7 +55,7 @@ {% flush %} - + {% endblock %} @@ -69,7 +69,7 @@

- OpenRheinRuhr + OpenRheinRuhr

@@ -78,14 +78,44 @@

8. und 9. November 2014, Oberhausen

-
- Tickets » -
+ + {% if page_template == 'tpl_index' %} +
+ Tickets » +
+ {% endif %} +
+ +
+
+
+ +
+
+ +
+ +
+ +
+ + {% block content %}{% endblock %} diff --git a/app/views/tpl_index.twig b/app/views/tpl_index.twig index 36f0f30..fb2288e 100644 --- a/app/views/tpl_index.twig +++ b/app/views/tpl_index.twig @@ -3,33 +3,6 @@ {% block content %} - -
-
-
- -
-
- -
- -
- - -
- -
@@ -314,124 +287,7 @@
-
-
-
-
-
-
05,00 €
-
(ohne Spende)
- Kaufen -
-
-
-
10,00 €
-
(Spende: 5,00 €)
- Kaufen -
-
-
-
12,50 €
-
(ohne Spende)
- Kaufen -
-
-
-
17,50 €
-
(Spende: 5,00 €)
- Kaufen -
-
-
-
-
-
- 08.11.2014 (Ticket für eine Person) -
-
-
-
- -
-
- -
-
- -
-
- -
-
-
-
-
-
- 09.11.2014 (Ticket für eine Person) -
-
-
-
- -
-
- -
-
- -
-
- -
-
-
-
-
-
- Spende (5,00 €) -
-
-
-
- -
-
- -
-
- -
-
- -
-
-
-
-
-
- Tasse + kostenfrei Kaffee und Tee -
-
-
-
- -
-
- -
-
- -
-
- -
-
-
-
- -

- Die Tickets beinhaltet einen kostenfreien Zugang zu der Ausstellung des LVR Rheinischen Industriemuseums. -

+ {% include 'inc_plan.twig' %}
@@ -445,12 +301,6 @@

add the link here test.

-
    -
    • -
    • -
    • -
    • -
@@ -506,4 +356,4 @@
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/views/tpl_termine.twig b/app/views/tpl_termine.twig index a83ad8b..6416c1c 100644 --- a/app/views/tpl_termine.twig +++ b/app/views/tpl_termine.twig @@ -1,5 +1,7 @@ {% extends 'tpl_base.twig' %} +{# TODO #} + {% block content %}