commit 6fad9e0243550d40cd2088c3438ae525cb120c1d parent ba3ffacc48eb23f603997c9b2955a5ca170717f1 Author: Jan Dankert <develop@jandankert.de> Date: Thu, 20 Aug 2020 21:15:48 +0200 Cleanup: Deleting unused components. Diffstat:
104 files changed, 1700 insertions(+), 2059 deletions(-)
diff --git a/modules/cms/ui/themes/default/html/views/element/name.php b/modules/cms/ui/themes/default/html/views/element/name.php @@ -1,44 +1,41 @@ <?php if (defined('OR_TITLE')) { ?> - - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('name') ?>" data-action="<?php echo escapeHtml('element') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form element') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('element') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('name') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> - <div><?php echo escapeHtml('') ?> - - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('ELEMENT_NAME').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> - <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" /><?php echo escapeHtml('') ?> - </div> - </td> - </tr> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('DESCRIPTION').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <textarea name="<?php echo escapeHtml('description') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$description.'') ?> - </textarea> - </td> - </tr> - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> - - </td> - </tr> - </div> - <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> - </div> - </form> - + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('name') ?>" data-action="<?php echo escapeHtml('element') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form element') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('element') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('name') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('ELEMENT_NAME').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" /><?php echo escapeHtml('') ?> + </div> + </td> + </tr> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('DESCRIPTION').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('description') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$description.'') ?> + </textarea> + </td> + </tr> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> + + </td> + </tr> + </div> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> + </div> + </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/element/name.tpl.src.xml b/modules/cms/ui/themes/default/html/views/element/name.tpl.src.xml @@ -1,31 +1,26 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <dummy> - <form> - <window name="NAME"> - <row> - <column> - <text value="${message:ELEMENT_NAME}"></text> - </column> - <column> - <input name="name"></input> - </column> - </row> - <row> - <column> - <text value="${message:DESCRIPTION}"></text> - </column> - <column> - <inputarea name="description" rows="5" cols="50"></inputarea> - </column> - </row> - <row> - <column colspan="2" class="act"> - <button type="ok"></button> - </column> - </row> - </window> - </form> - <focus field="name"></focus> - </dummy> + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <row> + <column> + <text value="${message:ELEMENT_NAME}"></text> + </column> + <column> + <input name="name"></input> + </column> + </row> + <row> + <column> + <text value="${message:DESCRIPTION}"></text> + </column> + <column> + <inputarea name="description" rows="5" cols="50"></inputarea> + </column> + </row> + <row> + <column colspan="2" class="act"> + <button type="ok"></button> + </column> + </row> + </form> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/element/properties.php b/modules/cms/ui/themes/default/html/views/element/properties.php @@ -1,326 +1,323 @@ <?php if (defined('OR_TITLE')) { ?> - - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('properties') ?>" data-action="<?php echo escapeHtml('element') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form element') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('element') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('properties') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> - <div><?php echo escapeHtml('') ?> - - <?php $if1=(isset($subtype)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('ELEMENT_SUBTYPE').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <?php $if1=(isset($subtypes)); if($if1) { ?> - <select name="<?php echo escapeHtml('subtype') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> - <option value="<?php echo escapeHtml('') ?>"><?php echo escapeHtml(''.@lang('LIST_ENTRY_EMPTY').'') ?> - </option> - <?php foreach($subtypes as $_key=>$_value) { ?> - <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$subtype){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> - </option> - <?php } ?> - </select> - <?php } ?> - <?php $if1=!(isset($subtypes)); if($if1) { ?> - <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> - <input name="<?php echo escapeHtml('subtype') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$subtype.'') ?>" /><?php echo escapeHtml('') ?> - </div> - <?php } ?> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($with_icon)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_WITH_ICON').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('with_icon') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$with_icon){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($all_languages)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_ALL_LANGUAGES').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('all_languages') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$all_languages){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($writable)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_writable').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('writable') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$writable){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($width)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('width').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> - <input name="<?php echo escapeHtml('width') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$width.'') ?>" /><?php echo escapeHtml('') ?> - </div> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($height)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('height').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> - <input name="<?php echo escapeHtml('height') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$height.'') ?>" /><?php echo escapeHtml('') ?> - </div> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($dateformat)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_DATEFORMAT').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <select name="<?php echo escapeHtml('dateformat') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> - <?php foreach($dateformats as $_key=>$_value) { ?> - <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$dateformat){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> - </option> - <?php } ?> - </select> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($format)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_FORMAT').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <?php foreach( $formatlist as $_key=>$_value) { ?> - <label><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('format') ?>" value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$format){ ?>checked="<?php echo escapeHtml('checked') ?>"<?php } ?> /><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@$_value.'') ?> - </span> - </label> - <br /><?php echo escapeHtml('') ?> - <?php } ?> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($decimals)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_DECIMALS').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> - <input name="<?php echo escapeHtml('decimals') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('2') ?>" value="<?php echo escapeHtml(''.@$decimals.'') ?>" /><?php echo escapeHtml('') ?> - </div> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($dec_point)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_DEC_POINT').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> - <input name="<?php echo escapeHtml('dec_point') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('5') ?>" value="<?php echo escapeHtml(''.@$dec_point.'') ?>" /><?php echo escapeHtml('') ?> - </div> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($thousand_sep)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_thousand_sep').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> - <input name="<?php echo escapeHtml('thousand_sep') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('1') ?>" value="<?php echo escapeHtml(''.@$thousand_sep.'') ?>" /><?php echo escapeHtml('') ?> - </div> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($default_text)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_default_text').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> - <input name="<?php echo escapeHtml('default_text') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('255') ?>" value="<?php echo escapeHtml(''.@$default_text.'') ?>" /><?php echo escapeHtml('') ?> - </div> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($default_longtext)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_default_longtext').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <textarea name="<?php echo escapeHtml('default_longtext') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$default_longtext.'') ?> - </textarea> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($parameters)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_DYNAMIC_PARAMETERS').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <textarea name="<?php echo escapeHtml('parameters') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$parameters.'') ?> - </textarea> - </td> - </tr> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - </td> - <td><?php echo escapeHtml('') ?> - <?php foreach((array)$dynamic_class_parameters as $paramName=>$defaultValue) { ?> - <span><?php echo escapeHtml(''.@$paramName.'') ?> - </span> - <span><?php echo escapeHtml(' (') ?> - </span> - <span><?php echo escapeHtml(''.@lang('DEFAULT').'') ?> - </span> - <span><?php echo escapeHtml(') = ') ?> - </span> - <span><?php echo escapeHtml(''.@$defaultValue.'') ?> - </span> - <br /><?php echo escapeHtml('') ?> - <?php } ?> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($select_items)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_select_items').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <textarea name="<?php echo escapeHtml('select_items') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$select_items.'') ?> - </textarea> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($linkelement)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_LINK').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <select name="<?php echo escapeHtml('linkelement') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> - <?php foreach($linkelements as $_key=>$_value) { ?> - <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$linkelement){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> - </option> - <?php } ?> - </select> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($name)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('ELEMENT_NAME').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <select name="<?php echo escapeHtml('name') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> - <?php foreach($names as $_key=>$_value) { ?> - <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$name){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> - </option> - <?php } ?> - </select> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($folderobjectid)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_DEFAULT_FOLDEROBJECT').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <select name="<?php echo escapeHtml('folderobjectid') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> - <?php foreach($folders as $_key=>$_value) { ?> - <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$folderobjectid){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> - </option> - <?php } ?> - </select> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($default_objectid)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_DEFAULT_OBJECT').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <select name="<?php echo escapeHtml('default_objectid') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> - <option value="<?php echo escapeHtml('') ?>"><?php echo escapeHtml(''.@lang('LIST_ENTRY_EMPTY').'') ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('properties') ?>" data-action="<?php echo escapeHtml('element') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form element') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('element') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('properties') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <?php $if1=(isset($subtype)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('ELEMENT_SUBTYPE').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <?php $if1=(isset($subtypes)); if($if1) { ?> + <select name="<?php echo escapeHtml('subtype') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <option value="<?php echo escapeHtml('') ?>"><?php echo escapeHtml(''.@lang('LIST_ENTRY_EMPTY').'') ?> + </option> + <?php foreach($subtypes as $_key=>$_value) { ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$subtype){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> - <?php foreach($objects as $_key=>$_value) { ?> - <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$default_objectid){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> - </option> - <?php } ?> - </select> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($code)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('EL_PROP_code').'') ?> + <?php } ?> + </select> + <?php } ?> + <?php $if1=!(isset($subtypes)); if($if1) { ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('subtype') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$subtype.'') ?>" /><?php echo escapeHtml('') ?> + </div> + <?php } ?> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($with_icon)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_WITH_ICON').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('with_icon') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$with_icon){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($all_languages)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_ALL_LANGUAGES').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('all_languages') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$all_languages){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($writable)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_writable').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('writable') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$writable){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($width)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('width').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('width') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$width.'') ?>" /><?php echo escapeHtml('') ?> + </div> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($height)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('height').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('height') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$height.'') ?>" /><?php echo escapeHtml('') ?> + </div> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($dateformat)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DATEFORMAT').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('dateformat') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <?php foreach($dateformats as $_key=>$_value) { ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$dateformat){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> + </option> + <?php } ?> + </select> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($format)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_FORMAT').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <?php foreach( $formatlist as $_key=>$_value) { ?> + <label><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('format') ?>" value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$format){ ?>checked="<?php echo escapeHtml('checked') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$_value.'') ?> </span> - </td> - <td><?php echo escapeHtml('') ?> - <textarea name="<?php echo escapeHtml('code') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$code.'') ?> - </textarea> - </td> - </tr> - <?php } ?> - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> - - </td> - </tr> - </div> - <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> - </div> - </form> - + </label> + <br /><?php echo escapeHtml('') ?> + <?php } ?> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($decimals)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DECIMALS').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('decimals') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('2') ?>" value="<?php echo escapeHtml(''.@$decimals.'') ?>" /><?php echo escapeHtml('') ?> + </div> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($dec_point)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DEC_POINT').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('dec_point') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('5') ?>" value="<?php echo escapeHtml(''.@$dec_point.'') ?>" /><?php echo escapeHtml('') ?> + </div> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($thousand_sep)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_thousand_sep').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('thousand_sep') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('1') ?>" value="<?php echo escapeHtml(''.@$thousand_sep.'') ?>" /><?php echo escapeHtml('') ?> + </div> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($default_text)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_default_text').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('default_text') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('255') ?>" value="<?php echo escapeHtml(''.@$default_text.'') ?>" /><?php echo escapeHtml('') ?> + </div> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($default_longtext)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_default_longtext').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('default_longtext') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$default_longtext.'') ?> + </textarea> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($parameters)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DYNAMIC_PARAMETERS').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('parameters') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$parameters.'') ?> + </textarea> + </td> + </tr> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + </td> + <td><?php echo escapeHtml('') ?> + <?php foreach((array)$dynamic_class_parameters as $paramName=>$defaultValue) { ?> + <span><?php echo escapeHtml(''.@$paramName.'') ?> + </span> + <span><?php echo escapeHtml(' (') ?> + </span> + <span><?php echo escapeHtml(''.@lang('DEFAULT').'') ?> + </span> + <span><?php echo escapeHtml(') = ') ?> + </span> + <span><?php echo escapeHtml(''.@$defaultValue.'') ?> + </span> + <br /><?php echo escapeHtml('') ?> + <?php } ?> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($select_items)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_select_items').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('select_items') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$select_items.'') ?> + </textarea> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($linkelement)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_LINK').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('linkelement') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <?php foreach($linkelements as $_key=>$_value) { ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$linkelement){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> + </option> + <?php } ?> + </select> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($name)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('ELEMENT_NAME').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('name') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <?php foreach($names as $_key=>$_value) { ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$name){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> + </option> + <?php } ?> + </select> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($folderobjectid)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DEFAULT_FOLDEROBJECT').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('folderobjectid') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <?php foreach($folders as $_key=>$_value) { ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$folderobjectid){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> + </option> + <?php } ?> + </select> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($default_objectid)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DEFAULT_OBJECT').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('default_objectid') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <option value="<?php echo escapeHtml('') ?>"><?php echo escapeHtml(''.@lang('LIST_ENTRY_EMPTY').'') ?> + </option> + <?php foreach($objects as $_key=>$_value) { ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$default_objectid){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> + </option> + <?php } ?> + </select> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($code)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_code').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('code') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$code.'') ?> + </textarea> + </td> + </tr> + <?php } ?> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> + + </td> + </tr> + </div> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> + </div> + </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/element/properties.tpl.src.xml b/modules/cms/ui/themes/default/html/views/element/properties.tpl.src.xml @@ -1,234 +1,229 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <dummy> - <form> - <window name="PREFS" widths="30%,70%"> - <if present="subtype"> - <row> - <column> - <text value="${message:ELEMENT_SUBTYPE}"></text> - </column> - <column> - <if present="subtypes"> - <selectbox name="subtype" list="subtypes" addempty="true"></selectbox> - </if> - <if not="true" present="subtypes"> - <input name="subtype"></input> - </if> - </column> - </row> - </if> - <if present="with_icon"> - <row> - <column> - <text value="${message:EL_PROP_WITH_ICON}"></text> - </column> - <column> - <checkbox name="with_icon"></checkbox> - </column> - </row> - </if> - <if present="all_languages"> - <row> - <column> - <text value="${message:EL_PROP_ALL_LANGUAGES}"></text> - </column> - <column> - <checkbox name="all_languages"></checkbox> - </column> - </row> - </if> - <if present="writable"> - <row> - <column> - <text value="${message:EL_PROP_writable}"></text> - </column> - <column> - <checkbox name="writable"></checkbox> - </column> - </row> - </if> - <if present="width"> - <row> - <column> - <text value="${message:width}"></text> - </column> - <column> - <input size="10" name="width"></input> - </column> - </row> - </if> - <if present="height"> - <row> - <column> - <text value="${message:height}"></text> - </column> - <column> - <input size="10" name="height"></input> - </column> - </row> - </if> - <if present="dateformat"> - <row> - <column> - <text value="${message:EL_PROP_DATEFORMAT}"></text> - </column> - <column> - <selectbox name="dateformat" list="dateformats"></selectbox> - </column> - </row> - </if> - <if present="format"> - <row> - <column> - <text value="${message:EL_PROP_FORMAT}"></text> - </column> - <column> - <radiobox name="format" list="formatlist"></radiobox> - </column> - </row> - </if> - <if present="decimals"> - <row> - <column> - <text value="${message:EL_PROP_DECIMALS}"></text> - </column> - <column> - <input size="10" maxlength="2" name="decimals"></input> - </column> - </row> - </if> - <if present="dec_point"> - <row> - <column> - <text value="${message:EL_PROP_DEC_POINT}"></text> - </column> - <column> - <input size="10" maxlength="5" name="dec_point"></input> - </column> - </row> - </if> - <if present="thousand_sep"> - <row> - <column> - <text value="${message:EL_PROP_thousand_sep}"></text> - </column> - <column> - <input size="10" maxlength="1" name="thousand_sep"></input> - </column> - </row> - </if> - <if present="default_text"> - <row> - <column> - <text value="${message:EL_PROP_default_text}"></text> - </column> - <column> - <input size="40" maxlength="255" name="default_text"></input> - </column> - </row> - </if> - <if present="default_longtext"> - <row> - <column> - <text value="${message:EL_PROP_default_longtext}"></text> - </column> - <column> - <inputarea rows="10" cols="40" name="default_longtext"></inputarea> - </column> - </row> - </if> - <if present="parameters"> - <row> - <column> - <text value="${message:EL_PROP_DYNAMIC_PARAMETERS}"></text> - </column> - <column> - <inputarea rows="15" cols="40" name="parameters"></inputarea> - </column> - </row> - <row> - <column></column> - <column> - <list list="${dynamic_class_parameters}" key="paramName" value="defaultValue"> - <text value="${paramName}"></text> - <text value=" ("></text> - <text value="${message:DEFAULT}"></text> - <text value=") = "></text> - <text value="${defaultValue}"></text> - <newline></newline> - </list> - </column> - </row> - </if> - <if present="select_items"> - <row> - <column> - <text value="${message:EL_PROP_select_items}"></text> - </column> - <column> - <inputarea rows="15" cols="40" name="select_items"></inputarea> - </column> - </row> - </if> - <if present="linkelement"> - <row> - <column> - <text value="${message:EL_LINK}"></text> - </column> - <column> - <selectbox name="linkelement" list="linkelements"></selectbox> - </column> - </row> - </if> - <if present="name"> - <row> - <column> - <text value="${message:ELEMENT_NAME}"></text> - </column> - <column> - <selectbox name="name" list="names"></selectbox> - </column> - </row> - </if> - <if present="folderobjectid"> - <row> - <column> - <text value="${message:EL_PROP_DEFAULT_FOLDEROBJECT}"></text> - </column> - <column> - <selectbox name="folderobjectid" list="folders"></selectbox> - </column> - </row> - </if> - <if present="default_objectid"> - <row> - <column> - <text value="${message:EL_PROP_DEFAULT_OBJECT}"></text> - </column> - <column> - <selectbox name="default_objectid" list="objects" - addempty="true"></selectbox> - </column> - </row> - </if> - <if present="code"> - <row> - <column> - <text value="${message:EL_PROP_code}"></text> - </column> - <column> - <inputarea name="code" rows="35" cols="60"></inputarea> - </column> - </row> - </if> - <row> - <column colspan="2" class="act"> - <button type="ok"></button> - </column> - </row> - </window> - </form> - <focus field="name"></focus> - </dummy> + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <if present="subtype"> + <row> + <column> + <text value="${message:ELEMENT_SUBTYPE}"></text> + </column> + <column> + <if present="subtypes"> + <selectbox name="subtype" list="subtypes" addempty="true"></selectbox> + </if> + <if not="true" present="subtypes"> + <input name="subtype"></input> + </if> + </column> + </row> + </if> + <if present="with_icon"> + <row> + <column> + <text value="${message:EL_PROP_WITH_ICON}"></text> + </column> + <column> + <checkbox name="with_icon"></checkbox> + </column> + </row> + </if> + <if present="all_languages"> + <row> + <column> + <text value="${message:EL_PROP_ALL_LANGUAGES}"></text> + </column> + <column> + <checkbox name="all_languages"></checkbox> + </column> + </row> + </if> + <if present="writable"> + <row> + <column> + <text value="${message:EL_PROP_writable}"></text> + </column> + <column> + <checkbox name="writable"></checkbox> + </column> + </row> + </if> + <if present="width"> + <row> + <column> + <text value="${message:width}"></text> + </column> + <column> + <input size="10" name="width"></input> + </column> + </row> + </if> + <if present="height"> + <row> + <column> + <text value="${message:height}"></text> + </column> + <column> + <input size="10" name="height"></input> + </column> + </row> + </if> + <if present="dateformat"> + <row> + <column> + <text value="${message:EL_PROP_DATEFORMAT}"></text> + </column> + <column> + <selectbox name="dateformat" list="dateformats"></selectbox> + </column> + </row> + </if> + <if present="format"> + <row> + <column> + <text value="${message:EL_PROP_FORMAT}"></text> + </column> + <column> + <radiobox name="format" list="formatlist"></radiobox> + </column> + </row> + </if> + <if present="decimals"> + <row> + <column> + <text value="${message:EL_PROP_DECIMALS}"></text> + </column> + <column> + <input size="10" maxlength="2" name="decimals"></input> + </column> + </row> + </if> + <if present="dec_point"> + <row> + <column> + <text value="${message:EL_PROP_DEC_POINT}"></text> + </column> + <column> + <input size="10" maxlength="5" name="dec_point"></input> + </column> + </row> + </if> + <if present="thousand_sep"> + <row> + <column> + <text value="${message:EL_PROP_thousand_sep}"></text> + </column> + <column> + <input size="10" maxlength="1" name="thousand_sep"></input> + </column> + </row> + </if> + <if present="default_text"> + <row> + <column> + <text value="${message:EL_PROP_default_text}"></text> + </column> + <column> + <input size="40" maxlength="255" name="default_text"></input> + </column> + </row> + </if> + <if present="default_longtext"> + <row> + <column> + <text value="${message:EL_PROP_default_longtext}"></text> + </column> + <column> + <inputarea rows="10" cols="40" name="default_longtext"></inputarea> + </column> + </row> + </if> + <if present="parameters"> + <row> + <column> + <text value="${message:EL_PROP_DYNAMIC_PARAMETERS}"></text> + </column> + <column> + <inputarea rows="15" cols="40" name="parameters"></inputarea> + </column> + </row> + <row> + <column></column> + <column> + <list list="${dynamic_class_parameters}" key="paramName" value="defaultValue"> + <text value="${paramName}"></text> + <text value=" ("></text> + <text value="${message:DEFAULT}"></text> + <text value=") = "></text> + <text value="${defaultValue}"></text> + <newline></newline> + </list> + </column> + </row> + </if> + <if present="select_items"> + <row> + <column> + <text value="${message:EL_PROP_select_items}"></text> + </column> + <column> + <inputarea rows="15" cols="40" name="select_items"></inputarea> + </column> + </row> + </if> + <if present="linkelement"> + <row> + <column> + <text value="${message:EL_LINK}"></text> + </column> + <column> + <selectbox name="linkelement" list="linkelements"></selectbox> + </column> + </row> + </if> + <if present="name"> + <row> + <column> + <text value="${message:ELEMENT_NAME}"></text> + </column> + <column> + <selectbox name="name" list="names"></selectbox> + </column> + </row> + </if> + <if present="folderobjectid"> + <row> + <column> + <text value="${message:EL_PROP_DEFAULT_FOLDEROBJECT}"></text> + </column> + <column> + <selectbox name="folderobjectid" list="folders"></selectbox> + </column> + </row> + </if> + <if present="default_objectid"> + <row> + <column> + <text value="${message:EL_PROP_DEFAULT_OBJECT}"></text> + </column> + <column> + <selectbox name="default_objectid" list="objects" + addempty="true"></selectbox> + </column> + </row> + </if> + <if present="code"> + <row> + <column> + <text value="${message:EL_PROP_code}"></text> + </column> + <column> + <inputarea name="code" rows="35" cols="60"></inputarea> + </column> + </row> + </if> + <row> + <column colspan="2" class="act"> + <button type="ok"></button> + </column> + </row> + </form> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/element/remove.php b/modules/cms/ui/themes/default/html/views/element/remove.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('remove') ?>" data-action="<?php echo escapeHtml('element') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form element') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('element') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/element/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/element/remove.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true"></header> <form> <group> <part class="line"> diff --git a/modules/cms/ui/themes/default/html/views/file/extract.php b/modules/cms/ui/themes/default/html/views/file/extract.php @@ -1,22 +1,20 @@ <?php if (defined('OR_TITLE')) { ?> - - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('extract') ?>" data-action="<?php echo escapeHtml('file') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form file') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('file') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('extract') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> - <div><?php echo escapeHtml('') ?> - - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> - - </td> - </tr> - </div> - <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> - </div> - </form> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('extract') ?>" data-action="<?php echo escapeHtml('file') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form file') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('file') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('extract') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> + + </td> + </tr> + </div> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> + </div> + </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/extract.tpl.src.xml b/modules/cms/ui/themes/default/html/views/file/extract.tpl.src.xml @@ -1,15 +1,11 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <dummy> - <form> - <window name="asdf" title="asdfdfs"> - <row> - <column colspan="2" class="act"> - <button type="ok"></button> - </column> - </row> - </window> - </form> - </dummy> + <form> + <row> + <column colspan="2" class="act"> + <button type="ok"></button> + </column> + </row> + </form> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/value.php b/modules/cms/ui/themes/default/html/views/file/value.php @@ -6,27 +6,25 @@ <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('value') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> <div><?php echo escapeHtml('') ?> - - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('VALUE').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <textarea name="<?php echo escapeHtml('value') ?>" data-extension="<?php echo escapeHtml('') ?>" data-mimetype="<?php echo escapeHtml('') ?>" data-mode="<?php echo escapeHtml('htmlmixed') ?>" class="<?php echo escapeHtml('editor code-editor') ?>"><?php echo escapeHtml(''.@$value.'') ?> - </textarea> - </td> - </tr> - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> - - </td> - </tr> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('VALUE').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('value') ?>" data-extension="<?php echo escapeHtml('') ?>" data-mimetype="<?php echo escapeHtml('') ?>" data-mode="<?php echo escapeHtml('htmlmixed') ?>" class="<?php echo escapeHtml('editor code-editor') ?>"><?php echo escapeHtml(''.@$value.'') ?> + </textarea> + </td> + </tr> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> + + </td> + </tr> </div> <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> - <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/value.tpl.src.xml b/modules/cms/ui/themes/default/html/views/file/value.tpl.src.xml @@ -1,22 +1,19 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <form> - <window> - <row> - <column> - <text value="${message:VALUE}"></text> - </column> - <column> - <editor name="value" type="code"></editor> - </column> - </row> - <row> - <column class="act" colspan="2"> - <button type="ok"></button> - </column> - </row> - </window> - </form> - <focus field="value"></focus> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <row> + <column> + <text value="${message:VALUE}"></text> + </column> + <column> + <editor name="value" type="code"></editor> + </column> + </row> + <row> + <column class="act" colspan="2"> + <button type="ok"></button> + </column> + </row> + </form> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/createfile.php b/modules/cms/ui/themes/default/html/views/folder/createfile.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('upload') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('createfile') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('multipart/form-data') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> @@ -84,5 +83,4 @@ <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> - <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/createfile.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createfile.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true"></header> <form enctype="multipart/form-data" target="upload" type="upload" visible="true"> <hidden name="type" default="file"></hidden> <part class="line"> @@ -61,5 +60,4 @@ </part> </form> - <focus field="name"></focus> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/createfolder.php b/modules/cms/ui/themes/default/html/views/folder/createfolder.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('createfolder') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/createfolder.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createfolder.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true"></header> <form visible="true" label="${message:add}"> <hidden name="languageid" /> <part class="line"> diff --git a/modules/cms/ui/themes/default/html/views/folder/createimage.php b/modules/cms/ui/themes/default/html/views/folder/createimage.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('upload') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('createimage') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('multipart/form-data') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> @@ -84,5 +83,4 @@ <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> - <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/createimage.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createimage.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true"></header> <form enctype="multipart/form-data" target="upload" type="upload" visible="true"> <hidden name="type" default="file"></hidden> <part class="line"> @@ -61,5 +60,4 @@ </part> </form> - <focus field="name"></focus> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/createpage.php b/modules/cms/ui/themes/default/html/views/folder/createpage.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('createpage') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/createpage.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createpage.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true"></header> <form> <part class="line"> <part class="label"> diff --git a/modules/cms/ui/themes/default/html/views/folder/createtext.php b/modules/cms/ui/themes/default/html/views/folder/createtext.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('createtext') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> @@ -83,5 +82,4 @@ <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> - <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/createtext.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createtext.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true"></header> <form> <part class="line"> <part class="label"> @@ -60,5 +59,4 @@ </part> </form> - <focus field="name"></focus> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/inherit.php b/modules/cms/ui/themes/default/html/views/folder/inherit.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('inherit') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/inherit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/inherit.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true" /> <form> <if value="${type}" equals="folder"> diff --git a/modules/cms/ui/themes/default/html/views/group/add.php b/modules/cms/ui/themes/default/html/views/group/add.php @@ -1,27 +1,26 @@ <?php if (defined('OR_TITLE')) { ?> - - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('add') ?>" data-action="<?php echo escapeHtml('group') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form group') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('group') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('add') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> - <div><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> - <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml(''.@lang('name').'') ?> - </label> - </div> - <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> - <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" class="<?php echo escapeHtml('focus') ?>" /><?php echo escapeHtml('') ?> - </div> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('add') ?>" data-action="<?php echo escapeHtml('group') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form group') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('group') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('add') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml(''.@lang('name').'') ?> + </label> + </div> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" class="<?php echo escapeHtml('focus') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> - </div> - </form> + </div> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> + </div> + </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/group/add.tpl.src.xml b/modules/cms/ui/themes/default/html/views/group/add.tpl.src.xml @@ -1,3 +1,14 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"><header back="true"><form><part class="line"><part class="label"><label for="name" key="name"></label></part><part class="input"><input name="name" class="focus"></input></part></part></form></header></output>- \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <part class="line"> + <part class="label"> + <label for="name" key="name"></label> + </part> + <part class="input"> + <input name="name" class="focus"></input> + </part> + </part> + </form> +</output>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/grouplist/show.php b/modules/cms/ui/themes/default/html/views/grouplist/show.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/grouplist/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/grouplist/show.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header views="add" /> <table> <row class="headline"> <column> diff --git a/modules/cms/ui/themes/default/html/views/image/extract.php b/modules/cms/ui/themes/default/html/views/image/extract.php @@ -1,22 +1,20 @@ <?php if (defined('OR_TITLE')) { ?> - - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('extract') ?>" data-action="<?php echo escapeHtml('image') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form image') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('image') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('extract') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> - <div><?php echo escapeHtml('') ?> - - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> - - </td> - </tr> - </div> - <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> - </div> - </form> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('extract') ?>" data-action="<?php echo escapeHtml('image') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form image') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('image') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('extract') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> + + </td> + </tr> + </div> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> + </div> + </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/extract.tpl.src.xml b/modules/cms/ui/themes/default/html/views/image/extract.tpl.src.xml @@ -1,3 +1,11 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"><dummy><form><window name="asdf" title="asdfdfs"><row><column colspan="2" class="act"><button type="ok"></button></column></row></window></form></dummy></output>- \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <row> + <column colspan="2" class="act"> + <button type="ok"></button> + </column> + </row> + </form> +</output>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/remove.php b/modules/cms/ui/themes/default/html/views/image/remove.php @@ -1,42 +1,39 @@ <?php if (defined('OR_TITLE')) { ?> - - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('remove') ?>" data-action="<?php echo escapeHtml('image') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form image') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('image') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('remove') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> - <div><?php echo escapeHtml('') ?> - - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('NAME').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@$name.'') ?> - </span> - </td> - </tr> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('DELETE').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('delete') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> - </td> - </tr> - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> - - </td> - </tr> - </div> - <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> - </div> - </form> - + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('remove') ?>" data-action="<?php echo escapeHtml('image') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form image') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('image') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('remove') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('NAME').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> + </span> + </td> + </tr> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('DELETE').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('delete') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + </td> + </tr> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + + </td> + </tr> + </div> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> + </div> + </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/image/remove.tpl.src.xml @@ -1,3 +1,27 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"><dummy><form><window icon="group" name="GROUPS"><row><column><text value="${message:NAME}"></text></column><column><text value="${name}"></text></column></row><row><column><text value="${message:DELETE}"></text></column><column><checkbox name="delete"></checkbox></column></row><row><column colspan="2"><button type="ok"></button></column></row></window></form><focus field="delete"></focus></dummy></output>- \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <row> + <column> + <text value="${message:NAME}"></text> + </column> + <column> + <text value="${name}"></text> + </column> + </row> + <row> + <column> + <text value="${message:DELETE}"></text> + </column> + <column> + <checkbox name="delete"></checkbox> + </column> + </row> + <row> + <column colspan="2"> + <button type="ok"></button> + </column> + </row> + </form> +</output>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/show.php b/modules/cms/ui/themes/default/html/views/image/show.php @@ -1,21 +1,19 @@ <?php if (defined('OR_TITLE')) { ?> - - - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> - <iframe src="<?php echo escapeHtml(''.@$preview_url.'') ?>"><?php echo escapeHtml('') ?> - </iframe> - <a target="<?php echo escapeHtml('_self') ?>" data-action="<?php echo escapeHtml('file') ?>" data-method="<?php echo escapeHtml('edit') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/file/') ?>" class="<?php echo escapeHtml('action') ?>"><?php echo escapeHtml('') ?> - <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/edit.png') ?>" /><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('menu_file_edit').'') ?> - </span> - </a> - <a target="<?php echo escapeHtml('_self') ?>" data-action="<?php echo escapeHtml('file') ?>" data-method="<?php echo escapeHtml('editvalue') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/file/') ?>" class="<?php echo escapeHtml('action') ?>"><?php echo escapeHtml('') ?> - <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/editvalue.png') ?>" /><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('menu_file_editvalue').'') ?> - </span> - </a> - </td> - </tr> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <iframe src="<?php echo escapeHtml(''.@$preview_url.'') ?>"><?php echo escapeHtml('') ?> + </iframe> + <a target="<?php echo escapeHtml('_self') ?>" data-action="<?php echo escapeHtml('file') ?>" data-method="<?php echo escapeHtml('edit') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/file/') ?>" class="<?php echo escapeHtml('action') ?>"><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/edit.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_file_edit').'') ?> + </span> + </a> + <a target="<?php echo escapeHtml('_self') ?>" data-action="<?php echo escapeHtml('file') ?>" data-method="<?php echo escapeHtml('editvalue') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/file/') ?>" class="<?php echo escapeHtml('action') ?>"><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/editvalue.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_file_editvalue').'') ?> + </span> + </a> + </td> + </tr> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/image/show.tpl.src.xml @@ -1,21 +1,17 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <dummy> - <window icon="folder"> - <row> - <column colspan="2"> - <insert url="${preview_url}"></insert> - <link class="action" action="file" subaction="edit"> - <image file="icon/edit"></image> - <text value="${message:menu_file_edit}"></text> - </link> - <link class="action" action="file" subaction="editvalue"> - <image file="icon/editvalue"></image> - <text value="${message:menu_file_editvalue}"></text> - </link> - </column> - </row> - </window> - </dummy> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <row> + <column colspan="2"> + <insert url="${preview_url}"></insert> + <link class="action" action="file" subaction="edit"> + <image file="icon/edit"></image> + <text value="${message:menu_file_edit}"></text> + </link> + <link class="action" action="file" subaction="editvalue"> + <image file="icon/editvalue"></image> + <text value="${message:menu_file_editvalue}"></text> + </link> + </column> + </row> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/value.php b/modules/cms/ui/themes/default/html/views/image/value.php @@ -6,27 +6,25 @@ <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('value') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> <div><?php echo escapeHtml('') ?> - - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('VALUE').'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <textarea name="<?php echo escapeHtml('value') ?>" data-extension="<?php echo escapeHtml('') ?>" data-mimetype="<?php echo escapeHtml('') ?>" data-mode="<?php echo escapeHtml('htmlmixed') ?>" class="<?php echo escapeHtml('editor code-editor') ?>"><?php echo escapeHtml(''.@$value.'') ?> - </textarea> - </td> - </tr> - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> - - </td> - </tr> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('VALUE').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('value') ?>" data-extension="<?php echo escapeHtml('') ?>" data-mimetype="<?php echo escapeHtml('') ?>" data-mode="<?php echo escapeHtml('htmlmixed') ?>" class="<?php echo escapeHtml('editor code-editor') ?>"><?php echo escapeHtml(''.@$value.'') ?> + </textarea> + </td> + </tr> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> + + </td> + </tr> </div> <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> - <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/value.tpl.src.xml b/modules/cms/ui/themes/default/html/views/image/value.tpl.src.xml @@ -1,22 +1,19 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <form> - <window> - <row> - <column> - <text value="${message:VALUE}"></text> - </column> - <column> - <editor name="value" type="code"></editor> - </column> - </row> - <row> - <column class="act" colspan="2"> - <button type="ok"></button> - </column> - </row> - </window> - </form> - <focus field="value"></focus> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <row> + <column> + <text value="${message:VALUE}"></text> + </column> + <column> + <editor name="value" type="code"></editor> + </column> + </row> + <row> + <column class="act" colspan="2"> + <button type="ok"></button> + </column> + </row> + </form> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/language/listing.php b/modules/cms/ui/themes/default/html/views/language/listing.php @@ -1,69 +1,67 @@ <?php if (defined('OR_TITLE')) { ?> - - - <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> - </div> - <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> - <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> - <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('name').'') ?> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> + </div> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('name').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('') ?> + </span> + </td> + </tr> + <?php foreach((array)$el as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon_language.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$isocode.'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <?php $if1=(isset($default_url)); if($if1) { ?> + <span><?php echo escapeHtml(''.@lang('make_default').'') ?> </span> - </td> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml('') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml('') ?> + <?php } ?> + <?php if(!$if1) { ?> + <span><?php echo escapeHtml(''.@lang('is_default').'') ?> </span> - </td> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml('') ?> + <?php } ?> + </td> + <td><?php echo escapeHtml('') ?> + <?php $if1=(isset($select_url)); if($if1) { ?> + <span><?php echo escapeHtml(''.@lang('select').'') ?> </span> - </td> - </tr> - <?php foreach((array)$el as $list_key=>$list_value) { extract($list_value); ?> - <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon_language.png') ?>" /><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@$name.'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@$isocode.'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <?php $if1=(isset($default_url)); if($if1) { ?> - <span><?php echo escapeHtml(''.@lang('make_default').'') ?> - </span> - <?php } ?> - <?php if(!$if1) { ?> - <span><?php echo escapeHtml(''.@lang('is_default').'') ?> - </span> - <?php } ?> - </td> - <td><?php echo escapeHtml('') ?> - <?php $if1=(isset($select_url)); if($if1) { ?> - <span><?php echo escapeHtml(''.@lang('select').'') ?> - </span> - <?php } ?> - <?php if(!$if1) { ?> - <span><?php echo escapeHtml(''.@lang('selected').'') ?> - </span> - <?php } ?> - </td> - </tr> - <?php { unset($select_url) ?> <?php } ?> - <?php { unset($default_url}) ?> + <?php if(!$if1) { ?> + <span><?php echo escapeHtml(''.@lang('selected').'') ?> + </span> <?php } ?> - <?php } ?> - </table> - </div> - </div> + </td> + </tr> + <?php { unset($select_url) ?> + <?php } ?> + <?php { unset($default_url}) ?> + <?php } ?> + <?php } ?> + </table> + </div> + </div> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/language/listing.tpl.src.xml b/modules/cms/ui/themes/default/html/views/language/listing.tpl.src.xml @@ -1,53 +1,49 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <dummy> - <window icon="language"> - <table> - <row class="headline"> - <column> - <text value="${message:name}"></text> - </column> - <column> - <text value=""></text> - </column> - <column> - <text value=""></text> - </column> - <column> - <text value=""></text> - </column> - </row> - <list list="${el}" extract="true"> - <row class="data"> - <column url="${url}"> - <image file="icon_language"></image> - <text value="${name}" maxlength="25"></text> - </column> - <column> - <text value="${isocode}"></text> - </column> - <column url="${default_url}"> - <if present="default_url"> - <text value="${message:make_default}"></text> - </if> - <else> - <text value="${message:is_default}"></text> - </else> - </column> - <column url="${select_url}"> - <if present="select_url"> - <text value="${message:select}"></text> - </if> - <else> - <text value="${message:selected}"></text> - </else> - </column> - </row> - <set var="select_url"></set> - <set var="default_url}"></set> - </list> - </table> - </window> - </dummy> + <table> + <row class="headline"> + <column> + <text value="${message:name}"></text> + </column> + <column> + <text value=""></text> + </column> + <column> + <text value=""></text> + </column> + <column> + <text value=""></text> + </column> + </row> + <list list="${el}" extract="true"> + <row class="data"> + <column url="${url}"> + <image file="icon_language"></image> + <text value="${name}" maxlength="25"></text> + </column> + <column> + <text value="${isocode}"></text> + </column> + <column url="${default_url}"> + <if present="default_url"> + <text value="${message:make_default}"></text> + </if> + <else> + <text value="${message:is_default}"></text> + </else> + </column> + <column url="${select_url}"> + <if present="select_url"> + <text value="${message:select}"></text> + </if> + <else> + <text value="${message:selected}"></text> + </else> + </column> + </row> + <set var="select_url"></set> + <set var="default_url}"></set> + </list> + </table> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/language/prop.php b/modules/cms/ui/themes/default/html/views/language/prop.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('prop') ?>" data-action="<?php echo escapeHtml('language') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('post') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form language') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('language') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/language/prop.tpl.src.xml b/modules/cms/ui/themes/default/html/views/language/prop.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true"></header> <form method="post"> <part class="line"> diff --git a/modules/cms/ui/themes/default/html/views/language/remove.php b/modules/cms/ui/themes/default/html/views/language/remove.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('remove') ?>" data-action="<?php echo escapeHtml('language') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('post') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form language') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('language') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/language/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/language/remove.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true" /> <form method="post"> <group> <part class="line"> diff --git a/modules/cms/ui/themes/default/html/views/login/openid.php b/modules/cms/ui/themes/default/html/views/login/openid.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('_top') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('login') ?>" data-action="<?php echo escapeHtml('login') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form login') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('login') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/login/openid.tpl.src.xml b/modules/cms/ui/themes/default/html/views/login/openid.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header views="password"></header> <form action="login" subaction="login" target="_top"> <!-- Open-Id --> diff --git a/modules/cms/ui/themes/default/html/views/login/password.php b/modules/cms/ui/themes/default/html/views/login/password.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <?php $if1=(config('login','send_password')); if($if1) { ?> <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('password') ?>" data-action="<?php echo escapeHtml('login') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form login') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/login/password.tpl.src.xml b/modules/cms/ui/themes/default/html/views/login/password.tpl.src.xml @@ -1,8 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true"></header> - <if true="${config:login/send_password}"> <form> <logo name="password"></logo> diff --git a/modules/cms/ui/themes/default/html/views/login/passwordcode.php b/modules/cms/ui/themes/default/html/views/login/passwordcode.php @@ -43,5 +43,4 @@ <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> - <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/login/passwordcode.tpl.src.xml b/modules/cms/ui/themes/default/html/views/login/passwordcode.tpl.src.xml @@ -21,5 +21,4 @@ </row> </row> </form> - <focus field="code"></focus> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/model/listing.php b/modules/cms/ui/themes/default/html/views/model/listing.php @@ -1,63 +1,61 @@ <?php if (defined('OR_TITLE')) { ?> - - - <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> - </div> - <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> - <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> - <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('name').'') ?> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> + </div> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('name').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('') ?> + </span> + </td> + </tr> + <?php foreach((array)$el as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-action="<?php echo escapeHtml('') ?>" data-method="<?php echo escapeHtml('') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#//') ?>"><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon_model.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> - </td> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml('') ?> + </a> + </td> + <td><?php echo escapeHtml('') ?> + <?php $if1=(isset($default_url)); if($if1) { ?> + <span><?php echo escapeHtml(''.@lang('make_default').'') ?> </span> - </td> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml('') ?> + <?php } ?> + <?php if(!$if1) { ?> + <span><?php echo escapeHtml(''.@lang('is_default').'') ?> + </span> + <?php } ?> + </td> + <td><?php echo escapeHtml('') ?> + <?php $if1=(isset($select_url)); if($if1) { ?> + <span><?php echo escapeHtml(''.@lang('select').'') ?> </span> - </td> - </tr> - <?php foreach((array)$el as $list_key=>$list_value) { extract($list_value); ?> - <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <a target="<?php echo escapeHtml('_self') ?>" data-action="<?php echo escapeHtml('') ?>" data-method="<?php echo escapeHtml('') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#//') ?>"><?php echo escapeHtml('') ?> - <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon_model.png') ?>" /><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@$name.'') ?> - </span> - </a> - </td> - <td><?php echo escapeHtml('') ?> - <?php $if1=(isset($default_url)); if($if1) { ?> - <span><?php echo escapeHtml(''.@lang('make_default').'') ?> - </span> - <?php } ?> - <?php if(!$if1) { ?> - <span><?php echo escapeHtml(''.@lang('is_default').'') ?> - </span> - <?php } ?> - </td> - <td><?php echo escapeHtml('') ?> - <?php $if1=(isset($select_url)); if($if1) { ?> - <span><?php echo escapeHtml(''.@lang('select').'') ?> - </span> - <?php } ?> - <?php if(!$if1) { ?> - <span><?php echo escapeHtml(''.@lang('selected').'') ?> - </span> - <?php } ?> - </td> - </tr> - <?php { unset($select_url) ?> <?php } ?> - <?php { unset($default_url}) ?> + <?php if(!$if1) { ?> + <span><?php echo escapeHtml(''.@lang('selected').'') ?> + </span> <?php } ?> - <?php } ?> - </table> - </div> - </div> + </td> + </tr> + <?php { unset($select_url) ?> + <?php } ?> + <?php { unset($default_url}) ?> + <?php } ?> + <?php } ?> + </table> + </div> + </div> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/model/listing.tpl.src.xml b/modules/cms/ui/themes/default/html/views/model/listing.tpl.src.xml @@ -1,49 +1,45 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <dummy> - <window icon="group" name="MODELS" widths="50%,25%,25%"> - <table> - <row class="headline"> - <column> - <text value="${message:name}"></text> - </column> - <column> - <text value=""></text> - </column> - <column> - <text value=""></text> - </column> - </row> - <list list="${el}" extract="true"> - <row class="data"> - <column url="${url}"> - <link target="cms_main"> - <image file="icon_model"></image> - <text value="${name}" maxlength="25"></text> - </link> - </column> - <column url="${default_url}"> - <if present="default_url"> - <text value="${message:make_default}"></text> - </if> - <else> - <text value="${message:is_default}"></text> - </else> - </column> - <column url="${select_url}"> - <if present="select_url"> - <text value="${message:select}"></text> - </if> - <else> - <text value="${message:selected}"></text> - </else> - </column> - </row> - <set var="select_url"></set> - <set var="default_url}"></set> - </list> - </table> - </window> - </dummy> + <table> + <row class="headline"> + <column> + <text value="${message:name}"></text> + </column> + <column> + <text value=""></text> + </column> + <column> + <text value=""></text> + </column> + </row> + <list list="${el}" extract="true"> + <row class="data"> + <column url="${url}"> + <link target="cms_main"> + <image file="icon_model"></image> + <text value="${name}" maxlength="25"></text> + </link> + </column> + <column url="${default_url}"> + <if present="default_url"> + <text value="${message:make_default}"></text> + </if> + <else> + <text value="${message:is_default}"></text> + </else> + </column> + <column url="${select_url}"> + <if present="select_url"> + <text value="${message:select}"></text> + </if> + <else> + <text value="${message:selected}"></text> + </else> + </column> + </row> + <set var="select_url"></set> + <set var="default_url}"></set> + </list> + </table> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/model/remove.php b/modules/cms/ui/themes/default/html/views/model/remove.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('remove') ?>" data-action="<?php echo escapeHtml('model') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('post') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form model') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('model') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/model/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/model/remove.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true"></header> <form method="post"> <group> <part class="line"> diff --git a/modules/cms/ui/themes/default/html/views/modellist/add.php b/modules/cms/ui/themes/default/html/views/modellist/add.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('add') ?>" data-action="<?php echo escapeHtml('modellist') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('post') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form modellist') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('modellist') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/modellist/add.tpl.src.xml b/modules/cms/ui/themes/default/html/views/modellist/add.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true"></header> <form method="post"> <part class="line"> <part class="label"> diff --git a/modules/cms/ui/themes/default/html/views/object/inherit.php b/modules/cms/ui/themes/default/html/views/object/inherit.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('inherit') ?>" data-action="<?php echo escapeHtml('object') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form object') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('object') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/object/inherit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/object/inherit.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true" /> <form> <if value="${type}" equals="folder"> diff --git a/modules/cms/ui/themes/default/html/views/page/form.php b/modules/cms/ui/themes/default/html/views/page/form.php @@ -1,118 +1,116 @@ <?php if (defined('OR_TITLE')) { ?> - - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('form') ?>" data-action="<?php echo escapeHtml('page') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form page') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('page') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('form') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> - <div><?php echo escapeHtml('') ?> - - <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> - </div> - <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> - <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> - <?php $if1=(($el)==FALSE); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('4') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('NOT_FOUND').'') ?> - </span> - </td> - </tr> - <?php } ?> - <?php $if1=!(($el)==FALSE); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('PAGE_ELEMENT_NAME').'') ?> - </span> - </td> - <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('CHANGE').'') ?> - </span> - </td> - <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('VALUE').'') ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('form') ?>" data-action="<?php echo escapeHtml('page') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form page') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('page') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('form') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> + </div> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <?php $if1=(($el)==FALSE); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('4') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('NOT_FOUND').'') ?> + </span> + </td> + </tr> + <?php } ?> + <?php $if1=!(($el)==FALSE); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('PAGE_ELEMENT_NAME').'') ?> + </span> + </td> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('CHANGE').'') ?> + </span> + </td> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('VALUE').'') ?> + </span> + </td> + </tr> + <?php foreach((array)$el as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-el_'.@$type.'') ?>"><?php echo escapeHtml('') ?> + </i> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> - </td> - </tr> - <?php foreach((array)$el as $list_key=>$list_value) { extract($list_value); ?> - <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> - <i class="<?php echo escapeHtml('image-icon image-icon--action-el_'.@$type.'') ?>"><?php echo escapeHtml('') ?> - </i> - <span><?php echo escapeHtml(''.@$name.'') ?> - </span> - </label> - </td> - <td><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml(''.@$saveid.'') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$$saveid){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> - </td> - <td><?php echo escapeHtml('') ?> - <?php $if1=(in_array($type,explode(",",text,date,number)); if($if1) { ?> - <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> - <input name="<?php echo escapeHtml(''.@$id.'') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('255') ?>" value="<?php echo escapeHtml(''.@$value.'') ?>" /><?php echo escapeHtml('') ?> - </div> + </label> + </td> + <td><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml(''.@$saveid.'') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$$saveid){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + </td> + <td><?php echo escapeHtml('') ?> + <?php $if1=(in_array($type,explode(",",text,date,number)); if($if1) { ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml(''.@$id.'') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('255') ?>" value="<?php echo escapeHtml(''.@$value.'') ?>" /><?php echo escapeHtml('') ?> + </div> + <?php } ?> + <?php $if1=($type=='longtext'); if($if1) { ?> + <textarea name="<?php echo escapeHtml(''.@$id.'') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$value.'') ?> + </textarea> + <?php } ?> + <?php $if1=(in_array($type,explode(",",select,link,list)); if($if1) { ?> + <select name="<?php echo escapeHtml(''.@$id.'') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <?php foreach($list as $_key=>$_value) { ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$value){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> + </option> <?php } ?> - <?php $if1=($type=='longtext'); if($if1) { ?> - <textarea name="<?php echo escapeHtml(''.@$id.'') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$value.'') ?> - </textarea> - <?php } ?> - <?php $if1=(in_array($type,explode(",",select,link,list)); if($if1) { ?> - <select name="<?php echo escapeHtml(''.@$id.'') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> - <?php foreach($list as $_key=>$_value) { ?> - <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$value){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> - </option> - <?php } ?> - </select> - <?php } ?> - </td> - </tr> - <?php } ?> - <?php } ?> - </table> - </div> - </div> - <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> - <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('options').'') ?> - <img /><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> - </div> - <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> - </div> - </legend> - <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> - <?php $if1=(isset($release)); if($if1) { ?> - <div class="<?php echo escapeHtml('') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('release') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> - <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(' ') ?> - </span> - <span><?php echo escapeHtml(''.@lang('RELEASE').'') ?> - </span> - </label> - </div> + </select> + <?php } ?> + </td> + </tr> <?php } ?> - <?php $if1=(isset($publish)); if($if1) { ?> - <div class="<?php echo escapeHtml('') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('publish') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$publish){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> - <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(' ') ?> - </span> - <span><?php echo escapeHtml(''.@lang('PAGE_PUBLISH_AFTER_SAVE').'') ?> - </span> - </label> - </div> - <?php } ?> - </div> - </fieldset> - + <?php } ?> + </table> + </div> </div> - <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> - </div> - </form> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('options').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> + </div> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> + </div> + </legend> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <?php $if1=(isset($release)); if($if1) { ?> + <div class="<?php echo escapeHtml('') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('release') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> + </span> + <span><?php echo escapeHtml(''.@lang('RELEASE').'') ?> + </span> + </label> + </div> + <?php } ?> + <?php $if1=(isset($publish)); if($if1) { ?> + <div class="<?php echo escapeHtml('') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('publish') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$publish){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> + </span> + <span><?php echo escapeHtml(''.@lang('PAGE_PUBLISH_AFTER_SAVE').'') ?> + </span> + </label> + </div> + <?php } ?> + </div> + </fieldset> + + </div> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> + </div> + </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/page/form.tpl.src.xml b/modules/cms/ui/themes/default/html/views/page/form.tpl.src.xml @@ -1,78 +1,74 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <dummy> - <form> - <window> - <table> - <if empty="${el}"> - <row> - <column colspan="4"> - <text value="${message:NOT_FOUND}"></text> - </column> - </row> - </if> - <if not="" empty="${el}"> - <row> - <column class="help"> - <text value="${message:PAGE_ELEMENT_NAME}"></text> - </column> - <column class="help"> - <text value="${message:CHANGE}"></text> - </column> - <column class="help"> - <text value="${message:VALUE}"></text> - </column> - </row> - <list list="${el}" extract="true"> - <row class="data"> - <column> - <label for="${saveid}"> - <image elementtype="${type}"></image> - <text value="${name}"></text> - </label> - </column> - <column> - <checkbox name="${saveid}" default="false" readonly="false"></checkbox> - </column> - <column> - <if value="${type}" contains="text,date,number"> - <input index="true" type="text" name="${id}" default="${value}" - size="40" maxlength="255" onchange="onchange"></input> - </if> - <if value="${type}" equals="longtext"> - <inputarea index="true" name="${id}" rows="7" cols="50" - onchange="onchange" default="${value}"></inputarea> - </if> - <if value="${type}" contains="select,link,list"> - <selectbox name="${id}" list="list" default="${value}"></selectbox> - </if> - </column> - </row> - </list> - </if> - </table> - <group title="${message:options}"> - <if present="release"> - <part> - <checkbox name="release"></checkbox> - <label for="release"> - <text value=" "></text> - <text value="${message:RELEASE}"></text> + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <table> + <if empty="${el}"> + <row> + <column colspan="4"> + <text value="${message:NOT_FOUND}"></text> + </column> + </row> + </if> + <if not="" empty="${el}"> + <row> + <column class="help"> + <text value="${message:PAGE_ELEMENT_NAME}"></text> + </column> + <column class="help"> + <text value="${message:CHANGE}"></text> + </column> + <column class="help"> + <text value="${message:VALUE}"></text> + </column> + </row> + <list list="${el}" extract="true"> + <row class="data"> + <column> + <label for="${saveid}"> + <image elementtype="${type}"></image> + <text value="${name}"></text> </label> - </part> - </if> - <if present="publish"> - <part> - <checkbox name="publish"></checkbox> - <label for="publish"> - <text value=" "></text> - <text value="${message:PAGE_PUBLISH_AFTER_SAVE}"></text> - </label> - </part> - </if> - </group> - <button type="ok"></button> - </window> - </form> - </dummy> + </column> + <column> + <checkbox name="${saveid}" default="false" readonly="false"></checkbox> + </column> + <column> + <if value="${type}" contains="text,date,number"> + <input index="true" type="text" name="${id}" default="${value}" + size="40" maxlength="255" onchange="onchange"></input> + </if> + <if value="${type}" equals="longtext"> + <inputarea index="true" name="${id}" rows="7" cols="50" + onchange="onchange" default="${value}"></inputarea> + </if> + <if value="${type}" contains="select,link,list"> + <selectbox name="${id}" list="list" default="${value}"></selectbox> + </if> + </column> + </row> + </list> + </if> + </table> + <group title="${message:options}"> + <if present="release"> + <part> + <checkbox name="release"></checkbox> + <label for="release"> + <text value=" "></text> + <text value="${message:RELEASE}"></text> + </label> + </part> + </if> + <if present="publish"> + <part> + <checkbox name="publish"></checkbox> + <label for="publish"> + <text value=" "></text> + <text value="${message:PAGE_PUBLISH_AFTER_SAVE}"></text> + </label> + </part> + </if> + </group> + <button type="ok"></button> + </form> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/page/info.php b/modules/cms/ui/themes/default/html/views/page/info.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('info') ?>" data-action="<?php echo escapeHtml('page') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form page') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('page') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/page/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/page/info.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header views="changetemplate"></header> <form readonly="true" cancel="false"> <text value="${name}" class="headline" /> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/export.php b/modules/cms/ui/themes/default/html/views/pageelement/export.php @@ -1,33 +1,30 @@ <?php if (defined('OR_TITLE')) { ?> - - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('export') ?>" data-action="<?php echo escapeHtml('pageelement') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form pageelement') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('pageelement') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('export') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> - <div><?php echo escapeHtml('') ?> - - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <select name="<?php echo escapeHtml('type') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> - <?php foreach($types as $_key=>$_value) { ?> - <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$type){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> - </option> - <?php } ?> - </select> - </td> - </tr> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - - </td> - </tr> - </div> - <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> - </div> - </form> - + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('export') ?>" data-action="<?php echo escapeHtml('pageelement') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form pageelement') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('pageelement') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('export') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('type') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <?php foreach($types as $_key=>$_value) { ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$type){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> + </option> + <?php } ?> + </select> + </td> + </tr> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + + </td> + </tr> + </div> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> + </div> + </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/pageelement/export.tpl.src.xml b/modules/cms/ui/themes/default/html/views/pageelement/export.tpl.src.xml @@ -1,3 +1,16 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"><dummy><form><window name="export" columnclasses="a"><row><column><selectbox list="types" name="type"></selectbox></column></row><row><column><button type="ok"></button></column></row></window></form><focus field="text"></focus></dummy></output>- \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <row> + <column> + <selectbox list="types" name="type"></selectbox> + </column> + </row> + <row> + <column> + <button type="ok"></button> + </column> + </row> + </form> +</output>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/pageelement/import.php b/modules/cms/ui/themes/default/html/views/pageelement/import.php @@ -1,38 +1,35 @@ <?php if (defined('OR_TITLE')) { ?> - - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('import') ?>" data-action="<?php echo escapeHtml('pageelement') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form pageelement') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('pageelement') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('import') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> - <div><?php echo escapeHtml('') ?> - - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <select name="<?php echo escapeHtml('type') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> - <?php foreach($types as $_key=>$_value) { ?> - <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$type){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> - </option> - <?php } ?> - </select> - </td> - </tr> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <input id="<?php echo escapeHtml('req0_file') ?>" name="<?php echo escapeHtml('file') ?>" size="<?php echo escapeHtml('40') ?>" class="<?php echo escapeHtml('upload') ?>" /><?php echo escapeHtml('') ?> - </td> - </tr> - <tr><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - - </td> - </tr> - </div> - <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> - </div> - </form> - + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('import') ?>" data-action="<?php echo escapeHtml('pageelement') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form pageelement') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('pageelement') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('import') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('type') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <?php foreach($types as $_key=>$_value) { ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$type){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> + </option> + <?php } ?> + </select> + </td> + </tr> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <input id="<?php echo escapeHtml('req0_file') ?>" name="<?php echo escapeHtml('file') ?>" size="<?php echo escapeHtml('40') ?>" class="<?php echo escapeHtml('upload') ?>" /><?php echo escapeHtml('') ?> + </td> + </tr> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + + </td> + </tr> + </div> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> + </div> + </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/pageelement/import.tpl.src.xml b/modules/cms/ui/themes/default/html/views/pageelement/import.tpl.src.xml @@ -1,3 +1,21 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"><dummy><form><window name="import" columnclasses="a"><row><column><selectbox list="types" name="type"></selectbox></column></row><row><column><upload name="file"></upload></column></row><row><column><button type="ok"></button></column></row></window></form><focus field="text"></focus></dummy></output>- \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <row> + <column> + <selectbox list="types" name="type"></selectbox> + </column> + </row> + <row> + <column> + <upload name="file"></upload> + </column> + </row> + <row> + <column> + <button type="ok"></button> + </column> + </row> + </form> +</output>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/pageelement/link.php b/modules/cms/ui/themes/default/html/views/pageelement/link.php @@ -1,84 +1,81 @@ <?php if (defined('OR_TITLE')) { ?> - - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('link') ?>" data-action="<?php echo escapeHtml('pageelement') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form pageelement') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('pageelement') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('link') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> - <div><?php echo escapeHtml('') ?> - - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@$desc.'') ?> - </span> - </td> - </tr> - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> - <select name="<?php echo escapeHtml('linkobjectid') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> - <?php foreach($objects as $_key=>$_value) { ?> - <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$linkobjectid){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> - </option> - <?php } ?> - </select> - </td> - </tr> - <?php $if1=(isset($release)); if($if1) { ?> - <?php $if1=(isset($publish)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> - <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> - <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('options').'') ?> - <img /><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> - </div> - <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> - </div> - </legend> - <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> - </div> - </fieldset> - </td> - </tr> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('link') ?>" data-action="<?php echo escapeHtml('pageelement') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form pageelement') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('pageelement') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('link') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$desc.'') ?> + </span> + </td> + </tr> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('linkobjectid') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <?php foreach($objects as $_key=>$_value) { ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$linkobjectid){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> + </option> <?php } ?> - <?php } ?> - <?php $if1=(isset($release)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('release') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> - <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(' ') ?> - </span> - <span><?php echo escapeHtml(''.@lang('RELEASE').'') ?> - </span> - </label> - </td> - </tr> - <?php } ?> - <?php $if1=(isset($publish)); if($if1) { ?> - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('publish') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$publish){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> - <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(' ') ?> - </span> - <span><?php echo escapeHtml(''.@lang('PAGE_PUBLISH_AFTER_SAVE').'') ?> - </span> - </label> - </td> - </tr> - <?php } ?> + </select> + </td> + </tr> + <?php $if1=(isset($release)); if($if1) { ?> + <?php $if1=(isset($publish)); if($if1) { ?> <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> - + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('options').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> + </div> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> + </div> + </legend> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + </div> + </fieldset> </td> </tr> - </div> - <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> - </div> - </form> - + <?php } ?> + <?php } ?> + <?php $if1=(isset($release)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('release') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> + </span> + <span><?php echo escapeHtml(''.@lang('RELEASE').'') ?> + </span> + </label> + </td> + </tr> + <?php } ?> + <?php $if1=(isset($publish)); if($if1) { ?> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('publish') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$publish){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> + </span> + <span><?php echo escapeHtml(''.@lang('PAGE_PUBLISH_AFTER_SAVE').'') ?> + </span> + </label> + </td> + </tr> + <?php } ?> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> + + </td> + </tr> + </div> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> + </div> + </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/pageelement/link.tpl.src.xml b/modules/cms/ui/themes/default/html/views/pageelement/link.tpl.src.xml @@ -1,3 +1,52 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"><dummy><form><window name="element"><row><column colspan="2" class="help"><text value="${desc}"></text></column></row><row><column colspan="2"><selectbox list="objects" name="linkobjectid"></selectbox></column></row><if present="release"><if present="publish"><row><column colspan="2"><group title="${message:options}"></group></column></row></if></if><if present="release"><row><column colspan="2"><checkbox name="release"></checkbox><label for="release"><text value=" "></text><text value="${message:RELEASE}"></text></label></column></row></if><if present="publish"><row><column colspan="2"><checkbox name="publish"></checkbox><label for="publish"><text value=" "></text><text value="${message:PAGE_PUBLISH_AFTER_SAVE}"></text></label></column></row></if><row><column colspan="2" class="act"><button type="ok"></button></column></row></window></form><focus field="linko"></focus></dummy></output>- \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <row> + <column colspan="2" class="help"> + <text value="${desc}"></text> + </column> + </row> + <row> + <column colspan="2"> + <selectbox list="objects" name="linkobjectid"></selectbox> + </column> + </row> + <if present="release"> + <if present="publish"> + <row> + <column colspan="2"> + <group title="${message:options}"></group> + </column> + </row> + </if> + </if> + <if present="release"> + <row> + <column colspan="2"> + <checkbox name="release"></checkbox> + <label for="release"> + <text value=" "></text> + <text value="${message:RELEASE}"></text> + </label> + </column> + </row> + </if> + <if present="publish"> + <row> + <column colspan="2"> + <checkbox name="publish"></checkbox> + <label for="publish"> + <text value=" "></text> + <text value="${message:PAGE_PUBLISH_AFTER_SAVE}"></text> + </label> + </column> + </row> + </if> + <row> + <column colspan="2" class="act"> + <button type="ok"></button> + </column> + </row> + </form> +</output>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/pageelement/value.php b/modules/cms/ui/themes/default/html/views/pageelement/value.php @@ -187,7 +187,6 @@ <?php $if1=($editor=='text'); if($if1) { ?> <textarea name="<?php echo escapeHtml('text') ?>" class="<?php echo escapeHtml('editor raw-editor') ?>"><?php echo escapeHtml(''.@$text.'') ?> </textarea> - <?php } ?> <?php } ?> <?php $if1=($type=='link'); if($if1) { ?> @@ -230,7 +229,6 @@ </option> <?php } ?> </select> - </div> </div> </fieldset> @@ -245,7 +243,6 @@ </option> <?php } ?> </select> - </div> </div> </fieldset> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/value.tpl.src.xml b/modules/cms/ui/themes/default/html/views/pageelement/value.tpl.src.xml @@ -97,7 +97,6 @@ </if> <if value="${editor}" equals="text"> <inputarea class="editor raw-editor" name="text" rows="25" cols="70"></inputarea> - <focus field="text"></focus> </if> </if> <if value="${type}" equals="link"> @@ -134,7 +133,6 @@ <group> <part> <selectbox list="objects" name="linkobjectid"></selectbox> - <focus field="linkobjectid"></focus> </part> </group> </if> @@ -142,7 +140,6 @@ <group> <part> <selectbox list="objects" name="linkobjectid"></selectbox> - <focus field="linkobjectid"></focus> </part> </group> </if> diff --git a/modules/cms/ui/themes/default/html/views/profile/edit.php b/modules/cms/ui/themes/default/html/views/profile/edit.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('edit') ?>" data-action="<?php echo escapeHtml('profile') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form profile') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('profile') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/profile/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/profile/edit.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header views="mail"></header> <form label="${message:save}"> <group title="${message:name}"> <part class="line"> diff --git a/modules/cms/ui/themes/default/html/views/project/add.php b/modules/cms/ui/themes/default/html/views/project/add.php @@ -63,5 +63,4 @@ <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> - <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/project/add.tpl.src.xml b/modules/cms/ui/themes/default/html/views/project/add.tpl.src.xml @@ -35,5 +35,4 @@ </column> </row> </form> - <focus field="name"></focus> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/project/maintenance.php b/modules/cms/ui/themes/default/html/views/project/maintenance.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('maintenance') ?>" data-action="<?php echo escapeHtml('project') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form project') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('project') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/project/maintenance.tpl.src.xml b/modules/cms/ui/themes/default/html/views/project/maintenance.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true" /> <form> <group title="${message:options}"> <part> diff --git a/modules/cms/ui/themes/default/html/views/project/prop.php b/modules/cms/ui/themes/default/html/views/project/prop.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('prop') ?>" data-action="<?php echo escapeHtml('project') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form project') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('project') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/project/prop.tpl.src.xml b/modules/cms/ui/themes/default/html/views/project/prop.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header views="remove,export,maintenance"></header> <form> <group title="${message:NAME}"> <part class="line"> diff --git a/modules/cms/ui/themes/default/html/views/projectlist/edit.php b/modules/cms/ui/themes/default/html/views/projectlist/edit.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/projectlist/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/projectlist/edit.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header views="add" /> <table> <row class="headline"> <column> diff --git a/modules/cms/ui/themes/default/html/views/template/addel.php b/modules/cms/ui/themes/default/html/views/template/addel.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('addel') ?>" data-action="<?php echo escapeHtml('template') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form template') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('template') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/template/addel.tpl.src.xml b/modules/cms/ui/themes/default/html/views/template/addel.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true"></header> <form> <part class="line"> diff --git a/modules/cms/ui/themes/default/html/views/template/edit.php b/modules/cms/ui/themes/default/html/views/template/edit.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/template/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/template/edit.tpl.src.xml @@ -1,7 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header views="src,remove"></header> - <table> <row class="headline"> <column> diff --git a/modules/cms/ui/themes/default/html/views/template/listing.php b/modules/cms/ui/themes/default/html/views/template/listing.php @@ -1,37 +1,34 @@ <?php if (defined('OR_TITLE')) { ?> - - - - <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> - </div> - <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> - <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> - <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('name').'') ?> - </span> - </td> - </tr> - <?php foreach((array)$templates as $list_key=>$list_value) { extract($list_value); ?> - <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@$name.'') ?> - </span> - </td> - </tr> - <?php } ?> - </table> - </div> - </div> - <?php $if1=(($templates)==FALSE); if($if1) { ?> - <span><?php echo escapeHtml(''.@lang('NO_TEMPLATES_AVAILABLE_DESC').'') ?> - </span> - <?php } ?> - <a target="<?php echo escapeHtml('_self') ?>" data-action="<?php echo escapeHtml('template') ?>" data-method="<?php echo escapeHtml('add') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/template/') ?>" class="<?php echo escapeHtml('action') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('menu_template_add').'') ?> - </span> - </a> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> + </div> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('name').'') ?> + </span> + </td> + </tr> + <?php foreach((array)$templates as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> + </span> + </td> + </tr> + <?php } ?> + </table> + </div> + </div> + <?php $if1=(($templates)==FALSE); if($if1) { ?> + <span><?php echo escapeHtml(''.@lang('NO_TEMPLATES_AVAILABLE_DESC').'') ?> + </span> + <?php } ?> + <a target="<?php echo escapeHtml('_self') ?>" data-action="<?php echo escapeHtml('template') ?>" data-method="<?php echo escapeHtml('add') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/template/') ?>" class="<?php echo escapeHtml('action') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_template_add').'') ?> + </span> + </a> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/template/listing.tpl.src.xml b/modules/cms/ui/themes/default/html/views/template/listing.tpl.src.xml @@ -1,28 +1,23 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header views="add"></header> - <dummy> - <window name="GLOBAL_TEMPLATES"> - <table> - <row class="headline"> - <column> - <text value="${message:name}"></text> - </column> - </row> - <list list="${templates}" extract="true"> - <row class="data"> - <column url="${url}"> - <text value="${name}"></text> - </column> - </row> - </list> - </table> - <if empty="${templates}"> - <text value="${message:NO_TEMPLATES_AVAILABLE_DESC}"></text> - </if> - <link class="action" action="template" subaction="add"> - <text value="${message:menu_template_add}"></text> - </link> - </window> - </dummy> + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <table> + <row class="headline"> + <column> + <text value="${message:name}"></text> + </column> + </row> + <list list="${templates}" extract="true"> + <row class="data"> + <column url="${url}"> + <text value="${name}"></text> + </column> + </row> + </list> + </table> + <if empty="${templates}"> + <text value="${message:NO_TEMPLATES_AVAILABLE_DESC}"></text> + </if> + <link class="action" action="template" subaction="add"> + <text value="${message:menu_template_add}"></text> + </link> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/template/prop.php b/modules/cms/ui/themes/default/html/views/template/prop.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('prop') ?>" data-action="<?php echo escapeHtml('template') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form template') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('template') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/template/prop.tpl.src.xml b/modules/cms/ui/themes/default/html/views/template/prop.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header views="extension"></header> <form> <part class="line"> <part class="label"> diff --git a/modules/cms/ui/themes/default/html/views/template/srcelement.php b/modules/cms/ui/themes/default/html/views/template/srcelement.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('srcelement') ?>" data-action="<?php echo escapeHtml('template') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form template') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('template') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/template/srcelement.tpl.src.xml b/modules/cms/ui/themes/default/html/views/template/srcelement.tpl.src.xml @@ -1,10 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header back="true"></header> <form> - - - <if present="elements"> <part class="line"> <part class="label"> diff --git a/modules/cms/ui/themes/default/html/views/text/extract.php b/modules/cms/ui/themes/default/html/views/text/extract.php @@ -1,22 +1,20 @@ <?php if (defined('OR_TITLE')) { ?> - - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('extract') ?>" data-action="<?php echo escapeHtml('text') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form text') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('text') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('extract') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> - <div><?php echo escapeHtml('') ?> - - <tr><?php echo escapeHtml('') ?> - <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> - - </td> - </tr> - </div> - <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> - </div> - </form> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('extract') ?>" data-action="<?php echo escapeHtml('text') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form text') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('text') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('extract') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> + + </td> + </tr> + </div> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> + </div> + </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/text/extract.tpl.src.xml b/modules/cms/ui/themes/default/html/views/text/extract.tpl.src.xml @@ -1,3 +1,11 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"><dummy><form><window name="asdf" title="asdfdfs"><row><column colspan="2" class="act"><button type="ok"></button></column></row></window></form></dummy></output>- \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <row> + <column colspan="2" class="act"> + <button type="ok"></button> + </column> + </row> + </form> +</output>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/text/value.php b/modules/cms/ui/themes/default/html/views/text/value.php @@ -28,5 +28,4 @@ <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> - <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/text/value.tpl.src.xml b/modules/cms/ui/themes/default/html/views/text/value.tpl.src.xml @@ -16,5 +16,4 @@ </column> </row> </form> - <focus field="value"></focus> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/user/add.php b/modules/cms/ui/themes/default/html/views/user/add.php @@ -1,27 +1,26 @@ <?php if (defined('OR_TITLE')) { ?> - - <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('add') ?>" data-action="<?php echo escapeHtml('user') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('post') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form user') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('user') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('add') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> - <div><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> - <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml(''.@lang('user_username').'') ?> - </label> - </div> - <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> - <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" class="<?php echo escapeHtml('focus') ?>" /><?php echo escapeHtml('') ?> - </div> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('add') ?>" data-action="<?php echo escapeHtml('user') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('post') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form user') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('user') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('add') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml(''.@lang('user_username').'') ?> + </label> + </div> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" class="<?php echo escapeHtml('focus') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> - </div> - </form> + </div> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> + </div> + </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/user/add.tpl.src.xml b/modules/cms/ui/themes/default/html/views/user/add.tpl.src.xml @@ -1,3 +1,14 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"><header back="true"><form method="post"><part class="line"><part class="label"><label for="name" key="user_username"></label></part><part class="input"><input name="name" class="focus"></input></part></part></form></header></output>- \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form method="post"> + <part class="line"> + <part class="label"> + <label for="name" key="user_username"></label> + </part> + <part class="input"> + <input name="name" class="focus"></input> + </part> + </part> + </form> +</output>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/user/listing.php b/modules/cms/ui/themes/default/html/views/user/listing.php @@ -1,56 +1,54 @@ <?php if (defined('OR_TITLE')) { ?> - - - <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> - <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> - <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> - </div> - <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> - <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> - <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon_user.png') ?>" /><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('name').'') ?> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> + </div> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon_user.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('name').'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('LOGIN').'') ?> + </span> + </td> + </tr> + <?php foreach((array)$el as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon_user.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> + </span> + </td> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$fullname.'') ?> + </span> + <?php $if1=($isAdmin); if($if1) { ?> + <span><?php echo escapeHtml('_(') ?> </span> - </td> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('USER_ADMIN').'') ?> </span> - </td> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('LOGIN').'') ?> + <span><?php echo escapeHtml(')') ?> </span> - </td> - </tr> - <?php foreach((array)$el as $list_key=>$list_value) { extract($list_value); ?> - <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> - <td><?php echo escapeHtml('') ?> - <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon_user.png') ?>" /><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@$name.'') ?> - </span> - </td> - <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@$fullname.'') ?> - </span> - <?php $if1=($isAdmin); if($if1) { ?> - <span><?php echo escapeHtml('_(') ?> - </span> - <span><?php echo escapeHtml(''.@lang('USER_ADMIN').'') ?> - </span> - <span><?php echo escapeHtml(')') ?> - </span> - <?php } ?> - </td> - <td><?php echo escapeHtml('') ?> - <a target="<?php echo escapeHtml('_self') ?>" data-action="<?php echo escapeHtml('index') ?>" data-method="<?php echo escapeHtml('switchuser') ?>" data-id="<?php echo escapeHtml(''.@$userid.'') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/index/'.@$userid.'') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('LOGIN').'}') ?> - </span> - </a> - </td> - </tr> - <?php } ?> - </table> - </div> - </div> + <?php } ?> + </td> + <td><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-action="<?php echo escapeHtml('index') ?>" data-method="<?php echo escapeHtml('switchuser') ?>" data-id="<?php echo escapeHtml(''.@$userid.'') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/index/'.@$userid.'') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('LOGIN').'}') ?> + </span> + </a> + </td> + </tr> + <?php } ?> + </table> + </div> + </div> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/user/listing.tpl.src.xml b/modules/cms/ui/themes/default/html/views/user/listing.tpl.src.xml @@ -1,43 +1,39 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <dummy> - <window icon="user" name="USERS" width="70%"> - <table> - <row class="headline"> - <column> - <image type="user"></image> - <text value="${message:name}"></text> - </column> - <column> - <text value=""></text> - </column> - <column> - <text value="${message:LOGIN}"></text> - </column> - </row> - <list list="${el}" extract="true"> - <row class="data"> - <column url="${url}"> - <image type="user"></image> - <text value="${name}"></text> - </column> - <column url="${url}"> - <text value="${fullname}"></text> - <if true="${isAdmin}"> - <text value="_("></text> - <text value="${message:USER_ADMIN}"></text> - <text value=")"></text> - </if> - </column> - <column> - <link target="_top" action="index" subaction="switchuser" id="${userid}"> - <text value="${message:LOGIN}}"></text> - </link> - </column> - </row> - </list> - </table> - </window> - </dummy> + <table> + <row class="headline"> + <column> + <image type="user"></image> + <text value="${message:name}"></text> + </column> + <column> + <text value=""></text> + </column> + <column> + <text value="${message:LOGIN}"></text> + </column> + </row> + <list list="${el}" extract="true"> + <row class="data"> + <column url="${url}"> + <image type="user"></image> + <text value="${name}"></text> + </column> + <column url="${url}"> + <text value="${fullname}"></text> + <if true="${isAdmin}"> + <text value="_("></text> + <text value="${message:USER_ADMIN}"></text> + <text value=")"></text> + </if> + </column> + <column> + <link target="_top" action="index" subaction="switchuser" id="${userid}"> + <text value="${message:LOGIN}}"></text> + </link> + </column> + </row> + </list> + </table> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/user/pw.php b/modules/cms/ui/themes/default/html/views/user/pw.php @@ -97,7 +97,6 @@ </div> <?php } ?> <?php } ?> - </div> <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/user/pw.tpl.src.xml b/modules/cms/ui/themes/default/html/views/user/pw.tpl.src.xml @@ -66,6 +66,5 @@ </part> </if> </if> - <focus field="password1"></focus> </form> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/userlist/show.php b/modules/cms/ui/themes/default/html/views/userlist/show.php @@ -1,6 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/userlist/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/userlist/show.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <header views="add" /> <table> <row class="headline"> <column> diff --git a/modules/template_engine/components/components.ini b/modules/template_engine/components/components.ini @@ -1,7 +1,6 @@ # generated by XSDGenerator. do not change manually. selector = text = -dummy = logo = include = else = @@ -14,14 +13,13 @@ set = checkbox = input = insert = -header = +page = date = if = qrcode = list = table = inputarea = -window = part = user = selectbox = @@ -30,7 +28,6 @@ radiobox = image = hidden = row = -focus = group = button = password = diff --git a/modules/template_engine/components/html/dummy/Dummy.class.php b/modules/template_engine/components/html/dummy/Dummy.class.php @@ -1,14 +0,0 @@ -<?php - -namespace template_engine\components; - -use template_engine\components\html\Component; -use template_engine\element\Element; - -class DummyComponent extends Component -{ - public function createElement() - { - return new Element(null); - } -}- \ No newline at end of file diff --git a/modules/template_engine/components/html/focus/Focus.class.php b/modules/template_engine/components/html/focus/Focus.class.php @@ -1,15 +0,0 @@ -<?php - -namespace template_engine\components; - -use template_engine\components\html\Component; -use template_engine\element\Element; - -class FocusComponent extends Component -{ - - public function createElement() - { - return new Element(null); - } -}- \ No newline at end of file diff --git a/modules/template_engine/components/html/header/Header.class.php b/modules/template_engine/components/html/header/Header.class.php @@ -1,38 +0,0 @@ -<?php - -namespace template_engine\components; - -use template_engine\components\html\Component; -use template_engine\element\Element; - -class HeaderComponent extends Component -{ - public $views; - - public function createElement() - { - return new Element(null); - } - - public function begin() - { - if(false) // DEACTIVATED - if (isset($this->views)) { - echo '<div class="headermenu">'; - - foreach (explode(',', $this->views) as $view) { - echo '<div class="toolbar-icon clickable">'; - echo '<a href="javascript:void(0);" title="<?php echo lang(\'MENU_' . strtoupper($view ). '\') ?>" data-type="dialog" data-name="<?php echo lang(\'MENU_' . strtoupper($view ). '\') ?>" data-method="' . $view . '">'; - echo '<img src="./themes/default/images/icon/action/' . $view . '.svg" title="<?php echo lang(\'MENU_' . $view . '_DESC\') ?>" /><?php echo lang(\'MENU_' . $view . '\') ?>'; - echo '</a>'; - echo '</div>'; - } - echo '</div>'; - - } - - } -} - - -?>- \ No newline at end of file diff --git a/modules/template_engine/components/html/window/Window.class.php b/modules/template_engine/components/html/window/Window.class.php @@ -1,19 +0,0 @@ -<?php - -namespace template_engine\components; - - -use template_engine\components\html\Component; -use template_engine\element\Element; - -class WindowComponent extends Component -{ - - public function createElement() - { - // No content. - return new Element(null ); - } -} - - diff --git a/modules/template_engine/components/template.xsd b/modules/template_engine/components/template.xsd @@ -2,12 +2,12 @@ <xsd:schema xmlns="http://www.openrat.de/template" targetNamespace="http://www.openrat.de/template" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified"> + <!-- generated by XSDGenerator. do not change manually --> <xsd:element name="selector" type="selectorType"/> <xsd:complexType name="selectorType"> <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -20,14 +20,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -36,7 +35,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -57,7 +55,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -70,14 +67,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -86,7 +82,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -95,75 +90,19 @@ <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="tree" maxOccurs="unbounded" minOccurs="0"/> </xsd:choice> - <xsd:attribute name="prefix" type="xsd:string"/> - <xsd:attribute name="suffix" type="xsd:string"/> <xsd:attribute name="title" type="xsd:string"/> <xsd:attribute name="type" type="xsd:string"/> <xsd:attribute name="escape" type="xsd:boolean"/> - <xsd:attribute name="var" type="xsd:string"/> - <xsd:attribute name="text" type="xsd:string"/> - <xsd:attribute name="key" type="xsd:string"/> - <xsd:attribute name="raw" type="xsd:string"/> <xsd:attribute name="value" type="xsd:string"/> - <xsd:attribute name="maxlength" type="xsd:string"/> - <xsd:attribute name="accesskey" type="xsd:string"/> - <xsd:attribute name="cut" type="xsd:string"/> <xsd:attribute name="label" type="xsd:string"/> - <xsd:attribute name="newline" type="xsd:boolean"/> <xsd:attribute name="class" type="xsd:string"/> <xsd:attribute name="request" type="xsd:string"/> </xsd:complexType> - <xsd:element name="dummy" type="dummyType"/> - <xsd:complexType name="dummyType"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="tree" maxOccurs="unbounded" minOccurs="0"/> - </xsd:choice> - <xsd:attribute name="request" type="xsd:string"/> - </xsd:complexType> <xsd:element name="logo" type="logoType"/> <xsd:complexType name="logoType"> <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -176,14 +115,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -192,7 +130,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -209,7 +146,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -222,14 +158,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -238,7 +173,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -255,7 +189,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -268,14 +201,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -284,7 +216,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -300,7 +231,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -313,14 +243,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -329,7 +258,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -349,7 +277,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -362,14 +289,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -378,7 +304,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -402,7 +327,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -415,14 +339,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -431,7 +354,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -447,7 +369,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -460,14 +381,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -476,7 +396,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -517,7 +436,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -530,14 +448,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -546,7 +463,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -572,7 +488,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -585,14 +500,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -601,7 +515,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -620,7 +533,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -633,14 +545,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -649,7 +560,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -670,7 +580,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -683,14 +592,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -699,7 +607,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -715,6 +622,7 @@ <xsd:attribute name="prefix" type="xsd:string"/> <xsd:attribute name="value" type="xsd:string"/> <xsd:attribute name="size" type="xsd:string"/> + <xsd:attribute name="minlength" type="xsd:int"/> <xsd:attribute name="maxlength" type="xsd:int"/> <xsd:attribute name="onchange" type="xsd:string"/> <xsd:attribute name="hint" type="xsd:string"/> @@ -731,7 +639,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -744,14 +651,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -760,7 +666,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -774,12 +679,11 @@ <xsd:attribute name="function" type="xsd:string"/> <xsd:attribute name="request" type="xsd:string"/> </xsd:complexType> - <xsd:element name="header" type="headerType"/> - <xsd:complexType name="headerType"> + <xsd:element name="page" type="pageType"/> + <xsd:complexType name="pageType"> <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -792,14 +696,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -808,7 +711,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -817,7 +719,6 @@ <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="tree" maxOccurs="unbounded" minOccurs="0"/> </xsd:choice> - <xsd:attribute name="views" type="xsd:string"/> <xsd:attribute name="request" type="xsd:string"/> </xsd:complexType> <xsd:element name="date" type="dateType"/> @@ -825,7 +726,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -838,14 +738,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -854,7 +753,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -871,7 +769,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -884,14 +781,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -900,7 +796,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -926,7 +821,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -939,14 +833,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -955,7 +848,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -964,7 +856,7 @@ <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="tree" maxOccurs="unbounded" minOccurs="0"/> </xsd:choice> - <xsd:attribute name="title" type="xsd:string"/> + <xsd:attribute name="value" type="xsd:string"/> <xsd:attribute name="request" type="xsd:string"/> </xsd:complexType> <xsd:element name="list" type="listType"/> @@ -972,7 +864,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -985,14 +876,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1001,7 +891,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1021,7 +910,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1034,14 +922,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1050,7 +937,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1069,7 +955,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1082,14 +967,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1098,7 +982,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1114,6 +997,7 @@ <xsd:attribute name="onchange" type="xsd:string"/> <xsd:attribute name="prefix" type="xsd:string"/> <xsd:attribute name="class" type="xsd:string"/> + <xsd:attribute name="required" type="xsd:boolean"/> <xsd:attribute name="default" type="xsd:string"/> <xsd:attribute name="maxlength" type="xsd:int"/> <xsd:attribute name="label" type="xsd:string"/> @@ -1121,57 +1005,11 @@ <xsd:attribute name="readonly" type="xsd:boolean"/> <xsd:attribute name="request" type="xsd:string"/> </xsd:complexType> - <xsd:element name="window" type="windowType"/> - <xsd:complexType name="windowType"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="tree" maxOccurs="unbounded" minOccurs="0"/> - </xsd:choice> - <xsd:attribute name="request" type="xsd:string"/> - </xsd:complexType> <xsd:element name="part" type="partType"/> <xsd:complexType name="partType"> <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1184,14 +1022,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1200,7 +1037,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1218,7 +1054,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1231,14 +1066,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1247,7 +1081,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1265,7 +1098,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1278,14 +1110,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1294,7 +1125,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1320,7 +1150,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1333,14 +1162,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1349,7 +1177,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1376,7 +1203,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1389,14 +1215,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1405,7 +1230,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1427,7 +1251,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1440,14 +1263,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1456,7 +1278,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1487,7 +1308,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1500,14 +1320,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1516,7 +1335,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1525,8 +1343,11 @@ <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="tree" maxOccurs="unbounded" minOccurs="0"/> </xsd:choice> - <xsd:attribute name="name" type="xsd:string"/> <xsd:attribute name="default" type="xsd:string"/> + <xsd:attribute name="prefix" type="xsd:string"/> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="readonly" type="xsd:boolean"/> + <xsd:attribute name="class" type="xsd:string"/> <xsd:attribute name="request" type="xsd:string"/> </xsd:complexType> <xsd:element name="row" type="rowType"/> @@ -1534,7 +1355,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1547,14 +1367,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1563,7 +1382,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1576,57 +1394,11 @@ <xsd:attribute name="id" type="xsd:string"/> <xsd:attribute name="request" type="xsd:string"/> </xsd:complexType> - <xsd:element name="focus" type="focusType"/> - <xsd:complexType name="focusType"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="tree" maxOccurs="unbounded" minOccurs="0"/> - </xsd:choice> - <xsd:attribute name="request" type="xsd:string"/> - </xsd:complexType> <xsd:element name="group" type="groupType"/> <xsd:complexType name="groupType"> <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1639,14 +1411,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1655,7 +1426,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1675,7 +1445,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1688,14 +1457,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1704,7 +1472,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1725,7 +1492,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1738,14 +1504,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1754,7 +1519,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1763,11 +1527,13 @@ <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="tree" maxOccurs="unbounded" minOccurs="0"/> </xsd:choice> - <xsd:attribute name="name" type="xsd:string"/> <xsd:attribute name="default" type="xsd:string"/> - <xsd:attribute name="class" type="xsd:string"/> <xsd:attribute name="size" type="xsd:int"/> <xsd:attribute name="maxlength" type="xsd:int"/> + <xsd:attribute name="prefix" type="xsd:string"/> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="readonly" type="xsd:boolean"/> + <xsd:attribute name="class" type="xsd:string"/> <xsd:attribute name="request" type="xsd:string"/> </xsd:complexType> <xsd:element name="form" type="formType"/> @@ -1775,7 +1541,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1788,14 +1553,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1804,7 +1568,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1837,7 +1600,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1850,14 +1612,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1866,7 +1627,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1879,7 +1639,7 @@ <xsd:attribute name="name" type="xsd:string"/> <xsd:attribute name="multiple" type="xsd:boolean"/> <xsd:attribute name="class" type="xsd:string"/> - <xsd:attribute name="maxlength" type="xsd:string"/> + <xsd:attribute name="maxlength" type="xsd:int"/> <xsd:attribute name="request" type="xsd:string"/> </xsd:complexType> <xsd:element name="output" type="outputType"/> @@ -1887,7 +1647,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1900,14 +1659,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1916,7 +1674,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> @@ -1932,7 +1689,6 @@ <xsd:choice maxOccurs="unbounded" minOccurs="0"> <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="dummy" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> @@ -1945,14 +1701,13 @@ <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="header" maxOccurs="unbounded" minOccurs="0"/> + <xsd:element ref="page" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="window" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> @@ -1961,7 +1716,6 @@ <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="focus" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/>