From f6d1df32773aaedeb54b7b3f30d79c8df044e90a Mon Sep 17 00:00:00 2001 From: Tezza Date: Mon, 23 Feb 2015 13:42:38 +0100 Subject: [PATCH] more sample data, more work on the css --- src/app/level2/Level2.php | 6 ++-- src/app/level2/WebControllerProvider.php | 2 +- src/app/views/base.twig | 22 +++++++----- src/app/views/level2.twig | 34 ++++++++++++++++-- src/web/css/level2.css | 44 ++++++++++++++++-------- 5 files changed, 81 insertions(+), 27 deletions(-) diff --git a/src/app/level2/Level2.php b/src/app/level2/Level2.php index 9623463..380a27a 100644 --- a/src/app/level2/Level2.php +++ b/src/app/level2/Level2.php @@ -13,8 +13,10 @@ true ); - $Level2[ 'open' ] = $spaceAPI[ 'state' ][ 'open' ]; - $Level2[ 'people' ] = $spaceAPI[ 'sensors' ][ 'people_now_present' ][ 0 ][ 'value' ]; + $Level2[ 'open' ] = $spaceAPI[ 'state' ][ 'open' ]; + $Level2[ 'people' ] = $spaceAPI[ 'sensors' ][ 'people_now_present' ][ 0 ][ 'value' ]; + $Level2[ 'address' ] = $spaceAPI[ 'location' ][ 'address' ]; + $Level2[ 'phone' ] = $spaceAPI[ 'contact' ][ 'phone' ]; return $Level2; diff --git a/src/app/level2/WebControllerProvider.php b/src/app/level2/WebControllerProvider.php index 0e0b56e..ea6b649 100644 --- a/src/app/level2/WebControllerProvider.php +++ b/src/app/level2/WebControllerProvider.php @@ -16,7 +16,7 @@ return $app['twig']->render( 'level2.twig', array( - 'level2State' => Level2::getStatus() + 'level2' => Level2::getStatus() ) ); diff --git a/src/app/views/base.twig b/src/app/views/base.twig index 39cecec..bf7f968 100644 --- a/src/app/views/base.twig +++ b/src/app/views/base.twig @@ -43,8 +43,8 @@
  • Contact