From 5755187f500dde606b9d16a075d8aeb6b6105d18 Mon Sep 17 00:00:00 2001 From: Tezza Date: Mon, 23 Feb 2015 23:34:54 +0100 Subject: [PATCH] more responsive, added real menu items --- src/app/level2/Level2.php | 8 +++-- src/app/level2/WebControllerProvider.php | 20 ++++++++++- src/app/views/base.twig | 5 ++- src/app/views/level2.twig | 34 +++++++++++------- src/web/css/level2.css | 44 ++++++++++++++++++++---- 5 files changed, 85 insertions(+), 26 deletions(-) diff --git a/src/app/level2/Level2.php b/src/app/level2/Level2.php index dfea952..96ae311 100644 --- a/src/app/level2/Level2.php +++ b/src/app/level2/Level2.php @@ -39,6 +39,8 @@ foreach( $googleCalendar[ 'items' ] as $googleEvent ) { + unset( $event ); + $event[ 'name' ] = $googleEvent[ 'summary' ]; if ( array_key_exists( 'dateTime' , $googleEvent[ 'start' ] ) ){ @@ -75,7 +77,9 @@ ); if ( is_array( $image ) ) { - $event[ 'image' ] = $image[ 0 ]; + if ( $image[ 0 ][ 0 ] != '' ) { + $event[ 'image' ] = $image[ 0 ][ 0 ]; + } } $event[ 'description' ] = nl2br( $event[ 'description' ] ); @@ -92,7 +96,7 @@ ); if ( is_array( $url ) ) { - $event[ 'url' ] = $url[ 0 ]; + $event[ 'url' ] = $url[ 0 ][ 0 ]; } } diff --git a/src/app/level2/WebControllerProvider.php b/src/app/level2/WebControllerProvider.php index 4be0f61..718e8ef 100644 --- a/src/app/level2/WebControllerProvider.php +++ b/src/app/level2/WebControllerProvider.php @@ -16,11 +16,29 @@ return $app['twig']->render( 'level2.twig', array( + 'page' => 'home', 'level2' => Level2::getStatus(), 'events' => array_slice( Level2::getEvents( $app ), 0, - 5 + 1 + ) + ) + ); + + }); + + $ctr->get('/events', function() use ( $app ) { + + return $app['twig']->render( + 'level2.twig', + array( + 'page' => 'events', + 'level2' => Level2::getStatus(), + 'events' => array_slice( + Level2::getEvents( $app ), + 0, + 10 ) ) ); diff --git a/src/app/views/base.twig b/src/app/views/base.twig index cecb84c..40b2aff 100644 --- a/src/app/views/base.twig +++ b/src/app/views/base.twig @@ -38,9 +38,8 @@