[Phpgroupware-cvs] CVS: etemplate/templates/default editor.cell.vbox.xet,1.1,1.2 editor.xet,1.3,1.4

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/etemplate/templates/default
In directory subversions:/tmp/cvs-serv23066

Modified Files:
        editor.cell.vbox.xet editor.xet 
Log Message:
lots of fixes and additions:
- load_via works now in boetemplate::read
- included templates are relative to the includeing tpl, if they contain no '.'
- xul_io is alway writing the comple/absolute name
- HBox gets width=100% if alignment other then left set (new!)
- added links as 2. option to label
- added header function to uietemplate

Index: editor.cell.vbox.xet
===================================================================
RCS file: 
/cvsroot/phpgroupware/etemplate/templates/default/editor.cell.vbox.xet,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** editor.cell.vbox.xet        12 Oct 2002 16:37:44 -0000      1.1
--- editor.cell.vbox.xet        14 Oct 2002 00:39:17 -0000      1.2
***************
*** 35,39 ****
                                <textbox id="name" statustext="index/name of 
returned content (name of the Template, Link / Method for Image)"/>
                                <hbox span="4">
!                                       <checkbox label="%s needed" 
align="right" id="needed" statustext="check if field has to be filled by user"/>
                                        <checkbox label="%s readonly" 
align="center" id="readonly" statustext="check if content should only be 
displayed but not altered (the content is not send back then!)"/>
                                        <checkbox label="%s disabled" 
align="center" id="disabled" statustext="if field is disabled an empty 
table-cell is displayed, for (temporal) removement of a field/cell"/>
--- 35,39 ----
                                <textbox id="name" statustext="index/name of 
returned content (name of the Template, Link / Method for Image)"/>
                                <hbox span="4">
!                                       <checkbox label="%s needed" 
align="center" id="needed" statustext="check if field has to be filled by 
user"/>
                                        <checkbox label="%s readonly" 
align="center" id="readonly" statustext="check if content should only be 
displayed but not altered (the content is not send back then!)"/>
                                        <checkbox label="%s disabled" 
align="center" id="disabled" statustext="if field is disabled an empty 
table-cell is displayed, for (temporal) removement of a field/cell"/>
***************
*** 47,51 ****
                </rows>
        </grid>
!       <grid id="etemplate.editor.cell.vbox" template="" lang="" group="" 
version="0.9.15.002" height="100%" border="1">
                <columns>
                        <column/>
--- 47,51 ----
                </rows>
        </grid>
!       <grid id="etemplate.editor.cell.vbox" template="" lang="" group="" 
version="0.9.15.003" height="100%" border="1">
                <columns>
                        <column/>
***************
*** 59,65 ****
                                        </menulist>
                                        <description value="Cells" 
align="center"/>
!                                       <textbox size="3" id="size" 
statustext="number of rows in a VBox or cols in a HBox"/>
                                        <description value="Span, Class" 
align="center"/>
                                        <textbox size="10" id="span" 
statustext="number of colums the field/cell should span or 'all' for the 
remaining columns, CSS-class name (for the TD tag)"/>
                                </hbox>
                        </row>
--- 59,69 ----
                                        </menulist>
                                        <description value="Cells" 
align="center"/>
!                                       <textbox size="5" id="size" 
statustext="number of rows/cols in a V/HBox, Cellpadding, Cellspacing"/>
                                        <description value="Span, Class" 
align="center"/>
                                        <textbox size="10" id="span" 
statustext="number of colums the field/cell should span or 'all' for the 
remaining columns, CSS-class name (for the TD tag)"/>
+                                       <description value="Align"/>
+                                       <menulist>
+                                               <menupopup id="align" 
statustext="Alignment of the V/HBox containing table-cell"/>
+                                       </menulist>
                                </hbox>
                        </row>

Index: editor.xet
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/templates/default/editor.xet,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** editor.xet  12 Oct 2002 16:37:44 -0000      1.3
--- editor.xet  14 Oct 2002 00:39:17 -0000      1.4
***************
*** 18,22 ****
                </rows>
        </grid>
