From f8d998e66f298fc7ff01dec4565dcf6f2f502945 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 8 Nov 2007 09:00:33 +0000 Subject: [PATCH] Added styles from currently used list. git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-playground@7751 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa.conf | 2 +- include/class_ObjectList.inc | 104 +++++++++++++++------------ include/class_ObjectListViewport.inc | 15 ++-- test.php | 82 +++++++++++++++++++-- 4 files changed, 139 insertions(+), 64 deletions(-) diff --git a/gosa.conf b/gosa.conf index e30c923c2..ca705aa79 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|{100px:R}Actions|" +headline= "|{18px}|{:L}Name|{160px:R}Actions|" footer= "Statistics with no information currently" entryFormat= "|{_icon}|{cn} ({_filter(uppercase,{cn})})|{_actions}|" diff --git a/include/class_ObjectList.inc b/include/class_ObjectList.inc index 4763933b3..f9f7dd3bd 100644 --- a/include/class_ObjectList.inc +++ b/include/class_ObjectList.inc @@ -68,282 +68,292 @@ class ObjectList implements IteratorAggregate { defined filter modules. Handles sorting, too. */ private function load(){ -# Crap filling + + $icon = +' '. +' '. +' '. +' '. +' '. +' '. +''; + + # Crap filling $this->objects= array( array("dn" => "cn=1aherbertskiste,ou=workstations,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "1aherbertskiste", "_icon" => "select_workstation.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=72:9c:13:e9:72:2b,ou=incoming,o=Landeshauptstadt München,c=de", "cn" => "72:9c:13:e9:72:2b", "_icon" => "select_newsystem.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=8f:9c:d0:d5:42:c0,ou=incoming,o=Landeshauptstadt München,c=de", "cn" => "8f:9c:d0:d5:42:c0", "_icon" => "select_newsystem.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=a.b_c,ou=printers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "a.b_c", "_icon" => "select_printer.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=a5:35:77:86:ff:ca,ou=workstations,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "a5:35:77:86:ff:ca", "_icon" => "select_workstation.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=cl1--141,ou=workstations,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "cl1--141", "_icon" => "select_workstation.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=d9:57:9d:08:2c:65,ou=incoming,o=Landeshauptstadt München,c=de", "cn" => "d9:57:9d:08:2c:65", "_icon" => "select_newsystem.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=dyn-111,ou=servers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "dyn-111", "_icon" => "select_server.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=e3:b4:43:51:f6:13,ou=incoming,o=Landeshauptstadt München,c=de", "cn" => "e3:b4:43:51:f6:13", "_icon" => "select_newsystem.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=f2:d7:ef:92:e6:43,ou=incoming,o=Landeshauptstadt München,c=de", "cn" => "f2:d7:ef:92:e6:43", "_icon" => "select_newsystem.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=f9:fa:4e:f8:1a:40,ou=incoming,o=Landeshauptstadt München,c=de", "cn" => "f9:fa:4e:f8:1a:40", "_icon" => "select_newsystem.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=hu_ber-test.gonicus.de,ou=printers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "hu_ber-test.gonicus.de", "_icon" => "select_printer.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=loghost-01,ou=servers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "loghost-01", "_icon" => "select_server.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=ntp.jp.,ou=servers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "ntp.jp.", "_icon" => "select_server.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=phone-1.gonicus.de.,ou=phones,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "phone-1.gonicus.de.", "_icon" => "select_phone.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=printer.222,ou=printers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "printer.222", "_icon" => "select_printer.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=printer,ou=printers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "printer", "_icon" => "select_printer.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=shares.jp.,ou=servers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "shares.jp. [Share server]", "_icon" => "select_server.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=terminal.jp.,ou=servers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "terminal.jp.", "_icon" => "select_server.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=test.test.etst,ou=printers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "test.test.etst", "_icon" => "select_printer.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=tester,ou=printers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "tester", "_icon" => "select_printer.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=vserver-04.intranet.gonicus.de,ou=servers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "vserver-04.", "_icon" => "select_server.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=workstation,ou=workstations,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "workstation", "_icon" => "select_workstation.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=1aherbertskiste,ou=workstations,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "1aherbertskiste", "_icon" => "select_workstation.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=72:9c:13:e9:72:2b,ou=incoming,o=Landeshauptstadt München,c=de", "cn" => "72:9c:13:e9:72:2b", "_icon" => "select_newsystem.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=8f:9c:d0:d5:42:c0,ou=incoming,o=Landeshauptstadt München,c=de", "cn" => "8f:9c:d0:d5:42:c0", "_icon" => "select_newsystem.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=a.b_c,ou=printers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "a.b_c", "_icon" => "select_printer.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=a5:35:77:86:ff:ca,ou=workstations,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "a5:35:77:86:ff:ca", "_icon" => "select_workstation.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=cl1--141,ou=workstations,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "cl1--141", "_icon" => "select_workstation.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=d9:57:9d:08:2c:65,ou=incoming,o=Landeshauptstadt München,c=de", "cn" => "d9:57:9d:08:2c:65", "_icon" => "select_newsystem.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=dyn-111,ou=servers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "dyn-111", "_icon" => "select_server.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=e3:b4:43:51:f6:13,ou=incoming,o=Landeshauptstadt München,c=de", "cn" => "e3:b4:43:51:f6:13", "_icon" => "select_newsystem.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=f2:d7:ef:92:e6:43,ou=incoming,o=Landeshauptstadt München,c=de", "cn" => "f2:d7:ef:92:e6:43", "_icon" => "select_newsystem.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=f9:fa:4e:f8:1a:40,ou=incoming,o=Landeshauptstadt München,c=de", "cn" => "f9:fa:4e:f8:1a:40", "_icon" => "select_newsystem.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=hu_ber-test.gonicus.de,ou=printers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "hu_ber-test.gonicus.de", "_icon" => "select_printer.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=loghost-01,ou=servers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "loghost-01", "_icon" => "select_server.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=ntp.jp.,ou=servers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "ntp.jp.", "_icon" => "select_server.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=phone-1.gonicus.de.,ou=phones,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "phone-1.gonicus.de.", "_icon" => "select_phone.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=printer.222,ou=printers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "printer.222", "_icon" => "select_printer.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=printer,ou=printers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "printer", "_icon" => "select_printer.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=shares.jp.,ou=servers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "shares.jp. [Share server]", "_icon" => "select_server.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=terminal.jp.,ou=servers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "terminal.jp.", "_icon" => "select_server.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=test.test.etst,ou=printers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "test.test.etst", "_icon" => "select_printer.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=tester,ou=printers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "tester", "_icon" => "select_printer.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=vserver-04.intranet.gonicus.de,ou=servers,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "vsernicus.de", "_icon" => "select_server.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')), array("dn" => "cn=workstation,ou=workstations,ou=systems,o=Landeshauptstadt München,c=de", "cn" => "workstation", "_icon" => "select_workstation.png", - "_actions" => "CPSREDX", + "_actions" => $icon, "objectClass" => array('gotoWorkstation')) ); diff --git a/include/class_ObjectListViewport.inc b/include/class_ObjectListViewport.inc index 3d55843e4..693e424c1 100644 --- a/include/class_ObjectListViewport.inc +++ b/include/class_ObjectListViewport.inc @@ -92,9 +92,9 @@ class ObjectListViewport { $buffer ="\n"; $buffer.="\n"; foreach($this->headline as $key => $value){ - $buffer .= "\n"; + $buffer .= "\n"; } - $buffer.=""; + $buffer.=""; $buffer.="\n"; $buffer.="
".$value['name']."".$value['name']."  
\n"; return $buffer; @@ -160,18 +160,11 @@ class ObjectListViewport { $buffer="\n"; foreach($tmp as $key => $value){ - - if(1 || empty($this->headline[$key]['width']) || preg_match("/\%/",$this->headline[$key]['width'])){ $buffer .= "". - "
". + "
". $value. "
". "\n"; - }else{ - $buffer .= "". - $value. - "\n"; - } } $buffer.="\n"; @@ -294,7 +287,7 @@ class ObjectListViewport { /* Get width */ $s_width = preg_replace("/^([^:]*).*$/","\\1",$s_format); if(!empty($s_width)){ - $s_style = "width: ".$s_width.";"; + $s_style.= "width: ".$s_width.";"; } } $cell_formats[$key] = array("name" => $s_name, "width" => $s_width, "alignment" => $s_alignment,"style" => $s_style); diff --git a/test.php b/test.php index 9979820e6..070e26ade 100644 --- a/test.php +++ b/test.php @@ -62,9 +62,81 @@ height:100px; } .ObjectListViewport_Entry_Cell { - border-left: solid 1px; - font-size:10px; - height:12px; + background-color: white; + background-image: none; + background-repeat: repeat; + background-attachment: scroll; + -x-background-x-position: 0%; + -x-background-y-position: 0%; + -moz-background-clip: -moz-initial; + -moz-background-origin: -moz-initial; + -moz-background-inline-policy: -moz-initial; + border-right-width: 1px; + border-right-style: solid; + border-right-color: rgb(192, 192, 192); + padding-top: 3px; + padding-right-value: 3px; + padding-bottom: 3px; + padding-left-value: 3px; + padding-left-ltr-source: physical; + padding-left-rtl-source: physical; + padding-right-ltr-source: physical; + padding-right-rtl-source: physical; + height: 22px; +} + +.ObjectListViewport_Footer_Cell { + + background-color: rgb(240, 240, 240); + background-image: none; + background-repeat: repeat; + background-attachment: scroll; + -x-background-x-position: 0%; + -x-background-y-position: 0%; + -moz-background-clip: -moz-initial; + -moz-background-origin: -moz-initial; + -moz-background-inline-policy: -moz-initial; + font-weight: bold; + border-top-width: 1px; + border-top-style: solid; + border-top-color: rgb(170, 170, 170); + padding-top: 3px; + padding-right-value: 3px; + padding-bottom: 3px; + padding-left-value: 3px; + padding-left-ltr-source: physical; + padding-left-rtl-source: physical; + padding-right-ltr-source: physical; + padding-right-rtl-source: physical; + height: 22px; +} + +.ObjectListViewport_Header_Cell { + background-color: rgb(240, 240, 240); + background-image: none; + background-repeat: repeat; + background-attachment: scroll; + -x-background-x-position: 0%; + -x-background-y-position: 0%; + -moz-background-clip: -moz-initial; + -moz-background-origin: -moz-initial; + -moz-background-inline-policy: -moz-initial; + font-weight: bold; + border-right-width: 1px; + border-right-style: solid; + border-right-color: rgb(170, 170, 170); + border-bottom-width: 1px; + border-bottom-style: solid; + border-bottom-color: rgb(170, 170, 170); + padding-top: 3px; + padding-right-value: 3px; + padding-bottom: 3px; + padding-left-value: 3px; + padding-left-ltr-source: physical; + padding-left-rtl-source: physical; + padding-right-ltr-source: physical; + padding-right-rtl-source: physical; + height: 22px; } @@ -168,8 +240,8 @@ $a5 = shell_exec("./test"); $a6 = shell_exec("./test"); ?> - +
-- 2.30.2