extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-20 09:58:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fixed horizontal alignment of all box-types

Browse Source 
- allow to re-enable (by default) disabled cells, via setting the value for their name in $readonlys to false
- class attribute can be a reference into the content (@) and/or contain vars like $row or $col
This commit is contained in:
Ralf Becker 2005-04-27 20:53:17 +00:00
parent 0476bb0032
commit 3de0d563ca
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etemplate/inc/class.uietemplate.inc.php
View File

@ -618,7 +618,8 @@
if ($cell['name'][0] == '@' && $cell['type'] != 'template') if ($cell['name'][0] == '@' && $cell['type'] != 'template')
{ {
$cell['name'] = $this->get_array($content,substr($cell['name'],1)); $cell['name'] = $this->get_array($content,$this->expand_name(substr($cell['name'],1),
$show_c,$show_row,$content['.c'],$content['.row'],$content));
} }
$name = $this->expand_name($cell['name'],$show_c,$show_row,$content['.c'],$content['.row'],$content); $name = $this->expand_name($cell['name'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
@ -630,7 +631,7 @@
{ {
$options .= ' READONLY'; $options .= ' READONLY';
} }
if ($cell['disabled'] || $readonly && $cell['type'] == 'button' && !strstr($cell['size'],',')) if ($cell['disabled'] && $readonlys[$name] !== false || $readonly && $cell['type'] == 'button' && !strstr($cell['size'],','))
{ {
if ($this->rows == 1) { if ($this->rows == 1) {
return ''; // if only one row omit cell return ''; // if only one row omit cell
@ -650,6 +651,14 @@
$this->set_array($content,$name,$value); $this->set_array($content,$name,$value);
} }
list(,$class) = explode(',',$cell['span']); // might be set by extension list(,$class) = explode(',',$cell['span']); // might be set by extension
if (strchr($class,'$'))
{
$class = $this->expand_name($class,$show_c,$show_row,$content['.c'],$content['.row'],$content);
}
if ($class[0] == '@')
{
$class = $this->get_array($content,substr($class,1));
}
$cell_options = $cell['size']; $cell_options = $cell['size'];
if (strchr($cell_options,'$')) if (strchr($cell_options,'$'))
@ -1112,6 +1121,7 @@
if ($cell[$n]['align']) if ($cell[$n]['align'])
{ {
$rows[$box_row]['.'.$box_col] = $this->html->formatOptions($cell[$n]['align'],'ALIGN'); $rows[$box_row]['.'.$box_col] = $this->html->formatOptions($cell[$n]['align'],'ALIGN');
$sub_cell_has_align = true;
} }
$class = $this->expand_name(isset($this->class_conf[$cl]) ? $this->class_conf[$cl] : $cl, $class = $this->expand_name(isset($this->class_conf[$cl]) ? $this->class_conf[$cl] : $cl,
$show_c,$show_row,$content['.c'],$content['.row'],$content); $show_c,$show_row,$content['.c'],$content['.row'],$content);
@ -1122,7 +1132,7 @@
{ {
$html = $this->html->table($rows,$this->html->formatOptions($cell_options,',,CELLPADDING,CELLSPACING'). $html = $this->html->table($rows,$this->html->formatOptions($cell_options,',,CELLPADDING,CELLSPACING').
$this->html->formatOptions($cell['span'],',CLASS'). $this->html->formatOptions($cell['span'],',CLASS').
($cell['align'] && $orient != 'horizontal' ? ' WIDTH="100%"' : '')); // alignment only works if table has full width ($cell['align'] && $orient != 'horizontal' || $sub_cell_has_align ? ' WIDTH="100%"' : '')); // alignment only works if table has full width
} }
// use a div to not loose the css class // use a div to not loose the css class
elseif ($class && $orient) elseif ($class && $orient)