!       <grid id="etemplate.editor.options" template="" lang="" group="0" 
version="0.9.15.001">
                <columns>
                        <column/>
--- 18,22 ----
                </rows>
        </grid>
!       <grid id="etemplate.editor.edit-buttons" template="" lang="" group="0" 
version="0.9.15.002">
                <columns>
                        <column/>
***************
*** 27,42 ****
                        <column/>
                        <column/>
                </columns>
                <rows>
                        <row>
!                               <textbox size="8" label="Width" id="width" 
statustext="Width of the table in % or pixels for the table-tag and (optional) 
div"/>
!                               <textbox size="8" label="Height" id="height" 
statustext="Height of the table in % or pixels for the table-tag and (optional) 
div"/>
!                               <menulist>
!                                       <menupopup label="Overflow" no_lang="1" 
id="overflow" statustext="what happens with overflowing content: visible 
(default), hidden, scroll, auto (browser decides)"/>
!                               </menulist>
!                               <int label="Border" id="border" 
statustext="Border-line-thickness for the table-tag"/>
!                               <textbox size="12" label="Class" id="class" 
statustext="CSS class for the table-tag"/>
!                               <int label="Spacing" id="spacing" 
statustext="Cellspacing for the table-tag"/>
!                               <int label="Padding" id="padding" 
statustext="Cellpadding for the table-tag"/>
                        </row>
                </rows>
--- 27,44 ----
                        <column/>
                        <column/>
+                       <column/>
+                       <column/>
                </columns>
                <rows>
                        <row>
!                               <button label="Read" id="read" statustext="read 
eTemplate from database (for the keys above)"/>
!                               <button label="Show (no save)" id="show" 
statustext="shows/displays eTemplate for testing, does NOT save it before"/>
!                               <button label="Save" id="save" statustext="save 
the eTemplate under the above keys (name, ...), change them for a SaveAs"/>
!                               <button label="Delete" id="delete" 
statustext="deletes the eTemplate spez. above"/>
!                               <button label="Dump4Setup" id="dump" 
statustext="writes a 'etemplates.inc.php' file (for application in Name) in the 
setup-dir of the app"/>
!                               <button label="Write Langfile" id="langfile" 
statustext="creates an english ('en') langfile from label and helptexts (for 
application in Name)"/>
!                               <button label="Export XML" id="export_xml" 
statustext="export the loaded eTemplate into a xml-file"/>
!                               <button label="Import XML" id="import_xml" 
statustext="import an eTemplate from a xml-file"/>
!                               <file id="file" statustext="xml-file to 
import"/>
                        </row>
                </rows>
***************
*** 56,60 ****
                                <button label="&gt;|&lt;" no_lang="1" 
id="exchange_col[$c_]" statustext="exchange this two columns"/>
                                <description options="b" no_lang="1" 
align="center" id=".col"/>
!                               <textbox size="5" label="Width, Disabled" 
align="right" id="width[$col_]" statustext="width of col (in % or pixel), 
disable col: [! = not]&lt;value&gt;[=&lt;check&gt;] eg: 'address@hidden' 
disable col if content of data is empty"/>
                                <button label="-" no_lang="1" align="right" 
id="delete_col[$c_]" statustext="delete whole column (can NOT be undone!!!)"/>
                                <button label="+" no_lang="1" align="right" 
id="insert_col[$c_]" statustext="insert new column behind this one"/>
--- 58,62 ----
                                <button label="&gt;|&lt;" no_lang="1" 
id="exchange_col[$c_]" statustext="exchange this two columns"/>
                                <description options="b" no_lang="1" 
align="center" id=".col"/>
!                               <textbox size="8" label="Width, Disabled" 
align="right" id="width[$col_]" statustext="width of col (in % or pixel), 
disable col: [! = not]&lt;value&gt;[=&lt;check&gt;] eg: 'address@hidden' 
disable col if content of data is empty"/>
                                <button label="-" no_lang="1" align="right" 
id="delete_col[$c_]" statustext="delete whole column (can NOT be undone!!!)"/>
                                <button label="+" no_lang="1" align="right" 
