From 7051f96d9beec19e62dd0dacf5c4036333e9fcba Mon Sep 17 00:00:00 2001 From: janw Date: Fri, 18 Nov 2005 15:22:36 +0000 Subject: [PATCH] All Lists are now scrollable. Verified with Konqueror/Linux, Firefox/Linux, Firefox/Windows, IE/Windows. Need to use hardcoded styles instead of id-based css2-styles (works not with IE). git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1980 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/themes/default/style.css | 757 +++++++++++------- include/class_divlist.inc | 80 +- .../class_applicationManagement.inc | 18 +- .../class_departmentManagement.inc | 12 +- plugins/admin/fai/class_faiManagement.inc | 24 +- .../admin/groups/class_groupManagement.inc | 25 +- .../admin/ogroups/class_ogroupManagement.inc | 24 +- .../admin/systems/class_systemManagement.inc | 19 +- plugins/admin/users/class_userManagement.inc | 22 +- .../blocklists/class_blocklistManagement.inc | 18 +- .../class_phoneConferenceManagment.inc | 36 +- .../macro/class_gofonMacroManagement.inc | 24 +- 12 files changed, 593 insertions(+), 466 deletions(-) diff --git a/html/themes/default/style.css b/html/themes/default/style.css index e6c74988b..e4e46c990 100644 --- a/html/themes/default/style.css +++ b/html/themes/default/style.css @@ -11,386 +11,523 @@ td.listheader { background:#E5E5E5; font-weight:bold; border-right:1px solid #C0C0C0; + border-bottom: 1px solid #b0b0b0; padding:3px; + height:22px; +} + +td.scrollhead { + vertical-align:top; + padding:0px; +} + +td.scrollbody { + vertical-align:top; + padding:0px; +} + +td.listheader#icon { + width:20px; +} + +td.listheader#entry { +} + +td.listheader#property { + width:50px; +} + +td.listheader#info { + width:200px; +} + +td.listheader#properties7 { + width:136px; +} + +td.listheader#8properties { + width:152px; +} + +td.listheader#9properties { + width:168px; +} + +td.listheader#10properties { + width:186px; +} + +td.listheader#actions { + width:52px; + border-right:0px; + text-align:right; +} + +td.listheader#scrollbar { + width:13px; + border-right:0px; } td.list0 { background:#F0F0F0; border-right:1px solid #C0C0C0; padding:3px; + height:22px; +} + +td.list0#icon { + width:20px; + text-align:center; +} + +td.list0#entry { +} + +td.list0#info { + width:200px; +} + +td.list0#property { + width:50px; +} + +td.list0#properties7 { + width:136px; +} + +td.list0#properties8 { + width:152px; +} + +td.list0#properties9 { + width:168px; +} + +td.list0#properties10 { + width:186px; +} + +td.list0#actions { + width:52px; + border-right:0px; + text-align:right; } td.list1 { background:white; border-right:1px solid #C0C0C0; padding:3px; + height:22px; +} + +td.list1#fill { + height:100%; +} + +td.list1#icon { + width:0px; + text-align:center; } -tbody.scrollcontent { - overflow:auto; - overflow:-moz-scrollbars-vertical; - overflow-x:hidden; - height:480px; +td.list1#entry { } -body -{ - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; - margin-bottom: 0px; - background-color: white; - background-image:url("images/border.png"); - background-repeat:repeat-y; - color: #00008F; - font-family:Arial,Helvetica,sans-serif; - font-size: 12px; +td.list1#info { + width:200px; } -h1 { font-size: 14px; color: #00378a;} -h2,h3,h4,h5,h6 { font-size: 13px; color: #00378a;} +td.list1#property { + width:50px; +} + +td.list1#properties7 { + width:136px; +} + +td.list1#properties8 { + width:152px; +} + +td.list1#properties9 { + width:168px; +} -td,p,b {font-size: 12px;} +td.list1#properties10 { + width:186px; +} + +td.list1#actions { + width:52px; + border-right:0px; + text-align:right; +} + +body { + margin-left:0px; + margin-right:0px; + margin-top:0px; + margin-bottom:0px; + background-color:white; + background-image:url("images/border.png"); + background-repeat:repeat-y; + color:#00008F; + font-family:arial,helvetica,sans-serif; + font-size:12px; +} + +h1 { + font-size:14px; + color: #00378a; +} + +h2, h3, h4, h5, h6 { + font-size:13px; + color:#00378a; +} + +td, p, b { + font-size:12px; +} /* Title bar */ a.maintitlebar, div.maintitlebar { - font-family: arial,helvetica,sans-serif; - text-decoration: none; - color: #00348B; - font-size: 12px; + font-family:arial,helvetica,sans-serif; + text-decoration:none; + color:#00348B; + font-size:12px; } -a.maintitlebar:hover{ - text-decoration: none; - background-color: #B0D3A0; +a.maintitlebar:hover { + text-decoration:none; + background-color:#B0D3A0; } p.menuheader { - font-family: arial,helvetica,sans-serif; - color: #00378a; - text-decoration: none; - background-color: #CDF6BD; - font-weight: bold; - font-size: 12px; - text-align: center; - width: 100%; - vertical-align: middle; - padding: 3px; - margin-top: 30px; + font-family:arial,helvetica,sans-serif; + color:#00378a; + text-decoration:none; + background-color:#CDF6BD; + font-weight:bold; + font-size:12px; + text-align:center; + width:100%; + vertical-align:middle; + padding:3px; + margin-top:30px; } p.menuitem { - font-family: arial,helvetica,sans-serif; - color: #00378a; - text-decoration: none; - font-weight: normal; - font-size: 12px; - text-align: left; - padding-left: 15px; - padding-top: 2px; - padding-bottom: 2px; - vertical-align: middle; - margin: 2px; - background-color: #DFFFDF; - padding-right: 5px; + font-family:arial,helvetica,sans-serif; + color:#00378a; + text-decoration:none; + font-weight:normal; + font-size:12px; + text-align:left; + padding-left:15px; + padding-top:2px; + padding-bottom:2px; + vertical-align:middle; + margin:2px; + background-color:#dfffdf; + padding-right:5px; } -p.menuitem:hover{ - background-color:#D2F6C2; +p.menuitem:hover { + background-color:#d2f6c2; } table.menuitem { - width:100%; - margin-top:10px; - margin-bottom:10px; - margin-right:10px; - background-color:#F0F0F0; + width:100%; + margin-top:10px; + margin-bottom:10px; + margin-right:10px; + background-color:#f0f0f0; } -table.menuitem:hover{ - background-color:#C5C5C5; +table.menuitem:hover { + background-color:#c5c5c5; } td.phonelist:hover { - background-color: #D2D2D2; + background-color:#d2d2d2; } -h1.menuheader{ - border-style:solid; - border-color:#707070; - width:100%; - border-top-width:1px; - border-bottom-width:0px; - border-left-width:0px; - border-right-width:0px; - padding-top:10px; - padding-bottom:0px; +h1.menuheader { + border-style:solid; + border-color:#707070; + width:100%; + border-top-width:1px; + border-bottom-width:0px; + border-left-width:0px; + border-right-width:0px; + padding-top:10px; + padding-bottom:0px; } div.copynotice{ - border-style:solid; - border-color:#707070; - width:100%; - border-top-width:1px; - border-bottom-width:0px; - border-left-width:0px; - border-right-width:0px; - padding-top:3px; - padding-bottom:0px; - text-align: right; - font-family:Arial,Helvetica,sans-serif; - font-size: 10px; + border-style:solid; + border-color:#707070; + width:100%; + border-top-width:1px; + border-bottom-width:0px; + border-left-width:0px; + border-right-width:0px; + padding-top:3px; + padding-bottom:0px; + text-align:right; + font-family:arial,helvetica,sans-serif; + font-size:10px; } -a:link{ - text-decoration: none; - color: #00008F; +a:link { + text-decoration:none; + color:#00008f; } -a:visited{ - text-decoration: none; - color: #00008F; +a:visited { + text-decoration:none; + color:#00008f; } -a.menuitem:link{ - text-decoration: none; - color: #00008F; +a.menuitem:link { + text-decoration:none; + color:#00008f; } -a.menuitem:visited{ - text-decoration: none; - color: #00008F; +a.menuitem:visited { + text-decoration:none; + color:#00008f; } -a.menuitem:hover{ - text-decoration: none; +a.menuitem:hover { + text-decoration:none; } -a.iconmenu:link{ - text-decoration: none; - color: #00008F; +a.iconmenu:link { + text-decoration:none; + color:#00008f; } td.iconmenu:hover { - background-color: #E0E0E0; + background-color:#e0e0e0; } -a.iconmenu:visited{ - text-decoration: none; - color: #00008F; +a.iconmenu:visited { + text-decoration:none; + color:#00008f; } -a.iconmenu:hover{ - text-decoration: none; +a.iconmenu:hover { + text-decoration:none; } h1.plugtop{ - border-style:solid; - border-color:#707070; - width:100%; - border-top-width:0px; - border-bottom-width:1px; - border-left-width:0px; - border-right-width:0px; - padding-top:0px; - margin-top:0px; - padding-bottom:6px; - text-align: left; - background-color: red; - font-family:Arial,Helvetica,sans-serif; - font-size: 24px; -} - -div.plugtop{ - border-style:solid; - border-color:#B0B0B0; - width:100%; - border-top-color: #E0E0F0; - border-top-width:6px; - border-bottom-width:1px; - border-left-width:0px; - border-right-width:0px; - padding-top:0px; - padding-bottom:6px; - margin-bottom: 0px; - text-align: left; - vertical-align: middle; - background-color: #E0E0F0; - font-family:Arial,Helvetica,sans-serif; - font-weight: bold; - font-size: 24px; -} - -div.pluginfo{ - border:solid; - border:0px; - width:100%; - padding-top:2px; - padding-bottom:2px; - margin-bottom: 10px; - text-align: right; - vertical-align: middle; - background-color: #C0C0E0; - font-family:Arial,Helvetica,sans-serif; - font-size: 11px; -} - -p.seperator{ - border-style:solid; - border-color:#A0A0A0; - width:100%; - border-top-width:0px; - border-bottom-width:1px; - border-left-width:0px; - border-right-width:0px; - padding-top:0px; - padding-bottom:0px; - margin-top:0px; - margin-bottom:0px; - text-align: left; -} - -p.plugbottom{ - border-style:solid; - border-color:#A0A0A0; - width:100%; - border-top-width:1px; - border-bottom-width:0px; - border-left-width:0px; - border-right-width:0px; - padding-top:10px; - padding-bottom:0px; - text-align: right; - font-family:Arial,Helvetica,sans-serif; + border-style:solid; + border-color:#707070; + width:100%; + border-top-width:0px; + border-bottom-width:1px; + border-left-width:0px; + border-right-width:0px; + padding-top:0px; + margin-top:0px; + padding-bottom:6px; + text-align:left; + background-color:red; + font-family:arial,helvetica,sans-serif; + font-size:24px; +} + +div.plugtop { + border-style:solid; + border-color:#b0b0b0; + width:100%; + border-top-color:#e0e0f0; + border-top-width:6px; + border-bottom-width:1px; + border-left-width:0px; + border-right-width:0px; + padding-top:0px; + padding-bottom:6px; + margin-bottom: 0px; + text-align:left; + vertical-align:middle; + background-color:#e0e0f0; + font-family:arial,helvetica,sans-serif; + font-weight:bold; + font-size:24px; +} + +div.pluginfo { + border:solid; + border:0px; + width:100%; + padding-top:2px; + padding-bottom:2px; + margin-bottom:10px; + text-align:right; + vertical-align:middle; + background-color:#c0c0e0; + font-family:arial,helvetica,sans-serif; + font-size:11px; +} + +p.seperator { + border-style:solid; + border-color:#a0a0a0; + width:100%; + border-top-width:0px; + border-bottom-width:1px; + border-left-width:0px; + border-right-width:0px; + padding-top:0px; + padding-bottom:0px; + margin-top:0px; + margin-bottom:0px; + text-align:left; +} + +p.plugbottom { + border-style:solid; + border-color:#a0a0a0; + width:100%; + border-top-width:1px; + border-bottom-width:0px; + border-left-width:0px; + border-right-width:0px; + padding-top:10px; + padding-bottom:0px; + text-align:right; + font-family:arial,helvetica,sans-serif; } font.must { - color: red; - font-family:Arial,Helvetica,sans-serif; + color:red; + font-family:arial,helvetica,sans-serif; } div.tab_active { - text-align:center; - height:25px; - width:100px; - background-color:#F0F0F0; - border-style:solid; - border-color:black; - border-top-width:1px; - border-bottom-width:0px; - border-left-width:1px; - border-right-width:1px; - margin-top: 0px; - padding-top:1px; + text-align:center; + height:25px; + width:100px; + background-color:#f0f0f0; + border-style:solid; + border-color:black; + border-top-width:1px; + border-bottom-width:0px; + border-left-width:1px; + border-right-width:1px; + margin-top:0px; + padding-top:1px; } div.tab_left { - text-align:center; - height:20px; - width:100px; - background-color:#C0C0C0; - border-style:solid; - border-color:black; - border-top-width:1px; - border-bottom-width:1px; - border-left-width:1px; - border-right-width:0px; - margin-top: 5px; - padding-top:1px; + text-align:center; + height:20px; + width:100px; + background-color:#c0c0c0; + border-style:solid; + border-color:black; + border-top-width:1px; + border-bottom-width:1px; + border-left-width:1px; + border-right-width:0px; + margin-top:5px; + padding-top:1px; } div.tab_right { - text-align:center; - height:20px; - width:100px; - background-color:#C0C0C0; - border-style:solid; - border-color:black; - border-top-width:1px; - border-bottom-width:1px; - border-left-width:0px; - border-right-width:1px; - margin-top: 5px; - padding-top:1px; + text-align:center; + height:20px; + width:100px; + background-color:#c0c0c0; + border-style:solid; + border-color:black; + border-top-width:1px; + border-bottom-width:1px; + border-left-width:0px; + border-right-width:1px; + margin-top:5px; + padding-top:1px; } div.tab_near_active { - text-align:center; - height:20px; - width:100px; - background-color:#C0C0C0; - border-style:solid; - border-color:black; - border-top-width:1px; - border-bottom-width:1px; - border-left-width:1px; - border-right-width:1px; - margin-top: 5px; - padding-top:1px; + text-align:center; + height:20px; + width:100px; + background-color:#c0c0c0; + border-style:solid; + border-color:black; + border-top-width:1px; + border-bottom-width:1px; + border-left-width:1px; + border-right-width:1px; + margin-top:5px; + padding-top:1px; } div.tab_border { - width:100%; - height:20px; - border-style:solid; - border-color:black; - border-top-width:0px; - border-bottom-width:1px; - border-left-width:0px; - border-right-width:0px; + width:100%; + height:20px; + border-style:solid; + border-color:black; + border-top-width:0px; + border-bottom-width:1px; + border-left-width:0px; + border-right-width:0px; } a.tab_active, input.tab_active { - border: 0px; - margin: 0px; - width: 100px; - height: 22px; - font-family: arial,helvetica,sans-serif; - background-color: #F0F0F0; - text-decoration: none; - color: #00348B; - font-size: 13px; - font-weight: bold; + border:0px; + margin:0px; + width:100px; + height:22px; + font-family:arial,helvetica,sans-serif; + background-color:#f0f0f0; + text-decoration:none; + color:#00348B; + font-size:13px; + font-weight:bold; } a.tab_right, input.tab_right { - width: 100px; - height: 20px; - border: 0px; - margin: 0px; - font-family: arial,helvetica,sans-serif; - background-color: #C0C0C0; - text-decoration: none; - color: #00348B; - font-size: 13px; - font-weight: bold; + width:100px; + height:20px; + border:0px; + margin:0px; + font-family:arial,helvetica,sans-serif; + background-color:#c0c0c0; + text-decoration:none; + color:#00348b; + font-size:13px; + font-weight:bold; } a.tab_left, input.tab_left { - width: 100px; - height: 20px; - border: 0px; - margin: 0px; - font-family: arial,helvetica,sans-serif; - background-color: #C0C0C0; - text-decoration: none; - color: #00348B; - font-size: 13px; - font-weight: bold; + width:100px; + height:20px; + border:0px; + margin:0px; + font-family:arial,helvetica,sans-serif; + background-color:#c0c0c0; + text-decoration:none; + color:#00348b; + font-size:13px; + font-weight:bold; } a.tab_near_active, input.tab_near_active { - width: 100px; - height: 20px; - border: 0px; - margin: 0px; - font-family: arial,helvetica,sans-serif; - background-color: #C0C0C0; - text-decoration: none; - color: #00348B; - font-size: 13px; - font-weight: bold; + width:100px; + height:20px; + border:0px; + margin:0px; + font-family:arial,helvetica,sans-serif; + background-color:#c0c0c0; + text-decoration:none; + color:#00348b; + font-size:13px; + font-weight:bold; } @@ -403,8 +540,8 @@ div.gosaLoginSpacer { } table.gosaLoginMask { - background-color:#8B898B; - text-align: center; + background-color:#8b898b; + text-align:center; border:0px; } @@ -424,10 +561,10 @@ div.gosaLoginBack { } p.gosaLoginHeader { - text-align: center; - font-size: 14px; - font-weight: bold; - margin-bottom: 15px; + text-align:center; + font-size:14px; + font-weight:bold; + margin-bottom:15px; } p.gosaLoginWarning { @@ -444,7 +581,7 @@ table.framework { border-spacing:0px; padding:0px; margin:0px; - background-color:#CDF6BD; + background-color:#cdf6bd; vertical-align:top; } @@ -455,77 +592,77 @@ table.maintab { border-spacing:0px; padding:0px; margin:0px; - background-color:#CDF6BD; + background-color:#cdf6bd; vertical-align:top; } input { - font-size: 12px; + font-size:12px; } input:focus { - font-size: 12px; + font-size:12px; } select { - font-size: 12px; + font-size:12px; } textarea { - font-size: 12px; + font-size:12px; } textarea:focus { - font-size: 12px; + font-size:12px; } div.contentboxh { - background-color:#E8E8E8; - border:1px solid #B0B0B0; + background-color:#e8e8e8; + border:1px solid #b0b0b0; border-bottom-width:0px; height:26px; } p.contentboxh { margin:2px; - font-family:Arial,Helvetica,sans-serif; - font-size: 16px; - font-weight: bold; + font-family:arial,helvetica,sans-serif; + font-size:16px; + font-weight:bold; } div.contentboxb { - border:1px solid #B0B0B0; + border:1px solid #b0b0b0; border-top-width:0px; } p.contentboxb { padding-bottom:0px; margin:0px; - border:4px solid #F8F8F8; + border:4px solid #f8f8f8; } a.alphaselect:hover { - text-decoration: none; - background-color: #A0A0A0; - color: white; + text-decoration:none; + background-color:#a0a0a0; + color:white; } table.check { - background-color: #E1E1F1; - color: black; - border:1px dashed #A0A0A0; + background-color:#e1e1f1; + color:black; + border:1px dashed #a0a0a0; width:95%; margin-left:20px; } td.check { - border-right:1px dashed #A0A0A0; + border-right:1px dashed #a0a0a0; } option.select { background-repeat:no-repeat; - background-position: 0px top; + background-position:0px top; border:0; padding-left:20px; padding-bottom:1px; @@ -533,7 +670,7 @@ option.select { } input.menubar{ - text-decoration: none; + text-decoration:none; height:19px; padding:0px; width:100%; diff --git a/include/class_divlist.inc b/include/class_divlist.inc index ef1c137e9..443b8ed2e 100644 --- a/include/class_divlist.inc +++ b/include/class_divlist.inc @@ -49,31 +49,10 @@ class divlist { function DrawList(){ $s_return = ""; - $s_return.= ""; - if($this->i_entriesPerPage==0) { - // TODO: Find a more convenient way to use the same functionality in both - // MSIE and non-MSIE browsers. ATM we need to manually set entriesPerPage to - // a non-zero value, because MSIE won't scroll the tbody properly. - $s_browser = isset($_SERVER['HTTP_USER_AGENT'])?$_SERVER['HTTP_USER_AGENT']:""; - if(is_numeric(strpos($s_browser,'Mozilla')) && - !is_numeric(strpos($s_browser,'MSIE')) && - !is_numeric(strpos($s_browser,'KHTML')) - ){ - $s_return.= "".$this->_generateHeader().""; - // Define an alternate style for IE (not used ATM) - // $s_return.= ""; - $s_return.= "".$this->_generatePage().""; - } else { - // Call ourself with i_entriesPerPage set to a default value - $this->SetEntriesPerPage(20); - $s_return.=$this->_generateHeader(); - $s_return.=$this->_generatePage(); - } - } else { - $s_return.=$this->_generateHeader(); - $s_return.=$this->_generatePage(); - } - //$s_return.= nl2br(htmlentities($this->_generatePage())); + $s_return.= "
"; + + $s_return.= $this->_generateHeader(); + $s_return.=$this->_generatePage(); $s_return.= "
"; @@ -98,31 +77,34 @@ class divlist { function _generateHeader(){ $s_return = ""; - $s_value = ""; $s_key = ""; - + + // Using scrolltable? + if($this->i_entriesPerPage == 0) { + $s_return .= "\n"; + } + $s_return .= "\n"; - $i_count = count($this->a_header[0])-1; foreach($this->a_header[0] as $s_key => $s_value ){ if(!isset($s_value['attach'])){ $s_value['attach'] = ""; } - - if($i_count == 0) { - $s_return .= "\n"; - } else { - $s_return .= "\n"; - } - $i_count--; + + $s_return.= "\n"; } - // Only create additional column if we're using scrollbars - if($this->i_entriesPerPage==0) { - $s_return .= "\n"; + // Attach a 18px-wide column (used as scrollbar space in body-table), + // but do this only if we are really using scrolltables. + if($this->i_entriesPerPage == 0) { + if($this->_numEntries()>20) { + $s_return .= "\n"; + } + $s_return .= "\n
".$s_value['string']."".$s_value['string']."".$s_value['string']."  
"; } - $s_return .= "\n"; + + $s_return .= "\n"; return $s_return; } @@ -135,7 +117,15 @@ class divlist { $s_value = ""; $s_key = ""; $s_return = ""; - + + // We need to construct a "body"-table that is width-of-scrollbar thinner than the "head"-table. I assume 18px as max. + $s_return .= "\n
"; + // Only reduce width if we need a scrollbar (>20 Entries) + if($this->_numEntries()>20) { + $s_return .= ""; + } else { + $s_return .= "
"; + } $i_alternate=0; if(isset($_GET['start'])){ @@ -230,6 +220,7 @@ class divlist { $s_return .= ""; } } else { + // $this->i_entriesPerPage <= 0 // We should display all entries on one page $i = $this->_numEntries(); @@ -271,18 +262,19 @@ class divlist { } } - // if fewer than 22 Entries (list not full), print row to fill empty space - if($this->_numEntries()<22){ + // if fewer than 20 Entries (list not full), print row to fill empty space + if($this->_numEntries()<20){ $fill= ""; for ($i= 1; $i <= $this->cols; $i++){ if ($i == $this->cols){ - $fill.= ""; + $fill.= ""; } else { - $fill.= ""; + $fill.= ""; } } $s_return.="\n$fill"; } + $s_return .= "\n
".range_selector($this->_numentries(),$start,$this->i_entriesPerPage)."
    
"; return $s_return; } } diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc index 22e3947ae..8924f4382 100644 --- a/plugins/admin/applications/class_applicationManagement.inc +++ b/plugins/admin/applications/class_applicationManagement.inc @@ -353,9 +353,9 @@ class applicationManagement extends plugin $divlist = new divlist("applicationtabs"); $divlist->SetHeader(array( - array("string" => ""), - array("string" => _("Application name")." / "._("Department")), - array("string" => _("Actions") ,"attach"=>"style='border:none;width:40px;'") + array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), + array("string" => _("Application name")." / "._("Department"), "attach" => "style=''"), + array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'") )); @@ -376,9 +376,9 @@ class applicationManagement extends plugin } } - $field1 = array("string" => "department","attach"=>"style='width:20px;text-align:center;'"); - $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val)); - $field3 = array("string" => " ","attach"=>"style='width:48px;text-align:left;border:none'"); + $field1 = array("string" => "department", "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); + $field3 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3)); } @@ -391,9 +391,9 @@ class applicationManagement extends plugin }else{ $desc = " - [ ".$val['description'][0]." ]"; } - $field1 = array("string" => sprintf($applimg,$val['dn']),"attach"=>"style='width:20px;align:center;text-align:center;'"); - $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)),"attach"=>$title); - $field3 = array("string" => preg_replace("/%KEY%/", $key, $actions),"attach"=>"style='width:48px;text-align:right;border:none'"); + $field1 = array("string" => sprintf($applimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title); + $field3 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3)); } diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc index 32f1998bd..dbaece848 100644 --- a/plugins/admin/departments/class_departmentManagement.inc +++ b/plugins/admin/departments/class_departmentManagement.inc @@ -297,9 +297,9 @@ class departmentManagement extends plugin $linkopen = "%s"; $divlist->SetHeader(array( - array("string" => " "), - array("string"=>_("Department name")), - array("string" =>_("Actions"), "attach" => "style='border:none;'"))); + array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), + array("string"=>_("Department name"), "attach" => "style=''"), + array("string" =>_("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'"))); foreach($this->departments as $key => $val) { if(!isset($this->config->departments[trim($key)])){ @@ -315,9 +315,9 @@ class departmentManagement extends plugin } $title = $this->config->departments[$key]; - $field0 = array("string" => "department","attach"=>"style='text-align:center;width:20px;'"); - $field1 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style='text-align:left;' title='".$title."'"); - $field2 = array("string" => preg_replace("/%KEY%/", base64_encode($key), $actions),"attach"=>"style='text-align:right;border:none;width:48px;'"); + $field0 = array("string" => "department", "attach" => "style='text-align:center;width:20px;'"); + $field1 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style='' title='".$title."'"); + $field2 = array("string" => preg_replace("/%KEY%/", base64_encode($key), $actions), "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry( array($field0,$field1,$field2)); diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc index 137845a57..3f87f0826 100644 --- a/plugins/admin/fai/class_faiManagement.inc +++ b/plugins/admin/fai/class_faiManagement.inc @@ -471,10 +471,10 @@ class faiManagement extends plugin $divlist->SetSummary(_("This table displays all systems, in the selected tree.")); $divlist->SetHeader(array( - array("string" => " "), - array("string" => _("Name of FAI class")), - array("string" => _("Class type")), - array("string" => _("Actions"), "attach"=>"style='border-right:none;width:40px;'"))); + array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), + array("string" => _("Name of FAI class"), "attach" => "style=''"), + array("string" => _("Class type"), "attach" => "style='width:200px;'"), + array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'"))); $action = ""; @@ -498,10 +498,10 @@ class faiManagement extends plugin $title = $this->config->departments[$key]; - $field0 = array("string" => "department", "attach"=>"style='text-align:center;width:20px;'"); - $field1 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "title='".$title."'"); - $field2 = array("string" => ""); - $field3 = array("string" => "","attach"=>"style='width:48px;text-align:right;border-right:none;'"); + $field0 = array("string" => "department", "attach" => "style='text-align:center;width:20px;'"); + $field1 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style='' title='".$title."'"); + $field2 = array("string" => " ", "attach" => "style='width:200px;'"); + $field3 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry( array($field0,$field1,$field2,$field3)); @@ -577,10 +577,10 @@ class faiManagement extends plugin $desc= ""; } - $field1 = array("string" => $img , "attach" => "style='text-align:center;width=20px;'"); - $field2 = array("string" => preg_replace(array("/%KEY%/","/%NAME%/"),array($key,$value['cn'].$desc),$editlink) , "attach" => ""); - $field3 = array("string" => $info, "attach" => ""); - $field4 = array("string" => preg_replace("/%KEY%/",$key,$action) , "attach"=>"style='width:48px;text-align:right;border:none'"); + $field1 = array("string" => $img , "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => preg_replace(array("/%KEY%/","/%NAME%/"),array($key,$value['cn'].$desc),$editlink) , "attach" => "style=''"); + $field3 = array("string" => $info, "attach" => "style='width:200px;'"); + $field4 = array("string" => preg_replace("/%KEY%/",$key,$action) , "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3,$field4)); } diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc index 2f444c58e..277d1fa79 100644 --- a/plugins/admin/groups/class_groupManagement.inc +++ b/plugins/admin/groups/class_groupManagement.inc @@ -384,13 +384,12 @@ class groupManagement extends plugin $divlist = new divlist("groupstab"); $divlist->SetHeader(array( - array("string" => " "), - array("string" => _("Groupname")." / "._("Department")), - array("string" => _("Properties"), "attach" => "style='width:116px;'"), - array("string" => _("Actions") ,"attach" => "style='border:none'") + array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), + array("string" => _("Groupname")." / "._("Department"), "attach" => "style=''"), + array("string" => _("Properties"), "attach" => "style='width:136px;'"), + array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'") )); - $divlist->SetSummary(_("This table displays all groups, in the selected tree.")); $divlist->SetEntriesPerPage(0); @@ -409,10 +408,10 @@ class groupManagement extends plugin } - $field1 = array("string" => "department","attach"=>"style='text-align:center;width:20px;'"); - $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val)); - $field3 = array("string" => " "); - $field4 = array("string" => " ","attach"=>"style='text-align:right;border:none;width:48px;'"); + $field1 = array("string" => "department", "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); + $field3 = array("string" => " ", "attach" => "style='width:136px;'"); + $field4 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3,$field4)); } @@ -437,10 +436,10 @@ class groupManagement extends plugin }else{ $desc = " - [ ".$val['description'][0]." ]"; } - $field1 = array("string" => sprintf($userimg,$val['dn']),"attach"=>"style='width:20px;text-align:center;'"); - $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)),"attach"=>$title); - $field3 = array("string" => $posix." ".$enviro." ".$mail." ".$samba." ".$appl." ".$phone,"attach"=>"style='text-align:left;width:136px;'"); - $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions),"attach"=>"style='text-align:right;border:none;width:48px;'"); + $field1 = array("string" => sprintf($userimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title); + $field3 = array("string" => $posix." ".$enviro." ".$mail." ".$samba." ".$appl." ".$phone, "attach" => "style='width:136px;'"); + $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3,$field4)); } diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc index c1f4b3f18..971c99c6f 100644 --- a/plugins/admin/ogroups/class_ogroupManagement.inc +++ b/plugins/admin/ogroups/class_ogroupManagement.inc @@ -388,10 +388,10 @@ name='dep_root' alt='"._("Root")."'> ". // List Setup $divlist = new divlist("ogroubstab"); $divlist->SetHeader(array( - array("string" => " "), - array("string" => _("Name of object groups")." / "._("Departments")), - array("string" => _("Properties")), - array("string" => _("Actions")) + array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), + array("string" => _("Name of object groups")." / "._("Departments"), "attach" => "style=''"), + array("string" => _("Properties"), "attach" => "style='width:136px;'"), + array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'") )); @@ -414,10 +414,10 @@ name='dep_root' alt='"._("Root")."'> ". - $field1 = array("string" => ""._("Department")."","attach"=>"style='text-align:center;width:20px;'"); - $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val)); - $field3 = array("string" => " ","attach"=>"style='width:136px;'"); - $field4 = array("string" => " ","attach"=>"style='width:48px;text-align:left;border:none'"); + $field1 = array("string" => ""._("Department")."", "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); + $field3 = array("string" => " ", "attach" => "style='width:136px;'"); + $field4 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3,$field4)); } @@ -438,10 +438,10 @@ name='dep_root' alt='"._("Root")."'> ". }else{ $desc = " - [ ".$val['description'][0]." ]"; } - $field1 = array("string" => ""._("Object group")."","attach"=>"style='text-align:center;width:20px;'"); - $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)),"attach"=>$title); - $field3 = array("string" => $this->convert_list($val)." ".$mail); - $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions),"attach"=>"style='text-align:right;border:none'"); + $field1 = array("string" => ""._("Object group")."", "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title); + $field3 = array("string" => $this->convert_list($val)." ".$mail, "attach" => "style='width:136px;'"); + $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3,$field4)); } diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc index 968df5ed3..6dee85647 100644 --- a/plugins/admin/systems/class_systemManagement.inc +++ b/plugins/admin/systems/class_systemManagement.inc @@ -585,10 +585,9 @@ class systems extends plugin $divlist = new divlist("systemstab"); $divlist->SetHeader(array( - array("string" => " "), - array("string" => _("System")." / "._("Department")), - array("string" => _("Actions"), "attach" => "style='border:none'" ))); - + array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), + array("string" => _("System")." / "._("Department"), "attach" => "style=''"), + array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'" ))); $divlist->SetSummary(_("This table displays all systems, in the selected tree.")); $divlist->SetEntriesPerPage(0); @@ -610,9 +609,9 @@ class systems extends plugin } } - $field1 = array("string" => "department","attach"=>"style='width:20px;text-align:center;'"); - $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val)); - $field3 = array("string" => " ", "attach" => "style='border:none;width:48px;text-align:right;'"); + $field1 = array("string" => "department", "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); + $field3 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3)); } @@ -669,9 +668,9 @@ class systems extends plugin $img=$this->convert_list($val); - $field1 = array("string" => sprintf($img['img'],$val['dn']),"attach"=>"style='width:20px;text-align:center;'"); - $field2 = array("string" => sprintf($editlink,$key,$display),"attach"=>"title='".$val['dn']."'"); - $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action),"attach" => "style='border:none; text-align:right;width:48px'"); + $field1 = array("string" => sprintf($img['img'],$val['dn']), "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='".$val['dn']."'"); + $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action), "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry( array($field1,$field2,$field3)); } diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc index 1b81ca4db..8641ae802 100644 --- a/plugins/admin/users/class_userManagement.inc +++ b/plugins/admin/users/class_userManagement.inc @@ -685,10 +685,10 @@ class userManagement extends plugin $divlist = new divlist("userstab"); $divlist->SetHeader(array( - array("string" => " "), - array("string" => _("Username")." / "._("Department")), - array("string" => _("Properties")), - array("string" => _("Actions"), "attach" => "style='border:none'" ))); + array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), + array("string" => _("Username")." / "._("Department"), "attach" => "style=''"), + array("string" => _("Properties"), "attach" => "style='width:136px;'"), + array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'"))); $divlist->SetSummary(_("This table displays all users, in the selected tree.")); @@ -712,10 +712,10 @@ class userManagement extends plugin } } - $field1 = array("string" => "department","attach"=>"style='width:20px;text-align:center;'"); - $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val)); - $field3 = array("string" => " "); - $field4 = array("string" => " ", "attach" => "style='width:48px;border:none'"); + $field1 = array("string" => "department", "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); + $field3 = array("string" => " ", "attach" => "style='width:136px;'"); + $field4 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3,$field4)); @@ -865,10 +865,10 @@ class userManagement extends plugin } /* Create each field */ - $field1 = array("string" => sprintf($tpl,$val['dn']),"attach"=>"style='width:20px;text-align:center;'"); - $field2 = array("string" => sprintf($editlink,$key,$display).$ip_port,"attach"=>"title='".$val['dn']."'"); + $field1 = array("string" => sprintf($tpl,$val['dn']), "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($editlink,$key,$display).$ip_port, "attach" => "style='' title='".$val['dn']."'"); $field3 = array("string" => $usrimg2." ".$posix." ".$enviro." ".$maila." ".$fonac." ".$faxac." ".$samba." ".$s_img_create_from_template, "attach" => "style='width:136px;'"); - $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action),"attach" => "style='border:none;text-align:right;width:48px'"); + $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action),"attach" => "style='width:52px;border-right:0px;text-align:right;'"); $add = array($field1,$field2,$field3,$field4); diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc index c36d32a3a..b154c6807 100644 --- a/plugins/gofax/blocklists/class_blocklistManagement.inc +++ b/plugins/gofax/blocklists/class_blocklistManagement.inc @@ -306,9 +306,9 @@ class blocklist extends plugin $divlist = new divlist("faxtabs"); $divlist->SetHeader(array( - array("string" => " "), - array("string" => _("Blocklist name")." / "._("Department")), - array("string" => _("Actions"), "attach" => "style='border:none'" ))); + array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), + array("string" => _("Blocklist name")." / "._("Department"), "attach" => "style=''"), + array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'" ))); $divlist->SetSummary(_("This table displays faxblocklists for the selected tree.")); @@ -329,9 +329,9 @@ class blocklist extends plugin } } - $field1 = array("string" => "department","attach"=>"style='text-align:center;width:20px;'"); - $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val)); - $field3 = array("string" => " ", "attach" => "style='border:none;width:48px;'"); + $field1 = array("string" => "department", "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); + $field3 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3)); } @@ -342,9 +342,9 @@ class blocklist extends plugin foreach($this->blocklists as $key => $val){ // Generate Array to Add $display= "[".$val["cn"][0]."]"; - $field1 = array("string" => sprintf($blockimg,$val['dn']),"attach"=>"style='width:20px;text-align:center;'"); - $field2 = array("string" => sprintf($editlink,$key,$display),"attach"=>"title='".$val['dn']."'"); - $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action),"attach" => "style='border:none; text-align:right;width:48px'"); + $field1 = array("string" => sprintf($blockimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='".$val['dn']."'"); + $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry( array($field1,$field2,$field3)); } diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc index 8e61a5e13..3e5814a84 100644 --- a/plugins/gofon/conference/class_phoneConferenceManagment.inc +++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc @@ -311,11 +311,11 @@ class phoneConferenceManagment extends plugin $divlist->SetSummary(_("This table displays all available conference rooms.")); $divlist->SetEntriesPerPage(0); $divlist->SetHeader(array( - array("string" => " "), - array("string" =>_("Name - Number")), - array("string" => _("Owner")), - array("string" => _("PIN")), - array("string" =>_("Actions"), "attach" => "style='text-align:left;border:none'"))); + array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), + array("string" =>_("Name - Number"), "attach" => "style=''"), + array("string" => _("Owner"), "attach" => "style='width:200px;'"), + array("string" => _("PIN"), "attach" => "style='width:50px;'"), + array("string" =>_("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'"))); /* Insert departments in divlist*/ foreach($this->departments as $key=> $val){ @@ -332,11 +332,11 @@ class phoneConferenceManagment extends plugin } /* Prepare and insert fields*/ - $a_field1 = array("string" => "department","attach"=>"style='text-align:center;width:20px;'"); - $a_field2 = array("string" => sprintf($linkopen,base64_encode($key),$val)); - $a_field3 = array("string" => " "); - $a_field4 = array("string" => " "); - $a_field5 = array("string" => " ", "attach" => "style='text-align:right;border:none;width:48px;'"); + $a_field1 = array("string" => "department", "attach" => "style='text-align:center;width:20px;'"); + $a_field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); + $a_field3 = array("string" => " ", "attach" => "style='width:200px;'"); + $a_field4 = array("string" => " ", "attach" => "style='width:50px;'"); + $a_field5 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); /* Add entries */ $divlist->AddEntry(array($a_field1,$a_field2,$a_field3,$a_field4,$a_field5)); @@ -368,25 +368,25 @@ class phoneConferenceManagment extends plugin $data = $ldap->fetch($ldap->cat($conference['goFonConferenceOwner'][0])); $cn = $data['cn'][0]; - $a_field1 = array("string"=>sprintf($userimg,_("Conference")),"attach"=>"style='text-align:center;width:20px;'"); + $a_field1 = array("string"=>sprintf($userimg,_("Conference")), "attach" => "style='text-align:center;width:20px;'"); $acl= get_permissions ($conference['dn'], $this->ui->subtreeACL); $this->acl = get_module_permission($acl, "goFonConference", $conference['dn']); if(($this->ui->dn==$conference['goFonConferenceOwner'][0])&&(chkacl($this->acl,"goFonConferenceOwner")=="")){ - $a_field2 = array("string"=>sprintf($editlink,$conferencekey,$conference['cn'][0].$number)); + $a_field2 = array("string"=>sprintf($editlink,$conferencekey,$conference['cn'][0].$number), "attach" => "style=''"); }else{ - $a_field2 = array("string"=>$conference['cn'][0].$number); + $a_field2 = array("string"=>$conference['cn'][0].$number, "attach" => "style=''"); } - $a_field3 = array("string"=> $cn); - $a_field4 = array("string"=> $pin); + $a_field3 = array("string"=> $cn, "attach" => "style='width:200px;'"); + $a_field4 = array("string"=> $pin, "attach" => "style='width:50px;'"); if(($this->ui->dn==$conference['goFonConferenceOwner'][0])&&(chkacl($this->acl,"goFonConferenceOwner")=="")){ - $a_field5 = array("string"=>preg_replace("/%KEY%/",$conferencekey,$actions), "attach" => "style='text-align: right;border:none'"); + $a_field5 = array("string"=>preg_replace("/%KEY%/",$conferencekey,$actions), "attach" => "style='width:52px;border-right:0px;text-align:right;'"); }elseif(chkacl($this->acl,"goFonConferenceOwner")==""){ - $a_field5 = array("string"=>preg_replace("/%KEY%/",$conferencekey,$actions2), "attach" => "style='text-align: right;border:none'"); + $a_field5 = array("string"=>preg_replace("/%KEY%/",$conferencekey,$actions2), "attach" => "style='width:52px;border-right:0px;text-align:right;'"); }else{ - $a_field5 = array("string"=>" ", "attach" => "style='text-align:right;border:none;width:48px;'"); + $a_field5 = array("string"=>" ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); } $divlist->AddEntry(array($a_field1,$a_field2,$a_field3,$a_field4,$a_field5)); diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc index 233529168..b0a3713fb 100755 --- a/plugins/gofon/macro/class_gofonMacroManagement.inc +++ b/plugins/gofon/macro/class_gofonMacroManagement.inc @@ -341,10 +341,10 @@ class gofonMacro extends plugin $divlist = new divlist("macrotabs"); $divlist->SetHeader(array( - array("string" => " "), - array("string" => _("Username")." / "._("Department")), - array("string" => _("Visible"), "attach" => "style='width:30px;'"), - array("string" => _("Actions"), "attach" => "style='border:none'" ))); + array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), + array("string" => _("Username")." / "._("Department"), "attach" => "style=''"), + array("string" => _("Visible"), "attach" => "style='width:50px;'"), + array("string" => _("Actions"), "attach" => "style='width:52px;border-right:0px;text-align:right;'" ))); $divlist->SetSummary(_("This table displays all phone macros, in the selected tree.")); @@ -367,10 +367,10 @@ class gofonMacro extends plugin } } - $field1 = array("string" => "department","attach"=>"style='text-align:center;width:20px;'"); - $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val)); - $field3 = array("string" => " "); - $field4 = array("string" => " ", "attach"=>"style='border:none;text-align:right;width:48px;'"); + $field1 = array("string" => "department", "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); + $field3 = array("string" => " ", "attach" => "style='width:50px;'"); + $field4 = array("string" => " ", "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3,$field4)); } @@ -397,10 +397,10 @@ class gofonMacro extends plugin $pic1 = $invisible; } - $field1 = array("string" => sprintf($macroimg,$val['dn']),"attach"=>"style='width:20px;text-align:center;'"); - $field2 = array("string" => sprintf($editlink,$key,$display),"attach"=>"title='".$val['dn']."'"); - $field3 = array("string" => $pic1, "attach" => "style='width:20px;text-align:right;'"); - $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action),"attach" => "style='border:none;text-align:right;width:48px;'"); + $field1 = array("string" => sprintf($macroimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='".$val['dn']."'"); + $field3 = array("string" => $pic1, "attach" => "style='width:50px;'"); + $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:52px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3,$field4)); } -- 2.30.2