[Phpgroupware-cvs] CVS: etemplate/inc class.xul_io.inc.php,1.2,1.3

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.xul_io.inc.php 
Log Message:
some changes to be closer to XUL:
<overlay> now root-node of each eTemplate xul-file
<template> is replaced by <grid id="app.template" ...>

Index: class.xul_io.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.xul_io.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.xul_io.inc.php        12 Sep 2002 10:03:52 -0000      1.2
--- class.xul_io.inc.php        12 Sep 2002 17:57:27 -0000      1.3
***************
*** 58,61 ****
--- 58,65 ----
                                'select' => array(
                                        '.name' => 'menulist,menupopup'
+                               ),
+                               'template' => array(
+                                       '.name' => 'grid',
+                                       'size'  => 'content'
                                )
                        );
***************
*** 98,101 ****
--- 102,107 ----
                        $doc = new xmldoc();
  
+                       $xul_overlay = new xmlnode('overlay');
+ 
                        $xul_grid = new xmlnode('grid');
                        $xul_grid->set_attribute('id',$etempl->name);
***************
*** 144,148 ****
                                        {
                                                $attrs = 
explode(',',$widgetattr2xul[1]);
!                                               while (list(,$attr) = 
each($attr))
                                                {
                                                        list($attr,$val) = 
explode('=',$attr);
--- 150,154 ----
                                        {
                                                $attrs = 
explode(',',$widgetattr2xul[1]);
!                                               while (list(,$attr) = 
each($attrs))
                                                {
                                                        list($attr,$val) = 
explode('=',$attr);
***************
*** 188,192 ****
                                $xul_grid->add_node($styles);
                        }
!                       $doc->add_root($xul_grid);
                        $xml = $doc->dump_mem();
  
--- 194,200 ----
                                $xul_grid->add_node($styles);
                        }
!                       $xul_overlay->add_node($xul_grid);
! 
!                       $doc->add_root($xul_overlay);
                        $xml = $doc->dump_mem();
  
***************
*** 229,232 ****
--- 237,244 ----
                                        $attr['name'] = $attr['id']; 
unset($attr['id']);
                                }
+                               if ($tag == 'grid' && $type == 'complete')
+                               {
+                                       $tag = 'template';
+                               }
                                if ($tag != 'textbox')
                                {
***************
*** 240,250 ****
                                {
                                        case 'grid':
!                                               if ($type != 'open')
                                                {
!                                                       break;
                                                }
!                                               if ($node['level'] > 1)
                                                {
!                                                       return "Can't import 
nested $node[type]'s !!!";
                                                }
                                                $etempl->init($attr);
--- 252,262 ----
                                {
                                        case 'grid':
!                                               if ($node['level'] > 2) // 
level 1 is the overlay
                                                {
!                                                       return "Can't import 
nested $node[tag]'s !!!";
                                                }
!                                               if ($type != 'open')
                                                {
!                                                       break;
                                                }
                                                $etempl->init($attr);
***************
*** 281,284 ****
--- 293,297 ----
                                        case 'styles':
                                                $etempl->style = $node['value'];
+                                               break;
                                        case 'textbox':
                                                if ($attr['multiline'])
***************
*** 303,309 ****
                                                // fall-through
                                        default:
!                                               if ($tag == 'label')
                                                {
!                                                       $attr['label'] = 
$attr['value']; unset($attr['value']);
                                                }
                                                $attr['help'] = 
$attr['statustext']; unset($attr['statustext']);
--- 316,329 ----
                                                // fall-through
                                        default:
!                                               switch ($tag)
                                                {
!                                                       case 'label':
!                                                               $attr['label'] 
= $attr['value'];
!                                                               
unset($attr['value']);
!                                                               break;
!                                                       case 'template':
!                                                               $attr['size'] = 
$attr['content'];
!                                                               
unset($attr['content']);
!                                                               break;
                                                }
                                                $attr['help'] = 
$attr['statustext']; unset($attr['statustext']);