From 9b648a7b3c1e89f3b9fc4fcd4e24138c5ae809f4 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 7 Nov 2007 07:08:09 +0000 Subject: [PATCH] Some changes git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-playground@7740 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa.conf | 2 +- include/class_ObjectListViewport.inc | 20 ++++++++++++++++---- test.php | 16 +++++++++++++++- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/gosa.conf b/gosa.conf index 7833c6644..e30c923c2 100644 --- a/gosa.conf +++ b/gosa.conf @@ -119,6 +119,6 @@ kiosk-path = "/var/spool/kiosk" ppd-path = "/var/spool/ppds" [plugin/sample] -headline= "|{18px}|{:L}Name|{64px:R}Actions|" +headline= "|{18px}|{:L}Name|{100px:R}Actions|" footer= "Statistics with no information currently" entryFormat= "|{_icon}|{cn} ({_filter(uppercase,{cn})})|{_actions}|" diff --git a/include/class_ObjectListViewport.inc b/include/class_ObjectListViewport.inc index 970d1aa0e..7d51f7b8b 100644 --- a/include/class_ObjectListViewport.inc +++ b/include/class_ObjectListViewport.inc @@ -89,6 +89,7 @@ class ObjectListViewport { foreach($this->headline as $key => $value){ $buffer .= "".$value['name']."\n"; } + $buffer.=" "; $buffer.="\n"; $buffer.="\n"; return $buffer; @@ -154,7 +155,18 @@ class ObjectListViewport { $buffer="\n"; foreach($tmp as $key => $value){ - $buffer .= "".$value."\n"; + + if(empty($this->headline[$key]['width']) || preg_match("/\%/",$this->headline[$key]['width'])){ + $buffer .= "". + "
". + $value. + "
". + "\n"; + }else{ + $buffer .= "". + $value. + "\n"; + } } $buffer.="\n"; @@ -188,13 +200,13 @@ class ObjectListViewport { /* Apply current filter */ $objects= new ObjectListFilterIterator($this->objects->getIterator()); - $buffer.="
+ $buffer.="
\n"; foreach ($objects as $value){ - $buffer.= $this->renderEntry($value); + $buffer.= "
";//$this->renderEntry($value); } $buffer.="
- \n"; +
\n"; /* Generate footer */ $buffer.= $this->renderFooter(); diff --git a/test.php b/test.php index 139329695..c3ff99321 100644 --- a/test.php +++ b/test.php @@ -31,12 +31,26 @@ border: 1px solid #000000; } + -
+ +
+ + + + + +
+
-- 2.30.2