From 9764b4441b1a839d8eb222d8a9392e4ef5885924 Mon Sep 17 00:00:00 2001 From: Tezza Date: Fri, 27 Feb 2015 00:40:08 +0100 Subject: [PATCH] separated the event view from it's containers --- src/app/level2/WebControllerProvider.php | 4 +- src/app/views/event.twig | 53 ++++++++++++++++++++++++ src/app/views/events.twig | 26 ++++++++++++ src/app/views/level2.twig | 45 +------------------- 4 files changed, 83 insertions(+), 45 deletions(-) create mode 100644 src/app/views/event.twig create mode 100644 src/app/views/events.twig diff --git a/src/app/level2/WebControllerProvider.php b/src/app/level2/WebControllerProvider.php index fd63a11..784586b 100644 --- a/src/app/level2/WebControllerProvider.php +++ b/src/app/level2/WebControllerProvider.php @@ -31,14 +31,14 @@ $ctr->get('/events', function() use ( $app ) { return $app['twig']->render( - 'level2.twig', + 'events.twig', array( 'page' => 'events', 'level2' => Level2::getStatus( $app ), 'events' => array_slice( Level2::getEvents( $app ), 0, - 10 + 100 ) ) ); diff --git a/src/app/views/event.twig b/src/app/views/event.twig new file mode 100644 index 0000000..966269b --- /dev/null +++ b/src/app/views/event.twig @@ -0,0 +1,53 @@ +{% block event %} + +
+ + +
+

+ {% if event.url %} + + {{ event.name }} + + {% else %} + {{ event.name }} + {% endif %} +

+

+ {{ event.date }} + {% if event.location is defined %} + - {{ event.location }} + {% endif %} +

+ {% if event.description is defined %} +

{{ event.description|raw }}

+ {% endif %} +
+ +
+ +{% endblock %} diff --git a/src/app/views/events.twig b/src/app/views/events.twig new file mode 100644 index 0000000..35cc7b3 --- /dev/null +++ b/src/app/views/events.twig @@ -0,0 +1,26 @@ +{% extends "base.twig" %} + +{% block container %} + +
+ +
+ +

Events

+ +
+ +
+ + {% for event in events %} + + {% embed "event.twig" %} + {% endembed %} + + {% endfor %} + +
+ +
+ +{% endblock %} diff --git a/src/app/views/level2.twig b/src/app/views/level2.twig index cbc9409..35cc7b3 100644 --- a/src/app/views/level2.twig +++ b/src/app/views/level2.twig @@ -14,49 +14,8 @@ {% for event in events %} -
- - -
-

- {% if event.url %} - - {{ event.name }} - - {% else %} - {{ event.name }} - {% endif %} -

-

- {{ event.date }} - {% if event.location is defined %} - - {{ event.location }} - {% endif %} -

- {% if event.description is defined %} -

{{ event.description|raw }}

- {% endif %} -
- -
+ {% embed "event.twig" %} + {% endembed %} {% endfor %}