id="insert_col[$c_]" statustext="insert new column behind this one"/>
***************
*** 122,126 ****
                                <textbox id="name" statustext="index/name of 
returned content (name of the Template, Link / Method for Image)"/>
                                <hbox span="4">
!                                       <checkbox label="%s needed" 
align="right" id="needed" statustext="check if field has to be filled by user"/>
                                        <checkbox label="%s readonly" 
align="center" id="readonly" statustext="check if content should only be 
displayed but not altered (the content is not send back then!)"/>
                                        <checkbox label="%s disabled" 
align="center" id="disabled" statustext="if field is disabled an empty 
table-cell is displayed, for (temporal) removement of a field/cell"/>
--- 124,128 ----
                                <textbox id="name" statustext="index/name of 
returned content (name of the Template, Link / Method for Image)"/>
                                <hbox span="4">
!                                       <checkbox label="%s needed" 
align="center" id="needed" statustext="check if field has to be filled by 
user"/>
                                        <checkbox label="%s readonly" 
align="center" id="readonly" statustext="check if content should only be 
displayed but not altered (the content is not send back then!)"/>
                                        <checkbox label="%s disabled" 
align="center" id="disabled" statustext="if field is disabled an empty 
table-cell is displayed, for (temporal) removement of a field/cell"/>
***************
*** 146,150 ****
                        <row>
                                <grid content="Row$row," class="th" 
id="etemplate.editor.row_header"/>
!                               <grid content="$col$row" 
id="etemplate.editor.cell$col_row_cont[cell_tpl]"/>
                        </row>
                </rows>
--- 148,152 ----
                        <row>
                                <grid content="Row$row," class="th" 
id="etemplate.editor.row_header"/>
!                               <grid content="$col$row" 
id="etemplate.editor.cell"/>
                        </row>
                </rows>
***************
*** 153,157 ****
                </styles>
        </grid>
!       <grid id="etemplate.editor" template="" lang="" group="" 
version="0.9.15.004" width="100%" height="100%">
                <columns>
                        <column/>
--- 155,159 ----
                </styles>
        </grid>
!       <grid id="etemplate.editor" template="" lang="" group="" 
version="0.9.15.002" width="100%">
                <columns>
                        <column/>
***************
*** 170,187 ****
                        </row>
                        <row>
!                               <hbox span="all">
!                                       <button label="Read" id="read" 
statustext="read eTemplate from database (for the keys above)"/>
!                                       <button label="Show (no save)" 
id="show" statustext="shows/displays eTemplate for testing, does NOT save it 
before"/>
!                                       <button label="Save" id="save" 
statustext="save the eTemplate under the above keys (name, ...), change them 
for a SaveAs"/>
!                                       <button label="Delete" id="delete" 
statustext="deletes the eTemplate spez. above"/>
!                                       <button label="Dump4Setup" id="dump" 
statustext="writes a 'etemplates.inc.php' file (for application in Name) in the 
setup-dir of the app"/>
!                                       <button label="Write Langfile" 
id="langfile" statustext="creates an english ('en') langfile from label and 
helptexts (for application in Name)"/>
!                                       <button label="Export XML" 
id="export_xml" statustext="export the loaded eTemplate into a xml-file"/>
!                                       <button label="Import XML" 
id="import_xml" statustext="import an eTemplate from a xml-file"/>
!                                       <file id="file" statustext="xml-file to 
import"/>
!                               </hbox>
                        </row>
                        <row>
!                               <grid content="options" span="all" 
id="etemplate.editor.options"/>
                        </row>
                        <row>
--- 172,179 ----
                        </row>
                        <row>
!                               <grid span="all" 
id="etemplate.editor.edit-buttons"/>
                        </row>
                        <row>
!                               <textbox span="all" label="Width, Height, 
Border, class, Spacing, Padding" id="size" statustext="width, height, 
border-line-thickness, CSS-class name, Celspaceing, Cellpadding (for TABLE 
tag)"/>
                        </row>
                        <row>