[Phpgroupware-cvs] CVS: etemplate/inc class.html.inc.php,1.5,1.6 class.uietemplate.inc.php,1.17,1.18 class.xul_io.inc.php,1.7,1.8

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv7848

Modified Files:
        class.html.inc.php class.uietemplate.inc.php 
        class.xul_io.inc.php 
Log Message:
added <button image=".." ro_image=".."/> to have an image instead of a button
updated referenz.html

Index: class.html.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.html.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.html.inc.php  12 Sep 2002 08:40:57 -0000      1.5
--- class.html.inc.php  17 Sep 2002 12:28:36 -0000      1.6
***************
*** 49,62 ****
        function input($name,$value='',$type='',$options='' )
        {
!               if ($type) $type = "TYPE=$type";
  
                return "<INPUT $type NAME=\"$name\" VALUE=\"$value\" 
$options>\n";
        }
  
!       function submit_button($name,$lang,$onClick='',$no_lang=0,$options='')
        {
                if (!$no_lang) $lang = lang($lang);
                if ($onClick) $options .= " onClick=\"$onClick\"";
!               return $this->input($name,$lang,'SUBMIT',$options);
        }
  
--- 49,68 ----
        function input($name,$value='',$type='',$options='' )
        {
!               if ($type) $type = 'TYPE="'.$type.'"';
  
                return "<INPUT $type NAME=\"$name\" VALUE=\"$value\" 
$options>\n";
        }
  
!       function 
submit_button($name,$lang,$onClick='',$no_lang=0,$options='',$image='')
        {
+               if ($image != '')
+               {
+                       if (!($path = 
$GLOBALS['phpgw']->common->image($app,$image)))
+                               $path = $image;         // name may already 
contain absolut path
+                       $options .= ' src="'.$path.'"';
+               }
                if (!$no_lang) $lang = lang($lang);
                if ($onClick) $options .= " onClick=\"$onClick\"";
!               return $this->input($name,$lang,$image != '' ? 'IMAGE' : 
'SUBMIT',$options);
        }
  

Index: class.uietemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.uietemplate.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.uietemplate.inc.php   12 Sep 2002 08:40:57 -0000      1.17
--- class.uietemplate.inc.php   17 Sep 2002 12:28:37 -0000      1.18
***************
*** 352,356 ****
                                $options .= ' READONLY';
                        }
!                       if ($cell['disabled'] || $cell['type'] == 'button' && 
$readonly)
                        {
                                if ($this->rows == 1) {
--- 352,356 ----
                                $options .= ' READONLY';
                        }
!                       if ($cell['disabled'] || $readonly && $cell['type'] == 
'button' && !strstr($cell['size'],','))
                        {
                                if ($this->rows == 1) {
***************
*** 463,468 ****
                                        else
                                        {
!                                               $html .= 
$this->html->submit_button($form_name,$label,'',
!                                                       strlen($label) <= 1 || 
$cell['no_lang'],$options);
                                        }
                                        $extra_label = False;
--- 463,471 ----
                                        else
                                        {
!                                               list($img,$ro_img) = 
explode(',',$cell['size']);
! 
!                                               $html .= !$readonly ? 
$this->html->submit_button($form_name,$label,'',
!                                                               strlen($label) 
<= 1 || $cell['no_lang'],$options,$img) :
!                                                       
$this->html->image(substr($this->name,0,strpos($this->name,'.')),$ro_img);
                                        }
                                        $extra_label = False;

Index: class.xul_io.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.xul_io.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.xul_io.inc.php        17 Sep 2002 09:12:45 -0000      1.7
--- class.xul_io.inc.php        17 Sep 2002 12:28:37 -0000      1.8
***************
*** 74,77 ****
--- 74,81 ----
                                'tab' => array(
                                        '.name' => 'tabbox,tabs,tabpanels'
+                               ),
+                               'button' => array(
+                                       '.name' => 'button',
+                                       'size'  => 'image,ro_image'
                                )
                        );
***************
*** 444,447 ****
--- 448,458 ----
                                                                {
                                                                        $attr 
+= $menulist_attr;
+                                                               }
+                                                               break;
+                                                       case 'button':
+                                                               if 
($attr['image'] || $attr['ro_image'])
+                                                               {
+                                                                       
$attr['size'] = $attr['image'] . ($attr['ro_image'] ? ','.$attr['ro_image'] : 
'');
+                                                                       
unset($attr['image']); unset($attr['ro_image']);
                                                                }
                                                                break;