openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit efdfda9525c168c4948fc9c70c98fec0eb2c8a15
parent 7f3b4683468cd0dd67b9963d0f5cb5d376b3faef
Author: dankert <devnull@localhost>
Date:   Tue, 12 Jan 2010 00:00:30 +0100

Anzeige der Konfiguration: HTML-Titel und intelligentes Kürzen.

Diffstat:
serviceClasses/AdministrationTree.class.php | 35+++++++++++++++++++----------------
themes/default/include/elements.ini.php | 2+-
themes/default/include/html/text.inc.php | 2+-
themes/default/templates/tree/show.tpl.src.php | 4++--
4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/serviceClasses/AdministrationTree.class.php b/serviceClasses/AdministrationTree.class.php @@ -350,28 +350,31 @@ class AdministrationTree extends AbstractTree } else { - if ( is_bool($value)) - $value = $value ? lang('IS_YES') : lang('IS_NO'); - elseif ( is_numeric($value)) - $value = ($value>0?'':'').$value; + if ( $value=='' ) + // Anzeige 'Leer' + $value = lang('EMPTY'); + elseif ( $value=='0' ) + // Anzeige 'Nein' + $value = $value.' ('.lang('IS_NO').')'; + elseif ( $value=='1' ) + // Anzeige 'Ja' + $value = '+'.$value.' ('.lang('IS_YES').')'; + elseif ( is_numeric($value) ) + // Anzeige numerische Werte + $value = ($value>0?'+':'').$value; else - $value = $conf['html']['speech_open'].htmlentities(Text::maxLength($value,30)).$conf['html']['speech_close']; + // Anzeige von Zeichenketten + $value = $value; $this->confCache[crc32($key)] = $value; - $treeElement = new TreeElement(); + if ( strpos($key,'pass') !== FALSE ) + $value = '***'; // Kennwörter nicht anzeigen - $treeElement->text = $key.'='; - if ( $key != 'password') - $treeElement->text .= $value; - else - $treeElement->text .= '*'; - + $treeElement = new TreeElement(); + $treeElement->text = $key.': '.$value; $treeElement->icon = 'config_property'; - -// if ( $key != 'password') -// $treeElement->description = $value; - $treeElement->description = lang('SETTING').' '.$key; + $treeElement->description = lang('SETTING')." '".$key."'".(!empty($value)?': '.$value:''); $this->addTreeElement( $treeElement ); } diff --git a/themes/default/include/elements.ini.php b/themes/default/include/elements.ini.php @@ -37,7 +37,7 @@ selectbox= list:*,name:*,default,onchange:,title:,class:,addempty:false,multiple radiobox = list:*,name:*,default,onchange:,title:,class: set = var:*,value,key table = class,width:100%,space:0px,padding:0px,widths,rowclasses,columnclasses -text = title,class:text,var,text,key,textvar,raw,maxlength,value,suffix,prefix,accesskey,escape:true,type +text = title,class:text,var,text,key,textvar,raw,maxlength,value,suffix,prefix,accesskey,escape:true,type,cut:both upload = name:*,class:upload,maxlength,size:40 user = user window = title,name,icon,widths,width:93%,rowclasses:oddCOMMAeven,columnclasses:1COMMA2COMMA3 \ No newline at end of file diff --git a/themes/default/include/html/text.inc.php b/themes/default/include/html/text.inc.php @@ -85,7 +85,7 @@ #END-IF #IF-ATTR maxlength# - $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength),'..',STR_PAD_BOTH ); + $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength),'..',constant('STR_PAD_'.strtoupper($attr_cut)) ); #END-IF #IF-ATTR accesskey# diff --git a/themes/default/templates/tree/show.tpl.src.php b/themes/default/templates/tree/show.tpl.src.php @@ -18,9 +18,9 @@ page class:tree if present:url link url:var:url title:var:desc class:tree target:var:target image icon:var:icon - text var:text maxlength:15 + text var:text maxlength:20 cut:right else image icon:var:icon - text var:text + text var:text maxlength:20 cut:right title:var:desc set var:url set var:image