commit 44c1780ebb52acbc9a82b7becedd3892d3530502
parent d33bf8ce59c8e308218dabf43ddf6b909dbf9c03
Author: Jan Dankert <devnull@localhost>
Date: Sun, 20 Nov 2011 00:34:56 +0100
Layout der Masken für Vorlagen-Elemente angepasst.
Diffstat:
6 files changed, 333 insertions(+), 87 deletions(-)
diff --git a/themes/default/templates/element/delete.tpl.src.xml b/themes/default/templates/element/delete.tpl.src.xml
@@ -1,3 +1,48 @@
-<output xmlns="http://www.openrat.de/template"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window><row><cell><text text="ELEMENT_NAME"></text></cell><cell><text var="name"></text></cell></row><row><cell colspan="2"><fieldset title="message:options"></fieldset></cell></row><row><cell colspan="2"><checkbox name="confirm"></checkbox><label for="confirm"><text text="CONFIRM_DELETE"></text></label></cell></row><row><cell colspan="2"><label for="type_value"><text raw="_____"></text><radio name="type" value="value" default="value"></radio><text text="ELEMENT_DELETE_VALUES"></text></label><newline></newline><label for="type_all"><text raw="_____"></text><radio name="type" value="all"></radio><text text="DELETE"></text></label></cell></row><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></window></form><focus field="delete"></focus></dummy></output>-
\ No newline at end of file
+<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
+ <header back="true"></header>
+ <form>
+ <fieldset>
+ <part class="line">
+ <part class="label">
+ <text key="ELEMENT_NAME"></text>
+ </part>
+ <part class="input">
+ <text var="name" class="name"></text>
+ </part>
+ </part>
+ </fieldset>
+ <fieldset title="message:options">
+
+ <part class="line">
+ <part class="label">
+ </part>
+ <part class="input">
+ <checkbox name="confirm"></checkbox>
+ <label for="confirm">
+ <text text="CONFIRM_DELETE"></text>
+ </label>
+ </part>
+ </part>
+
+ <part class="line">
+ <part class="label">
+ </part>
+ <part class="input">
+ <text raw="_____"></text>
+ <radio name="type" value="value" default="value"></radio>
+ <label for="type_value">
+ <text text="ELEMENT_DELETE_VALUES"></text>
+ </label>
+ <newline></newline>
+ <text raw="_____"></text>
+ <radio name="type" value="all"></radio>
+ <label for="type_all">
+ <text text="DELETE"></text>
+ </label>
+ </part>
+ </part>
+ </fieldset>
+
+ </form>
+</output>+
\ No newline at end of file
diff --git a/themes/default/templates/element/edit.tpl.src.xml b/themes/default/templates/element/edit.tpl.src.xml
@@ -1,32 +1,25 @@
<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
<header views="type,delete"></header>
- <dummy>
- <form>
- <window name="GLOBAL_NAME">
- <row>
- <cell>
- <text text="ELEMENT_NAME"></text>
- </cell>
- <cell>
- <input name="name"></input>
- </cell>
- </row>
- <row>
- <cell>
- <text text="GLOBAL_DESCRIPTION"></text>
- </cell>
- <cell>
- <inputarea name="description" rows="5" cols="50"></inputarea>
- </cell>
- </row>
- <row>
- <cell colspan="2" class="act">
- <button type="ok"></button>
- </cell>
- </row>
- </window>
- </form>
- <focus field="name"></focus>
- </dummy>
+ <form>
+
+ <part class="line">
+ <part class="label">
+ <text text="ELEMENT_NAME"></text>
+ </part>
+ <part class="input">
+ <input name="name" class="focus"></input>
+ </part>
+ </part>
+
+ <part class="line">
+ <part class="label">
+ <text text="GLOBAL_DESCRIPTION"></text>
+ </part>
+ <part class="input">
+ <inputarea name="description" rows="5"></inputarea>
+ </part>
+ </part>
+
+ </form>
</output>
\ No newline at end of file
diff --git a/themes/default/templates/element/prop.tpl.src.xml b/themes/default/templates/element/prop.tpl.src.xml
@@ -1,3 +1,235 @@
-<output xmlns="http://www.openrat.de/template"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window name="GLOBAL_PREFS" widths="30%,70%"><if present="subtype"><row><cell><text text="ELEMENT_SUBTYPE"></text></cell><cell><if present="subtypes"><selectbox name="subtype" list="subtypes" addempty="true"></selectbox></if><if not="true" present="subtypes"><input name="subtype"></input></if></cell></row></if><if present="with_icon"><row><cell><text text="EL_PROP_WITH_ICON"></text></cell><cell><checkbox name="with_icon"></checkbox></cell></row></if><if present="all_languages"><row><cell><text text="EL_PROP_ALL_LANGUAGES"></text></cell><cell><checkbox name="all_languages"></checkbox></cell></row></if><if present="writable"><row><cell><text text="EL_PROP_writable"></text></cell><cell><checkbox name="writable"></checkbox></cell></row></if><if present="width"><row><cell><text text="width"></text></cell><cell><input size="10" name="width"></input></cell></row></if><if present="height"><row><cell><text text="height"></text></cell><cell><input size="10" name="height"></input></cell></row></if><if present="dateformat"><row><cell><text text="EL_PROP_DATEFORMAT"></text></cell><cell><selectbox name="dateformat" list="dateformats"></selectbox></cell></row></if><if present="format"><row><cell><text text="EL_PROP_FORMAT"></text></cell><cell><radiobox name="format" list="formatlist"></radiobox></cell></row></if><if present="decimals"><row><cell><text text="EL_PROP_DECIMALS"></text></cell><cell><input size="10" maxlength="2" name="decimals"></input></cell></row></if><if present="dec_point"><row><cell><text text="EL_PROP_DEC_POINT"></text></cell><cell><input size="10" maxlength="5" name="dec_point"></input></cell></row></if><if present="thousand_sep"><row><cell><text text="EL_PROP_thousand_sep"></text></cell><cell><input size="10" maxlength="1" name="thousand_sep"></input></cell></row></if><if present="default_text"><row><cell><text text="EL_PROP_default_text"></text></cell><cell><input size="40" maxlength="255" name="default_text"></input></cell></row></if><if present="default_longtext"><row><cell><text text="EL_PROP_default_longtext"></text></cell><cell><inputarea rows="10" cols="40" name="default_longtext"></inputarea></cell></row></if><if present="parameters"><row><cell><text text="EL_PROP_DYNAMIC_PARAMETERS"></text></cell><cell><inputarea rows="15" cols="40" name="parameters"></inputarea></cell></row><row><cell></cell><cell><list list="dynamic_class_parameters" key="paramName" value="defaultValue"><text var="paramName"></text><text raw="_("></text><text text="GLOBAL_DEFAULT"></text><text raw=")_=_"></text><text var="defaultValue"></text><newline></newline></list></cell></row></if><if present="select_items"><row><cell><text text="EL_PROP_select_items"></text></cell><cell><inputarea rows="15" cols="40" name="select_items"></inputarea></cell></row></if><if present="linkelement"><row><cell><text text="EL_LINK"></text></cell><cell><selectbox name="linkelement" list="linkelements"></selectbox></cell></row></if><if present="name"><row><cell><text text="ELEMENT_NAME"></text></cell><cell><selectbox name="name" list="names"></selectbox></cell></row></if><if present="folderobjectid"><row><cell><text text="EL_PROP_DEFAULT_FOLDEROBJECT"></text></cell><cell><selectbox name="folderobjectid" list="folders"></selectbox></cell></row></if><if present="default_objectid"><row><cell><text text="EL_PROP_DEFAULT_OBJECT"></text></cell><cell><selectbox name="default_objectid" list="objects" addempty="true"></selectbox></cell></row></if><if present="code"><row><cell><text text="EL_PROP_code"></text></cell><cell><inputarea name="code" rows="35" cols="60"></inputarea></cell></row></if><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></window></form><focus field="name"></focus></dummy></output>-
\ No newline at end of file
+<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
+ <header></header>
+ <form>
+ <fieldset>
+ <if present="subtype">
+ <part class="line">
+ <part class="label">
+ <text text="ELEMENT_SUBTYPE"></text>
+ </part>
+ <part class="input">
+ <if present="subtypes">
+ <selectbox name="subtype" list="subtypes" addempty="true"></selectbox>
+ </if>
+ <if not="true" present="subtypes">
+ <input name="subtype"></input>
+ </if>
+ </part>
+ </part>
+ </if>
+ <if present="with_icon">
+ <part class="line">
+ <part class="label">
+ </part>
+ <part class="input">
+ <checkbox name="with_icon"></checkbox>
+ <label for="with_icon">
+ <text text="EL_PROP_WITH_ICON"></text>
+ </label>
+ </part>
+ </part>
+ </if>
+ <if present="all_languages">
+ <part class="line">
+ <part class="label">
+ </part>
+ <part class="input">
+ <checkbox name="all_languages"></checkbox>
+ <label for="all_languages">
+ <text text="EL_PROP_ALL_LANGUAGES"></text>
+ </label>
+ </part>
+ </part>
+ </if>
+ <if present="writable">
+ <part class="line">
+ <part class="label">
+ </part>
+ <part class="input">
+ <checkbox name="writable"></checkbox>
+ <label for="writable">
+ <text text="EL_PROP_writable"></text>
+ </label>
+ </part>
+ </part>
+ </if>
+ <if present="width">
+ <part class="line">
+ <part class="label">
+ <text text="width"></text>
+ </part>
+ <part class="input">
+ <input size="10" name="width"></input>
+ </part>
+ </part>
+
+ </if>
+ <if present="height">
+ <part class="line">
+ <part class="label">
+ <text text="height"></text>
+ </part>
+ <part class="input">
+ <input size="10" name="height"></input>
+ </part>
+ </part>
+ </if>
+ <if present="dateformat">
+ <part class="line">
+ <part class="label">
+ <text text="EL_PROP_DATEFORMAT"></text>
+ </part>
+ <part class="input">
+ <selectbox name="dateformat" list="dateformats"></selectbox>
+ </part>
+ </part>
+ </if>
+ <if present="format">
+ <part class="line">
+ <part class="label">
+ <text text="EL_PROP_FORMAT"></text>
+ </part>
+ <part class="input">
+ <radiobox name="format" list="formatlist"></radiobox>
+ </part>
+ </part>
+ </if>
+ <if present="decimals">
+ <part class="line">
+ <part class="label">
+ <text text="EL_PROP_DECIMALS"></text>
+ </part>
+ <part class="input">
+ <input size="10" maxlength="2" name="decimals"></input>
+ </part>
+ </part>
+ </if>
+ <if present="dec_point">
+ <part class="line">
+ <part class="label">
+ <text text="EL_PROP_DEC_POINT"></text>
+ </part>
+ <part class="input">
+ <input size="10" maxlength="5" name="dec_point"></input>
+ </part>
+ </part>
+ </if>
+ <if present="thousand_sep">
+ <part class="line">
+ <part class="label">
+ <text text="EL_PROP_thousand_sep"></text>
+ </part>
+ <part class="input">
+ <input size="10" maxlength="1" name="thousand_sep"></input>
+ </part>
+ </part>
+ </if>
+ <if present="default_text">
+ <part class="line">
+ <part class="label">
+ <text text="EL_PROP_default_text"></text>
+ </part>
+ <part class="input">
+ <input size="40" maxlength="255" name="default_text"></input>
+ </part>
+ </part>
+ </if>
+ <if present="default_longtext">
+ <part class="line">
+ <part class="label">
+ <text text="EL_PROP_default_longtext"></text>
+ </part>
+ <part class="input">
+ <inputarea rows="10" name="default_longtext"></inputarea>
+ </part>
+ </part>
+ </if>
+ <if present="parameters">
+ <part class="line">
+ <part class="label">
+ <text text="EL_PROP_DYNAMIC_PARAMETERS"></text>
+ </part>
+ <part class="input">
+ <inputarea rows="15" name="parameters"></inputarea>
+ </part>
+ </part>
+ <part class="line">
+ <part class="label">
+ </part>
+ <part class="input">
+ <list list="dynamic_class_parameters" key="paramName" value="defaultValue">
+ <text var="paramName"></text>
+ <text raw="_("></text>
+ <text text="GLOBAL_DEFAULT"></text>
+ <text raw=")_=_"></text>
+ <text var="defaultValue"></text>
+ <newline></newline>
+ </list>
+ </part>
+ </part>
+ </if>
+ <if present="select_items">
+ <part class="line">
+ <part class="label">
+ <text text="EL_PROP_select_items"></text>
+ </part>
+ <part class="input">
+ <inputarea rows="15" cols="40" name="select_items"></inputarea>
+ </part>
+ </part>
+ </if>
+ <if present="linkelement">
+ <part class="line">
+ <part class="label">
+ <text text="EL_LINK"></text>
+ </part>
+ <part class="input">
+ <selectbox name="linkelement" list="linkelements"></selectbox>
+ </part>
+ </part>
+ </if>
+ <if present="name">
+ <part class="line">
+ <part class="label">
+ <text text="ELEMENT_NAME"></text>
+ </part>
+ <part class="input">
+ <selectbox name="name" list="names"></selectbox>
+ </part>
+ </part>
+ </if>
+ <if present="folderobjectid">
+ <part class="line">
+ <part class="label">
+ <text text="EL_PROP_DEFAULT_FOLDEROBJECT"></text>
+ </part>
+ <part class="input">
+ <selectbox name="folderobjectid" list="folders"></selectbox>
+ </part>
+ </part>
+ </if>
+ <if present="default_objectid">
+ <part class="line">
+ <part class="label">
+ <text text="EL_PROP_DEFAULT_OBJECT"></text>
+ </part>
+ <part class="input">
+ <selectbox name="default_objectid" list="objects"
+ addempty="true"></selectbox>
+ </part>
+ </part>
+ </if>
+ <if present="code">
+ <part class="line">
+ <part class="label">
+ <text text="EL_PROP_code"></text>
+ </part>
+ <part class="input">
+ <inputarea name="code" rows="35"></inputarea>
+ </part>
+ </part>
+ </if>
+ </fieldset>
+ </form>
+</output>+
\ No newline at end of file
diff --git a/themes/default/templates/element/remove.tpl.src.php b/themes/default/templates/element/remove.tpl.src.php
@@ -1,35 +0,0 @@
-dummy
- form
-
- window
- row
- cell
- text text:ELEMENT_NAME
- cell
- text var:name
- row
- cell colspan:2
- fieldset title:message:options
- row
- cell colspan:2
- checkbox name:confirm
- label for:confirm
- text text:CONFIRM_DELETE
- row
- cell colspan:2
- label for:type_value
- text raw:_____
- radio name:type value:value default:value
- text text:ELEMENT_DELETE_VALUES
- newline
- label for:type_all
- text raw:_____
- radio name:type value:all
- text text:DELETE
-
- row
- cell colspan:2 class:act
- button type:ok
-
- focus field:delete
- -
\ No newline at end of file
diff --git a/themes/default/templates/element/type.tpl.src.xml b/themes/default/templates/element/type.tpl.src.xml
@@ -2,18 +2,16 @@
xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
<header back="true"></header>
<form>
- <row>
- <cell>
- <text text="ELEMENT_TYPE"></text>
- </cell>
- <cell>
- <selectbox name="type" list="types" lang="true"></selectbox>
- </cell>
- </row>
- <row>
- <cell colspan="2" class="act">
- <button type="ok"></button>
- </cell>
- </row>
+ <fieldset>
+ <part class="line">
+ <part class="label">
+ <text text="ELEMENT_TYPE"></text>
+ </part>
+ <part class="input">
+ <selectbox name="type" list="types" lang="true"></selectbox>
+ </part>
+ </part>
+ </fieldset>
+
</form>
</output>
\ No newline at end of file
diff --git a/themes/default/templates/template.xsd b/themes/default/templates/template.xsd
@@ -116,7 +116,7 @@
<xsd:element name="row" type="rowType"></xsd:element>
- <xsd:element name="radiobox" type="xsd:string"></xsd:element>
+ <xsd:element name="radiobox" type="radioboxType"></xsd:element>
<xsd:element name="selectbox" type="selectBoxType"></xsd:element>
@@ -190,6 +190,7 @@
<xsd:element ref="date"></xsd:element>
<xsd:element ref="user"></xsd:element>
<xsd:element ref="if"></xsd:element>
+ <xsd:element ref="list"></xsd:element>
</xsd:choice>
<xsd:attributeGroup ref="universal"></xsd:attributeGroup>
</xsd:complexType>
@@ -284,6 +285,7 @@
<xsd:element ref="row" maxOccurs="unbounded"
minOccurs="0">
</xsd:element>
+ <xsd:element ref="text"></xsd:element>
</xsd:choice>
<xsd:attribute name="list" type="xsd:string"></xsd:attribute>
<xsd:attribute name="extract" type="xsd:boolean"></xsd:attribute>
@@ -303,6 +305,9 @@
<xsd:element ref="link"></xsd:element>
<xsd:element ref="image"></xsd:element>
<xsd:element ref="if"></xsd:element>
+ <xsd:element ref="selectbox"></xsd:element>
+ <xsd:element ref="radiobox"></xsd:element>
+ <xsd:element ref="input"></xsd:element>
</xsd:choice>
<xsd:attribute name="true" type="xsd:string"></xsd:attribute>
<xsd:attribute name="false" type="xsd:string"></xsd:attribute>
@@ -346,6 +351,15 @@
<xsd:complexType name="inputareaType">
<xsd:attribute name="name" type="xsd:string"></xsd:attribute>
- <xsd:attributeGroup ref="universal"></xsd:attributeGroup>
+ <xsd:attributeGroup ref="universal"></xsd:attributeGroup>
+ <xsd:attribute name="rows" type="xsd:string"></xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="radioboxType">
+ <xsd:attribute name="list" type="xsd:string"></xsd:attribute>
+ <xsd:attribute name="name" type="xsd:string"></xsd:attribute>
</xsd:complexType>
+
+ <xsd:attribute name="NewAttribute" type="xsd:string"></xsd:attribute>
+
</xsd:schema>
\ No newline at end of file
