From 8ba0ced1911cc1a824088a28a4008cf647de9f41 Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 29 May 2013 21:09:14 +1000 Subject: [PATCH] Added scrollable and boolean label status --- classes/lnApp/Block.php | 9 ++++- media/theme/baseadmin/css/custom.css | 38 +++++++++++++++++++ .../baseadmin/{status.php => label/bool.php} | 2 +- 3 files changed, 46 insertions(+), 3 deletions(-) rename views/theme/baseadmin/{status.php => label/bool.php} (63%) diff --git a/classes/lnApp/Block.php b/classes/lnApp/Block.php index 55c4670..b6321e2 100644 --- a/classes/lnApp/Block.php +++ b/classes/lnApp/Block.php @@ -16,7 +16,7 @@ abstract class lnApp_Block extends HTMLRender { protected static $_data = array(); protected static $_spacer = ''; protected static $_c = 0; - protected $_items = array('body','span','title','title_icon','type'); + protected $_items = array('body','scrollable','span','title','title_icon','type'); protected static $_required_keys = array('body'); @@ -50,7 +50,7 @@ abstract class lnApp_Block extends HTMLRender { $record = static::$_data[$this->_x]; $output = ''; - $output .= sprintf('
',empty($record['span']) ? '12' : $record['span']); + $output .= sprintf('
',empty($record['span']) ? '12' : $record['span'],empty($record['scrollable']) ? '' : 'scrollable'); $output .= '
'; if (! empty($record['title'])) @@ -60,6 +60,11 @@ abstract class lnApp_Block extends HTMLRender { if (! empty($record['type'])) switch ($record['type']) { + case 'form': $output .= Form::open(); + $output .= (string)$record['body']; + $output .= Form::close(); + break; + case 'form-horizontal': $output .= Form::open(NULL,array('class'=>'form-horizontal')); $output .= (string)$record['body']; $output .= Form::close(); diff --git a/media/theme/baseadmin/css/custom.css b/media/theme/baseadmin/css/custom.css index 0624d63..d5f21cd 100644 --- a/media/theme/baseadmin/css/custom.css +++ b/media/theme/baseadmin/css/custom.css @@ -11,3 +11,41 @@ .pull-right > .dropdown-menu { right: auto; } + +.subnavbar .subnavbar-inner { + height: 50px; +} + +.subnavbar .mainnav { + height: 50px; +} + +.subnavbar .mainnav > li { + min-width: 50px; + height: 50px; +} + +.subnavbar .mainnav > li > a:hover { + background-color: #f90; + color: #fff; +} + +.subnavbar .mainnav > li > a { + color: #a7a7a7; +} + +.subnavbar .mainnav > li > a > i { + height: 12px; + margin-top: 5px; + margin-bottom: 1px; + font-size: 18px; +} + +.scrollable { + max-height: 600px; + overflow: auto; +} + +legend+.control-group { + margin-top: 0px; +} diff --git a/views/theme/baseadmin/status.php b/views/theme/baseadmin/label/bool.php similarity index 63% rename from views/theme/baseadmin/status.php rename to views/theme/baseadmin/label/bool.php index 2ba2b3e..2ed34cc 100644 --- a/views/theme/baseadmin/status.php +++ b/views/theme/baseadmin/label/bool.php @@ -1 +1 @@ - +