commit 92709b3d4bec48eee356242ab6622932787ef3a7 parent f8367a0e4df32f2036483f1a14cfb05917eda7db Author: Jan Dankert <develop@jandankert.de> Date: Tue, 18 Feb 2020 00:59:51 +0100 Total refactoring: All components are creating elements. Status: Work in progress. Diffstat:
366 files changed, 6853 insertions(+), 6244 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -1,3 +1,4 @@ .idea config/config-*.yml -log/cms-*.log- \ No newline at end of file +log/cms-*.log +/audit-log/ diff --git a/modules/cms-ui/themes/default/html/views/README.md b/modules/cms-ui/themes/default/html/views/README.md @@ -0,0 +1,19 @@ +## OpenRat CMS Templates + +All views are desribe within a XML file with the extension `.tpl.src.xml`. + +These views are compiled to `.php` files. + +# Components + +You may use the following namespaces for the source xml files: + +- `http://www.openrat.de/template` for special CMS components. +- `http://www.w3.org/1999/xhtml` for HTML5 components. + +# Variables + +- `${variable.name}` outputs a data variable +- `#{messagekey}` outputs a i18n message +- `%{config/subconfig/value}` outputs a configuration value + diff --git a/modules/cms-ui/themes/default/html/views/configuration/show.php b/modules/cms-ui/themes/default/html/views/configuration/show.php @@ -1,21 +1,25 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_VALUE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_VALUE'))) ?> + </span> </td> </tr> - <?php foreach($config as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($config as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($key))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$key)) ?> + </span> </td> - <td class="<?php echo $class ?>"> - <span class="<?php echo $class ?>"><?php echo nl2br(encodeHtml(htmlentities($value))); ?></span> + <td class="<?php echo encodeHtml(htmlentities(@$class)) ?>"> + <span class="<?php echo encodeHtml(htmlentities(@$class)) ?>"><?php echo encodeHtml(htmlentities(@$value)) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/configuration/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/configuration/show.tpl.src.xml @@ -14,8 +14,8 @@ <column> <text var="key"></text> </column> - <column class="var:class"> - <text class="var:class" var="value"></text> + <column class="${class}"> + <text class="${class}" var="value"></text> </column> </row> </list> diff --git a/modules/cms-ui/themes/default/html/views/configuration/src.php b/modules/cms-ui/themes/default/html/views/configuration/src.php @@ -1 +1,3 @@ -<?php if (!defined('OR_TITLE')) die('Forbidden'); ?><textarea name="<?php if ('') echo ''.'_' ?>source<?php if (false) echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="yaml" class="editor code-editor"><?php echo htmlentities(${'source'}) ?></textarea>- \ No newline at end of file +<?php if (!defined('OR_TITLE')) die('Forbidden'); ?> +<textarea name="source" data-extension="" data-mimetype="" data-mode="yaml" class="editor code-editor"> +</textarea>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/advanced.php b/modules/cms-ui/themes/default/html/views/element/advanced.php @@ -1,303 +1,299 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('security','disable_dynamic_code')); if($if2){?> - <?php $if3=(!true); if($if3){?> + <?php $if2=(config('security','disable_dynamic_code')); if($if2) { ?> + <?php $if3=(!true); if($if3) { ?> <div class="message warn"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NOTICE_CODE_DISABLED'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NOTICE_CODE_DISABLED'))) ?> + </span> </div> - <?php } ?> - <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="advanced" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form element" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="element" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="advanced" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> - <?php $if4=(isset($subtype)); if($if4){?> + <?php } ?> + <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="advanced" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <?php $if4=(isset($subtype)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_SUBTYPE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_SUBTYPE'))) ?> + </span> </div> <div class="input"> - <?php $if7=(isset($subtypes)); if($if7){?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_subtype" name="subtype" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($subtypes,$subtype,1,0) ?><?php if (count($subtypes)==0) { ?><input type="hidden" name="subtype" value="" /><?php } ?><?php if (count($subtypes)==1) { ?><input type="hidden" name="subtype" value="<?php echo array_keys($subtypes)[0] ?>" /><?php } ?> - </select></div> - <?php } ?> - <?php $if7=!(isset($subtypes)); if($if7){?> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_subtype" name="<?php if ('') echo ''.'_' ?>subtype<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$subtype) ?>" /><?php if (false) { ?><input type="hidden" name="subtype" value="<?php $subtype ?>"/><?php } ?></div> - <?php } ?> + <?php $if7=(isset($subtypes)); if($if7) { ?> + <input name="subtype" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" size="1" class=""> + </input> + <?php } ?> + <?php $if7=!(isset($subtypes)); if($if7) { ?> + <input name="subtype" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" class=""> + </input> + <?php } ?> </div> </div> - <?php } ?> - <?php $if4=(isset($with_icon)); if($if4){?> + <?php } ?> + <?php $if4=(isset($with_icon)); if($if4) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'with_icon';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_with_icon" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_WITH_ICON')))); ?></span> + <input type="checkbox" name="with_icon" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$with_icon)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_WITH_ICON'))) ?> + </span> </label> </div> </div> - <?php } ?> - <?php $if4=(isset($inherit)); if($if4){?> + <?php } ?> + <?php $if4=(isset($inherit)); if($if4) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'inherit';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_inherit" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_INHERIT')))); ?></span> + <input type="checkbox" name="inherit" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$inherit)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_INHERIT'))) ?> + </span> </label> </div> </div> - <?php } ?> - <?php $if4=(isset($all_languages)); if($if4){?> + <?php } ?> + <?php $if4=(isset($all_languages)); if($if4) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'all_languages';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_all_languages" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_ALL_LANGUAGES')))); ?></span> + <input type="checkbox" name="all_languages" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$all_languages)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_ALL_LANGUAGES'))) ?> + </span> </label> </div> </div> - <?php } ?> - <?php $if4=(isset($writable)); if($if4){?> + <?php } ?> + <?php $if4=(isset($writable)); if($if4) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'writable';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_writable" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_writable')))); ?></span> + <input type="checkbox" name="writable" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$writable)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_writable'))) ?> + </span> </label> </div> </div> - <?php } ?> - <?php $if4=(isset($width)); if($if4){?> + <?php } ?> + <?php $if4=(isset($width)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('width')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('width'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_width" name="<?php if ('') echo ''.'_' ?>width<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$width) ?>" /><?php if (false) { ?><input type="hidden" name="width" value="<?php $width ?>"/><?php } ?></div> + <input name="width" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($height)); if($if4){?> + <?php } ?> + <?php $if4=(isset($height)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('height')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('height'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_height" name="<?php if ('') echo ''.'_' ?>height<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$height) ?>" /><?php if (false) { ?><input type="hidden" name="height" value="<?php $height ?>"/><?php } ?></div> + <input name="height" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($dateformat)); if($if4){?> + <?php } ?> + <?php $if4=(isset($dateformat)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DATEFORMAT')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DATEFORMAT'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dateformat" name="dateformat" title="" class=""<?php if (count($dateformats)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dateformats,$dateformat,0,0) ?><?php if (count($dateformats)==0) { ?><input type="hidden" name="dateformat" value="" /><?php } ?><?php if (count($dateformats)==1) { ?><input type="hidden" name="dateformat" value="<?php echo array_keys($dateformats)[0] ?>" /><?php } ?> - </select></div> + <input name="dateformat" value="<?php echo encodeHtml(htmlentities(@$dateformat)) ?>" size="1" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($format)); if($if4){?> + <?php } ?> + <?php $if4=(isset($format)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_FORMAT')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_FORMAT'))) ?> + </span> </div> <div class="input"> - <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php') ?><?php component_radio_box('format',$formatlist,$format) ?> + <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php'); { <?php component_radio_box(format,$formatlist,${format}) ?> ?> + <?php } ?> </div> </div> - <?php } ?> - <?php $if4=(isset($decimals)); if($if4){?> + <?php } ?> + <?php $if4=(isset($decimals)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DECIMALS')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DECIMALS'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_decimals" name="<?php if ('') echo ''.'_' ?>decimals<?php if (false) echo '_disabled' ?>" type="text" maxlength="2" class="" value="<?php echo Text::encodeHtml(@$decimals) ?>" /><?php if (false) { ?><input type="hidden" name="decimals" value="<?php $decimals ?>"/><?php } ?></div> + <input name="decimals" disabled="" type="text" maxlength="2" value="<?php echo encodeHtml(htmlentities(@$decimals)) ?>" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($dec_point)); if($if4){?> + <?php } ?> + <?php $if4=(isset($dec_point)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEC_POINT')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEC_POINT'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_dec_point" name="<?php if ('') echo ''.'_' ?>dec_point<?php if (false) echo '_disabled' ?>" type="text" maxlength="5" class="" value="<?php echo Text::encodeHtml(@$dec_point) ?>" /><?php if (false) { ?><input type="hidden" name="dec_point" value="<?php $dec_point ?>"/><?php } ?></div> + <input name="dec_point" disabled="" type="text" maxlength="5" value="<?php echo encodeHtml(htmlentities(@$dec_point)) ?>" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($thousand_sep)); if($if4){?> + <?php } ?> + <?php $if4=(isset($thousand_sep)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_thousand_sep')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_thousand_sep'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_thousand_sep" name="<?php if ('') echo ''.'_' ?>thousand_sep<?php if (false) echo '_disabled' ?>" type="text" maxlength="1" class="" value="<?php echo Text::encodeHtml(@$thousand_sep) ?>" /><?php if (false) { ?><input type="hidden" name="thousand_sep" value="<?php $thousand_sep ?>"/><?php } ?></div> + <input name="thousand_sep" disabled="" type="text" maxlength="1" value="<?php echo encodeHtml(htmlentities(@$thousand_sep)) ?>" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($default_text)); if($if4){?> + <?php } ?> + <?php $if4=(isset($default_text)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_text')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_default_text'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_default_text" name="<?php if ('') echo ''.'_' ?>default_text<?php if (false) echo '_disabled' ?>" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$default_text) ?>" /><?php if (false) { ?><input type="hidden" name="default_text" value="<?php $default_text ?>"/><?php } ?></div> + <input name="default_text" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$default_text)) ?>" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($default_longtext)); if($if4){?> + <?php } ?> + <?php $if4=(isset($default_longtext)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_longtext')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_default_longtext'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>default_longtext<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($default_longtext) ?></textarea></div> + <textarea name="default_longtext" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$default_longtext)) ?> + </textarea> </div> </div> - <?php } ?> - <?php $if4=(isset($parameters)); if($if4){?> + <?php } ?> + <?php $if4=(isset($parameters)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DYNAMIC_PARAMETERS')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DYNAMIC_PARAMETERS'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>parameters<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($parameters) ?></textarea></div> + <textarea name="parameters" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$parameters)) ?> + </textarea> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php foreach($dynamic_class_parameters as $paramName=>$defaultValue){ ?> - <span><?php echo nl2br(encodeHtml(htmlentities($paramName))); ?></span> - <span><?php echo nl2br(' ('); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DEFAULT')))); ?></span> - <span><?php echo nl2br(') = '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($defaultValue))); ?></span> - <br/> - <?php } ?> + <?php foreach($dynamic_class_parameters as $paramName=>$defaultValue) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@$paramName)) ?> + </span> + <span class=""> ( + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DEFAULT'))) ?> + </span> + <span class="">) = + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$defaultValue)) ?> + </span> + <br> + </br> + <?php } ?> </div> </div> - <?php } ?> - <?php $if4=(isset($select_items)); if($if4){?> + <?php } ?> + <?php $if4=(isset($select_items)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_select_items')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_select_items'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>select_items<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($select_items) ?></textarea></div> + <textarea name="select_items" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$select_items)) ?> + </textarea> </div> </div> - <?php } ?> - <?php $if4=(isset($linkelement)); if($if4){?> + <?php } ?> + <?php $if4=(isset($linkelement)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_LINK')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_LINK'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_linkelement" name="linkelement" title="" class=""<?php if (count($linkelements)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($linkelements,$linkelement,0,0) ?><?php if (count($linkelements)==0) { ?><input type="hidden" name="linkelement" value="" /><?php } ?><?php if (count($linkelements)==1) { ?><input type="hidden" name="linkelement" value="<?php echo array_keys($linkelements)[0] ?>" /><?php } ?> - </select></div> + <input name="linkelement" value="<?php echo encodeHtml(htmlentities(@$linkelement)) ?>" size="1" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($name)); if($if4){?> + <?php } ?> + <?php $if4=(isset($name)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_name" name="name" title="" class=""<?php if (count($names)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($names,$name,0,0) ?><?php if (count($names)==0) { ?><input type="hidden" name="name" value="" /><?php } ?><?php if (count($names)==1) { ?><input type="hidden" name="name" value="<?php echo array_keys($names)[0] ?>" /><?php } ?> - </select></div> + <input name="name" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" size="1" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($folderobjectid)); if($if4){?> + <?php } ?> + <?php $if4=(isset($folderobjectid)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_FOLDEROBJECT')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEFAULT_FOLDEROBJECT'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_folderobjectid" name="folderobjectid" title="" class=""<?php if (count($folders)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($folders,$folderobjectid,0,0) ?><?php if (count($folders)==0) { ?><input type="hidden" name="folderobjectid" value="" /><?php } ?><?php if (count($folders)==1) { ?><input type="hidden" name="folderobjectid" value="<?php echo array_keys($folders)[0] ?>" /><?php } ?> - </select></div> + <input name="folderobjectid" value="<?php echo encodeHtml(htmlentities(@$folderobjectid)) ?>" size="1" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($default_objectid)); if($if4){?> + <?php } ?> + <?php $if4=(isset($default_objectid)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_OBJECT')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEFAULT_OBJECT'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_default_objectid" name="default_objectid" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($objects,$default_objectid,1,0) ?><?php if (count($objects)==0) { ?><input type="hidden" name="default_objectid" value="" /><?php } ?><?php if (count($objects)==1) { ?><input type="hidden" name="default_objectid" value="<?php echo array_keys($objects)[0] ?>" /><?php } ?> - </select></div> + <input name="default_objectid" value="<?php echo encodeHtml(htmlentities(@$default_objectid)) ?>" size="1" class=""> + </input> </div> </div> - <?php } ?> - <?php $if4=(isset($code)); if($if4){?> + <?php } ?> + <?php $if4=(isset($code)); if($if4) { ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_code')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_code'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>code<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($code) ?></textarea></div> + <textarea name="code" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$code)) ?> + </textarea> </div> </div> - <?php } ?> + <?php } ?> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/advanced.tpl.src.xml b/modules/cms-ui/themes/default/html/views/element/advanced.tpl.src.xml @@ -1,7 +1,7 @@ <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"> - <if true="config:security/disable_dynamic_code"> - <if value="var:type" equals="code" false="true"> + <if true="%{security/disable_dynamic_code}"> + <if value="${type}" equals="code" false="true"> <part class="message warn"> <text key="NOTICE_CODE_DISABLED"/> </part> diff --git a/modules/cms-ui/themes/default/html/views/element/info.php b/modules/cms-ui/themes/default/html/views/element/info.php @@ -1,30 +1,37 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="data"> - <td colspan="1"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'type'.'')))); ?></span> + <td colspan="1" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + </span> </td> - <td> - <i class="image-icon image-icon--action-el_<?php echo $type ?>"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('el_'.$type.'')))); ?></span> + <td class=""> + <i class="image-icon image-icon--action-el_<?php echo encodeHtml(htmlentities(@$type)) ?>"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('${type'))) ?>} + </span> </td> </tr> <tr class="data"> - <td colspan="1"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td colspan="1" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> <td class="clickable"> - <a class="" target="_self" data-type="edit" data-action="element" data-method="prop" data-id="<?php echo $id ?>" data-extra="[]" href="./#/element/<?php echo $id ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <a target="_self" data-type="edit" data-action="element" data-method="prop" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/element/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> </tr> <tr class="data"> - <td colspan="1"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> + <td colspan="1" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('id'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($id))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$id)) ?> + </span> </td> </tr> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/element/info.tpl.src.xml @@ -6,8 +6,8 @@ <text key="type" /> </column> <column> - <image elementtype="var:type" /> - <text key="var:type" prefix="el_" /> + <image elementtype="${type}" /> + <text key="${type}" prefix="el_" /> </column> </row> <row class="data"> @@ -15,7 +15,7 @@ <text key="name" /> </column> <column class="clickable"> - <link class="" type="edit" action="element" subaction="prop" id="var:id"> + <link class="" type="edit" action="element" subaction="prop" id="${id}"> <text var="name" /> </link> </column> 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,27 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="name" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form element" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="element" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="name" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_NAME')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="name" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_NAME'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <td class=""> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </td> </tr> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DESCRIPTION')))); ?></span> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DESCRIPTION'))) ?> + </span> </td> - <td> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($description) ?></textarea></div> + <td class=""> + <textarea name="description" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$description)) ?> + </textarea> </td> </tr> - <tr> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/prop.php b/modules/cms-ui/themes/default/html/views/element/prop.php @@ -1,40 +1,47 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form element" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="element" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LABEL'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LABEL'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_label" name="<?php if ('') echo ''.'_' ?>label<?php if (false) echo '_disabled' ?>" required="required" autofocus="autofocus" type="text" maxlength="100" class="" value="<?php echo Text::encodeHtml(@$label) ?>" /><?php if (false) { ?><input type="hidden" name="label" value="<?php $label ?>"/><?php } ?></div> + <input name="label" disabled="" required="required" autofocus="autofocus" type="text" maxlength="100" value="<?php echo encodeHtml(htmlentities(@$label)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" required="required" type="text" maxlength="50" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" required="required" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>" maxlength="255"><?php echo Text::encodeHtml($description) ?></textarea></div> + <textarea name="description" disabled="" maxlength="255" class="inputarea"><?php echo encodeHtml(htmlentities(@$description)) ?> + </textarea> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_TYPE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_TYPE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_typeid" name="typeid" title="" class=""<?php if (count($types)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($types,$typeid,0,1) ?><?php if (count($types)==0) { ?><input type="hidden" name="typeid" value="" /><?php } ?><?php if (count($types)==1) { ?><input type="hidden" name="typeid" value="<?php echo array_keys($types)[0] ?>" /><?php } ?> - </select></div> + <input name="typeid" value="<?php echo encodeHtml(htmlentities(@$typeid)) ?>" size="1" class=""> + </input> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ 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,272 +1,273 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="properties" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form element" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="element" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="properties" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if5=(isset($subtype)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_SUBTYPE')))); ?></span> - </td> - <td> - <?php $if8=(isset($subtypes)); if($if8){?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_subtype" name="subtype" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($subtypes,$subtype,1,0) ?><?php if (count($subtypes)==0) { ?><input type="hidden" name="subtype" value="" /><?php } ?><?php if (count($subtypes)==1) { ?><input type="hidden" name="subtype" value="<?php echo array_keys($subtypes)[0] ?>" /><?php } ?> - </select></div> - <?php } ?> - <?php $if8=!(isset($subtypes)); if($if8){?> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_subtype" name="<?php if ('') echo ''.'_' ?>subtype<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$subtype) ?>" /><?php if (false) { ?><input type="hidden" name="subtype" value="<?php $subtype ?>"/><?php } ?></div> - <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="properties" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> + <?php $if5=(isset($subtype)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_SUBTYPE'))) ?> + </span> + </td> + <td class=""> + <?php $if8=(isset($subtypes)); if($if8) { ?> + <input name="subtype" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" size="1" class=""> + </input> + <?php } ?> + <?php $if8=!(isset($subtypes)); if($if8) { ?> + <input name="subtype" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" class=""> + </input> + <?php } ?> </td> </tr> - <?php } ?> - <?php $if5=(isset($with_icon)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_WITH_ICON')))); ?></span> - </td> - <td> - <?php { $tmpname = 'with_icon';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <?php } ?> + <?php $if5=(isset($with_icon)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_WITH_ICON'))) ?> + </span> + </td> + <td class=""> + <input type="checkbox" name="with_icon" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$with_icon)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($all_languages)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_ALL_LANGUAGES')))); ?></span> - </td> - <td> - <?php { $tmpname = 'all_languages';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <?php } ?> + <?php $if5=(isset($all_languages)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_ALL_LANGUAGES'))) ?> + </span> + </td> + <td class=""> + <input type="checkbox" name="all_languages" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$all_languages)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($writable)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_writable')))); ?></span> - </td> - <td> - <?php { $tmpname = 'writable';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <?php } ?> + <?php $if5=(isset($writable)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_writable'))) ?> + </span> + </td> + <td class=""> + <input type="checkbox" name="writable" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$writable)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($width)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('width')))); ?></span> + <?php } ?> + <?php $if5=(isset($width)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('width'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_width" name="<?php if ('') echo ''.'_' ?>width<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$width) ?>" /><?php if (false) { ?><input type="hidden" name="width" value="<?php $width ?>"/><?php } ?></div> + <td class=""> + <input name="width" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($height)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('height')))); ?></span> + <?php } ?> + <?php $if5=(isset($height)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('height'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_height" name="<?php if ('') echo ''.'_' ?>height<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$height) ?>" /><?php if (false) { ?><input type="hidden" name="height" value="<?php $height ?>"/><?php } ?></div> + <td class=""> + <input name="height" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($dateformat)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DATEFORMAT')))); ?></span> + <?php } ?> + <?php $if5=(isset($dateformat)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DATEFORMAT'))) ?> + </span> </td> - <td> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dateformat" name="dateformat" title="" class=""<?php if (count($dateformats)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dateformats,$dateformat,0,0) ?><?php if (count($dateformats)==0) { ?><input type="hidden" name="dateformat" value="" /><?php } ?><?php if (count($dateformats)==1) { ?><input type="hidden" name="dateformat" value="<?php echo array_keys($dateformats)[0] ?>" /><?php } ?> - </select></div> + <td class=""> + <input name="dateformat" value="<?php echo encodeHtml(htmlentities(@$dateformat)) ?>" size="1" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($format)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_FORMAT')))); ?></span> + <?php } ?> + <?php $if5=(isset($format)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_FORMAT'))) ?> + </span> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php') ?><?php component_radio_box('format',$formatlist,$format) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php'); { <?php component_radio_box(format,$formatlist,${format}) ?> ?> + <?php } ?> </td> </tr> - <?php } ?> - <?php $if5=(isset($decimals)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DECIMALS')))); ?></span> + <?php } ?> + <?php $if5=(isset($decimals)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DECIMALS'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_decimals" name="<?php if ('') echo ''.'_' ?>decimals<?php if (false) echo '_disabled' ?>" type="text" maxlength="2" class="" value="<?php echo Text::encodeHtml(@$decimals) ?>" /><?php if (false) { ?><input type="hidden" name="decimals" value="<?php $decimals ?>"/><?php } ?></div> + <td class=""> + <input name="decimals" disabled="" type="text" maxlength="2" value="<?php echo encodeHtml(htmlentities(@$decimals)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($dec_point)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEC_POINT')))); ?></span> + <?php } ?> + <?php $if5=(isset($dec_point)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEC_POINT'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_dec_point" name="<?php if ('') echo ''.'_' ?>dec_point<?php if (false) echo '_disabled' ?>" type="text" maxlength="5" class="" value="<?php echo Text::encodeHtml(@$dec_point) ?>" /><?php if (false) { ?><input type="hidden" name="dec_point" value="<?php $dec_point ?>"/><?php } ?></div> + <td class=""> + <input name="dec_point" disabled="" type="text" maxlength="5" value="<?php echo encodeHtml(htmlentities(@$dec_point)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($thousand_sep)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_thousand_sep')))); ?></span> + <?php } ?> + <?php $if5=(isset($thousand_sep)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_thousand_sep'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_thousand_sep" name="<?php if ('') echo ''.'_' ?>thousand_sep<?php if (false) echo '_disabled' ?>" type="text" maxlength="1" class="" value="<?php echo Text::encodeHtml(@$thousand_sep) ?>" /><?php if (false) { ?><input type="hidden" name="thousand_sep" value="<?php $thousand_sep ?>"/><?php } ?></div> + <td class=""> + <input name="thousand_sep" disabled="" type="text" maxlength="1" value="<?php echo encodeHtml(htmlentities(@$thousand_sep)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($default_text)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_text')))); ?></span> + <?php } ?> + <?php $if5=(isset($default_text)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_default_text'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_default_text" name="<?php if ('') echo ''.'_' ?>default_text<?php if (false) echo '_disabled' ?>" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$default_text) ?>" /><?php if (false) { ?><input type="hidden" name="default_text" value="<?php $default_text ?>"/><?php } ?></div> + <td class=""> + <input name="default_text" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$default_text)) ?>" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($default_longtext)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_longtext')))); ?></span> + <?php } ?> + <?php $if5=(isset($default_longtext)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_default_longtext'))) ?> + </span> </td> - <td> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>default_longtext<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($default_longtext) ?></textarea></div> + <td class=""> + <textarea name="default_longtext" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$default_longtext)) ?> + </textarea> </td> </tr> - <?php } ?> - <?php $if5=(isset($parameters)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DYNAMIC_PARAMETERS')))); ?></span> + <?php } ?> + <?php $if5=(isset($parameters)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DYNAMIC_PARAMETERS'))) ?> + </span> </td> - <td> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>parameters<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($parameters) ?></textarea></div> + <td class=""> + <textarea name="parameters" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$parameters)) ?> + </textarea> </td> </tr> - <tr> - <td> - </td> - <td> - <?php foreach($dynamic_class_parameters as $paramName=>$defaultValue){ ?> - <span><?php echo nl2br(encodeHtml(htmlentities($paramName))); ?></span> - <span><?php echo nl2br(' ('); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DEFAULT')))); ?></span> - <span><?php echo nl2br(') = '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($defaultValue))); ?></span> - <br/> - <?php } ?> + <tr class=""> + <td class=""> + </td> + <td class=""> + <?php foreach($dynamic_class_parameters as $paramName=>$defaultValue) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@$paramName)) ?> + </span> + <span class=""> ( + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DEFAULT'))) ?> + </span> + <span class="">) = + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$defaultValue)) ?> + </span> + <br> + </br> + <?php } ?> </td> </tr> - <?php } ?> - <?php $if5=(isset($select_items)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_select_items')))); ?></span> + <?php } ?> + <?php $if5=(isset($select_items)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_select_items'))) ?> + </span> </td> - <td> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>select_items<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($select_items) ?></textarea></div> + <td class=""> + <textarea name="select_items" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$select_items)) ?> + </textarea> </td> </tr> - <?php } ?> - <?php $if5=(isset($linkelement)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_LINK')))); ?></span> + <?php } ?> + <?php $if5=(isset($linkelement)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_LINK'))) ?> + </span> </td> - <td> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_linkelement" name="linkelement" title="" class=""<?php if (count($linkelements)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($linkelements,$linkelement,0,0) ?><?php if (count($linkelements)==0) { ?><input type="hidden" name="linkelement" value="" /><?php } ?><?php if (count($linkelements)==1) { ?><input type="hidden" name="linkelement" value="<?php echo array_keys($linkelements)[0] ?>" /><?php } ?> - </select></div> + <td class=""> + <input name="linkelement" value="<?php echo encodeHtml(htmlentities(@$linkelement)) ?>" size="1" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($name)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_NAME')))); ?></span> + <?php } ?> + <?php $if5=(isset($name)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_NAME'))) ?> + </span> </td> - <td> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_name" name="name" title="" class=""<?php if (count($names)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($names,$name,0,0) ?><?php if (count($names)==0) { ?><input type="hidden" name="name" value="" /><?php } ?><?php if (count($names)==1) { ?><input type="hidden" name="name" value="<?php echo array_keys($names)[0] ?>" /><?php } ?> - </select></div> + <td class=""> + <input name="name" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" size="1" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($folderobjectid)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_FOLDEROBJECT')))); ?></span> + <?php } ?> + <?php $if5=(isset($folderobjectid)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEFAULT_FOLDEROBJECT'))) ?> + </span> </td> - <td> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_folderobjectid" name="folderobjectid" title="" class=""<?php if (count($folders)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($folders,$folderobjectid,0,0) ?><?php if (count($folders)==0) { ?><input type="hidden" name="folderobjectid" value="" /><?php } ?><?php if (count($folders)==1) { ?><input type="hidden" name="folderobjectid" value="<?php echo array_keys($folders)[0] ?>" /><?php } ?> - </select></div> + <td class=""> + <input name="folderobjectid" value="<?php echo encodeHtml(htmlentities(@$folderobjectid)) ?>" size="1" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($default_objectid)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_OBJECT')))); ?></span> + <?php } ?> + <?php $if5=(isset($default_objectid)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEFAULT_OBJECT'))) ?> + </span> </td> - <td> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_default_objectid" name="default_objectid" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($objects,$default_objectid,1,0) ?><?php if (count($objects)==0) { ?><input type="hidden" name="default_objectid" value="" /><?php } ?><?php if (count($objects)==1) { ?><input type="hidden" name="default_objectid" value="<?php echo array_keys($objects)[0] ?>" /><?php } ?> - </select></div> + <td class=""> + <input name="default_objectid" value="<?php echo encodeHtml(htmlentities(@$default_objectid)) ?>" size="1" class=""> + </input> </td> </tr> - <?php } ?> - <?php $if5=(isset($code)); if($if5){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_code')))); ?></span> + <?php } ?> + <?php $if5=(isset($code)); if($if5) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('EL_PROP_code'))) ?> + </span> </td> - <td> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>code<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($code) ?></textarea></div> + <td class=""> + <textarea name="code" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$code)) ?> + </textarea> </td> </tr> - <?php } ?> - <tr> + <?php } ?> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ 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,35 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form element" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="element" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'ELEMENT_NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_NAME'))) ?> + </span> </div> <div class="input"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'confirm';$default = false;$readonly = false;$required = true; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_confirm" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('CONFIRM_DELETE')))); ?></span> + <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> + </span> </label> </div> </div> @@ -37,18 +29,25 @@ <div class="label"> </div> <div class="input"> - <span><?php echo nl2br(' '); ?></span> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_value" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="value"<?php if('value'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_value" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_DELETE_VALUES')))); ?></span> + <span class=""> + </span> + <input type="radio" name="type" disabled="" value="value" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('ELEMENT_DELETE_VALUES'))) ?> + </span> </label> - <br/> - <span><?php echo nl2br(' '); ?></span> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_all" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="all"<?php if('all'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_all" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('DELETE')))); ?></span> + <br> + </br> + <span class=""> + </span> + <input type="radio" name="type" disabled="" value="all" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('DELETE'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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 @@ -12,7 +12,7 @@ </part> </part> </group> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> diff --git a/modules/cms-ui/themes/default/html/views/file/advanced.php b/modules/cms-ui/themes/default/html/views/file/advanced.php @@ -1,6 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="advanced" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="advanced" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('file_extension') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_extension" name="<?php if ('') echo ''.'_' ?>extension<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="extension" value="<?php echo Text::encodeHtml(@$extension) ?>" /><?php if (false) { ?><input type="hidden" name="extension" value="<?php $extension ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label">?type?</span><span class="or-form-input"><div class="inputholder"><select id="<?php echo REQUEST_ID ?>_type" name="type" title="" class=""<?php if (count($types)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($types,$type,0,0) ?><?php if (count($types)==0) { ?><input type="hidden" name="type" value="" /><?php } ?><?php if (count($types)==1) { ?><input type="hidden" name="type" value="<?php echo array_keys($types)[0] ?>" /><?php } ?> - </select></div></span></label> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <form name="" target="_self" data-target="view" action="./" data-method="advanced" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <label class="or-form-row or-form-input"><input name="extension" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$extension)) ?>" class="extension"> + </input></label> + <label class="or-form-row or-form-input"><input name="type" value="<?php echo encodeHtml(htmlentities(@$type)) ?>" size="1" class=""> + </input></label> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/compress.php b/modules/cms-ui/themes/default/html/views/file/compress.php @@ -1,25 +1,33 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="compress" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="compress" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('OPTIONS') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="compress" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('type')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + </span> </div> <div class="input"> - <?php $gz= 'gz'; ?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_format" name="format" title="" class=""<?php if (count($formats)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($formats,'gz',0,0) ?><?php if (count($formats)==0) { ?><input type="hidden" name="format" value="" /><?php } ?><?php if (count($formats)==1) { ?><input type="hidden" name="format" value="<?php echo array_keys($formats)[0] ?>" /><?php } ?> - </select></div> - <?php $replace= '1'; ?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_1" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="1"<?php if('1'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_1" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'replace'.'')))); ?></span> + <?php { $gz= 'gz'; ?> + <?php } ?> + <input name="format" value="gz" size="1" class=""> + </input> + <?php { $replace= '1'; ?> + <?php } ?> + <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + </span> </label> - <br/> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="0"<?php if('0'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_0" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <br> + </br> + <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/compress.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/compress.tpl.src.xml @@ -1,7 +1,7 @@ <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> - <group title="message:OPTIONS"> + <group title="#{OPTIONS}"> <part class="line"> <part class="label"> <text text="type"></text> diff --git a/modules/cms-ui/themes/default/html/views/file/edit.php b/modules/cms-ui/themes/default/html/views/file/edit.php @@ -1,13 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="languageid" value="<?php echo $languageid ?>" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="edit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> <div class="line"> <div class="label"> </div> <div class="input"> - <br/> - <input size="40" id="req0_file" type="file" name="file" class="upload" /> - <br/> - <br/> + <br> + </br> + <input id="req0_file" name="file" size="40" class="upload"> + </input> + <br> + </br> + <br> + </br> </div> </div> <div class="line or-dropzone-upload"> @@ -16,4 +20,4 @@ <div class="input"> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/edit.tpl.src.xml @@ -1,6 +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"> - <form languageid="var:languageid"> + <form languageid="${languageid}"> <part class="line"> <part class="label" /> 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,11 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="extract" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="extract" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> + <form name="" target="_self" data-target="view" action="./" data-method="extract" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/info.php b/modules/cms-ui/themes/default/html/views/file/info.php @@ -1,160 +1,205 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_name'))) ?> + </span> </div> <div class="input"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_filename'))) ?> + </span> </div> <div class="input"> - <span class="filename"><?php echo nl2br(encodeHtml(htmlentities($filename))); ?></span> + <span class="filename"><?php echo encodeHtml(htmlentities(@$filename)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('file_extension')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('file_extension'))) ?> + </span> </div> <div class="input"> - <span class="extension"><?php echo nl2br(encodeHtml(htmlentities($extension))); ?></span> + <span class="extension"><?php echo encodeHtml(htmlentities(@$extension)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_description'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$description)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('additional_info') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_full_filename" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_full_filename'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($full_filename))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$full_filename)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_size" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_SIZE')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_SIZE'))) ?> + </span> </label> </div> <div class="input"> </div> - <span><?php echo nl2br(encodeHtml(htmlentities($size))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$size)) ?> + </span> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_mimetype" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_mimetype')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_mimetype'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($mimetype))); ?></span> - <br/> - <a class="action" target="_self" data-action="file" data-method="size" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/file/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_file_size'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$mimetype)) ?> + </span> + <br> + </br> + <a target="_self" data-action="file" data-method="size" data-id="" data-extra="[]" href="/#/file/" class="action"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_file_size'))) ?> + </span> </a> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(lang('id'))))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('#{id'))) ?>} + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$objectid)) ?> + </span> </div> </div> - <?php $if4=(isset($cache_filename)); if($if4){?> + <?php $if4=(isset($cache_filename)); if($if4) { ?> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_cache_filename" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('CACHE_FILENAME')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CACHE_FILENAME'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($cache_filename))); ?></span> - <br/> - <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($cache_filemtime) ?> + <span class=""><?php echo encodeHtml(htmlentities(@$cache_filename)) ?> + </span> + <br> + </br> + <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" class=""> + </img> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($cache_filemtime); ?> + <?php } ?> </div> </div> - <?php } ?> + <?php } ?> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_pages" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_PAGES')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_PAGES'))) ?> + </span> </label> </div> <div class="input"> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <?php foreach($pages as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <tr> - <td> - <a target="_self" data-url="<?php echo $url ?>" data-action="" data-method="info" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <img src="./modules/cms-ui/themes/default/images/icon_page.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <?php foreach($pages as $list_key=>$list_value) { extract($list_value); ?> + <tr class=""> + <td class=""> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$url)) ?>" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class=""> + <img src="./modules/cms-ui/themes/default/images/icon_page.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <?php $if6=(($pages)==FALSE); if($if6){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> - <?php } ?> + <?php $if6=(($pages)==FALSE); if($if6) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> + <?php } ?> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('prop_userinfo') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_created'))) ?> + </span> </div> <div class="input"> - <i class="image-icon image-icon--action-el_date"></i> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($create_date) ?> - <br/> - <i class="image-icon image-icon--action-user"></i> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($create_user) ?> + <i class="image-icon image-icon--action-el_date"> + </i> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($create_date); ?> + <?php } ?> + <br> + </br> + <i class="image-icon image-icon--action-user"> + </i> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($create_user); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_lastchange'))) ?> + </span> </div> <div class="input"> - <i class="image-icon image-icon--action-el_date"></i> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> - <br/> - <i class="image-icon image-icon--action-user"></i> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($lastchange_user) ?> + <i class="image-icon image-icon--action-el_date"> + </i> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php } ?> + <br> + </br> + <i class="image-icon image-icon--action-user"> + </i> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($lastchange_user); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_published_date" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_published')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_published'))) ?> + </span> </label> </div> <div class="input"> - <i class="image-icon image-icon--action-el_date"></i> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($published_date) ?> - <br/> - <i class="image-icon image-icon--action-user"></i> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($published_user) ?> + <i class="image-icon image-icon--action-el_date"> + </i> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($published_date); ?> + <?php } ?> + <br> + </br> + <i class="image-icon image-icon--action-user"> + </i> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($published_user); ?> + <?php } ?> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/info.tpl.src.xml @@ -36,7 +36,7 @@ </part> </group> - <group title="message:additional_info"> + <group title="#{additional_info}"> <part class="line"> <part class="label"> <label for="full_filename"> @@ -73,7 +73,7 @@ </part> <part class="line"> <part class="label"> - <text text="message:id"></text> + <text text="#{id}"></text> </part> <part class="input"> <text var="objectid"></text> @@ -90,7 +90,7 @@ <text var="cache_filename"></text> <newline></newline> <image icon="el_date"></image> - <date date="var:cache_filemtime"></date> + <date date="${cache_filemtime}"></date> </part> </part> </if> @@ -105,7 +105,7 @@ <list list="pages" extract="true"> <row> <column> - <link url="var:url" target="cms_main"> + <link url="${url}" target="cms_main"> <image type="page"></image> <text var="name"></text> </link> @@ -119,17 +119,17 @@ </part> </part> </group> - <group title="message:prop_userinfo"> + <group title="#{prop_userinfo}"> <part class="line"> <part class="label"> <text text="global_created"></text> </part> <part class="input"> <image elementtype="date"></image> - <date date="var:create_date"></date> + <date date="${create_date}"></date> <newline></newline> <image action="user"></image> - <user user="var:create_user"></user> + <user user="${create_user}"></user> </part> </part> <part class="line"> @@ -138,10 +138,10 @@ </part> <part class="input"> <image elementtype="date"></image> - <date date="var:lastchange_date"></date> + <date date="${lastchange_date}"></date> <newline></newline> <image action="user"></image> - <user user="var:lastchange_user"></user> + <user user="${lastchange_user}"></user> </part> </part> <part class="line"> @@ -152,10 +152,10 @@ </part> <part class="input"> <image elementtype="date"></image> - <date date="var:published_date"></date> + <date date="${published_date}"></date> <newline></newline> <image action="user"></image> - <user user="var:published_user"></user> + <user user="${published_user}"></user> </part> </part> </group> diff --git a/modules/cms-ui/themes/default/html/views/file/preview.php b/modules/cms-ui/themes/default/html/views/file/preview.php @@ -1,6 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="clickable"> - <a class="action" target="_self" data-url="<?php echo $preview_url ?>" data-type="popup" data-action="" data-method="preview" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LINK_OPEN_IN_NEW_WINDOW'.'')))); ?></span> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>" data-type="popup" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class="action"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LINK_OPEN_IN_NEW_WINDOW'))) ?> + </span> </a> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/preview.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/preview.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <part class="clickable"> - <link type="popup" url="var:preview_url" class="action"> + <link type="popup" url="${preview_url}" class="action"> <text key="LINK_OPEN_IN_NEW_WINDOW" /> </link> </part> diff --git a/modules/cms-ui/themes/default/html/views/file/pub.php b/modules/cms-ui/themes/default/html/views/file/pub.php @@ -1,21 +1,19 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('security','nopublish')); if($if2){?> + <?php $if2=(config('security','nopublish')); if($if2) { ?> <div class="message warn"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NOPUBLISH_DESC'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOPUBLISH_DESC'))) ?> + </span> </div> - <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="true" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pub" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <br/> + <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="1" data-autosave="" class="or-form file"> + <tr class=""> + <td class=""> + <br> + </br> </td> </tr> - <tr> + <tr class=""> <td class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('publish') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/pub.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/pub.tpl.src.xml @@ -4,13 +4,13 @@ <!-- Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. --> - <if true="config:security/nopublish"> + <if true="%{security/nopublish}"> <part class="message warn"> <text key="GLOBAL_NOPUBLISH_DESC" class="help"></text> </part> </if> - <form cancel="true" label="message:publish" async="true"> + <form cancel="true" label="#{publish}" async="true"> <row> <column> <newline></newline> diff --git a/modules/cms-ui/themes/default/html/views/file/remove.php b/modules/cms-ui/themes/default/html/views/file/remove.php @@ -1,17 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('GLOBAL_NAME') ?></span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> - <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'delete';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> ?GLOBAL_DELETE? </span></label> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span></span></label> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + </input></label> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/show.php b/modules/cms-ui/themes/default/html/views/file/show.php @@ -1 +1,2 @@ -<?php if (!defined('OR_TITLE')) die('Forbidden'); ?><?php echo $value; ?>- \ No newline at end of file +<?php if (!defined('OR_TITLE')) die('Forbidden'); ?> +<?php echo @$value ?>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/structure.php b/modules/cms-ui/themes/default/html/views/file/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/structure.tpl.src.xml @@ -1,7 +1,7 @@ <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"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/uncompress.php b/modules/cms-ui/themes/default/html/views/file/uncompress.php @@ -1,21 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="uncompress" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="uncompress" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="uncompress" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> </div> <div class="input"> - <?php $replace= '1'; ?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_1" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="1"<?php if('1'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_1" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'replace'.'')))); ?></span> + <?php { $replace= '1'; ?> + <?php } ?> + <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + </span> </label> - <br/> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="0"<?php if('0'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_0" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <br> + </br> + <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </label> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/uncompress.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/uncompress.tpl.src.xml @@ -1,7 +1,7 @@ <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> - <group title="message:options"></group> + <group title="#{options}"></group> <part class="line"> <part class="label"> </part> diff --git a/modules/cms-ui/themes/default/html/views/file/value.php b/modules/cms-ui/themes/default/html/views/file/value.php @@ -1,19 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="value" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_VALUE')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_VALUE'))) ?> + </span> </td> - <td> - <textarea name="<?php if ('') echo ''.'_' ?>value<?php if (false) echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"><?php echo htmlentities(${'value'}) ?></textarea> + <td class=""> + <textarea name="value" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"> + </textarea> </td> </tr> - <tr> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/advanced.php b/modules/cms-ui/themes/default/html/views/folder/advanced.php @@ -1,133 +1,109 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="edit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> <td class="help"> - <?php { $tmpname = 'checkall';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <input type="checkbox" name="checkall" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$checkall)) ?>" class=""> + </input> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> - <span><?php echo nl2br(' / '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_TYPE'))) ?> + </span> + <span class=""> / + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> </tr> - <?php foreach($object as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td width="1%"> - <?php $if7=($writable); if($if7){?> - <?php { $tmpname = $id;$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <?php } ?> - <?php $if7=(!'writable'); if($if7){?> - <span><?php echo nl2br(' '); ?></span> - <?php } ?> + <td width="1%" class=""> + <?php $if7=($writable); if($if7) { ?> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$id)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$${id)) ?>}" class=""> + </input> + <?php } ?> + <?php $if7=(!'writable'); if($if7) { ?> + <span class=""> + </span> + <?php } ?> </td> <td class="clickable"> - <label for="<?php echo REQUEST_ID ?>_<?php echo $id ?>" class="label"> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="<?php echo $type ?>" data-method="advanced" data-id="<?php echo $objectid ?>" data-extra="[]" href="./#/<?php echo $type ?>/<?php echo $objectid ?>"> - <i class="image-icon image-icon--action-<?php echo $icon ?>"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,40,'..',constant('STR_PAD_BOTH') )))); ?></span> - <span><?php echo nl2br(' '); ?></span> + <label class="label"> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$type)) ?>/<?php echo encodeHtml(htmlentities(@$objectid)) ?>" class=""> + <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$icon)) ?>"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> + <span class=""> + </span> </a> </label> </td> </tr> - <?php } ?> - <?php $if4=(($object)==FALSE); if($if4){?> - <tr> - <td colspan="2"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <?php } ?> + <?php $if4=(($object)==FALSE); if($if4) { ?> + <tr class=""> + <td colspan="2" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> <tr class="data"> - <td> - <span><?php echo nl2br(' '); ?></span> + <td class=""> + <span class=""> + </span> </td> <td colspan="2" class="clickable"> - <a target="_self" data-type="dialog" data-action="folder" data-method="create" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'folder','dialogMethod':'create'}" href="./#/folder/"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_create'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="folder" data-method="create" data-id="" data-extra="{'dialogAction':'folder','dialogMethod':'create'}" href="/#/folder/" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_folder_create'))) ?> + </span> </a> </td> </tr> </table></div></div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> - <?php $type= $defaulttype; ?> - <?php foreach($actionlist as $list_key=>$actiontype){ ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <?php { $type= $defaulttype; ?> + <?php } ?> + <?php foreach($actionlist as $list_key=>$actiontype) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_<?php echo $actiontype ?>" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="<?php echo $actiontype ?>"<?php if($actiontype==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_<?php echo $actiontype ?>" class="label"> - <span><?php echo nl2br(' '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FOLDER_SELECT_'.$actiontype.'')))); ?></span> + <input type="radio" name="type" disabled="" value="<?php echo encodeHtml(htmlentities(@$actiontype)) ?>" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('${actiontype'))) ?>} + </span> </label> </div> </div> - <?php } ?> + <?php } ?> <div class="line"> <div class="label"> </div> <div class="input"> - <span><?php echo nl2br(' '); ?></span> - <?php { $tmpname = 'confirm';$default = false;$readonly = false;$required = true; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_confirm" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'CONFIRM_DELETE'.'')))); ?></span> + <span class=""> + </span> + <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> + </span> </label> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'FOLDER_SELECT_TARGET_FOLDER'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FOLDER_SELECT_TARGET_FOLDER'))) ?> + </span> </div> <div class="input"> - <div class="selector"> -<div class="inputholder or-droppable"> -<input type="hidden" class="or-selector-link-value" name="targetobjectid" value="<?php echo $rootfolderid ?>" /> -<input type="text" class="or-selector-link-name" value="<?php echo $rootfoldername ?>" placeholder="<?php echo $rootfoldername ?>" /> -</div> -<div class="dropdown"></div> -<div class="tree selector" data-types="{types}" data-init-id="<?php echo $rootfolderid ?>" data-init-folderid="<?php echo $rootfolderid ?>"> -</div> -</div> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/advanced.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/advanced.tpl.src.xml @@ -18,17 +18,17 @@ <list list="object" extract="true"> <row class="data"> <column width="1%"> - <if true="var:writable"> - <checkbox name="var:id"></checkbox> + <if true="${writable}"> + <checkbox name="${id}"></checkbox> </if> <if false="writable"> <text raw="_"></text> </if> </column> <column class="clickable"> - <label for="var:id"> - <link type="open" name="var:name" action="var:type" id="var:objectid"> - <image action="var:icon"></image> + <label for="${id}"> + <link type="open" name="${name}" action="${type}" id="${objectid}"> + <image action="${icon}"></image> <text var="name" maxlength="40"></text> <text raw="_"></text> </link> @@ -56,17 +56,17 @@ </column> </row> </table> - <group title="message:options"> - <set var="type" value="var:defaulttype"></set> + <group title="#{options}"> + <set var="type" value="${defaulttype}"></set> <list list="actionlist" value="actiontype"> <part class="line"> <part class="label"> </part> <part class="input"> - <radio name="type" value="var:actiontype"></radio> - <label for="type" value="var:actiontype"> + <radio name="type" value="${actiontype}"></radio> + <label for="type" value="${actiontype}"> <text raw="_"></text> - <text key="var:actiontype" prefix="FOLDER_SELECT_"></text> + <text key="${actiontype}" prefix="FOLDER_SELECT_"></text> </label> </part> </part> @@ -88,11 +88,11 @@ <text key="FOLDER_SELECT_TARGET_FOLDER" /> </part> <part class="input"> - <selector types="folder" param="targetobjectid" name="var:rootfoldername" - id="var:rootfolderid" folderid="var:rootfolderid" /> + <selector types="folder" param="targetobjectid" name="${rootfoldername}" + id="${rootfolderid}" folderid="${rootfolderid}" /> </part> </part> </group> </form> - <insert script="mark" inline="true"></insert> + <!-- <insert script="mark" inline="true"></insert> --> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/content.php b/modules/cms-ui/themes/default/html/views/folder/content.php @@ -1,74 +1,94 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> - <span><?php echo nl2br(' / '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_TYPE'))) ?> + </span> + <span class=""> / + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_LASTCHANGE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LASTCHANGE'))) ?> + </span> </td> </tr> - <?php $if3=(isset($up_url)); if($if3){?> + <?php $if3=(isset($up_url)); if($if3) { ?> <tr class="data"> - <td> - <img src="./modules/cms-ui/themes/default/images/icon_folder.png" /> - <span><?php echo nl2br('..'); ?></span> + <td class=""> + <img src="./modules/cms-ui/themes/default/images/icon_folder.png" class=""> + </img> + <span class="">.. + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php } ?> - <?php foreach($object as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php } ?> + <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td title="<?php echo $desc ?>" data-name="<?php echo $name ?>" data-action="<?php echo $type ?>" data-id="<?php echo $id ?>" class="clickable <?php echo $class ?>"> - <img src="./modules/cms-ui/themes/default/images/icon_<?php echo $icon ?>.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - <span><?php echo nl2br(' '); ?></span> + <td title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" data-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="clickable <?php echo encodeHtml(htmlentities(@$class)) ?>"> + <img src="./modules/cms-ui/themes/default/images/icon_<?php echo encodeHtml(htmlentities(@$icon)) ?>.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> + <span class=""> + </span> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php } ?> </td> </tr> - <?php } ?> - <?php $if3=(($object)==FALSE); if($if3){?> - <tr> - <td colspan="2"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <?php } ?> + <?php $if3=(($object)==FALSE); if($if3) { ?> + <tr class=""> + <td colspan="2" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> <tr class="data"> - <td colspan="2"> - <a target="_self" data-type="view" data-action="folder" data-method="createfolder" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/folder/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createfolder'.'')))); ?></span> + <td colspan="2" class=""> + <a target="_self" data-type="view" data-action="folder" data-method="createfolder" data-id="" data-extra="[]" href="/#/folder/" class=""> + <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_folder_createfolder'))) ?> + </span> </a> </td> </tr> <tr class="data"> - <td colspan="2"> - <a target="_self" data-type="view" data-action="folder" data-method="createpage" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/folder/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createpage'.'')))); ?></span> + <td colspan="2" class=""> + <a target="_self" data-type="view" data-action="folder" data-method="createpage" data-id="" data-extra="[]" href="/#/folder/" class=""> + <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_folder_createpage'))) ?> + </span> </a> </td> </tr> <tr class="data"> - <td colspan="2"> - <a target="_self" data-type="view" data-action="folder" data-method="createfile" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/folder/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createfile'.'')))); ?></span> + <td colspan="2" class=""> + <a target="_self" data-type="view" data-action="folder" data-method="createfile" data-id="" data-extra="[]" href="/#/folder/" class=""> + <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_folder_createfile'))) ?> + </span> </a> </td> </tr> <tr class="data"> - <td colspan="2"> - <a target="_self" data-type="modal" data-action="folder" data-method="createlink" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/folder/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createlink'.'')))); ?></span> + <td colspan="2" class=""> + <a target="_self" data-type="modal" data-action="folder" data-method="createlink" data-id="" data-extra="[]" href="/#/folder/" class=""> + <img src="./modules/cms-ui/themes/default/images/icon/icon/create.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_folder_createlink'))) ?> + </span> </a> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/folder/content.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/content.tpl.src.xml @@ -13,7 +13,7 @@ </row> <if present="up_url"> <row class="data"> - <column url="var:up_url"> + <column url="${up_url}"> <image type="folder"></image> <text raw=".."></text> </column> @@ -24,13 +24,13 @@ </if> <list list="object" extract="true"> <row class="data"> - <column id="var:id" name="var:name" action="var:type" title="var:desc" class="var:class"> - <image type="var:icon"></image> + <column id="${id}" name="${name}" action="${type}" title="${desc}" class="${class}"> + <image type="${icon}"></image> <text var="name"></text> <text raw="_"></text> </column> <column> - <date date="var:date"></date> + <date date="${date}"></date> </column> </row> </list> diff --git a/modules/cms-ui/themes/default/html/views/folder/create.php b/modules/cms-ui/themes/default/html/views/folder/create.php @@ -1,52 +1,59 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="or-linklist"> - <?php $if3=($mayCreateFolder); if($if3){?> + <?php $if3=($mayCreateFolder); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createfolder" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createfolder'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createfolder'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createfolder" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createfolder'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createfolder'))) ?> + </span> </a> </div> - <?php } ?> - <?php $if3=($mayCreatePage); if($if3){?> + <?php } ?> + <?php $if3=($mayCreatePage); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createpage" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createpage'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createpage'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createpage" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createpage'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createpage'))) ?> + </span> </a> </div> - <?php } ?> - <?php $if3=($mayCreateFile); if($if3){?> + <?php } ?> + <?php $if3=($mayCreateFile); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createfile" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createfile'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createfile'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createfile" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createfile'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createfile'))) ?> + </span> </a> </div> - <?php } ?> - <?php $if3=($mayCreateImage); if($if3){?> + <?php } ?> + <?php $if3=($mayCreateImage); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createimage" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createimage'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createimage'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createimage" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createimage'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createimage'))) ?> + </span> </a> </div> - <?php } ?> - <?php $if3=($mayCreateText); if($if3){?> + <?php } ?> + <?php $if3=($mayCreateText); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createtext" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createtext'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createtext'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createtext" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createtext'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createtext'))) ?> + </span> </a> </div> - <?php } ?> - <?php $if3=($mayCreateUrl); if($if3){?> + <?php } ?> + <?php $if3=($mayCreateUrl); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createurl" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createurl'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createurl'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createurl" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createurl'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createurl'))) ?> + </span> </a> </div> - <?php } ?> - <?php $if3=($mayCreateLink); if($if3){?> + <?php } ?> + <?php $if3=($mayCreateLink); if($if3) { ?> <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createlink" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createlink'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createlink'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="createlink" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createlink'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createlink'))) ?> + </span> </a> </div> - <?php } ?> + <?php } ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/create.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/create.tpl.src.xml @@ -3,7 +3,7 @@ <part class="or-linklist"> - <if true="var:mayCreateFolder"> + <if true="${mayCreateFolder}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createfolder"> <text key="menu_createfolder"></text> @@ -11,7 +11,7 @@ </part> </if> - <if true="var:mayCreatePage"> + <if true="${mayCreatePage}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createpage"> <text key="menu_createpage"></text> @@ -19,7 +19,7 @@ </part> </if> - <if true="var:mayCreateFile"> + <if true="${mayCreateFile}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createfile"> <text key="menu_createfile"></text> @@ -27,7 +27,7 @@ </part> </if> - <if true="var:mayCreateImage"> + <if true="${mayCreateImage}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createimage"> <text key="menu_createimage"></text> @@ -35,7 +35,7 @@ </part> </if> - <if true="var:mayCreateText"> + <if true="${mayCreateText}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createtext"> <text key="menu_createtext"></text> @@ -43,7 +43,7 @@ </part> </if> - <if true="var:mayCreateUrl"> + <if true="${mayCreateUrl}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createurl"> <text key="menu_createurl"></text> @@ -51,7 +51,7 @@ </part> </if> - <if true="var:mayCreateLink"> + <if true="${mayCreateLink}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createlink"> <text key="menu_createlink"></text> 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,14 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="upload" action="./" data-method="createfile" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="multipart/form-data" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createfile" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="type" value="file"/> + <form name="" target="_self" data-target="upload" action="./" data-method="createfile" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="multipart/form-data" data-async="" data-autosave="" class="or-form folder"> + <input type="hidden" name="type" value="file" class=""> + </input> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_FILE')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_FILE'))) ?> + </span> </label> </div> <div class="input"> - <input size="40" id="req0_file" type="file" maxlength="<?php echo $maxlength ?>" name="file" class="upload" multiple="multiple" /> + <input multiple="multiple" id="req0_file" name="file" size="40" maxlength="<?php echo encodeHtml(htmlentities(@$maxlength)) ?>" class="upload"> + </input> </div> </div> <div class="line or-dropzone-upload"> @@ -19,36 +22,44 @@ </div> <div class="line"> <div class="label"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'file_max_size'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('file_max_size'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($max_size))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$max_size)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'HTTP_URL'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('HTTP_URL'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_url" name="<?php if ('') echo ''.'_' ?>url<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$url) ?>" /><?php if (false) { ?><input type="hidden" name="url" value="<?php $url ?>"/><?php } ?></div> + <input name="url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + </input> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('description') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ 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 @@ -10,7 +10,7 @@ </label> </part> <part class="input"> - <upload name="file" maxlength="var:maxlength" multiple="true"></upload> + <upload name="file" maxlength="${maxlength}" multiple="true"></upload> </part> </part> @@ -38,7 +38,7 @@ <input name="url" size="50"></input> </part> </part> - <group title="message:description"></group> + <group title="#{description}"></group> <part class="line"> 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,20 +1,25 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="createfolder" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createfolder" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="languageid" value="<?php echo $languageid ?>"/> + <form name="" target="_self" data-target="view" action="./" data-method="createfolder" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> + <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" class=""> + </input> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_FOLDER')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_FOLDER'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php '' ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('add') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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,7 +1,7 @@ <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"> + <form visible="true" label="#{add}"> <hidden name="languageid" /> <part class="line"> <part class="label"> 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,14 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="upload" action="./" data-method="createimage" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="multipart/form-data" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createimage" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="type" value="file"/> + <form name="" target="_self" data-target="upload" action="./" data-method="createimage" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="multipart/form-data" data-async="" data-autosave="" class="or-form folder"> + <input type="hidden" name="type" value="file" class=""> + </input> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_FILE')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_FILE'))) ?> + </span> </label> </div> <div class="input"> - <input size="40" id="req0_file" type="file" maxlength="<?php echo $maxlength ?>" name="file" class="upload" multiple="multiple" /> + <input multiple="multiple" id="req0_file" name="file" size="40" maxlength="<?php echo encodeHtml(htmlentities(@$maxlength)) ?>" class="upload"> + </input> </div> </div> <div class="line or-dropzone-upload"> @@ -19,36 +22,44 @@ </div> <div class="line"> <div class="label"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'file_max_size'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('file_max_size'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($max_size))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$max_size)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'HTTP_URL'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('HTTP_URL'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_url" name="<?php if ('') echo ''.'_' ?>url<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$url) ?>" /><?php if (false) { ?><input type="hidden" name="url" value="<?php $url ?>"/><?php } ?></div> + <input name="url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + </input> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('description') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ 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 @@ -10,7 +10,7 @@ </label> </part> <part class="input"> - <upload name="file" maxlength="var:maxlength" multiple="true"></upload> + <upload name="file" maxlength="${maxlength}" multiple="true"></upload> </part> </part> @@ -38,7 +38,7 @@ <input name="url" size="50"></input> </part> </part> - <group title="message:description"></group> + <group title="#{description}"></group> <part class="line"> diff --git a/modules/cms-ui/themes/default/html/views/folder/createlink.php b/modules/cms-ui/themes/default/html/views/folder/createlink.php @@ -1,11 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="createlink" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createlink" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="createlink" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php '' ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="" class=""> + </input> </div> </div> <div class="line"> @@ -16,10 +18,12 @@ </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ 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,28 +1,33 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="createpage" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createpage" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="createpage" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_TEMPLATE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_TEMPLATE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_templateid" name="templateid" title="" class=""<?php if (count($templates)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($templates,'',0,0) ?><?php if (count($templates)==0) { ?><input type="hidden" name="templateid" value="" /><?php } ?><?php if (count($templates)==1) { ?><input type="hidden" name="templateid" value="<?php echo array_keys($templates)[0] ?>" /><?php } ?> - </select></div> + <input name="templateid" value="" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus,name" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus,name"> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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,13 +1,15 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="createtext" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createtext" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="createtext" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_FILE')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_FILE'))) ?> + </span> </label> </div> <div class="input"> - <input size="40" id="req0_file" type="file" maxlength="<?php echo $maxlength ?>" name="file" class="upload" multiple="multiple" /> + <input multiple="multiple" id="req0_file" name="file" size="40" maxlength="<?php echo encodeHtml(htmlentities(@$maxlength)) ?>" class="upload"> + </input> </div> </div> <div class="line or-dropzone-upload"> @@ -18,36 +20,44 @@ </div> <div class="line"> <div class="label"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'file_max_size'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('file_max_size'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($max_size))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$max_size)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'HTTP_URL'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('HTTP_URL'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_url" name="<?php if ('') echo ''.'_' ?>url<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$url) ?>" /><?php if (false) { ?><input type="hidden" name="url" value="<?php $url ?>"/><?php } ?></div> + <input name="url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + </input> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('description') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ 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 @@ -9,7 +9,7 @@ </label> </part> <part class="input"> - <upload name="file" maxlength="var:maxlength" multiple="true"></upload> + <upload name="file" maxlength="${maxlength}" multiple="true"></upload> </part> </part> @@ -37,7 +37,7 @@ <input name="url" size="50"></input> </part> </part> - <group title="message:description"></group> + <group title="#{description}"></group> <part class="line"> diff --git a/modules/cms-ui/themes/default/html/views/folder/createurl.php b/modules/cms-ui/themes/default/html/views/folder/createurl.php @@ -1,19 +1,23 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="createurl" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="createurl" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="createurl" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('URL')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('URL'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_url" name="<?php if ('') echo ''.'_' ?>url<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="url" value="<?php '' ?>"/><?php } ?></div> + <input name="url" disabled="" type="text" maxlength="256" value="" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php '' ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="" class=""> + </input> </div> </div> <div class="line"> @@ -24,10 +28,12 @@ </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_DESCRIPTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></div> + <textarea name="description" disabled="" maxlength="0" class="inputarea"> + </textarea> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/edit.php b/modules/cms-ui/themes/default/html/views/folder/edit.php @@ -1,56 +1,69 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'TYPE'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('TYPE'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NAME'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LASTCHANGE'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LASTCHANGE'))) ?> + </span> </th> </tr> - <?php $if3=(isset($up_url)); if($if3){?> + <?php $if3=(isset($up_url)); if($if3) { ?> <tr class="data clickable"> - <td> - <a target="_self" date-name="" name="" data-type="open" data-action="folder" data-method="edit" data-id="<?php echo $parentid ?>" data-extra="[]" href="./#/folder/<?php echo $parentid ?>"> - <i class="image-icon image-icon--action-folder"></i> - <span><?php echo nl2br(encodeHtml(htmlentities('..'))); ?></span> + <td class=""> + <a target="_self" data-type="open" data-action="folder" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$parentid)) ?>" data-extra="[]" href="/#/folder/<?php echo encodeHtml(htmlentities(@$parentid)) ?>" class=""> + <i class="image-icon image-icon--action-folder"> + </i> + <span class="">.. + </span> </a> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php } ?> - <?php foreach($object as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php } ?> + <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> <tr class="data clickable"> - <td> - <i class="image-icon image-icon--action-<?php echo $icon ?>"></i> + <td class=""> + <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$icon)) ?>"> + </i> </td> - <td> - <a title="<?php echo $desc ?>" target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="<?php echo $type ?>" data-method="edit" data-id="<?php echo $id ?>" data-extra="[]" href="./#/<?php echo $type ?>/<?php echo $id ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - <span><?php echo nl2br(' '); ?></span> + <td class=""> + <a title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$type)) ?>/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> + <span class=""> + </span> </a> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php } ?> </td> </tr> - <?php } ?> - <?php $if3=(($object)==FALSE); if($if3){?> - <tr> - <td colspan="2"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <?php } ?> + <?php $if3=(($object)==FALSE); if($if3) { ?> + <tr class=""> + <td colspan="2" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> <div class="clickable"> - <a class="or-link-btn" target="_self" data-type="dialog" data-action="folder" data-method="create" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'folder','dialogMethod':'create'}" href="./#/folder/"> - <i class="image-icon image-icon--action-new"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="folder" data-method="create" data-id="" data-extra="{'dialogAction':'folder','dialogMethod':'create'}" href="/#/folder/" class="or-link-btn"> + <i class="image-icon image-icon--action-new"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/edit.tpl.src.xml @@ -15,7 +15,7 @@ <if present="up_url"> <row class="data clickable"> <column> - <link type="open" id="var:parentid" name="" action="folder"> + <link type="open" id="${parentid}" name="" action="folder"> <image action="folder"></image> <text value=".." /> </link> @@ -28,16 +28,16 @@ <list list="object" extract="true"> <row class="data clickable"> <column class=""> - <image action="var:icon"></image> + <image action="${icon}"></image> </column> <column class=""> - <link type="open" id="var:id" name="var:name" action="var:type" title="var:desc"> + <link type="open" id="${id}" name="${name}" action="${type}" title="${desc}"> <text var="name"></text> <text raw="_"></text> </link> </column> <column> - <date date="var:date"></date> + <date date="${date}"></date> </column> </row> </list> 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,18 +1,21 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="inherit" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="inherit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if3=($type=='folder'); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="inherit" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> + <?php $if3=($type=='folder'); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php $inherit= '1'; ?> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_inherit" name="<?php if ('') echo ''.'_' ?>inherit<?php if (false) echo '_disabled' ?>" type="checkbox" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$inherit) ?>" /><?php if (false) { ?><input type="hidden" name="inherit" value="<?php $inherit ?>"/><?php } ?></div> - <label for="<?php echo REQUEST_ID ?>_inherit" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'inherit_rights'.'')))); ?></span> + <?php { $inherit= '1'; ?> + <?php } ?> + <input name="inherit" disabled="" type="checkbox" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$inherit)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('inherit_rights'))) ?> + </span> </label> </div> </div> </div></fieldset> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file 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 @@ -3,8 +3,8 @@ <header back="true" /> <form> - <if value="var:type" equals="folder"> - <group title="message:options"> + <if value="${type}" equals="folder"> + <group title="#{options}"> <part class="line"> <part class="label"> </part> diff --git a/modules/cms-ui/themes/default/html/views/folder/order.php b/modules/cms-ui/themes/default/html/views/folder/order.php @@ -1,43 +1,55 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="order" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="order" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table class="or-table--sortable" width="100%"> + <form name="" target="_self" data-target="view" action="./" data-method="order" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class="or-table--sortable"> <tr class="headline"> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'FOLDER_ORDER'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FOLDER_ORDER'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_TYPE'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_FILENAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_FILENAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_LASTCHANGE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LASTCHANGE'))) ?> + </span> </td> </tr> - <?php foreach($object as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <tr class="data" data-id="<?php echo $id ?>"> - <td> - <span><?php echo nl2br(' '); ?></span> + <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> + <tr data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="data"> + <td class=""> + <span class=""> + </span> </td> - <td> - <span class="sort-value"><?php echo nl2br(encodeHtml(htmlentities($icon))); ?></span> - <i class="image-icon image-icon--action-<?php echo $icon ?>"></i> + <td class=""> + <span class="sort-value"><?php echo encodeHtml(htmlentities(@$icon)) ?> + </span> + <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$icon)) ?>"> + </i> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($filename))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$filename)) ?> + </span> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php } ?> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <input type="hidden" name="order" value=""/> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <input type="hidden" name="order" value="<?php echo encodeHtml(htmlentities(@$order)) ?>" class=""> + </input> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/order.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/order.tpl.src.xml @@ -21,13 +21,13 @@ </column> </row> <list list="object" extract="true"> - <row class="data" id="var:id"> + <row class="data" id="${id}"> <column> <text raw="_"></text> </column> <column> - <text class="sort-value" value="var:icon" /> - <image action="var:icon"></image> + <text class="sort-value" value="${icon}" /> + <image action="${icon}"></image> </column> <column> <text var="name"></text> @@ -36,7 +36,7 @@ <text var="filename"></text> </column> <column> - <date date="var:date"></date> + <date date="${date}"></date> </column> </row> </list> diff --git a/modules/cms-ui/themes/default/html/views/folder/pub.php b/modules/cms-ui/themes/default/html/views/folder/pub.php @@ -1,110 +1,75 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('security','nopublish')); if($if2){?> + <?php $if2=(config('security','nopublish')); if($if2) { ?> <div class="message warn"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NOPUBLISH_DESC'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOPUBLISH_DESC'))) ?> + </span> </div> - <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="true" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pub" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if3=($pages); if($if3){?> + <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="1" data-autosave="" class="or-form folder"> + <?php $if3=($pages); if($if3) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'pages';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_pages" class="label"> - <span><?php echo nl2br(' '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_pages')))); ?></span> + <input type="checkbox" name="pages" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$pages)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_pages'))) ?> + </span> </label> </div> </div> - <?php } ?> - <?php $if3=($files); if($if3){?> + <?php } ?> + <?php $if3=($files); if($if3) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'files';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_files" class="label"> - <span><?php echo nl2br(' '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_files')))); ?></span> + <input type="checkbox" name="files" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$files)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_files'))) ?> + </span> </label> </div> </div> - <?php } ?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> - <?php $if4=(isset($subdirs)); if($if4){?> + <?php } ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <?php $if4=(isset($subdirs)); if($if4) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'subdirs';$default = false;$readonly = $subdirs;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_subdirs" class="label"> - <span><?php echo nl2br(' '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_PUBLISH_WITH_SUBDIRS')))); ?></span> + <input type="checkbox" name="subdirs" disabled="<?php echo encodeHtml(htmlentities(@$subdirs)) ?>" value="1" checked="<?php echo encodeHtml(htmlentities(@$subdirs)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_PUBLISH_WITH_SUBDIRS'))) ?> + </span> </label> </div> </div> - <?php } ?> - <?php $if4=(isset($clean)); if($if4){?> + <?php } ?> + <?php $if4=(isset($clean)); if($if4) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'clean';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_clean" class="label"> - <span><?php echo nl2br(' '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_CLEAN_AFTER_PUBLISH')))); ?></span> + <input type="checkbox" name="clean" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$clean)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_CLEAN_AFTER_PUBLISH'))) ?> + </span> </label> </div> </div> - <?php } ?> + <?php } ?> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('publish') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/pub.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/pub.tpl.src.xml @@ -4,15 +4,15 @@ <!-- Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. --> - <if true="config:security/nopublish"> + <if true="%{security/nopublish}"> <part class="message warn"> <text key="GLOBAL_NOPUBLISH_DESC" class="help"></text> </part> </if> - <form cancel="false" visible="true" label="message:publish" async="true"> - <if true="var:pages"> + <form cancel="false" visible="true" label="#{publish}" async="true"> + <if true="${pages}"> <part class="line"> <part class="label"> @@ -26,7 +26,7 @@ </part> </part> </if> - <if true="var:files"> + <if true="${files}"> <part class="line"> <part class="label"> </part> @@ -40,13 +40,13 @@ </part> </if> - <group title="message:options"> + <group title="#{options}"> <if present="subdirs"> <part class="line"> <part class="label"> </part> <part class="input"> - <checkbox readonly="var:subdirs" name="subdirs"></checkbox> + <checkbox readonly="${subdirs}" name="subdirs"></checkbox> <label for="subdirs"> <text raw="_"></text> <text text="GLOBAL_PUBLISH_WITH_SUBDIRS"></text> diff --git a/modules/cms-ui/themes/default/html/views/folder/remove.php b/modules/cms-ui/themes/default/html/views/folder/remove.php @@ -1,30 +1,9 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('GLOBAL_NAME') ?></span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> - <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'delete';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> ?GLOBAL_DELETE? </span></label> - <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'withChildren';$default = false;$readonly = !$hasChildren;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> ?GLOBAL_DELETE_WITH_CHILDREN? </span></label> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> + <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span></span></label> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + </input></label> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="withChildren" disabled="not:var:hasChildren" value="1" checked="<?php echo encodeHtml(htmlentities(@$withChildren)) ?>" class=""> + </input></label> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/show.php b/modules/cms-ui/themes/default/html/views/folder/show.php @@ -1,52 +1,65 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'TYPE'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('TYPE'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NAME'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LASTCHANGE'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LASTCHANGE'))) ?> + </span> </th> </tr> - <?php $if3=(isset($up_url)); if($if3){?> + <?php $if3=(isset($up_url)); if($if3) { ?> <tr class="data clickable"> - <td> - <i class="image-icon image-icon--action-folder"></i> + <td class=""> + <i class="image-icon image-icon--action-folder"> + </i> </td> - <td> - <span><?php echo nl2br('..'); ?></span> + <td class=""> + <span class="">.. + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php } ?> - <?php foreach($object as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php } ?> + <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td title="<?php echo $desc ?>" data-name="<?php echo $name ?>" data-action="<?php echo $type ?>" data-id="<?php echo $id ?>" class="clickable <?php echo $class ?>"> - <img src="./modules/cms-ui/themes/default/images/icon_<?php echo $icon ?>.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - <span><?php echo nl2br(' '); ?></span> + <td title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" data-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="clickable <?php echo encodeHtml(htmlentities(@$class)) ?>"> + <img src="./modules/cms-ui/themes/default/images/icon_<?php echo encodeHtml(htmlentities(@$icon)) ?>.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> + <span class=""> + </span> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php } ?> </td> </tr> - <?php } ?> - <?php $if3=(($object)==FALSE); if($if3){?> - <tr> - <td colspan="2"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <?php } ?> + <?php $if3=(($object)==FALSE); if($if3) { ?> + <tr class=""> + <td colspan="2" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> <div class="clickable"> - <a class="or-link-btn" target="_self" data-type="view" data-action="folder" data-method="create" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/folder/"> - <i class="image-icon image-icon--action-new"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <a target="_self" data-type="view" data-action="folder" data-method="create" data-id="" data-extra="[]" href="/#/folder/" class="or-link-btn"> + <i class="image-icon image-icon--action-new"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/show.tpl.src.xml @@ -17,7 +17,7 @@ <column> <image action="folder" /> </column> - <column url="var:up_url"> + <column url="${up_url}"> <text raw=".."></text> </column> <column> @@ -27,13 +27,13 @@ </if> <list list="object" extract="true"> <row class="data"> - <column id="var:id" name="var:name" action="var:type" title="var:desc" class="var:class"> - <image type="var:icon"></image> + <column id="${id}" name="${name}" action="${type}" title="${desc}" class="${class}"> + <image type="${icon}"></image> <text var="name"></text> <text raw="_"></text> </column> <column> - <date date="var:date"></date> + <date date="${date}"></date> </column> </row> </list> diff --git a/modules/cms-ui/themes/default/html/views/folder/structure.php b/modules/cms-ui/themes/default/html/views/folder/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/structure.tpl.src.xml @@ -1,7 +1,7 @@ <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"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file 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,12 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form group" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="group" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form group"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('name') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('name'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/info.php b/modules/cms-ui/themes/default/html/views/group/info.php @@ -1,39 +1,47 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form group" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="group" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <span class="headline"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form group"> + <span class="headline"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input clickable"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - <a class="or-link-btn" target="_self" data-type="edit" data-action="group" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/group/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> + <a target="_self" data-type="edit" data-action="group" data-method="prop" data-id="" data-extra="[]" href="/#/group/" class="or-link-btn"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('USERS')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USERS'))) ?> + </span> </div> <div class="input"> - <?php foreach($users as $id=>$name){ ?> + <?php foreach($users as $id=>$name) { ?> <div class="clickable"> - <a target="_self" data-type="open" data-action="user" data-method="info" data-id="<?php echo $id ?>" data-extra="[]" href="./#/user/<?php echo $id ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <a target="_self" data-type="open" data-action="user" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/user/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> - <br/> + <br> + </br> </div> - <?php } ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> </div> <div class="input clickable"> - <a class="or-link-btn" target="_self" data-type="edit" data-action="group" data-method="memberships" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/group/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <a target="_self" data-type="edit" data-action="group" data-method="memberships" data-id="" data-extra="[]" href="/#/group/" class="or-link-btn"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div> - <div class="or-form-actionbar"></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/group/info.tpl.src.xml @@ -24,7 +24,7 @@ <list list="users" key="id" value="name"> <part class="clickable"> - <link type="open" action="user" id="var:id"> + <link type="open" action="user" id="${id}"> <text var="name"/> </link> <newline/> diff --git a/modules/cms-ui/themes/default/html/views/group/memberships.php b/modules/cms-ui/themes/default/html/views/group/memberships.php @@ -1,45 +1,33 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="memberships" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form group" data-async="false" data-autosave="true"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="group" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="memberships" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <form name="" target="_self" data-target="view" action="./" data-method="memberships" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="1" class="or-form group"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td width="10%"> + <td width="10%" class=""> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> </tr> - <?php foreach($memberships as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($memberships as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <?php { $tmpname = $var;$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <td class=""> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$var)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$${var)) ?>}" class=""> + </input> </td> - <td> - <label for="<?php echo REQUEST_ID ?>_<?php echo $var ?>" class="label"> - <i class="image-icon image-icon--action-user"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <label class="label"> + <i class="image-icon image-icon--action-user"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </label> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <tr> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/memberships.tpl.src.xml b/modules/cms-ui/themes/default/html/views/group/memberships.tpl.src.xml @@ -11,10 +11,10 @@ <list list="memberships" extract="true"> <row class="data"> <column> - <checkbox name="var:var"></checkbox> + <checkbox name="${var}"></checkbox> </column> <column> - <label for="var:var"> + <label for="${var}"> <image action="user"></image> <text var="name"></text> </label> diff --git a/modules/cms-ui/themes/default/html/views/group/prop.php b/modules/cms-ui/themes/default/html/views/group/prop.php @@ -1,13 +1,15 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="group" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form group" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="group" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="group" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form group"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="100" class="name focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="100" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="name focus"> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/remove.php b/modules/cms-ui/themes/default/html/views/group/remove.php @@ -1,35 +1,25 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form group" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="group" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form group"> <div class="line"> <div class="label"> - <label class="label"><?php echo lang('GLOBAL_NAME') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'confirm';$default = false;$readonly = false;$required = true; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_confirm" class="label"><?php echo lang('GROUP_DELETE') ?> + <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('GROUP_DELETE'))) ?> </label> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/group/remove.tpl.src.xml @@ -10,7 +10,7 @@ <text var="name"></text> </part> </part> - <group title="message:options"></group> + <group title="#{options}"></group> <part class="line"> <part class="label"></part> <part class="input"> diff --git a/modules/cms-ui/themes/default/html/views/group/rights.php b/modules/cms-ui/themes/default/html/views/group/rights.php @@ -1,83 +1,87 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-area"><table width="100%"> - <?php foreach($projects as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <tr> - <td> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo $projectname ?></legend><div class="closable"> - <?php $if7=(($rights)==FALSE); if($if7){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <?php foreach($projects as $list_key=>$list_value) { extract($list_value); ?> + <tr class=""> + <td class=""> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <?php $if7=(($rights)==FALSE); if($if7) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> - <?php $if7=!(($rights)==FALSE); if($if7){?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <?php } ?> + <?php $if7=!(($rights)==FALSE); if($if7) { ?> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_USER')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_USER'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_LANGUAGE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LANGUAGE'))) ?> + </span> </td> - <?php foreach($show as $list_key=>$t){ ?> + <?php foreach($show as $list_key=>$t) { ?> <td class="help"> - <span title="<?php echo lang('acl_'.$t.'') ?>"><?php echo nl2br(encodeHtml(htmlentities(lang('acl_'.$t.'_abbrev')))); ?></span> + <span title="message:acl<?php echo encodeHtml(htmlentities()) ?>" class=""><?php echo encodeHtml(htmlentities(@lang('${t'))) ?>} + </span> </td> - <?php } ?> + <?php } ?> </tr> - <?php foreach($rights as $aclid=>$acl){ ?><?php extract($acl) ?> + <?php foreach($rights as $aclid=>$acl) { extract($acl); ?> <tr class="data clickable"> - <td> - <?php $if12=(isset($groupname)); if($if12){?> - <i class="image-icon image-icon--action-group"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $groupname,20,'..',constant('STR_PAD_BOTH') )))); ?></span> - <?php } ?> - <?php $if12=!(isset($username)); if($if12){?> - <?php $if13=!(isset($groupname)); if($if13){?> - <i class="image-icon image-icon--action-group"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_all'.'')))); ?></span> - <?php } ?> - <?php } ?> - <?php unset($username) ?> - <?php unset($groupname) ?> + <td class=""> + <?php $if12=(isset($groupname)); if($if12) { ?> + <i class="image-icon image-icon--action-group"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$groupname)) ?> + </span> + <?php } ?> + <?php $if12=!(isset($username)); if($if12) { ?> + <?php $if13=!(isset($groupname)); if($if13) { ?> + <i class="image-icon image-icon--action-group"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_all'))) ?> + </span> + <?php } ?> + <?php } ?> + <?php { unset($username) ?> + <?php } ?> + <?php { unset($groupname) ?> + <?php } ?> </td> - <td title="<?php echo $objectname ?>"> - <i class="image-icon image-icon--action-<?php echo $objecttype ?>"></i> - <a target="_self" data-type="open" data-action="<?php echo $objecttype ?>" data-method="" data-id="<?php echo $objectid ?>" data-extra="[]" href="./#/<?php echo $objecttype ?>/<?php echo $objectid ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($objectname))); ?></span> + <td title="<?php echo encodeHtml(htmlentities(@$objectname)) ?>" class=""> + <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$objecttype)) ?>"> + </i> + <a target="_self" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$objecttype)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$objecttype)) ?>/<?php echo encodeHtml(htmlentities(@$objectid)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$objectname)) ?> + </span> </a> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $languagename,20,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$languagename)) ?> + </span> </td> - <?php foreach($show as $list_key=>$list_value){ ?> - <td> - <?php $$list_value= $bits[$list_value]; ?> - <?php { $tmpname = $list_value;$default = false;$readonly = true;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <?php foreach($show as $list_key=>$list_value) { ?> + <td class=""> + <?php { $$list_value= $bits[$list_value]; ?> + <?php } ?> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$list_value)) ?>" disabled="1" value="1" checked="<?php echo encodeHtml(htmlentities(@$${list_value)) ?>}" class=""> + </input> </td> - <?php } ?> + <?php } ?> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <?php } ?> + <?php } ?> </div></fieldset> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/rights.tpl.src.xml b/modules/cms-ui/themes/default/html/views/group/rights.tpl.src.xml @@ -4,7 +4,7 @@ <list list="projects" extract="true"> <row> <column> - <group title="var:projectname"> + <group title="${projectname}"> <if empty="rights"> <row> <column> @@ -26,7 +26,7 @@ </column> <list list="show" value="t"> <column class="help"> - <text key="var:t" prefix="acl_" suffix="_abbrev" + <text key="${t}" prefix="acl_" suffix="_abbrev" title="message:acl_{t}"></text> </column> </list> @@ -47,9 +47,9 @@ <set var="username"></set> <set var="groupname"></set> </column> - <column title="var:objectname"> - <image action="var:objecttype"></image> - <link type="open" action="var:objecttype" subaction="" id="var:objectid"> + <column title="${objectname}"> + <image action="${objecttype}"></image> + <link type="open" action="${objecttype}" subaction="" id="${objectid}"> <text var="objectname"></text> </link> </column> @@ -58,8 +58,8 @@ </column> <list list="show"> <column> - <set var="var:list_value" value="var:bits" key="var:list_value"></set> - <checkbox name="var:list_value" readonly="true"></checkbox> + <set var="${list_value}" value="${bits}" key="${list_value}"></set> + <checkbox name="${list_value}" readonly="true"></checkbox> </column> </list> </row> diff --git a/modules/cms-ui/themes/default/html/views/grouplist/add.php b/modules/cms-ui/themes/default/html/views/grouplist/add.php @@ -1,12 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="grouplist" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form grouplist" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="grouplist" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="grouplist" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form grouplist"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('name') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('name'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ 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,25 +1,30 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td data-name="<?php echo $name ?>" data-action="group" data-id="<?php echo $id ?>" class="clickable clickable"> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="group" data-method="show" data-id="<?php echo $id ?>" data-extra="[]" href="./#/group/<?php echo $id ?>"> - <i class="image-icon image-icon--action-group"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td data-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-action="group" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="clickable clickable"> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="group" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/group/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <i class="image-icon image-icon--action-group"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> <tr class="data"> <td colspan="2" class="clickable"> - <a target="_self" date-name="<?php echo lang('menu_add') ?>" name="<?php echo lang('menu_add') ?>" data-type="dialog" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@lang('menu_add'))) ?>" name="<?php echo encodeHtml(htmlentities(@lang('menu_add'))) ?>" data-type="dialog" data-action="" data-method="add" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </td> </tr> 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 @@ -9,8 +9,8 @@ </row> <list list="el" extract="true"> <row class="data"> - <column id="var:id" name="var:name" action="group" class="clickable"> - <link type="open" id="var:id" name="var:name" action="group"> + <column id="${id}" name="${name}" action="group" class="clickable"> + <link type="open" id="${id}" name="${name}" action="group"> <image action="group"></image> <text var="name" maxlength="30"></text> </link> @@ -20,7 +20,7 @@ </list> <row class="data"> <column colspan="2" class="clickable"> - <link type="dialog" subaction="add" name="message:menu_add"> + <link type="dialog" subaction="add" name="#{menu_add}"> <image method="add"/> <text text="new"/> </link> diff --git a/modules/cms-ui/themes/default/html/views/image/compress.php b/modules/cms-ui/themes/default/html/views/image/compress.php @@ -1,25 +1,33 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="compress" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="compress" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('OPTIONS') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="compress" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('type')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + </span> </div> <div class="input"> - <?php $gz= 'gz'; ?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_format" name="format" title="" class=""<?php if (count($formats)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($formats,'gz',0,0) ?><?php if (count($formats)==0) { ?><input type="hidden" name="format" value="" /><?php } ?><?php if (count($formats)==1) { ?><input type="hidden" name="format" value="<?php echo array_keys($formats)[0] ?>" /><?php } ?> - </select></div> - <?php $replace= '1'; ?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_1" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="1"<?php if('1'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_1" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'replace'.'')))); ?></span> + <?php { $gz= 'gz'; ?> + <?php } ?> + <input name="format" value="gz" size="1" class=""> + </input> + <?php { $replace= '1'; ?> + <?php } ?> + <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + </span> </label> - <br/> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="0"<?php if('0'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_0" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <br> + </br> + <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/compress.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/compress.tpl.src.xml @@ -1,7 +1,7 @@ <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> - <group title="message:OPTIONS"> + <group title="#{OPTIONS}"> <part class="line"> <part class="label"> <text text="type"></text> diff --git a/modules/cms-ui/themes/default/html/views/image/edit.php b/modules/cms-ui/themes/default/html/views/image/edit.php @@ -1,13 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="edit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> <div class="line"> <div class="label"> </div> <div class="input"> - <br/> - <input size="40" id="req0_file" type="file" name="file" class="upload" /> - <br/> - <br/> + <br> + </br> + <input id="req0_file" name="file" size="40" class="upload"> + </input> + <br> + </br> + <br> + </br> </div> </div> <div class="line or-dropzone-upload"> @@ -16,4 +20,4 @@ <div class="input"> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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,11 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="extract" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="extract" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> + <form name="" target="_self" data-target="view" action="./" data-method="extract" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/preview.php b/modules/cms-ui/themes/default/html/views/image/preview.php @@ -1,2 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <iframe src="<?php echo $preview_url ?>"></iframe>- \ No newline at end of file + <iframe src="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>" class=""> + </iframe>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/preview.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/preview.tpl.src.xml @@ -1,5 +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"> - <insert url="var:preview_url"></insert> + <insert url="${preview_url}"></insert> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/pub.php b/modules/cms-ui/themes/default/html/views/image/pub.php @@ -1,21 +1,19 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('security','nopublish')); if($if2){?> + <?php $if2=(config('security','nopublish')); if($if2) { ?> <div class="message warn"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NOPUBLISH_DESC'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOPUBLISH_DESC'))) ?> + </span> </div> - <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="true" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pub" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <br/> + <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="1" data-autosave="" class="or-form image"> + <tr class=""> + <td class=""> + <br> + </br> </td> </tr> - <tr> + <tr class=""> <td class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('publish') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/pub.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/pub.tpl.src.xml @@ -4,13 +4,13 @@ <!-- Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. --> - <if true="config:security/nopublish"> + <if true="%{security/nopublish}"> <part class="message warn"> <text key="GLOBAL_NOPUBLISH_DESC" class="help"></text> </part> </if> - <form cancel="false" visible="true" label="message:publish" async="true"> + <form cancel="false" visible="true" label="#{publish}" async="true"> <row> <column> <newline></newline> 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,39 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </td> </tr> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DELETE')))); ?></span> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DELETE'))) ?> + </span> </td> - <td> - <?php { $tmpname = 'delete';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <td class=""> + <input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + </input> </td> </tr> - <tr> - <td colspan="2"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> + <tr class=""> + <td colspan="2" class=""> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ 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,14 +1,19 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <tr> - <td colspan="2"> - <iframe src="<?php echo $preview_url ?>"></iframe> - <a class="action" target="_self" data-action="file" data-method="edit" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/file/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/edit.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_file_edit'.'')))); ?></span> + <tr class=""> + <td colspan="2" class=""> + <iframe src="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>" class=""> + </iframe> + <a target="_self" data-action="file" data-method="edit" data-id="" data-extra="[]" href="/#/file/" class="action"> + <img src="./modules/cms-ui/themes/default/images/icon/icon/edit.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_file_edit'))) ?> + </span> </a> - <a class="action" target="_self" data-action="file" data-method="editvalue" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/file/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/editvalue.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_file_editvalue'.'')))); ?></span> + <a target="_self" data-action="file" data-method="editvalue" data-id="" data-extra="[]" href="/#/file/" class="action"> + <img src="./modules/cms-ui/themes/default/images/icon/icon/editvalue.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_file_editvalue'))) ?> + </span> </a> </td> </tr> \ 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 @@ -5,7 +5,7 @@ <window icon="folder"> <row> <column colspan="2"> - <insert url="var:preview_url"></insert> + <insert url="${preview_url}"></insert> <link class="action" action="file" subaction="edit"> <image file="icon/edit"></image> <text key="menu_file_edit"></text> diff --git a/modules/cms-ui/themes/default/html/views/image/size.php b/modules/cms-ui/themes/default/html/views/image/size.php @@ -1,94 +1,99 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="size" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="size" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="size" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('IMAGE_OLD_SIZE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('IMAGE_OLD_SIZE'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($width))); ?></span> - <span><?php echo nl2br(' * '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($height))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$width)) ?> + </span> + <span class=""> * + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$height)) ?> + </span> </div> </div> - <?php $if3=!(($formats)==FALSE); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('IMAGE_NEW_SIZE') ?></legend><div class="closable"> + <?php $if3=!(($formats)==FALSE); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_factor" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="factor"<?php if('factor'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_factor" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_IMAGE_SIZE_FACTOR')))); ?></span> + <input type="radio" name="type" disabled="" value="factor" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_SIZE_FACTOR'))) ?> + </span> </label> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_factor" name="factor" title="" class=""<?php if (count($factors)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($factors,$factor,0,0) ?><?php if (count($factors)==0) { ?><input type="hidden" name="factor" value="" /><?php } ?><?php if (count($factors)==1) { ?><input type="hidden" name="factor" value="<?php echo array_keys($factors)[0] ?>" /><?php } ?> - </select></div> - <?php $factor= '1'; ?> + <input name="factor" value="<?php echo encodeHtml(htmlentities(@$factor)) ?>" size="1" class=""> + </input> + <?php { $factor= '1'; ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_input" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="input"<?php if('input'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_input" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_IMAGE_NEW_WIDTH_HEIGHT')))); ?></span> + <input type="radio" name="type" disabled="" value="input" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_NEW_WIDTH_HEIGHT'))) ?> + </span> </label> </div> <div class="label"> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_width" name="<?php if ('') echo ''.'_' ?>width<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$width) ?>" /><?php if (false) { ?><input type="hidden" name="width" value="<?php $width ?>"/><?php } ?></div> - <span><?php echo nl2br(' * '); ?></span> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_height" name="<?php if ('') echo ''.'_' ?>height<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$height) ?>" /><?php if (false) { ?><input type="hidden" name="height" value="<?php $height ?>"/><?php } ?></div> + <input name="width" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> + </input> + <span class=""> * + </span> + <input name="height" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> + </input> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_format" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_IMAGE_FORMAT')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_FORMAT'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_format" name="format" title="" class=""<?php if (count($formats)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($formats,$format,0,0) ?><?php if (count($formats)==0) { ?><input type="hidden" name="format" value="" /><?php } ?><?php if (count($formats)==1) { ?><input type="hidden" name="format" value="<?php echo array_keys($formats)[0] ?>" /><?php } ?> - </select></div> + <input name="format" value="<?php echo encodeHtml(htmlentities(@$format)) ?>" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_jpeglist_compression" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_IMAGE_JPEG_COMPRESSION')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_JPEG_COMPRESSION'))) ?> + </span> </label> </div> <div class="input"> - <?php $jpeg_compression= '70'; ?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_jpeg_compression" name="jpeg_compression" title="" class=""<?php if (count($jpeglist)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($jpeglist,$jpeg_compression,0,0) ?><?php if (count($jpeglist)==0) { ?><input type="hidden" name="jpeg_compression" value="" /><?php } ?><?php if (count($jpeglist)==1) { ?><input type="hidden" name="jpeg_compression" value="<?php echo array_keys($jpeglist)[0] ?>" /><?php } ?> - </select></div> + <?php { $jpeg_compression= '70'; ?> + <?php } ?> + <input name="jpeg_compression" value="<?php echo encodeHtml(htmlentities(@$jpeg_compression)) ?>" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'copy';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_copy" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'copy'.'')))); ?></span> + <input type="checkbox" name="copy" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$copy)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('copy'))) ?> + </span> </label> </div> </div> </div></fieldset> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/size.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/size.tpl.src.xml @@ -12,7 +12,7 @@ </part> </part> <if not="" empty="formats"> - <group title="message:IMAGE_NEW_SIZE"> + <group title="#{IMAGE_NEW_SIZE}"> <part class="line"> <part class="label"></part> @@ -44,7 +44,7 @@ </part> </part> </group> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> <label for="format"> diff --git a/modules/cms-ui/themes/default/html/views/image/structure.php b/modules/cms-ui/themes/default/html/views/image/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/structure.tpl.src.xml @@ -1,7 +1,7 @@ <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"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/uncompress.php b/modules/cms-ui/themes/default/html/views/image/uncompress.php @@ -1,21 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="uncompress" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="uncompress" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="uncompress" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> </div> <div class="input"> - <?php $replace= '1'; ?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_1" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="1"<?php if('1'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_1" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'replace'.'')))); ?></span> + <?php { $replace= '1'; ?> + <?php } ?> + <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + </span> </label> - <br/> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="0"<?php if('0'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_0" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <br> + </br> + <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </label> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/uncompress.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/uncompress.tpl.src.xml @@ -1,7 +1,7 @@ <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> - <group title="message:options"></group> + <group title="#{options}"></group> <part class="line"> <part class="label"> </part> diff --git a/modules/cms-ui/themes/default/html/views/image/value.php b/modules/cms-ui/themes/default/html/views/image/value.php @@ -1,19 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form image" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="value" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_VALUE')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_VALUE'))) ?> + </span> </td> - <td> - <textarea name="<?php if ('') echo ''.'_' ?>value<?php if (false) echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"><?php echo htmlentities(${'value'}) ?></textarea> + <td class=""> + <textarea name="value" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"> + </textarea> </td> </tr> - <tr> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/add.php b/modules/cms-ui/themes/default/html/views/language/add.php @@ -1,12 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form language" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="language" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form language"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('LANGUAGE_ISOCODE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_isocode" name="isocode" title="" class=""<?php if (count($isocodes)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($isocodes,$isocode,0,0) ?><?php if (count($isocodes)==0) { ?><input type="hidden" name="isocode" value="" /><?php } ?><?php if (count($isocodes)==1) { ?><input type="hidden" name="isocode" value="<?php echo array_keys($isocodes)[0] ?>" /><?php } ?> - </select></div> + <input name="isocode" value="<?php echo encodeHtml(htmlentities(@$isocode)) ?>" size="1" class=""> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/info.php b/modules/cms-ui/themes/default/html/views/language/info.php @@ -1,29 +1,35 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="language" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form language" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="language" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <span class="headline"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="language" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form language"> + <span class="headline"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input clickable"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('LANGUAGE_ISOCODE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + </span> </div> <div class="input clickable"> - <span><?php echo nl2br(encodeHtml(htmlentities($isocode))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$isocode)) ?> + </span> </div> </div> <div class="line"> <div class="label"> </div> <div class="input clickable"> - <a class="or-link-btn" target="_self" data-type="edit" data-action="language" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/language/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <a target="_self" data-type="edit" data-action="language" data-method="prop" data-id="" data-extra="[]" href="/#/language/" class="or-link-btn"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div> - <div class="or-form-actionbar"></div></form>- \ No newline at end of file + </form>+ \ 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,46 +1,59 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <img src="./modules/cms-ui/themes/default/images/icon/icon_language.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,25,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td class=""> + <img src="./modules/cms-ui/themes/default/images/icon/icon_language.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($isocode))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$isocode)) ?> + </span> </td> - <td> - <?php $if8=(isset($default_url)); if($if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_make_default')))); ?></span> - <?php } ?> - <?php if(!$if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_is_default')))); ?></span> - <?php } ?> + <td class=""> + <?php $if8=(isset($default_url)); if($if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_make_default'))) ?> + </span> + <?php } ?> + <?php if(!$if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> + </span> + <?php } ?> </td> - <td> - <?php $if8=(isset($select_url)); if($if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_select')))); ?></span> - <?php } ?> - <?php if(!$if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_selected')))); ?></span> - <?php } ?> + <td class=""> + <?php $if8=(isset($select_url)); if($if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_select'))) ?> + </span> + <?php } ?> + <?php if(!$if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_selected'))) ?> + </span> + <?php } ?> </td> </tr> - <?php unset($select_url) ?> - <?php unset($default_url) ?> - <?php } ?> + <?php { unset($select_url) ?> + <?php } ?> + <?php { unset($default_url) ?> + <?php } ?> + <?php } ?> </table></div></div> \ 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,3 +1,3 @@ <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 key="name"></text></column><column><text raw=""></text></column><column><text raw=""></text></column><column><text raw=""></text></column></row><list list="el" extract="true"><row class="data"><column url="var:url"><image file="icon_language"></image><text var="name" maxlength="25"></text></column><column><text var="isocode"></text></column><column url="var:default_url"><if present="default_url"><text text="GLOBAL_make_default"></text></if><else><text text="GLOBAL_is_default"></text></else></column><column url="var:select_url"><if present="select_url"><text text="GLOBAL_select"></text></if><else><text text="GLOBAL_selected"></text></else></column></row><set var="select_url"></set><set var="default_url"></set></list></table></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"><dummy><window icon="language"><table><row class="headline"><column><text key="name"></text></column><column><text raw=""></text></column><column><text raw=""></text></column><column><text raw=""></text></column></row><list list="el" extract="true"><row class="data"><column url="${url}"><image file="icon_language"></image><text var="name" maxlength="25"></text></column><column><text var="isocode"></text></column><column url="${default_url}"><if present="default_url"><text text="GLOBAL_make_default"></text></if><else><text text="GLOBAL_is_default"></text></else></column><column url="${select_url}"><if present="select_url"><text text="GLOBAL_select"></text></if><else><text text="GLOBAL_selected"></text></else></column></row><set var="select_url"></set><set var="default_url"></set></list></table></window></dummy></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,40 +1,33 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form language" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="language" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form language"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="50" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('LANGUAGE_ISOCODE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_isocode" name="<?php if ('') echo ''.'_' ?>isocode<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$isocode) ?>" /><?php if (false) { ?><input type="hidden" name="isocode" value="<?php $isocode ?>"/><?php } ?></div> + <input name="isocode" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$isocode)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'is_default';$default = false;$readonly = $is_default;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_is_default" class="label"><?php echo lang('GLOBAL_is_default') ?> + <input type="checkbox" name="is_default" disabled="<?php echo encodeHtml(htmlentities(@$is_default)) ?>" value="1" checked="<?php echo encodeHtml(htmlentities(@$is_default)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> </label> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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 @@ -26,7 +26,7 @@ <part class="label"> </part> <part class="input"> - <checkbox name="is_default" readonly="var:is_default"></checkbox> + <checkbox name="is_default" readonly="${is_default}"></checkbox> <label key="GLOBAL_is_default" for="is_default" /> </part> </part> 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,37 +1,29 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form language" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="language" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form language"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'confirm';$default = false;$readonly = false;$required = true; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_confirm" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('CONFIRM_DELETE')))); ?></span> + <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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 @@ -13,7 +13,7 @@ </part> </group> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> diff --git a/modules/cms-ui/themes/default/html/views/language/structure.php b/modules/cms-ui/themes/default/html/views/language/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/language/structure.tpl.src.xml @@ -1,7 +1,7 @@ <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"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/languagelist/add.php b/modules/cms-ui/themes/default/html/views/languagelist/add.php @@ -1,12 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="languagelist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form languagelist" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="languagelist" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="languagelist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form languagelist"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('LANGUAGE_ISOCODE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_isocode" name="isocode" title="" class=""<?php if (count($isocodes)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($isocodes,$isocode,0,0) ?><?php if (count($isocodes)==0) { ?><input type="hidden" name="isocode" value="" /><?php } ?><?php if (count($isocodes)==1) { ?><input type="hidden" name="isocode" value="<?php echo array_keys($isocodes)[0] ?>" /><?php } ?> - </select></div> + <input name="isocode" value="<?php echo encodeHtml(htmlentities(@$isocode)) ?>" size="1" class=""> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/languagelist/show.php b/modules/cms-ui/themes/default/html/views/languagelist/show.php @@ -1,52 +1,64 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NAME'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LANGUAGE_ISOCODE'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <i class="image-icon image-icon--action-language"></i> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="language" data-method="show" data-id="<?php echo $id ?>" data-extra="[]" href="./#/language/<?php echo $id ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,25,'..',constant('STR_PAD_BOTH') )))); ?></span> + <i class="image-icon image-icon--action-language"> + </i> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="language" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/language/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($isocode))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$isocode)) ?> + </span> </td> - <?php $if5=(!$is_default); if($if5){?> + <?php $if5=(!$is_default); if($if5) { ?> <td class="clickable"> - <?php $if7=(isset($id)); if($if7){?> - <a target="_self" data-type="post" data-action="language" data-method="setdefault" data-id="<?php echo $id ?>" data-extra="[]" data-data="{"action":"language","subaction":"setdefault","id":"<?php echo $id ?>","token":"<?php echo token() ?>","none":"0"}"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_make_default')))); ?></span> + <?php $if7=(isset($id)); if($if7) { ?> + <a target="_self" data-type="post" data-action="language" data-method="setdefault" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" data-data="{"action":"language","subaction":"setdefault","id":"<?php echo encodeHtml(htmlentities(@$id)) ?>",\"token":"<?php echo token() ?>","none":"0"}"" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_make_default'))) ?> + </span> </a> - <?php } ?> - <?php if(!$if7){?> - <?php } ?> + <?php } ?> + <?php if(!$if7) { ?> + <?php } ?> </td> - <?php } ?> - <?php if(!$if5){?> - <td> - <em><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_is_default')))); ?></em> + <?php } ?> + <?php if(!$if5) { ?> + <td class=""> + <em class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> + </em> </td> - <?php } ?> + <?php } ?> </tr> - <?php unset($select_url) ?> - <?php unset($default_url) ?> - <?php } ?> + <?php { unset($select_url) ?> + <?php } ?> + <?php { unset($default_url) ?> + <?php } ?> + <?php } ?> <tr class="data"> <td colspan="3" class="clickable"> - <a target="_self" data-type="dialog" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="add" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/languagelist/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/languagelist/show.tpl.src.xml @@ -16,18 +16,18 @@ <row class="data"> <column class="clickable"> <image action="language"></image> - <link type="open" name="var:name" action="language" id="var:id"> + <link type="open" name="${name}" action="language" id="${id}"> <text var="name" maxlength="25"></text> </link> </column> <column> <text var="isocode"></text> </column> - <if false="var:is_default"> + <if false="${is_default}"> <column class="clickable"> <if present="id"> - <link type="post" action="language" subaction="setdefault" id="var:id"> + <link type="post" action="language" subaction="setdefault" id="${id}"> <text text="GLOBAL_make_default"></text> </link> </if> diff --git a/modules/cms-ui/themes/default/html/views/link/edit.php b/modules/cms-ui/themes/default/html/views/link/edit.php @@ -1,21 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form link" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="link" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="edit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form link"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('link_target')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('link_target'))) ?> + </span> </div> <div class="input"> - <div class="selector"> -<div class="inputholder or-droppable"> -<input type="hidden" class="or-selector-link-value" name="targetobjectid" value="<?php echo $targetobjectid ?>" /> -<input type="text" class="or-selector-link-name" value="<?php echo $targetobjectname ?>" placeholder="<?php echo $targetobjectname ?>" /> -</div> -<div class="dropdown"></div> -<div class="tree selector" data-types="{types}" data-init-id="<?php echo $targetobjectid ?>" data-init-folderid="parentid"> -</div> -</div> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/link/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/link/edit.tpl.src.xml @@ -7,7 +7,7 @@ <text text="link_target"></text> </part> <part class="input"> - <selector id="var:targetobjectid" name="var:targetobjectname" types="page,file" param="targetobjectid" folderid="parentid"/> + <selector id="${targetobjectid}" name="${targetobjectname}" types="page,file" param="targetobjectid" folderid="parentid"/> </part> </part> diff --git a/modules/cms-ui/themes/default/html/views/link/remove.php b/modules/cms-ui/themes/default/html/views/link/remove.php @@ -1,17 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form link" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="link" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('GLOBAL_NAME') ?></span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> - <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'delete';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> ?GLOBAL_DELETE? </span></label> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form link"> + <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span></span></label> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + </input></label> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/link/structure.php b/modules/cms-ui/themes/default/html/views/link/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/link/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/link/structure.tpl.src.xml @@ -1,7 +1,7 @@ <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"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/license.php b/modules/cms-ui/themes/default/html/views/login/license.php @@ -1,100 +1,123 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="or-form"> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('USER') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_USERNAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_USERNAME'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($user_name))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$user_name)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_FULLNAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_FULLNAME'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($user_fullname))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$user_fullname)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_LOGIN_DATE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_LOGIN_DATE'))) ?> + </span> </div> <div class="input"> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($user_login) ?> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($user_login); ?> + <?php } ?> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('CMS') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($cms_name))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($cms_version))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$cms_name)) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$cms_version)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'OPERATOR'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('OPERATOR'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($cms_operator))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$cms_operator)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('SYSTEM') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'DATE_TIME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('DATE_TIME'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($time))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$time)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'OPERATING_SYSTEM'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('OPERATING_SYSTEM'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($os))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($release))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($machine))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$os)) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$release)) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$machine)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'INTERPRETER'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('INTERPRETER'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($version))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$version)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('LICENSE') ?></legend><div class="closable"> - <div class="or-table-wrapper"><div class="or-table-area"><table width="100%"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'license'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('license'))) ?> + </span> </td> </tr> - <?php foreach($software as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($software as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <a target="_self" data-url="<?php echo $url ?>" data-type="external" data-action="" data-method="license" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo $url ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$url)) ?>" data-type="external" data-action="" data-method="" data-id="" data-extra="[]" href="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($license))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$license)) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> </div></fieldset> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/license.tpl.src.xml b/modules/cms-ui/themes/default/html/views/login/license.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <part class="or-form"> - <group title="message:USER" open="true" show="true"> + <group title="#{USER}" open="true" show="true"> <part class="line"> <part class="label"> <text key="USER_USERNAME"></text> @@ -24,13 +24,13 @@ <text key="USER_LOGIN_DATE"></text> </part> <part class="input"> - <date date="var:user_login"/> + <date date="${user_login}"/> </part> </part> </group> - <group title="message:CMS"> + <group title="#{CMS}"> <part class="line"> <part class="label"> <text key="NAME"></text> @@ -51,7 +51,7 @@ </group> - <group title="message:SYSTEM"> + <group title="#{SYSTEM}"> <part class="line"> <part class="label"> <text key="DATE_TIME"></text> @@ -81,7 +81,7 @@ </group> - <group title="message:LICENSE"> + <group title="#{LICENSE}"> <table filter="false"> <row class="headline"> @@ -95,7 +95,7 @@ <list list="software" extract="true"> <row class="data"> <column class="clickable"> - <link type="external" url="var:url"> + <link type="external" url="${url}"> <text var="name"></text> </link> </column> diff --git a/modules/cms-ui/themes/default/html/views/login/login.php b/modules/cms-ui/themes/default/html/views/login/login.php @@ -1,134 +1,147 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="login" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form login" data-async="false" data-autosave="false" data-after-success="reloadAll"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if3=(config('login','logo','enabled')); if($if3){?> - <?php $if4=!((config('login','logo','url'))==FALSE); if($if4){?> - <a target="_self" data-url="<?php echo config('login','logo','url') ?>" data-action="" data-method="login" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <img src="<?php echo config('login','logo','image') ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="login" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" data-after-success="reloadAll" class="or-form login"> + <?php $if3=(config('login','logo','enabled')); if($if3) { ?> + <?php $if4=!((config('login','logo','url'))==FALSE); if($if4) { ?> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(config('login','logo','url'))) ?>" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class=""> + <img src="<?php echo encodeHtml(htmlentities(config('login','logo','image'))) ?>" class=""> + </img> </a> - <?php } ?> - <?php if(!$if4){?> - <img src="<?php echo config('login','logo','image') ?>" /> - <?php } ?> - <?php } ?> - <?php $if3=!((config('login','motd'))==FALSE); if($if3){?> + <?php } ?> + <?php if(!$if4) { ?> + <img src="<?php echo encodeHtml(htmlentities(config('login','logo','image'))) ?>" class=""> + </img> + <?php } ?> + <?php } ?> + <?php $if3=!((config('login','motd'))==FALSE); if($if3) { ?> <div class="message info"> - <span><?php echo nl2br(encodeHtml(htmlentities(config('login','motd')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(config('login','motd'))) ?> + </span> </div> - <?php } ?> - <?php $if3=(config('login','nologin')); if($if3){?> + <?php } ?> + <?php $if3=(config('login','nologin')); if($if3) { ?> <div class="message error"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LOGIN_NOLOGIN_DESC'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LOGIN_NOLOGIN_DESC'))) ?> + </span> </div> - <?php } ?> - <?php $if3=(config('security','readonly')); if($if3){?> + <?php } ?> + <?php $if3=(config('security','readonly')); if($if3) { ?> <div class="message warn"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_READONLY_DESC'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_READONLY_DESC'))) ?> + </span> </div> - <?php } ?> - <?php $if3=(!config('login','nologin')); if($if3){?> + <?php } ?> + <?php $if3=(!config('login','nologin')); if($if3) { ?> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_login_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_USERNAME'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_USERNAME'))) ?> + </span> </label> </div> <div class="input"> - <?php $if6=!(isset($$force_username)); if($if6){?> - <div class="inputholder"><input placeholder="<?php echo lang('USER_USERNAME') ?>" id="<?php echo REQUEST_ID ?>_login_name" name="<?php if ('') echo ''.'_' ?>login_name<?php if (false) echo '_disabled' ?>" required="required" autofocus="autofocus" type="text" maxlength="128" class="name" value="<?php echo Text::encodeHtml(@$login_name) ?>" /><?php if (false) { ?><input type="hidden" name="login_name" value="<?php $login_name ?>"/><?php } ?></div> - <?php } ?> - <?php if(!$if6){?> - <input type="hidden" name="login_name" value="<?php echo $login_name ?>"/> - <span><?php echo nl2br(encodeHtml(htmlentities($force_username))); ?></span> - <?php } ?> + <?php $if6=!(isset($force_username)); if($if6) { ?> + <input name="login_name" disabled="" required="required" placeholder="<?php echo encodeHtml(htmlentities(@lang('USER_USERNAME'))) ?>" autofocus="autofocus" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$login_name)) ?>" class="name"> + </input> + <?php } ?> + <?php if(!$if6) { ?> + <input type="hidden" name="login_name" value="<?php echo encodeHtml(htmlentities(@$login_name)) ?>" class=""> + </input> + <span class=""><?php echo encodeHtml(htmlentities(@$force_username)) ?> + </span> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_login_password" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_PASSWORD'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_PASSWORD'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input type="password" name="login_password" id="<?php echo REQUEST_ID ?>_login_password" size="20" maxlength="256" class="name" value="" /></div> + <div class="inputholder"><input type="password" name="login_password" size="20" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$login_password)) ?>" class="name"> + </input></div> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'remember';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_remember" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'REMEMBER_ME'.'')))); ?></span> + <input type="checkbox" name="remember" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$remember)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('REMEMBER_ME'))) ?> + </span> </label> </div> </div> - <?php } ?> - <fieldset class="toggle-open-close<?php echo false?" open":" closed" ?><?php echo false?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('USER_NEW_PASSWORD') ?></legend><div class="closable"> + <?php } ?> + <fieldset class="or-group toggle-open-close closed"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_password1" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_NEW_PASSWORD'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_NEW_PASSWORD'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input type="password" name="password1" id="<?php echo REQUEST_ID ?>_password1" size="25" maxlength="256" class="" value="" /></div> + <div class="inputholder"><input type="password" name="password1" size="25" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$password1)) ?>" class=""> + </input></div> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_password2" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_NEW_PASSWORD_REPEAT'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_NEW_PASSWORD_REPEAT'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input type="password" name="password2" id="<?php echo REQUEST_ID ?>_password2" size="25" maxlength="256" class="" value="" /></div> + <div class="inputholder"><input type="password" name="password2" size="25" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$password2)) ?>" class=""> + </input></div> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo false?" open":" closed" ?><?php echo false?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('USER_TOKEN') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close closed"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_user_token" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_TOKEN'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_TOKEN'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_user_token" name="<?php if ('') echo ''.'_' ?>user_token<?php if (false) echo '_disabled' ?>" type="text" maxlength="30" class="" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="user_token" value="<?php '' ?>"/><?php } ?></div> + <input name="user_token" disabled="" type="text" maxlength="30" value="" class=""> + </input> </div> </div> </div></fieldset> - <?php $if3=(intval('1')<intval(@count($dbids))); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><img src="/themes/default/images/icon/method/database.svg" /><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('DATABASE') ?></legend><div class="closable"> + <?php $if3=(intval('1')<intval('size:dbids')); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_dbid" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'DATABASE'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('DATABASE'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dbid" name="dbid" title="" class=""<?php if (count($dbids)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dbids,$dbid,0,0) ?><?php if (count($dbids)==0) { ?><input type="hidden" name="dbid" value="" /><?php } ?><?php if (count($dbids)==1) { ?><input type="hidden" name="dbid" value="<?php echo array_keys($dbids)[0] ?>" /><?php } ?> - </select></div> + <input name="dbid" value="<?php echo encodeHtml(htmlentities(@$dbid)) ?>" size="1" class=""> + </input> </div> </div> </div></fieldset> - <?php } ?> - <?php if(!$if3){?> - <input type="hidden" name="dbid" value="<?php echo $dbid ?>"/> - <?php } ?> - <input type="hidden" name="objectid" value="<?php echo $objectid ?>"/> - <input type="hidden" name="modelid" value="<?php echo $modelid ?>"/> - <input type="hidden" name="projectid" value="<?php echo $projectid ?>"/> - <input type="hidden" name="languageid" value="<?php echo $languageid ?>"/> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('menu_login') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + <?php if(!$if3) { ?> + <input type="hidden" name="dbid" value="<?php echo encodeHtml(htmlentities(@$dbid)) ?>" class=""> + </input> + <?php } ?> + <input type="hidden" name="objectid" value="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" class=""> + </input> + <input type="hidden" name="modelid" value="<?php echo encodeHtml(htmlentities(@$modelid)) ?>" class=""> + </input> + <input type="hidden" name="projectid" value="<?php echo encodeHtml(htmlentities(@$projectid)) ?>" class=""> + </input> + <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" class=""> + </input> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/login.tpl.src.xml b/modules/cms-ui/themes/default/html/views/login/login.tpl.src.xml @@ -1,36 +1,36 @@ <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 cancel="false" label="message:menu_login" visible="true" action="login" subaction="login" afterSuccess="reloadAll"> - <if true="config:login/logo/enabled"> - <if not="not" empty="config:login/logo/url"> - <link url="config:login/logo/url" target="_top"> - <image url="config:login/logo/image"></image> + <form cancel="false" label="#{menu_login}" visible="true" action="login" subaction="login" afterSuccess="reloadAll"> + <if true="%{login/logo/enabled}"> + <if not="not" empty="%{login/logo/url}"> + <link url="%{login/logo/url}" target="_top"> + <image url="%{login/logo/image}"></image> </link> </if> <else> - <image url="config:login/logo/image"></image> + <image url="%{login/logo/image}"></image> </else> </if> - <if not="not" empty="config:login/motd"> + <if not="not" empty="%{login/motd}"> <part class="message info"> - <text value="config:login/motd"></text> + <text value="%{login/motd}"></text> </part> </if> - <if true="config:login/nologin"> + <if true="%{login/nologin}"> <part class="message error"> <text key="LOGIN_NOLOGIN_DESC"></text> </part> </if> - <if true="config:security/readonly"> + <if true="%{security/readonly}"> <part class="message warn"> <text key="GLOBAL_READONLY_DESC"></text> </part> </if> - <if false="config:login/nologin"> + <if false="%{login/nologin}"> <part class="line"> <part class="label"> @@ -39,13 +39,13 @@ </label> </part> <part class="input"> - <if not="true" present="var:force_username"> + <if not="true" present="force_username"> <input type="text" name="login_name" class="name" value="" - hint="message:USER_USERNAME" size="20" maxlength="128" focus="true" required="true"></input> + hint="#{USER_USERNAME}" size="20" maxlength="128" focus="true" required="true"></input> </if> <else> <hidden name="login_name"></hidden> - <text value="var:force_username"></text> + <text value="${force_username}"></text> </else> </part> </part> @@ -82,7 +82,7 @@ <!-- <if true="property:mustChangePassword"> --> - <group title="message:USER_NEW_PASSWORD" open="false" show="false"> + <group title="#{USER_NEW_PASSWORD}" open="false" show="false"> <part class="line"> <part class="label"> <label for="password1"> @@ -105,7 +105,7 @@ </part> </group> - <group title="message:USER_TOKEN" open="false" show="false"> + <group title="#{USER_TOKEN}" open="false" show="false"> <part class="line"> <part class="label"> <label for="user_token"> @@ -132,7 +132,7 @@ <if value="size:dbids" greaterthan="1"> <!-- Mehr als 1 Datenbank zur Auswahl. Auswahlfeld anzeigen. --> - <group title="message:DATABASE" icon="database" open="true"> + <group title="#{DATABASE}" icon="database" open="true"> <part class="line"> <part class="label"> <label for="dbid"> @@ -157,7 +157,7 @@ <hidden name="languageid"></hidden> </form> <!-- - <newline /> <newline /> <link url="config:login/gpl/url" + <newline /> <newline /> <link url="%{login/gpl/url}" type="external" class="copyright"> <text key="GPL"></text> </link> --> </output> \ No newline at end of file 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,50 +1,63 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="_top" action="./" data-method="login" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form login" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if3=(config('security','openid','enable')); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('OPENID') ?></legend><div class="closable"> + <form name="" target="_self" data-target="_top" action="./" data-method="login" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form login"> + <?php $if3=(config('security','openid','enable')); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'openid_user'.'')))); ?></span> - <?php $if7=!((config('security','openid','logo_url'))==FALSE); if($if7){?> - <img src="<?php echo config('security','openid','logo_url') ?>" /> - <?php } ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('openid_user'))) ?> + </span> + <?php $if7=!((config('security','openid','logo_url'))==FALSE); if($if7) { ?> + <img src="<?php echo encodeHtml(htmlentities(config('security','openid','logo_url'))) ?>" class=""> + </img> + <?php } ?> </div> <div class="input"> - <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php') ?><?php component_radio_box('openid_provider',$openid_providers,$openid_provider) ?> - <?php $if7=($openid_user_identity); if($if7){?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_openid_provider_identity" name="<?php if ('') echo ''.'_' ?>openid_provider<?php if (false) echo '_disabled' ?>" value="identity"<?php if('identity'==@$openid_provider)echo ' checked="checked"' ?> /> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_openid_url" name="<?php if ('') echo ''.'_' ?>openid_url<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="name" value="<?php echo Text::encodeHtml(@$openid_url) ?>" /><?php if (false) { ?><input type="hidden" name="openid_url" value="<?php $openid_url ?>"/><?php } ?></div> - <?php } ?> + <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php'); { <?php component_radio_box(openid_provider,$openid_providers,${openid_provider}) ?> ?> + <?php } ?> + <?php $if7=($openid_user_identity); if($if7) { ?> + <input type="radio" name="openid_provider" disabled="" value="identity" checked="<?php echo encodeHtml(htmlentities(@$openid_provider)) ?>" class=""> + </input> + <input name="openid_url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$openid_url)) ?>" class="name"> + </input> + <?php } ?> </div> </div> </div></fieldset> - <?php $if4=(intval('1')<intval(@count($dbids))); if($if4){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><img src="/themes/default/images/icon/method/database.svg" /><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('DATABASE') ?></legend><div class="closable"> + <?php $if4=(intval('1')<intval('size:dbids')); if($if4) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_dbid" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'DATABASE'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('DATABASE'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dbid" name="dbid" title="" class=""<?php if (count($dbids)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dbids,$actdbid,0,0) ?><?php if (count($dbids)==0) { ?><input type="hidden" name="dbid" value="" /><?php } ?><?php if (count($dbids)==1) { ?><input type="hidden" name="dbid" value="<?php echo array_keys($dbids)[0] ?>" /><?php } ?> - </select></div> - <input type="hidden" name="screenwidth" value="9999"/> + <input name="dbid" value="<?php echo encodeHtml(htmlentities(@$actdbid)) ?>" size="1" class=""> + </input> + <input type="hidden" name="screenwidth" value="9999" class=""> + </input> </div> </div> </div></fieldset> - <?php } ?> - <?php if(!$if4){?> - <input type="hidden" name="dbid" value="<?php echo $actdbid ?>"/> - <?php } ?> - <input type="hidden" name="objectid" value="<?php echo $objectid ?>"/> - <input type="hidden" name="modelid" value="<?php echo $modelid ?>"/> - <input type="hidden" name="projectid" value="<?php echo $projectid ?>"/> - <input type="hidden" name="languageid" value="<?php echo $languageid ?>"/> - <?php } ?> - <?php if(!$if3){?> + <?php } ?> + <?php if(!$if4) { ?> + <input type="hidden" name="dbid" value="<?php echo encodeHtml(htmlentities(@$actdbid)) ?>" class=""> + </input> + <?php } ?> + <input type="hidden" name="objectid" value="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" class=""> + </input> + <input type="hidden" name="modelid" value="<?php echo encodeHtml(htmlentities(@$modelid)) ?>" class=""> + </input> + <input type="hidden" name="projectid" value="<?php echo encodeHtml(htmlentities(@$projectid)) ?>" class=""> + </input> + <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" class=""> + </input> + <?php } ?> + <?php if(!$if3) { ?> <div class="message error"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'OPENID_NOT_ENABLED'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('OPENID_NOT_ENABLED'))) ?> + </span> </div> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file 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 @@ -4,18 +4,18 @@ <form action="login" subaction="login" target="_top"> <!-- Open-Id --> - <if true="config:security/openid/enable"> - <group title="message:OPENID"> + <if true="%{security/openid/enable}"> + <group title="#{OPENID}"> <part class="line"> <part class="label"> <text key="openid_user"></text> - <if not="true" empty="config:security/openid/logo_url"> - <image url="config:security/openid/logo_url"></image> + <if not="true" empty="%{security/openid/logo_url}"> + <image url="%{security/openid/logo_url}"></image> </if> </part> <part class="input"> <radiobox name="openid_provider" list="openid_providers"></radiobox> - <if true="var:openid_user_identity"> + <if true="${openid_user_identity}"> <radio name="openid_provider" value="identity"></radio> <input name="openid_url" class="name" size="20"></input> </if> @@ -24,7 +24,7 @@ </group> <if value="size:dbids" greaterthan="1"> - <group title="message:DATABASE" icon="database"> + <group title="#{DATABASE}" icon="database"> <part class="line"> <part class="label"> <label for="dbid"> @@ -32,14 +32,14 @@ </label> </part> <part class="input"> - <selectbox name="dbid" list="dbids" default="var:actdbid"></selectbox> + <selectbox name="dbid" list="dbids" default="${actdbid}"></selectbox> <hidden name="screenwidth" default="9999"></hidden> </part> </part> </group> </if> <else> - <hidden name="dbid" default="var:actdbid"></hidden> + <hidden name="dbid" default="${actdbid}"></hidden> </else> <hidden name="objectid"></hidden> <hidden name="modelid"></hidden> @@ -53,6 +53,6 @@ </else> </form> - <!-- <newline></newline> <newline></newline> <link url="config:login/gpl/url" + <!-- <newline></newline> <newline></newline> <link url="%{login/gpl/url}" target="_top" class="copyright"> <text key="GPL"></text> </link> --> </output> \ No newline at end of file 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,43 +1,33 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('login','send_password')); if($if2){?> - <form name="" target="_self" data-target="view" action="./" data-method="password" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form login" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="password" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <?php $if2=(config('login','send_password')); if($if2) { ?> + <form name="" target="_self" data-target="view" action="./" data-method="password" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form login"> <div class="line logo"> - <div class="label"> - <img src="themes/default/images/logo_password.png ?>" - border="0" /> - </div> - <div class="input"> - <h2> - <?php echo langHtml('logo_password') ?> - </h2> - <p> - <?php echo langHtml('logo_password_text') ?> - </p> - - </div> -</div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('USER_USERNAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_USERNAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_username" name="<?php if ('') echo ''.'_' ?>username<?php if (false) echo '_disabled' ?>" autofocus="autofocus" type="text" maxlength="128" class="" value="<?php echo Text::encodeHtml(@$username) ?>" /><?php if (false) { ?><input type="hidden" name="username" value="<?php $username ?>"/><?php } ?></div> + <input name="username" disabled="" autofocus="autofocus" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$username)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DATABASE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DATABASE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dbid" name="dbid" title="" class=""<?php if (count($dbids)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dbids,'actdbid',0,0) ?><?php if (count($dbids)==0) { ?><input type="hidden" name="dbid" value="" /><?php } ?><?php if (count($dbids)==1) { ?><input type="hidden" name="dbid" value="<?php echo array_keys($dbids)[0] ?>" /><?php } ?> - </select></div> + <input name="dbid" value="actdbid" size="1" class=""> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> - <?php } ?> - <?php if(!$if2){?> + </form> + <?php } ?> + <?php if(!$if2) { ?> <div class="message error"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'PASSWORD_NOT_ENABLED'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('PASSWORD_NOT_ENABLED'))) ?> + </span> </div> - <?php } ?>- \ No newline at end of file + <?php } ?>+ \ No newline at end of file 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 @@ -3,7 +3,7 @@ <header back="true"></header> - <if true="config:login/send_password"> + <if true="%{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 @@ -1,39 +1,23 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="_top" action="./" data-method="passwordcode" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form login" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="passwordcode" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> + <form name="" target="_self" data-target="_top" action="./" data-method="passwordcode" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form login"> + <tr class=""> <td colspan="2" class="logo"> <div class="line logo"> - <div class="label"> - <img src="themes/default/images/logo_password.png ?>" - border="0" /> - </div> - <div class="input"> - <h2> - <?php echo langHtml('logo_password') ?> - </h2> - <p> - <?php echo langHtml('logo_password_text') ?> - </p> - - </div> -</div> </div> </td> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('mail_code')))); ?></span> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('mail_code'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_code" name="<?php if ('') echo ''.'_' ?>code<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$code) ?>" /><?php if (false) { ?><input type="hidden" name="code" value="<?php $code ?>"/><?php } ?></div> + <td class=""> + <input name="code" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$code)) ?>" class=""> + </input> </td> </tr> - <tr> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/register.php b/modules/cms-ui/themes/default/html/views/login/register.php @@ -1,30 +1,18 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('login','register')); if($if2){?> - <form name="" target="_self" data-target="view" action="./" data-method="register" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form login" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="register" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <?php $if2=(config('login','register')); if($if2) { ?> + <form name="" target="_self" data-target="view" action="./" data-method="register" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form login"> <div class="line logo"> - <div class="label"> - <img src="themes/default/images/logo_register.png ?>" - border="0" /> - </div> - <div class="input"> - <h2> - <?php echo langHtml('logo_register') ?> - </h2> - <p> - <?php echo langHtml('logo_register_text') ?> - </p> - - </div> -</div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_mail" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('USER_MAIL')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_MAIL'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_mail" name="<?php if ('') echo ''.'_' ?>mail<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="mail" value="<?php '' ?>"/><?php } ?></div> + <input name="mail" disabled="" type="text" maxlength="256" value="" class="focus"> + </input> </div> </div> <div class="line"> @@ -33,10 +21,11 @@ <div class="input"> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> - <?php } ?> - <?php if(!$if2){?> + </form> + <?php } ?> + <?php if(!$if2) { ?> <div class="message error"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'REGISTER_NOT_ENABLED'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('REGISTER_NOT_ENABLED'))) ?> + </span> </div> - <?php } ?>- \ No newline at end of file + <?php } ?>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/register.tpl.src.xml b/modules/cms-ui/themes/default/html/views/login/register.tpl.src.xml @@ -1,6 +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"> - <if true="config:login/register"> + <if true="%{login/register}"> <form> <logo name="register"></logo> diff --git a/modules/cms-ui/themes/default/html/views/login/registercode.php b/modules/cms-ui/themes/default/html/views/login/registercode.php @@ -1,52 +1,45 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="registercode" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form login" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="login" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="registercode" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="registercode" data-action="login" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form login"> <div class="line logo"> - <div class="label"> - <img src="themes/default/images/logo_register.png ?>" - border="0" /> - </div> - <div class="input"> - <h2> - <?php echo langHtml('logo_register') ?> - </h2> - <p> - <?php echo langHtml('logo_register_text') ?> - </p> - - </div> -</div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('USER_REGISTER_CODE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_REGISTER_CODE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_code" name="<?php if ('') echo ''.'_' ?>code<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml('') ?>" /><?php if (false) { ?><input type="hidden" name="code" value="<?php '' ?>"/><?php } ?></div> + <input name="code" disabled="" type="text" maxlength="256" value="" class="focus"> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('USER_USERNAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_USERNAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_username" name="<?php if ('') echo ''.'_' ?>username<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$username) ?>" /><?php if (false) { ?><input type="hidden" name="username" value="<?php $username ?>"/><?php } ?></div> + <input name="username" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$username)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('USER_PASSWORD')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_PASSWORD'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input type="password" name="password" id="<?php echo REQUEST_ID ?>_password" size="25" maxlength="256" class="" value="" /></div> + <div class="inputholder"><input type="password" name="password" size="25" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$password)) ?>" class=""> + </input></div> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DATABASE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DATABASE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dbid" name="dbid" title="" class=""<?php if (count($dbids)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dbids,'actdbid',0,0) ?><?php if (count($dbids)==0) { ?><input type="hidden" name="dbid" value="" /><?php } ?><?php if (count($dbids)==1) { ?><input type="hidden" name="dbid" value="<?php echo array_keys($dbids)[0] ?>" /><?php } ?> - </select></div> + <input name="dbid" value="actdbid" size="1" class=""> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/info.php b/modules/cms-ui/themes/default/html/views/model/info.php @@ -1,15 +1,19 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="model" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form model" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="model" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <span class="headline"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="model" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form model"> + <span class="headline"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input clickable"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - <a class="or-link-btn" target="_self" data-type="edit" data-action="model" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/model/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> + <a target="_self" data-type="edit" data-action="model" data-method="prop" data-id="" data-extra="[]" href="/#/model/" class="or-link-btn"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div> - <div class="or-form-actionbar"></div></form>- \ No newline at end of file + </form>+ \ 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,42 +1,53 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <a target="_self" data-action="" data-method="listing" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <img src="./modules/cms-ui/themes/default/images/icon/icon_model.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,25,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td class=""> + <a target="_self" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class=""> + <img src="./modules/cms-ui/themes/default/images/icon/icon_model.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <td> - <?php $if8=(isset($default_url)); if($if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_make_default')))); ?></span> - <?php } ?> - <?php if(!$if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_is_default')))); ?></span> - <?php } ?> + <td class=""> + <?php $if8=(isset($default_url)); if($if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_make_default'))) ?> + </span> + <?php } ?> + <?php if(!$if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> + </span> + <?php } ?> </td> - <td> - <?php $if8=(isset($select_url)); if($if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_select')))); ?></span> - <?php } ?> - <?php if(!$if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_selected')))); ?></span> - <?php } ?> + <td class=""> + <?php $if8=(isset($select_url)); if($if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_select'))) ?> + </span> + <?php } ?> + <?php if(!$if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_selected'))) ?> + </span> + <?php } ?> </td> </tr> - <?php unset($select_url) ?> - <?php unset($default_url) ?> - <?php } ?> + <?php { unset($select_url) ?> + <?php } ?> + <?php { unset($default_url) ?> + <?php } ?> + <?php } ?> </table></div></div> \ 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,3 +1,3 @@ <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="GLOBAL_MODELS" widths="50%,25%,25%"><table><row class="headline"><column><text key="name"></text></column><column><text raw=""></text></column><column><text raw=""></text></column></row><list list="el" extract="true"><row class="data"><column url="var:url"><link target="cms_main"><image file="icon_model"></image><text var="name" maxlength="25"></text></link></column><column url="var:default_url"><if present="default_url"><text text="GLOBAL_make_default"></text></if><else><text text="GLOBAL_is_default"></text></else></column><column url="var:select_url"><if present="select_url"><text text="GLOBAL_select"></text></if><else><text text="GLOBAL_selected"></text></else></column></row><set var="select_url"></set><set var="default_url"></set></list></table></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"><dummy><window icon="group" name="GLOBAL_MODELS" widths="50%,25%,25%"><table><row class="headline"><column><text key="name"></text></column><column><text raw=""></text></column><column><text raw=""></text></column></row><list list="el" extract="true"><row class="data"><column url="${url}"><link target="cms_main"><image file="icon_model"></image><text var="name" maxlength="25"></text></link></column><column url="${default_url}"><if present="default_url"><text text="GLOBAL_make_default"></text></if><else><text text="GLOBAL_is_default"></text></else></column><column url="${select_url}"><if present="select_url"><text text="GLOBAL_select"></text></if><else><text text="GLOBAL_selected"></text></else></column></row><set var="select_url"></set><set var="default_url"></set></list></table></window></dummy></output>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/prop.php b/modules/cms-ui/themes/default/html/views/model/prop.php @@ -1,32 +1,23 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="model" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form model" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="model" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="model" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form model"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" autofocus="autofocus" type="text" maxlength="50" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" autofocus="autofocus" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'is_default';$default = false;$readonly = $is_default;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_is_default" class="label"><?php echo lang('GLOBAL_is_default') ?> + <input type="checkbox" name="is_default" disabled="<?php echo encodeHtml(htmlentities(@$is_default)) ?>" value="1" checked="<?php echo encodeHtml(htmlentities(@$is_default)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> </label> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/model/prop.tpl.src.xml @@ -15,7 +15,7 @@ <part class="label"> </part> <part class="input"> - <checkbox name="is_default" readonly="var:is_default"></checkbox> + <checkbox name="is_default" readonly="${is_default}"></checkbox> <label key="GLOBAL_is_default" for="is_default" /> </part> </part> 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,37 +1,29 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="model" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form model" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="model" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="model" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form model"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'confirm';$default = false;$readonly = false;$required = true; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_confirm" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('CONFIRM_DELETE')))); ?></span> + <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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 @@ -12,7 +12,7 @@ </part> </part> </group> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> </part> diff --git a/modules/cms-ui/themes/default/html/views/model/structure.php b/modules/cms-ui/themes/default/html/views/model/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/model/structure.tpl.src.xml @@ -1,7 +1,7 @@ <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"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file 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,11 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="modellist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form modellist" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="modellist" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="modellist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form modellist"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_name'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_name'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/modellist/show.php b/modules/cms-ui/themes/default/html/views/modellist/show.php @@ -1,47 +1,58 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="model" data-method="show" data-id="<?php echo $id ?>" data-extra="[]" href="./#/model/<?php echo $id ?>"> - <i class="image-icon image-icon--action-model"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,25,'..',constant('STR_PAD_BOTH') )))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="model" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/model/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <i class="image-icon image-icon--action-model"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <?php $if5=(!$is_default); if($if5){?> + <?php $if5=(!$is_default); if($if5) { ?> <td class="clickable"> - <?php $if7=(isset($id)); if($if7){?> - <a target="_self" data-type="post" data-action="model" data-method="setdefault" data-id="<?php echo $id ?>" data-extra="[]" data-data="{"action":"model","subaction":"setdefault","id":"<?php echo $id ?>","token":"<?php echo token() ?>","none":"0"}"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_make_default')))); ?></span> + <?php $if7=(isset($id)); if($if7) { ?> + <a target="_self" data-type="post" data-action="model" data-method="setdefault" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" data-data="{"action":"model","subaction":"setdefault","id":"<?php echo encodeHtml(htmlentities(@$id)) ?>",\"token":"<?php echo token() ?>","none":"0"}"" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_make_default'))) ?> + </span> </a> - <?php } ?> + <?php } ?> </td> - <?php } ?> - <?php if(!$if5){?> - <td> - <em><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_is_default')))); ?></em> + <?php } ?> + <?php if(!$if5) { ?> + <td class=""> + <em class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> + </em> </td> - <?php } ?> + <?php } ?> </tr> - <?php unset($select_url) ?> - <?php unset($default_url) ?> - <?php } ?> + <?php { unset($select_url) ?> + <?php } ?> + <?php { unset($default_url) ?> + <?php } ?> + <?php } ?> <tr class="data"> <td colspan="2" class="clickable"> - <a target="_self" data-type="dialog" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="add" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/modellist/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/modellist/show.tpl.src.xml @@ -16,16 +16,16 @@ <row class="data"> <column class="clickable"> - <link type="open" name="var:name" action="model" id="var:id"> + <link type="open" name="${name}" action="model" id="${id}"> <image action="model"></image> <text var="name" maxlength="25"></text> </link> </column> - <if false="var:is_default"> + <if false="${is_default}"> <column class="clickable"> <if present="id"> - <link type="post" action="model" subaction="setdefault" id="var:id"> + <link type="post" action="model" subaction="setdefault" id="${id}"> <text text="GLOBAL_make_default"></text> </link> </if> diff --git a/modules/cms-ui/themes/default/html/views/object/aclform.php b/modules/cms-ui/themes/default/html/views/object/aclform.php @@ -1,11 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="aclform" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="aclform" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('users') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="aclform" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_all" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="all"<?php if('all'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_all" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_ALL')))); ?></span> + <input type="radio" name="type" disabled="" value="all" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_ALL'))) ?> + </span> </label> </div> <div class="input"> @@ -13,89 +15,75 @@ </div> <div class="line"> <div class="label"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_user" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="user"<?php if('user'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_user" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_USER')))); ?></span> + <input type="radio" name="type" disabled="" value="user" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_USER'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_userid" name="userid" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($users,'',1,0) ?><?php if (count($users)==0) { ?><input type="hidden" name="userid" value="" /><?php } ?><?php if (count($users)==1) { ?><input type="hidden" name="userid" value="<?php echo array_keys($users)[0] ?>" /><?php } ?> - </select></div> + <input name="userid" value="" size="1" class=""> + </input> </div> </div> - <?php $if4=(isset($groups)); if($if4){?> + <?php $if4=(isset($groups)); if($if4) { ?> <div class="line"> <div class="label"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_group" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="group"<?php if('group'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_group" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_GROUP')))); ?></span> + <input type="radio" name="type" disabled="" value="group" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_GROUP'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_groupid" name="groupid" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($groups,'',1,0) ?><?php if (count($groups)==0) { ?><input type="hidden" name="groupid" value="" /><?php } ?><?php if (count($groups)==1) { ?><input type="hidden" name="groupid" value="<?php echo array_keys($groups)[0] ?>" /><?php } ?> - </select></div> + <input name="groupid" value="" size="1" class=""> + </input> </div> </div> - <?php } ?> + <?php } ?> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('language') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_languageid" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_LANGUAGE')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LANGUAGE'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_languageid" name="languageid" title="" class=""<?php if (count($languages)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($languages,'',0,0) ?><?php if (count($languages)==0) { ?><input type="hidden" name="languageid" value="" /><?php } ?><?php if (count($languages)==1) { ?><input type="hidden" name="languageid" value="<?php echo array_keys($languages)[0] ?>" /><?php } ?> - </select></div> + <input name="languageid" value="" size="1" class=""> + </input> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('acl') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php foreach($show as $k=>$t){ ?> - <div> - <?php $if8=($t=='read'); if($if8){?> - <?php $$t= true; ?> - <?php { $tmpname = $t;$default = false;$readonly = true;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <?php } ?> - <?php if(!$if8){?> - <?php unset($$t) ?> - <?php { $tmpname = $t;$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <?php } ?> - <label for="<?php echo REQUEST_ID ?>_<?php echo $t ?>_" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('acl_'.$t.'')))); ?></span> + <?php foreach($show as $k=>$t) { ?> + <div class=""> + <?php $if8=($t=='read'); if($if8) { ?> + <?php { $$t= true; ?> + <?php } ?> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$t)) ?>" disabled="1" value="1" checked="<?php echo encodeHtml(htmlentities(@$${t)) ?>}" class=""> + </input> + <?php } ?> + <?php if(!$if8) { ?> + <?php { unset($$t) ?> + <?php } ?> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$t)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$${t)) ?>}" class=""> + </input> + <?php } ?> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('${t'))) ?>} + </span> </label> </div> - <?php } ?> + <?php } ?> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/aclform.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/aclform.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <header back="true" /> <form> - <group title="message:users"> + <group title="#{users}"> <part class="line"> <part class="label"> <radio name="type" value="all"></radio> @@ -39,7 +39,7 @@ </if> </group> - <group title="message:language"> + <group title="#{language}"> <part class="line"> <part class="label"> <label for="languageid"> @@ -53,23 +53,23 @@ </part> </group> - <group title="message:acl"> + <group title="#{acl}"> <part class="line"> <part class="label"> </part> <part class="input"> <list list="show" value="t" key="k"> <part> - <if value="var:t" equals="read"> - <set var="var:t" value="true" /> - <checkbox name="var:t" readonly="true"></checkbox> + <if value="${t}" equals="read"> + <set var="${t}" value="true" /> + <checkbox name="${t}" readonly="true"></checkbox> </if> <else> - <set var="var:t" value="false" /> - <checkbox name="var:t" readonly="false"></checkbox> + <set var="${t}" value="false" /> + <checkbox name="${t}" readonly="false"></checkbox> </else> - <label for="var:t" value=""> - <text key="var:t" prefix="acl_"></text> + <label for="${t}" value=""> + <text key="${t}" prefix="acl_"></text> </label> </part> </list> diff --git a/modules/cms-ui/themes/default/html/views/object/copy.php b/modules/cms-ui/themes/default/html/views/object/copy.php @@ -1,27 +1,31 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="copy" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="copy" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="copy" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> <div class="line"> <div class="label"> - <input type="hidden" name="sourceid" value="<?php echo $sourceId ?>"/> + <input type="hidden" name="sourceid" value="<?php echo encodeHtml(htmlentities(@$sourceId)) ?>" class=""> + </input> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities(@$source[name]))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$source['name'])) ?> + </span> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_type" name="type" title="" class=""<?php if (count($types)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($types,$type,0,0) ?><?php if (count($types)==0) { ?><input type="hidden" name="type" value="" /><?php } ?><?php if (count($types)==1) { ?><input type="hidden" name="type" value="<?php echo array_keys($types)[0] ?>" /><?php } ?> - </select></div> + <input name="type" value="<?php echo encodeHtml(htmlentities(@$type)) ?>" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <input type="hidden" name="targetid" value="<?php echo $targetId ?>"/> + <input type="hidden" name="targetid" value="<?php echo encodeHtml(htmlentities(@$targetId)) ?>" class=""> + </input> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities(@$target[name]))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$target['name'])) ?> + </span> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/copy.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/copy.tpl.src.xml @@ -3,10 +3,10 @@ <form> <part class="line"> <part class="label"> - <hidden name="sourceid" default="var:sourceId" /> + <hidden name="sourceid" default="${sourceId}" /> </part> <part class="input"> - <text value="arrayvar:source:name" /> + <text value="${source.name}" /> </part> </part> @@ -20,10 +20,10 @@ <part class="line"> <part class="label"> - <hidden name="targetid" default="var:targetId" /> + <hidden name="targetid" default="${targetId}" /> </part> <part class="input"> - <text value="arrayvar:target:name" /> + <text value="${target.name}" /> </part> </part> diff --git a/modules/cms-ui/themes/default/html/views/object/info.php b/modules/cms-ui/themes/default/html/views/object/info.php @@ -1,216 +1,269 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_name'))) ?> + </span> </div> <div class="input"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_filename'))) ?> + </span> </div> <div class="input"> - <span class="filename"><?php echo nl2br(encodeHtml(htmlentities($filename))); ?></span> + <span class="filename"><?php echo encodeHtml(htmlentities(@$filename)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('file_extension')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('file_extension'))) ?> + </span> </div> <div class="input"> - <span class="extension"><?php echo nl2br(encodeHtml(htmlentities($extension))); ?></span> + <span class="extension"><?php echo encodeHtml(htmlentities(@$extension)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_description'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$description)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('additional_info') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_full_filename" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_full_filename'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($full_filename))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$full_filename)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_size" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_SIZE')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_SIZE'))) ?> + </span> </label> </div> <div class="input"> </div> - <span><?php echo nl2br(encodeHtml(htmlentities($size))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$size)) ?> + </span> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_mimetype" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_mimetype')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_mimetype'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($mimetype))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$mimetype)) ?> + </span> </div> </div> <div class="line"> <div class="label"> </div> <div class="input clickable"> - <a class="action" target="_self" data-type="dialog" data-action="" data-method="size" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'size'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_file_size'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="size" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'size'}" href="/#//" class="action"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_file_size'))) ?> + </span> </a> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(lang('id'))))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('#{id'))) ?>} + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$objectid)) ?> + </span> </div> </div> - <?php $if4=(isset($cache_filename)); if($if4){?> + <?php $if4=(isset($cache_filename)); if($if4) { ?> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_cache_filename" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('CACHE_FILENAME')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CACHE_FILENAME'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($cache_filename))); ?></span> - <br/> - <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($cache_filemtime) ?> + <span class=""><?php echo encodeHtml(htmlentities(@$cache_filename)) ?> + </span> + <br> + </br> + <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" class=""> + </img> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($cache_filemtime); ?> + <?php } ?> </div> </div> - <?php } ?> + <?php } ?> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_pages" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_PAGES')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_PAGES'))) ?> + </span> </label> </div> <div class="input"> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <?php foreach($pages as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <tr> - <td> - <a target="_self" data-url="<?php echo $url ?>" data-action="" data-method="info" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <img src="./modules/cms-ui/themes/default/images/icon_page.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <?php foreach($pages as $list_key=>$list_value) { extract($list_value); ?> + <tr class=""> + <td class=""> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$url)) ?>" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class=""> + <img src="./modules/cms-ui/themes/default/images/icon_page.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <?php $if6=(($pages)==FALSE); if($if6){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> - <?php } ?> + <?php $if6=(($pages)==FALSE); if($if6) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> + <?php } ?> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('validity') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="clickable"> - <a target="_self" data-type="dialog" data-action="" data-method="settings" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'settings'}" href="./#//"> + <a target="_self" data-type="dialog" data-action="" data-method="settings" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'settings'}" href="/#//" class=""> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_state'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_state'))) ?> + </span> </div> <div class="input"> - <?php $if8=($is_valid); if($if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'is_yes'.'')))); ?></span> - <?php } ?> - <?php if(!$if8){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'is_no'.'')))); ?></span> - <?php } ?> + <?php $if8=($is_valid); if($if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('is_yes'))) ?> + </span> + <?php } ?> + <?php if(!$if8) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('is_no'))) ?> + </span> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('from')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('from'))) ?> + </span> </div> <div class="input"> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($valid_from_date) ?> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($valid_from_date); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('until')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('until'))) ?> + </span> </div> <div class="input"> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($valid_to_date) ?> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($valid_to_date); ?> + <?php } ?> </div> </div> </a> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('prop_userinfo') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_created'))) ?> + </span> </div> <div class="input"> - <i class="image-icon image-icon--action-el_date"></i> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($create_date) ?> - <br/> - <i class="image-icon image-icon--action-user"></i> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($create_user) ?> + <i class="image-icon image-icon--action-el_date"> + </i> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($create_date); ?> + <?php } ?> + <br> + </br> + <i class="image-icon image-icon--action-user"> + </i> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($create_user); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_lastchange'))) ?> + </span> </div> <div class="input"> - <i class="image-icon image-icon--action-el_date"></i> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> - <br/> - <i class="image-icon image-icon--action-user"></i> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($lastchange_user) ?> + <i class="image-icon image-icon--action-el_date"> + </i> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php } ?> + <br> + </br> + <i class="image-icon image-icon--action-user"> + </i> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($lastchange_user); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_published_date" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_published')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_published'))) ?> + </span> </label> </div> <div class="input"> - <i class="image-icon image-icon--action-el_date"></i> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($published_date) ?> - <br/> - <i class="image-icon image-icon--action-user"></i> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($published_user) ?> + <i class="image-icon image-icon--action-el_date"> + </i> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($published_date); ?> + <?php } ?> + <br> + </br> + <i class="image-icon image-icon--action-user"> + </i> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($published_user); ?> + <?php } ?> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('settings') ?></legend><div class="closable"> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <?php foreach($settings as $name=>$value){ ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <?php foreach($settings as $name=>$value) { ?> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </td> <td class="clickable"> - <a target="_self" data-type="dialog" data-action="" data-method="settings" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'settings'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities($value))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="settings" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'settings'}" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$value)) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/info.tpl.src.xml @@ -36,7 +36,7 @@ </part> </group> - <group title="message:additional_info"> + <group title="#{additional_info}"> <part class="line"> <part class="label"> <label for="full_filename"> @@ -78,7 +78,7 @@ </part> <part class="line"> <part class="label"> - <text text="message:id"></text> + <text text="#{id}"></text> </part> <part class="input"> <text var="objectid"></text> @@ -95,7 +95,7 @@ <text var="cache_filename"></text> <newline></newline> <image icon="el_date"></image> - <date date="var:cache_filemtime"></date> + <date date="${cache_filemtime}"></date> </part> </part> </if> @@ -110,7 +110,7 @@ <list list="pages" extract="true"> <row> <column> - <link url="var:url" target="cms_main"> + <link url="${url}" target="cms_main"> <image type="page"></image> <text var="name"></text> </link> @@ -124,7 +124,7 @@ </part> </part> </group> - <group title="message:validity"> + <group title="#{validity}"> <part class="clickable"> <link subaction="settings" type="dialog"> <part class="line"> @@ -132,7 +132,7 @@ <text key="global_state"></text> </part> <part class="input"> - <if true="var:is_valid"><text key="is_yes" /></if> + <if true="${is_valid}"><text key="is_yes" /></if> <else><text key="is_no" /></else> </part> </part> @@ -141,7 +141,7 @@ <text text="from"></text> </part> <part class="input"> - <date date="var:valid_from_date" /> + <date date="${valid_from_date}" /> </part> </part> <part class="line"> @@ -149,23 +149,23 @@ <text text="until"></text> </part> <part class="input"> - <date date="var:valid_to_date" /> + <date date="${valid_to_date}" /> </part> </part> </link> </part> </group> - <group title="message:prop_userinfo"> + <group title="#{prop_userinfo}"> <part class="line"> <part class="label"> <text text="global_created"></text> </part> <part class="input"> <image elementtype="date"></image> - <date date="var:create_date"></date> + <date date="${create_date}"></date> <newline></newline> <image action="user"></image> - <user user="var:create_user"></user> + <user user="${create_user}"></user> </part> </part> <part class="line"> @@ -174,10 +174,10 @@ </part> <part class="input"> <image elementtype="date"></image> - <date date="var:lastchange_date"></date> + <date date="${lastchange_date}"></date> <newline></newline> <image action="user"></image> - <user user="var:lastchange_user"></user> + <user user="${lastchange_user}"></user> </part> </part> <part class="line"> @@ -188,15 +188,15 @@ </part> <part class="input"> <image elementtype="date"></image> - <date date="var:published_date"></date> + <date date="${published_date}"></date> <newline></newline> <image action="user"></image> - <user user="var:published_user"></user> + <user user="${published_user}"></user> </part> </part> </group> - <group title="message:settings"> + <group title="#{settings}"> <table filter="true"> <list list="settings" key="name" value="value" > <row class="data"> 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,30 +1,21 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="inherit" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="inherit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if3=($type=='folder'); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="inherit" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> + <?php $if3=($type=='folder'); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php $inherit= '1'; ?> - <?php { $tmpname = 'inherit';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_inherit" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'inherit_rights'.'')))); ?></span> + <?php { $inherit= '1'; ?> + <?php } ?> + <input type="checkbox" name="inherit" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$inherit)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('inherit_rights'))) ?> + </span> </label> </div> </div> </div></fieldset> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file 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 @@ -3,8 +3,8 @@ <header back="true" /> <form> - <if value="var:type" equals="folder"> - <group title="message:options"> + <if value="${type}" equals="folder"> + <group title="#{options}"> <part class="line"> <part class="label"> </part> diff --git a/modules/cms-ui/themes/default/html/views/object/name.php b/modules/cms-ui/themes/default/html/views/object/name.php @@ -1,8 +1,11 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="name" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="name" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="languageid" value="<?php echo $languageid ?>"/> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('alias') ?></legend><div class="closable"> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('name') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" required="required" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label">?description?</span><span class="or-form-input"><div class="inputholder"><textarea class="description" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>" maxlength="255"><?php echo Text::encodeHtml($description) ?></textarea></div></span></label> + <form name="" target="_self" data-target="view" action="./" data-method="name" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> + <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" class=""> + </input> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <label class="or-form-row or-form-input"><input name="name" disabled="" required="required" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input></label> + <label class="or-form-row or-form-checkbox"><textarea name="description" disabled="" maxlength="255" class="description"><?php echo encodeHtml(htmlentities(@$description)) ?> + </textarea></label> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('global_save') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/name.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/name.tpl.src.xml @@ -1,9 +1,9 @@ <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 label="message:global_save"> + <form label="#{global_save}"> <hidden name="languageid" /> - <group title="message:alias" open="true"> + <group title="#{alias}" open="true"> <input label="name" name="name" maxlength="255" required="true" /> diff --git a/modules/cms-ui/themes/default/html/views/object/prop.php b/modules/cms-ui/themes/default/html/views/object/prop.php @@ -1,9 +1,11 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('global_prop') ?></legend><div class="closable"> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('global_filename') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_filename" name="<?php if ('') echo ''.'_' ?>filename<?php if (false) echo '_disabled' ?>" autofocus="autofocus" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$filename) ?>" /><?php if (false) { ?><input type="hidden" name="filename" value="<?php $filename ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('alias') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_alias_filename" name="<?php if ('') echo ''.'_' ?>alias_filename<?php if (false) echo '_disabled' ?>" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$alias_filename) ?>" /><?php if (false) { ?><input type="hidden" name="alias_filename" value="<?php $alias_filename ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label">?folder?</span><span class="or-form-input"><div class="inputholder"><select id="<?php echo REQUEST_ID ?>_alias_folderid" name="alias_folderid" title="" class=""<?php if (count($folders)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($folders,$alias_folderid,0,0) ?><?php if (count($folders)==0) { ?><input type="hidden" name="alias_folderid" value="" /><?php } ?><?php if (count($folders)==1) { ?><input type="hidden" name="alias_folderid" value="<?php echo array_keys($folders)[0] ?>" /><?php } ?> - </select></div></span></label> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <label class="or-form-row or-form-input"><input name="filename" disabled="" autofocus="autofocus" type="text" maxlength="150" value="<?php echo encodeHtml(htmlentities(@$filename)) ?>" class="filename"> + </input></label> + <label class="or-form-row or-form-input"><input name="alias_filename" disabled="" type="text" maxlength="150" value="<?php echo encodeHtml(htmlentities(@$alias_filename)) ?>" class="filename"> + </input></label> + <label class="or-form-row or-form-input"><input name="alias_folderid" value="<?php echo encodeHtml(htmlentities(@$alias_folderid)) ?>" size="1" class=""> + </input></label> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('global_save') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/prop.tpl.src.xml @@ -1,8 +1,8 @@ <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 label="message:global_save"> + <form label="#{global_save}"> - <group title="message:global_prop"> + <group title="#{global_prop}"> <input name="filename" label="global_filename" class="filename" maxlength="150" focus="true" /> diff --git a/modules/cms-ui/themes/default/html/views/object/rights.php b/modules/cms-ui/themes/default/html/views/object/rights.php @@ -1,74 +1,90 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=($type=='folder'); if($if2){?> - <?php } ?> - <?php if(!$if2){?> - <?php } ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <?php $if2=($type=='folder'); if($if2) { ?> + <?php } ?> + <?php if(!$if2) { ?> + <?php } ?> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_LANGUAGE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LANGUAGE'))) ?> + </span> </td> - <?php foreach($show as $list_key=>$t){ ?> + <?php foreach($show as $list_key=>$t) { ?> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('acl_'.$t.'_abbrev')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('${t'))) ?>} + </span> </td> - <?php } ?> + <?php } ?> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_delete'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_delete'))) ?> + </span> </td> </tr> - <?php $if3=(($acls)==FALSE); if($if3){?> + <?php $if3=(($acls)==FALSE); if($if3) { ?> <tr class="data"> - <td colspan="99"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <td colspan="99" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> - <?php $if3=!(($acls)==FALSE); if($if3){?> - <?php } ?> - <?php foreach($acls as $aclid=>$acl){ ?><?php extract($acl) ?> + <?php } ?> + <?php $if3=!(($acls)==FALSE); if($if3) { ?> + <?php } ?> + <?php foreach($acls as $aclid=>$acl) { extract($acl); ?> <tr class="data"> - <td> - <?php $if6=(isset($username)); if($if6){?> - <i class="image-icon image-icon--action-user"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($username))); ?></span> - <?php } ?> - <?php $if6=(isset($groupname)); if($if6){?> - <i class="image-icon image-icon--action-group"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($groupname))); ?></span> - <?php } ?> - <?php $if6=!(isset($username)); if($if6){?> - <?php $if7=!(isset($groupname)); if($if7){?> - <i class="image-icon image-icon--action-group"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_all'.'')))); ?></span> - <?php } ?> - <?php } ?> + <td class=""> + <?php $if6=(isset($username)); if($if6) { ?> + <i class="image-icon image-icon--action-user"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$username)) ?> + </span> + <?php } ?> + <?php $if6=(isset($groupname)); if($if6) { ?> + <i class="image-icon image-icon--action-group"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$groupname)) ?> + </span> + <?php } ?> + <?php $if6=!(isset($username)); if($if6) { ?> + <?php $if7=!(isset($groupname)); if($if7) { ?> + <i class="image-icon image-icon--action-group"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_all'))) ?> + </span> + <?php } ?> + <?php } ?> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($languagename))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$languagename)) ?> + </span> </td> - <?php foreach($show as $list_key=>$t){ ?> - <td> - <?php $if7=($$t); if($if7){?> - <span><?php echo nl2br('✓'); ?></span> - <?php } ?> + <?php foreach($show as $list_key=>$t) { ?> + <td class=""> + <?php $if7=('var:$t'); if($if7) { ?> + <span class="">✓ + </span> + <?php } ?> </td> - <?php } ?> + <?php } ?> <td class="clickable"> - <a target="_self" data-type="post" data-action="" data-method="delacl" data-id="<?php echo OR_ID ?>" data-extra="{'aclid':'<?php echo $aclid ?>'}" data-data="{"action":"object","subaction":"delacl","id":"<?php echo OR_ID ?>","token":"<?php echo token() ?>","aclid":"<?php echo $aclid ?>","none":"0"}"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_DELETE'.'')))); ?></span> + <a target="_self" data-type="post" data-action="" data-method="delacl" data-id="" data-extra="{'aclid':'<?php echo encodeHtml(htmlentities(@$aclid)) ?>'}" data-data="{"action":"object","subaction":"delacl","id":"",\"token":"<?php echo token() ?>","aclid":"<?php echo encodeHtml(htmlentities(@$aclid)) ?>","none":"0"}"" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DELETE'))) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> <tr class="data"> <td colspan="99" class="clickable"> - <a target="_self" date-name="<?php echo lang('menu_aclform') ?>" name="<?php echo lang('menu_aclform') ?>" data-type="dialog" data-action="" data-method="aclform" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'aclform'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@lang('menu_aclform'))) ?>" name="<?php echo encodeHtml(htmlentities(@lang('menu_aclform'))) ?>" data-type="dialog" data-action="" data-method="aclform" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'aclform'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/object/rights.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/rights.tpl.src.xml @@ -1,7 +1,7 @@ <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"> - <if value="var:type" equals="folder"> + <if value="${type}" equals="folder"> <header views="inherit,aclform" /> </if> <else> @@ -18,7 +18,7 @@ </column> <list list="show" value="t"> <column class="help"> - <text key="var:t" prefix="acl_" suffix="_abbrev"></text> + <text key="${t}" prefix="acl_" suffix="_abbrev"></text> </column> </list> <column class="help"> @@ -62,7 +62,7 @@ </column> </list> <column class="clickable"> - <link type="post" subaction="delacl" var1="aclid" value1="var:aclid"> + <link type="post" subaction="delacl" var1="aclid" value1="${aclid}"> <text key="GLOBAL_DELETE"></text> </link> </column> @@ -70,7 +70,7 @@ </list> <row class="data"> <column colspan="99" class="clickable"> - <link type="dialog" name="message:menu_aclform" subaction="aclform"> + <link type="dialog" name="#{menu_aclform}" subaction="aclform"> <image method="add" /> <text text="new" /> </link> diff --git a/modules/cms-ui/themes/default/html/views/object/settings.php b/modules/cms-ui/themes/default/html/views/object/settings.php @@ -1,39 +1,47 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="settings" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="settings" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('validity') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="settings" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form object"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_validity_from_date" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'from'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('from'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_valid_from_date" name="<?php if ('') echo ''.'_' ?>valid_from_date<?php if (false) echo '_disabled' ?>" type="date" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$valid_from_date) ?>" /><?php if (false) { ?><input type="hidden" name="valid_from_date" value="<?php $valid_from_date ?>"/><?php } ?></div> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_valid_from_time" name="<?php if ('') echo ''.'_' ?>valid_from_time<?php if (false) echo '_disabled' ?>" type="time" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$valid_from_time) ?>" /><?php if (false) { ?><input type="hidden" name="valid_from_time" value="<?php $valid_from_time ?>"/><?php } ?></div> + <input name="valid_from_date" disabled="" type="date" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_from_date)) ?>" class=""> + </input> + <input name="valid_from_time" disabled="" type="time" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_from_time)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_validity_until_date" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'until'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('until'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_valid_until_date" name="<?php if ('') echo ''.'_' ?>valid_until_date<?php if (false) echo '_disabled' ?>" type="date" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$valid_until_date) ?>" /><?php if (false) { ?><input type="hidden" name="valid_until_date" value="<?php $valid_until_date ?>"/><?php } ?></div> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_valid_until_time" name="<?php if ('') echo ''.'_' ?>valid_until_time<?php if (false) echo '_disabled' ?>" type="time" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$valid_until_time) ?>" /><?php if (false) { ?><input type="hidden" name="valid_until_time" value="<?php $valid_until_time ?>"/><?php } ?></div> + <input name="valid_until_date" disabled="" type="date" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_until_date)) ?>" class=""> + </input> + <input name="valid_until_time" disabled="" type="time" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$valid_until_time)) ?>" class=""> + </input> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('settings') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_settings" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'SETTINGS'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('SETTINGS'))) ?> + </span> </label> </div> <div class="input"> - <textarea name="<?php if ('') echo ''.'_' ?>settings<?php if (false) echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="yaml" class="editor code-editor"><?php echo htmlentities(${'settings'}) ?></textarea> + <textarea name="settings" data-extension="" data-mimetype="" data-mode="yaml" class="editor code-editor"> + </textarea> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/settings.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/settings.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <form> - <group title="message:validity"> + <group title="#{validity}"> <part class="line"> <part class="label"> <label for="validity_from_date"> @@ -27,7 +27,7 @@ </part> </group> - <group title="message:settings"> + <group title="#{settings}"> <part class="line"> <part class="label"> diff --git a/modules/cms-ui/themes/default/html/views/page/changetemplate.php b/modules/cms-ui/themes/default/html/views/page/changetemplate.php @@ -1,25 +1,31 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="changetemplateselectelements" data-action="page" data-id="<?php echo OR_ID ?>" method="get" enctype="application/x-www-form-urlencoded" class="or-form page" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="page" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="changetemplateselectelements" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="templateid" value="<?php echo $templateid ?>"/> - <input type="hidden" name="modelid" value="<?php echo $modelid ?>"/> + <form name="" target="_self" data-target="view" action="./" data-method="changetemplateselectelements" data-action="page" data-id="<?php echo OR_ID ?>" method="get" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form page"> + <input type="hidden" name="templateid" value="<?php echo encodeHtml(htmlentities(@$templateid)) ?>" class=""> + </input> + <input type="hidden" name="modelid" value="<?php echo encodeHtml(htmlentities(@$modelid)) ?>" class=""> + </input> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('page_template_old')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('page_template_old'))) ?> + </span> </div> <div class="input"> - <a target="_self" data-url="<?php echo $template_url ?>" data-action="" data-method="changetemplate" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <img src="./modules/cms-ui/themes/default/images/icon_template.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$template_url)) ?>" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class=""> + <img src="./modules/cms-ui/themes/default/images/icon_template.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$template_name)) ?> + </span> </a> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('page_template_new')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('page_template_new'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_newtemplateid" name="newtemplateid" title="" class=""<?php if (count($templates)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($templates,'',0,0) ?><?php if (count($templates)==0) { ?><input type="hidden" name="newtemplateid" value="" /><?php } ?><?php if (count($templates)==1) { ?><input type="hidden" name="newtemplateid" value="<?php echo array_keys($templates)[0] ?>" /><?php } ?> - </select></div> + <input name="newtemplateid" value="" size="1" class=""> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_NEXT') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/changetemplate.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/changetemplate.tpl.src.xml @@ -1,6 +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"> - <form method="get" subaction="changetemplateselectelements" visible="true" cancel="true" label="message:BUTTON_NEXT"> + <form method="get" subaction="changetemplateselectelements" visible="true" cancel="true" label="#{BUTTON_NEXT}"> <hidden name="templateid" /> <hidden name="modelid" /> @@ -9,7 +9,7 @@ <text text="page_template_old"></text> </part> <part class="input"> - <link url="var:template_url" target="cms_main"> + <link url="${template_url}" target="cms_main"> <image type="template"></image> <text var="template_name"></text> </link> diff --git a/modules/cms-ui/themes/default/html/views/page/changetemplateselectelements.php b/modules/cms-ui/themes/default/html/views/page/changetemplateselectelements.php @@ -1,15 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="changetemplateselectelements" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form page" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="page" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="changetemplateselectelements" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="newtemplateid" value="<?php echo $newtemplateid ?>"/> - <?php foreach($elements as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <form name="" target="_self" data-target="view" action="./" data-method="changetemplateselectelements" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form page"> + <input type="hidden" name="newtemplateid" value="<?php echo encodeHtml(htmlentities(@$newtemplateid)) ?>" class=""> + </input> + <?php foreach($elements as $list_key=>$list_value) { extract($list_value); ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_<?php echo $newElementsName ?>" name="<?php echo $newElementsName ?>" title="" class=""<?php if (count($newElementsList)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($newElementsList,'',0,0) ?><?php if (count($newElementsList)==0) { ?><input type="hidden" name="<?php echo $newElementsName ?>" value="" /><?php } ?><?php if (count($newElementsList)==1) { ?><input type="hidden" name="<?php echo $newElementsName ?>" value="<?php echo array_keys($newElementsList)[0] ?>" /><?php } ?> - </select></div> + <input name="<?php echo encodeHtml(htmlentities(@$newElementsName)) ?>" value="" size="1" class=""> + </input> </div> </div> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('MENU_CHANGETEMPLATE') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/changetemplateselectelements.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/changetemplateselectelements.tpl.src.xml @@ -1,6 +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"> - <form visible="true" cancel="true" label="message:MENU_CHANGETEMPLATE"> + <form visible="true" cancel="true" label="#{MENU_CHANGETEMPLATE}"> <hidden name="newtemplateid" /> <list list="elements" extract="true"> <part class="line"> @@ -8,7 +8,7 @@ <text var="name"></text> </part> <part class="input"> - <selectbox name="var:newElementsName" default="" list="newElementsList"></selectbox> + <selectbox name="${newElementsName}" default="" list="newElementsList"></selectbox> </part> </part> </list> diff --git a/modules/cms-ui/themes/default/html/views/page/edit.php b/modules/cms-ui/themes/default/html/views/page/edit.php @@ -1,38 +1,47 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NAME'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('DESCRIPTION')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('DESCRIPTION'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'TYPE'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('TYPE'))) ?> + </span> </th> </tr> - <?php $if3=(($elements)==FALSE); if($if3){?> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NOT_FOUND'.'')))); ?></span> + <?php $if3=(($elements)==FALSE); if($if3) { ?> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> - <?php foreach($elements as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php } ?> + <?php foreach($elements as $list_key=>$list_value) { extract($list_value); ?> <tr class="data clickable"> - <td> - <a title="<?php echo $desc ?>" target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="pageelement" data-method="edit" data-id="<?php echo $pageelementid ?>" data-extra="[]" href="./#/pageelement/<?php echo $pageelementid ?>"> - <i class="image-icon image-icon--action-pageelement"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($label))); ?></span> + <td class=""> + <a title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="pageelement" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$pageelementid)) ?>" data-extra="[]" href="/#/pageelement/<?php echo encodeHtml(htmlentities(@$pageelementid)) ?>" class=""> + <i class="image-icon image-icon--action-pageelement"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$label)) ?> + </span> </a> </td> - <td title="<?php echo $desc ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($desc))); ?></span> + <td title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$desc)) ?> + </span> </td> - <td> - <i class="image-icon image-icon--action-el_<?php echo $typename ?>"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('el_'.$typename.'')))); ?></span> + <td class=""> + <i class="image-icon image-icon--action-el_<?php echo encodeHtml(htmlentities(@$typename)) ?>"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('${typename'))) ?>} + </span> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/edit.tpl.src.xml @@ -22,17 +22,17 @@ <list list="elements" extract="true"> <row class="data clickable"> <column> - <link type="open" title="var:desc" name="var:name" action="pageelement" id="var:pageelementid"> + <link type="open" title="${desc}" name="${name}" action="pageelement" id="${pageelementid}"> <image action="pageelement"/> <text var="label"></text> </link> </column> - <column title="var:desc"> + <column title="${desc}"> <text var="desc"></text> </column> <column> - <image elementtype="var:typename"/> - <text prefix="el_" key="var:typename"></text> + <image elementtype="${typename}"/> + <text prefix="el_" key="${typename}"></text> </column> </row> </list> 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,110 +1,85 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="form" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form page" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="page" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="form" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <?php $if6=(($el)==FALSE); if($if6){?> - <tr> - <td colspan="4"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="form" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form page"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <?php $if6=(($el)==FALSE); if($if6) { ?> + <tr class=""> + <td colspan="4" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> - <?php $if6=!(($el)==FALSE); if($if6){?> - <tr> + <?php } ?> + <?php $if6=!(($el)==FALSE); if($if6) { ?> + <tr class=""> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_ELEMENT_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('PAGE_ELEMENT_NAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_CHANGE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_CHANGE'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_VALUE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_VALUE'))) ?> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <label for="<?php echo REQUEST_ID ?>_<?php echo $saveid ?>" class="label"> - <i class="image-icon image-icon--action-el_<?php echo $type ?>"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <label class="label"> + <i class="image-icon image-icon--action-el_<?php echo encodeHtml(htmlentities(@$type)) ?>"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </label> </td> - <td> - <?php { $tmpname = $saveid;$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <td class=""> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$saveid)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$${saveid)) ?>}" class=""> + </input> </td> - <td> - <?php $if10=(in_array($type,explode(",",'text,date,number')); if($if10){?> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_<?php echo $id ?>" name="<?php if ('') echo ''.'_' ?><?php echo $id ?><?php if (false) echo '_disabled' ?>" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml($value) ?>" /><?php if (false) { ?><input type="hidden" name="<?php echo $id ?>" value="<?php $value ?>"/><?php } ?></div> - <?php } ?> - <?php $if10=($type=='longtext'); if($if10){?> - <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?><?php echo $id ?><?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($value) ?></textarea></div> - <?php } ?> - <?php $if10=(in_array($type,explode(",",'select,link,list')); if($if10){?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_<?php echo $id ?>" name="<?php echo $id ?>" title="" class=""<?php if (count($list)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($list,$value,0,0) ?><?php if (count($list)==0) { ?><input type="hidden" name="<?php echo $id ?>" value="" /><?php } ?><?php if (count($list)==1) { ?><input type="hidden" name="<?php echo $id ?>" value="<?php echo array_keys($list)[0] ?>" /><?php } ?> - </select></div> - <?php } ?> + <td class=""> + <?php $if10=(in_array($type,explode(",",'text,date,number')); if($if10) { ?> + <input name="<?php echo encodeHtml(htmlentities(@$id)) ?>" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$value)) ?>" class=""> + </input> + <?php } ?> + <?php $if10=($type=='longtext'); if($if10) { ?> + <textarea name="<?php echo encodeHtml(htmlentities(@$id)) ?>" disabled="" maxlength="0" class="inputarea"><?php echo encodeHtml(htmlentities(@$value)) ?> + </textarea> + <?php } ?> + <?php $if10=(in_array($type,explode(",",'select,link,list')); if($if10) { ?> + <input name="<?php echo encodeHtml(htmlentities(@$id)) ?>" value="<?php echo encodeHtml(htmlentities(@$value)) ?>" size="1" class=""> + </input> + <?php } ?> </td> </tr> - <?php } ?> - <?php } ?> + <?php } ?> + <?php } ?> </table></div></div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> - <?php $if6=(isset($release)); if($if6){?> - <div> - <?php { $tmpname = 'release';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_release" class="label"> - <span><?php echo nl2br(' '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_RELEASE')))); ?></span> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <?php $if6=(isset($release)); if($if6) { ?> + <div class=""> + <input type="checkbox" name="release" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$release)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_RELEASE'))) ?> + </span> </label> </div> - <?php } ?> - <?php $if6=(isset($publish)); if($if6){?> - <div> - <?php { $tmpname = 'publish';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_publish" class="label"> - <span><?php echo nl2br(' '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_PUBLISH_AFTER_SAVE')))); ?></span> + <?php } ?> + <?php $if6=(isset($publish)); if($if6) { ?> + <div class=""> + <input type="checkbox" name="publish" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$publish)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('PAGE_PUBLISH_AFTER_SAVE'))) ?> + </span> </label> </div> - <?php } ?> + <?php } ?> </div></fieldset> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ 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 @@ -26,32 +26,32 @@ <list list="el" extract="true"> <row class="data"> <column> - <label for="var:saveid"> - <image elementtype="var:type"></image> + <label for="${saveid}"> + <image elementtype="${type}"></image> <text var="name"></text> </label> </column> <column> - <checkbox name="var:saveid" default="false" readonly="false"></checkbox> + <checkbox name="${saveid}" default="false" readonly="false"></checkbox> </column> <column> - <if value="var:type" contains="text,date,number"> - <input index="true" type="text" name="var:id" default="var:value" + <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="var:type" equals="longtext"> - <inputarea index="true" name="var:id" rows="7" cols="50" - onchange="onchange" default="var:value"></inputarea> + <if value="${type}" equals="longtext"> + <inputarea index="true" name="${id}" rows="7" cols="50" + onchange="onchange" default="${value}"></inputarea> </if> - <if value="var:type" contains="select,link,list"> - <selectbox name="var:id" list="list" default="var:value"></selectbox> + <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"> + <group title="#{options}"> <if present="release"> <part> <checkbox name="release"></checkbox> 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,158 +1,201 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form page" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="page" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <span class="headline"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form page"> + <span class="headline"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'type'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.$type.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('${type'))) ?>} + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_filename'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($filename))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$filename)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_description'))) ?> + </span> </div> <div class="input"> - <span class="description"><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> + <span class="description"><?php echo encodeHtml(htmlentities(@$description)) ?> + </span> </div> </div> <div class="line"> <div class="label"> </div> <div class="input clickable"> - <a class="or-link-btn" target="_self" data-type="dialog" data-action="" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'prop'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="prop" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'prop'}" href="/#//" class="or-link-btn"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div> </div></fieldset> - <?php foreach($languages as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo $languagename ?></legend><div class="closable"> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('name') ?></span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('description') ?></span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span></span></label> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('alias') ?></span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($alias))); ?></span></span></label> + <?php foreach($languages as $list_key=>$list_value) { extract($list_value); ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span></span></label> + <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$description)) ?> + </span></span></label> + <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$alias)) ?> + </span></span></label> <div class="clickable"> - <a class="or-link-btn" target="_self" data-type="edit" data-action="page" data-method="name" data-id="<?php echo OR_ID ?>" data-extra="{'languageid':'<?php echo $languageid ?>'}" href="./#/page/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <a target="_self" data-type="edit" data-action="page" data-method="name" data-id="" data-extra="{'languageid':'<?php echo encodeHtml(htmlentities(@$languageid)) ?>'}" href="/#/page/" class="or-link-btn"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div></fieldset> - <?php } ?> - <fieldset class="toggle-open-close<?php echo false?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('additional_info') ?></legend><div class="closable"> + <?php } ?> + <fieldset class="or-group toggle-open-close closed show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_full_filename" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_full_filename'))) ?> + </span> </label> </div> <div class="input"> - <span class="filename"><?php echo nl2br(encodeHtml(htmlentities($full_filename))); ?></span> + <span class="filename"><?php echo encodeHtml(htmlentities(@$full_filename)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_full_filename" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_full_filename'))) ?> + </span> </label> </div> <div class="input"> - <span class="filename"><?php echo nl2br(encodeHtml(htmlentities($tmp_filename))); ?></span> + <span class="filename"><?php echo encodeHtml(htmlentities(@$tmp_filename)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_template_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_template')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_template'))) ?> + </span> </label> </div> <div class="input"> - <?php $if6=(isset($templateid)); if($if6){?> + <?php $if6=(isset($templateid)); if($if6) { ?> <div class="clickable"> - <a target="_self" data-type="open" data-action="template" data-method="info" data-id="<?php echo $templateid ?>" data-extra="[]" href="./#/template/<?php echo $templateid ?>"> - <i class="image-icon image-icon--action-template"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> + <a target="_self" data-type="open" data-action="template" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$templateid)) ?>" data-extra="[]" href="/#/template/<?php echo encodeHtml(htmlentities(@$templateid)) ?>" class=""> + <i class="image-icon image-icon--action-template"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$template_name)) ?> + </span> </a> </div> - <?php } ?> - <?php if(!$if6){?> - <i class="image-icon image-icon--action-template"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> - <?php } ?> + <?php } ?> + <?php if(!$if6) { ?> + <i class="image-icon image-icon--action-template"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$template_name)) ?> + </span> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_mime_type" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'FILE_MIMETYPE'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_MIMETYPE'))) ?> + </span> </label> </div> <div class="input"> - <span class="filename"><?php echo nl2br(encodeHtml(htmlentities($mime_type))); ?></span> + <span class="filename"><?php echo encodeHtml(htmlentities(@$mime_type)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_objectid" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('id'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$objectid)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo false?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('prop_userinfo') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close closed show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_create_date" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_created'))) ?> + </span> </label> </div> <div class="input"> - <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($create_date) ?> - <br/> - <img src="./modules/cms-ui/themes/default/images/icon/user.png" /> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($create_user) ?> + <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" class=""> + </img> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date('var:create_date'); ?> + <?php } ?> + <br> + </br> + <img src="./modules/cms-ui/themes/default/images/icon/user.png" class=""> + </img> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user('var:create_user'); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_lastchange_date" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_lastchange'))) ?> + </span> </label> </div> <div class="input"> - <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> - <br/> - <img src="./modules/cms-ui/themes/default/images/icon/user.png" /> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($lastchange_user) ?> + <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" class=""> + </img> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date('var:lastchange_date'); ?> + <?php } ?> + <br> + </br> + <img src="./modules/cms-ui/themes/default/images/icon/user.png" class=""> + </img> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user('var:lastchange_user'); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_published_date" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_published')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_published'))) ?> + </span> </label> </div> <div class="input"> - <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($published_date) ?> - <br/> - <img src="./modules/cms-ui/themes/default/images/icon/user.png" /> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($published_user) ?> + <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" class=""> + </img> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date('var:published_date'); ?> + <?php } ?> + <br> + </br> + <img src="./modules/cms-ui/themes/default/images/icon/user.png" class=""> + </img> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user('var:published_user'); ?> + <?php } ?> </div> </div> </div></fieldset> - <div class="or-form-actionbar"></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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 @@ -11,7 +11,7 @@ <text key="type" /> </part> <part class="input"> - <text key="var:type" /> + <text key="${type}" /> </part> </part> <part class="line"> @@ -44,7 +44,7 @@ <list list="languages" extract="true"> - <group title="var:languagename"> + <group title="${languagename}"> <text label="name" var="name" /> <text label="description" var="description" /> @@ -52,7 +52,7 @@ <text label="alias" var="alias" /> <part class="clickable"> - <link class="or-link-btn" type="edit" action="page" subaction="name" var1="languageid" value1="var:languageid"> + <link class="or-link-btn" type="edit" action="page" subaction="name" var1="languageid" value1="${languageid}"> <text key="edit" /> </link> </part> @@ -60,7 +60,7 @@ </list> - <group title="message:additional_info" open="false"> + <group title="#{additional_info}" open="false"> <part class="line"> <part class="label"> @@ -91,7 +91,7 @@ <part class="input"> <if present="templateid"> <part class="clickable"> - <link action="template" id="var:templateid" type="open"> + <link action="template" id="${templateid}" type="open"> <image action="template"></image> <text var="template_name"></text> </link> diff --git a/modules/cms-ui/themes/default/html/views/page/name.php b/modules/cms-ui/themes/default/html/views/page/name.php @@ -1,26 +1,19 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="name" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form page" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="page" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="name" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="languageid" value="<?php echo $languageid ?>"/> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('name') ?></legend><div class="closable"> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('name') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" required="required" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label">?description?</span><span class="or-form-input"><div class="inputholder"><textarea class="description" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>" maxlength="255"><?php echo Text::encodeHtml($description) ?></textarea></div></span></label> + <form name="" target="_self" data-target="view" action="./" data-method="name" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form page"> + <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" class=""> + </input> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <label class="or-form-row or-form-input"><input name="name" disabled="" required="required" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input></label> + <label class="or-form-row or-form-checkbox"><textarea name="description" disabled="" maxlength="255" class="description"><?php echo encodeHtml(htmlentities(@$description)) ?> + </textarea></label> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('alias') ?></legend><div class="closable"> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('alias') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_alias_filename" name="<?php if ('') echo ''.'_' ?>alias_filename<?php if (false) echo '_disabled' ?>" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$alias_filename) ?>" /><?php if (false) { ?><input type="hidden" name="alias_filename" value="<?php $alias_filename ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label">?folder?</span><span class="or-form-input"><div class="inputholder"><select id="<?php echo REQUEST_ID ?>_alias_folderid" name="alias_folderid" title="" class=""<?php if (count($folders)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($folders,$alias_folderid,0,0) ?><?php if (count($folders)==0) { ?><input type="hidden" name="alias_folderid" value="" /><?php } ?><?php if (count($folders)==1) { ?><input type="hidden" name="alias_folderid" value="<?php echo array_keys($folders)[0] ?>" /><?php } ?> - </select></div></span></label> - <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'leave_link';$default = '0';$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> ?leave_link? </span></label> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <label class="or-form-row or-form-input"><input name="alias_filename" disabled="" type="text" maxlength="150" value="<?php echo encodeHtml(htmlentities(@$alias_filename)) ?>" class="filename"> + </input></label> + <label class="or-form-row or-form-input"><input name="alias_folderid" value="<?php echo encodeHtml(htmlentities(@$alias_folderid)) ?>" size="1" class=""> + </input></label> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="leave_link" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$leave_link)) ?>" class=""> + </input></label> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('global_save') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/name.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/name.tpl.src.xml @@ -1,10 +1,10 @@ <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 label="message:global_save"> + <form label="#{global_save}"> <hidden name="languageid" /> - <group title="message:name" open="true"> + <group title="#{name}" open="true"> <input label="name" name="name" maxlength="255" required="true" /> @@ -12,7 +12,7 @@ </group> - <group title="message:alias" open="true"> + <group title="#{alias}" open="true"> <input name="alias_filename" label="alias" class="filename" maxlength="150" /> diff --git a/modules/cms-ui/themes/default/html/views/page/preview.php b/modules/cms-ui/themes/default/html/views/page/preview.php @@ -1,16 +1,19 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="self" action="./" data-method="preview" data-action="page" data-id="<?php echo OR_ID ?>" method="GET" enctype="application/x-www-form-urlencoded" class="or-form page" data-async="false" data-autosave="true"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="page" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="preview" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_languageid" name="languageid" title="" class=""<?php if (count($languages)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($languages,$languageid,0,0) ?><?php if (count($languages)==0) { ?><input type="hidden" name="languageid" value="" /><?php } ?><?php if (count($languages)==1) { ?><input type="hidden" name="languageid" value="<?php echo array_keys($languages)[0] ?>" /><?php } ?> - </select></div> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_modelid" name="modelid" title="" class=""<?php if (count($models)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($models,$modelid,0,0) ?><?php if (count($models)==0) { ?><input type="hidden" name="modelid" value="" /><?php } ?><?php if (count($models)==1) { ?><input type="hidden" name="modelid" value="<?php echo array_keys($models)[0] ?>" /><?php } ?> - </select></div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('PREVIEW') ?></legend><div class="closable"> + <form name="" target="_self" data-target="self" action="./" data-method="preview" data-action="page" data-id="<?php echo OR_ID ?>" method="GET" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="1" class="or-form page"> + <input name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" size="1" class=""> + </input> + <input name="modelid" value="<?php echo encodeHtml(htmlentities(@$modelid)) ?>" size="1" class=""> + </input> + </form> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="toolbar-icon clickable"> - <a class="action" target="_self" data-url="<?php echo $preview_url ?>" data-type="popup" data-action="" data-method="preview" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <i class="image-icon image-icon--menu-open_in_new"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_open_in_new_window'.'')))); ?></span> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>" data-type="popup" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class="action"> + <i class="image-icon image-icon--menu-open_in_new"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('link_open_in_new_window'))) ?> + </span> </a> </div> - <iframe name="preview" src="<?php echo $preview_url ?>"></iframe> + <iframe name="preview" src="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>" class=""> + </iframe> </div></fieldset> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/preview.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/preview.tpl.src.xml @@ -2,26 +2,26 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <form action="page" method="GET" target="self" subaction="preview" autosave="true" cancel="false" > - <selectbox name="languageid" list="languages" default="var:languageid"> + <selectbox name="languageid" list="languages" default="${languageid}"> </selectbox> - <selectbox name="modelid" list="models" default="var:modelid"> + <selectbox name="modelid" list="models" default="${modelid}"> </selectbox> </form> - <group title="message:PREVIEW"> + <group title="#{PREVIEW}"> <part class="toolbar-icon clickable"> - <link type="popup" class="action" url="var:preview_url"> + <link type="popup" class="action" url="${preview_url}"> <image menu="open_in_new"></image> <text key="link_open_in_new_window"></text> </link> </part> - <insert url="var:preview_url" name="preview"></insert> + <insert url="${preview_url}" name="preview"></insert> </group> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/pub.php b/modules/cms-ui/themes/default/html/views/page/pub.php @@ -1,32 +1,23 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('security','nopublish')); if($if2){?> + <?php $if2=(config('security','nopublish')); if($if2) { ?> <div class="message warn"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NOPUBLISH_DESC'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOPUBLISH_DESC'))) ?> + </span> </div> - <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form page" data-async="true" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="page" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pub" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="1" data-autosave="" class="or-form page"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'files';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_files" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_files')))); ?></span> + <input type="checkbox" name="files" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$files)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_files'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/pub.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/pub.tpl.src.xml @@ -4,7 +4,7 @@ <!-- Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. --> - <if true="config:security/nopublish"> + <if true="%{security/nopublish}"> <part class="message warn"> <text key="GLOBAL_NOPUBLISH_DESC" class="help"></text> </part> @@ -13,7 +13,7 @@ <form async="true"> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> diff --git a/modules/cms-ui/themes/default/html/views/page/remove.php b/modules/cms-ui/themes/default/html/views/page/remove.php @@ -1,17 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form page" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="page" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('GLOBAL_NAME') ?></span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> - <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'delete';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> ?GLOBAL_DELETE? </span></label> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form page"> + <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span></span></label> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + </input></label> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/show.php b/modules/cms-ui/themes/default/html/views/page/show.php @@ -1 +1,2 @@ -<?php if (!defined('OR_TITLE')) die('Forbidden'); ?><?php echo $output; ?>- \ No newline at end of file +<?php if (!defined('OR_TITLE')) die('Forbidden'); ?> +<?php echo @$output ?>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/src.php b/modules/cms-ui/themes/default/html/views/page/src.php @@ -1,10 +1,11 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="self" action="./" data-method="src" data-action="page" data-id="<?php echo OR_ID ?>" method="GET" enctype="application/x-www-form-urlencoded" class="or-form page" data-async="false" data-autosave="true"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="page" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="src" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_languageid" name="languageid" title="" class=""<?php if (count($languages)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($languages,$languageid,0,0) ?><?php if (count($languages)==0) { ?><input type="hidden" name="languageid" value="" /><?php } ?><?php if (count($languages)==1) { ?><input type="hidden" name="languageid" value="<?php echo array_keys($languages)[0] ?>" /><?php } ?> - </select></div> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_modelid" name="modelid" title="" class=""<?php if (count($models)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($models,$modelid,0,0) ?><?php if (count($models)==0) { ?><input type="hidden" name="modelid" value="" /><?php } ?><?php if (count($models)==1) { ?><input type="hidden" name="modelid" value="<?php echo array_keys($models)[0] ?>" /><?php } ?> - </select></div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('SOURCE') ?></legend><div class="closable"> - <textarea name="<?php if ('') echo ''.'_' ?>src<?php if (true) echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="html" class="editor code-editor"><?php echo htmlentities(${'src'}) ?></textarea> + <form name="" target="_self" data-target="self" action="./" data-method="src" data-action="page" data-id="<?php echo OR_ID ?>" method="GET" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="1" class="or-form page"> + <input name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" size="1" class=""> + </input> + <input name="modelid" value="<?php echo encodeHtml(htmlentities(@$modelid)) ?>" size="1" class=""> + </input> + </form> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <textarea name="src" data-extension="" data-mimetype="" data-mode="html" class="editor code-editor"> + </textarea> </div></fieldset> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/src.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/src.tpl.src.xml @@ -2,17 +2,17 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <form action="page" method="GET" target="self" subaction="src" autosave="true" cancel="false" > - <selectbox name="languageid" list="languages" default="var:languageid"> + <selectbox name="languageid" list="languages" default="${languageid}"> </selectbox> - <selectbox name="modelid" list="models" default="var:modelid"> + <selectbox name="modelid" list="models" default="${modelid}"> </selectbox> </form> - <group title="message:SOURCE"> + <group title="#{SOURCE}"> <editor type="code" mode="html" name="src" readonly="true" /> </group> diff --git a/modules/cms-ui/themes/default/html/views/page/structure.php b/modules/cms-ui/themes/default/html/views/page/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/structure.tpl.src.xml @@ -1,7 +1,7 @@ <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"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/advanced.php b/modules/cms-ui/themes/default/html/views/pageelement/advanced.php @@ -1,35 +1,41 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'language'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('language'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'value'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('value'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'editor'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('editor'))) ?> + </span> </th> </tr> - <?php foreach($languages as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($languages as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($languagename))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$languagename)) ?> + </span> </td> <td class="clickable"> - <a target="_self" data-type="edit" data-action="pageelement" data-method="value" data-id="<?php echo OR_ID ?>" data-extra="{'languageid':'<?php echo $languageid ?>'}" href="./#/pageelement/"> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $value,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <a target="_self" data-type="edit" data-action="pageelement" data-method="value" data-id="" data-extra="{'languageid':'<?php echo encodeHtml(htmlentities(@$languageid)) ?>'}" href="/#/pageelement/" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$value)) ?> + </span> </a> </td> - <td> - <?php foreach($editors as $id=>$name){ ?> + <td class=""> + <?php foreach($editors as $id=>$name) { ?> <div class="clickable"> - <a target="_self" data-type="edit" data-action="pageelement" data-method="value" data-id="<?php echo OR_ID ?>" data-extra="{'languageid':'<?php echo $languageid ?>','format':'<?php echo $id ?>'}" href="./#/pageelement/"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <a target="_self" data-type="edit" data-action="pageelement" data-method="value" data-id="" data-extra="{'languageid':'<?php echo encodeHtml(htmlentities(@$languageid)) ?>','format':'<?php echo encodeHtml(htmlentities(@$id)) ?>'}" href="/#/pageelement/" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </div> - <?php } ?> + <?php } ?> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/advanced.tpl.src.xml b/modules/cms-ui/themes/default/html/views/pageelement/advanced.tpl.src.xml @@ -20,14 +20,14 @@ <text var="languagename" /> </column> <column class="clickable"> - <link subaction="value" var1="languageid" value1="var:languageid" type="edit" action="pageelement"> + <link subaction="value" var1="languageid" value1="${languageid}" type="edit" action="pageelement"> <text var="value" maxlength="30" escape="true" /> </link> </column> <column> <list list="editors" key="id" value="name"> <part class="clickable"> - <link type="edit" action="pageelement" subaction="value" var1="languageid" value1="var:languageid" var2="format" value2="var:id"> + <link type="edit" action="pageelement" subaction="value" var1="languageid" value1="${languageid}" var2="format" value2="${id}"> <text var="name" /> </link> </part> diff --git a/modules/cms-ui/themes/default/html/views/pageelement/diff.php b/modules/cms-ui/themes/default/html/views/pageelement/diff.php @@ -1,59 +1,69 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <tr> - <td> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <tr class=""> + <td class=""> </td> - <td> - <em><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_COMPARE')))); ?></em> - <span><?php echo nl2br(' '); ?></span> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date_left) ?> + <td class=""> + <em class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_COMPARE'))) ?> + </em> + <span class=""> + </span> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($date_left); ?> + <?php } ?> </td> - <td> + <td class=""> </td> - <td> - <em><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_WITH')))); ?></em> - <span><?php echo nl2br(' '); ?></span> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date_right) ?> + <td class=""> + <em class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_WITH'))) ?> + </em> + <span class=""> + </span> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($date_right); ?> + <?php } ?> </td> </tr> - <tr> - <td colspan="4"> + <tr class=""> + <td colspan="4" class=""> </td> </tr> - <?php foreach($diff as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($diff as $list_key=>$list_value) { extract($list_value); ?> <tr class="diff"> - <?php $if5=(isset($left)); if($if5){?> + <?php $if5=(isset($left)); if($if5) { ?> <td width="5%" class="line"> - <tt><?php echo nl2br(encodeHtml(htmlentities(@$left[line]))); ?></tt> + <tt class=""><?php echo encodeHtml(htmlentities(@$left['line'])) ?> + </tt> </td> - <td width="45%" class="<?php echo @$left[type] ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities(@$left[text]))); ?></span> + <td width="45%" class="<?php echo encodeHtml(htmlentities(@$left['type'])) ?>"> + <span class=""><?php echo encodeHtml(htmlentities(@$left['text'])) ?> + </span> </td> - <?php } ?> - <?php if(!$if5){?> + <?php } ?> + <?php if(!$if5) { ?> <td width="50%" colspan="2" class="help"> - <span><?php echo nl2br(' '); ?></span> + <span class=""> + </span> </td> - <?php } ?> - <?php $if5=(isset($right)); if($if5){?> + <?php } ?> + <?php $if5=(isset($right)); if($if5) { ?> <td width="5%" class="line"> - <tt><?php echo nl2br(encodeHtml(htmlentities(@$right[line]))); ?></tt> + <tt class=""><?php echo encodeHtml(htmlentities(@$right['line'])) ?> + </tt> </td> - <td width="45%" class="<?php echo @$right[type] ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities(@$right[text]))); ?></span> + <td width="45%" class="<?php echo encodeHtml(htmlentities(@$right['type'])) ?>"> + <span class=""><?php echo encodeHtml(htmlentities(@$right['text'])) ?> + </span> </td> - <?php } ?> - <?php if(!$if5){?> + <?php } ?> + <?php if(!$if5) { ?> <td width="50%" colspan="2" class="help"> - <span><?php echo nl2br(' '); ?></span> + <span class=""> + </span> </td> - <?php } ?> + <?php } ?> </tr> - <?php unset($left) ?> - <?php unset($right) ?> - <?php } ?> - </table></div></div> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?BUTTON_BACK_DESC?" - value=" ?BUTTON_BACK? " /> - </div>- \ No newline at end of file + <?php { unset($left) ?> + <?php } ?> + <?php { unset($right) ?> + <?php } ?> + <?php } ?> + </table></div></div>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/diff.tpl.src.xml b/modules/cms-ui/themes/default/html/views/pageelement/diff.tpl.src.xml @@ -6,13 +6,13 @@ <column> <text type="emphatic" text="GLOBAL_COMPARE"></text> <text raw="_"></text> - <date date="var:date_left"></date> + <date date="${date_left}"></date> </column> <column></column> <column> <text type="emphatic" text="GLOBAL_WITH"></text> <text raw="_"></text> - <date date="var:date_right"></date> + <date date="${date_right}"></date> </column> </row> <row> @@ -22,19 +22,19 @@ <row class="diff"> <if present="left"> <column width="5%" class="line"> - <text value="arrayvar:left:line" type="tt"></text> + <text value="${left.line}" type="tt"></text> </column> - <column width="45%" class="arrayvar:left:type"> - <text value="arrayvar:left:text"></text> + <column width="45%" class="${left.type}"> + <text value="${left.text}"></text> </column> </if> <else><column colspan="2" class="help" width="50%"><text raw="_"></text></column></else> <if present="right"> <column width="5%" class="line"> - <text value="arrayvar:right:line" type="tt"></text> + <text value="${right.line}" type="tt"></text> </column> - <column width="45%" class="arrayvar:right:type"> - <text value="arrayvar:right:text"></text> + <column width="45%" class="${right.type}"> + <text value="${right.text}"></text> </column> </if> <else><column colspan="2" class="help" width="50%"><text raw="_"></text></column></else> diff --git a/modules/cms-ui/themes/default/html/views/pageelement/edit.php b/modules/cms-ui/themes/default/html/views/pageelement/edit.php @@ -1,23 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'language'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('language'))) ?> + </span> </th> - <th> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'value'.'')))); ?></span> + <th class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('value'))) ?> + </span> </th> </tr> - <?php foreach($languages as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($languages as $list_key=>$list_value) { extract($list_value); ?> <tr class="data clickable"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($languagename))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$languagename)) ?> + </span> </td> - <td title="<?php echo $value ?>"> - <a target="_self" data-type="edit" data-action="pageelement" data-method="value" data-id="<?php echo OR_ID ?>" data-extra="{'languageid':'<?php echo $languageid ?>'}" href="./#/pageelement/"> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $value,120,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td title="<?php echo encodeHtml(htmlentities(@$value)) ?>" class=""> + <a target="_self" data-type="edit" data-action="pageelement" data-method="value" data-id="" data-extra="{'languageid':'<?php echo encodeHtml(htmlentities(@$languageid)) ?>'}" href="/#/pageelement/" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$value)) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/pageelement/edit.tpl.src.xml @@ -16,8 +16,8 @@ <column> <text var="languagename" /> </column> - <column title="var:value"> - <link subaction="value" var1="languageid" value1="var:languageid" type="edit" action="pageelement"> + <column title="${value}"> + <link subaction="value" var1="languageid" value1="${languageid}" type="edit" action="pageelement"> <text var="value" maxlength="120" escape="true" /> </link> </column> 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,17 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="export" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form pageelement" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="pageelement" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="export" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_type" name="type" title="" class=""<?php if (count($types)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($types,$type,0,0) ?><?php if (count($types)==0) { ?><input type="hidden" name="type" value="" /><?php } ?><?php if (count($types)==1) { ?><input type="hidden" name="type" value="<?php echo array_keys($types)[0] ?>" /><?php } ?> - </select></div> + <form name="" target="_self" data-target="view" action="./" data-method="export" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form pageelement"> + <tr class=""> + <td class=""> + <input name="type" value="<?php echo encodeHtml(htmlentities(@$type)) ?>" size="1" class=""> + </input> </td> </tr> - <tr> - <td> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> + <tr class=""> + <td class=""> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/history.php b/modules/cms-ui/themes/default/html/views/pageelement/history.php @@ -1,109 +1,131 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="diff" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="get" enctype="application/x-www-form-urlencoded" class="or-form pageelement" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="pageelement" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="diff" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <form name="" target="_self" data-target="view" action="./" data-method="diff" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="get" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form pageelement"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NR')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NR'))) ?> + </span> </td> <td colspan="2" class="help"> - <?php $if6=(isset($compareid)); if($if6){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_COMPARE')))); ?></span> - <?php } ?> - <?php if(!$if6){?> - <span><?php echo nl2br(' '); ?></span> - <?php } ?> + <?php $if6=(isset($compareid)); if($if6) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_COMPARE'))) ?> + </span> + <?php } ?> + <?php if(!$if6) { ?> + <span class=""> + </span> + <?php } ?> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('DATE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('DATE'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_USER')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_USER'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_VALUE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_VALUE'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_STATE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_STATE'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_ACTION')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_ACTION'))) ?> + </span> </td> </tr> - <?php $if4=(($el)==FALSE); if($if4){?> - <tr> - <td colspan="8"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <?php $if4=(($el)==FALSE); if($if4) { ?> + <tr class=""> + <td colspan="8" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php } ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($lfd_nr))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$lfd_nr)) ?> + </span> </td> - <td> - <?php $if7=(isset($compareid)); if($if7){?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_compareid_<?php echo $id ?>" name="<?php if ('') echo ''.'_' ?>compareid<?php if (false) echo '_disabled' ?>" value="<?php echo $id ?>"<?php if($id==@$compareid)echo ' checked="checked"' ?> /> - <?php } ?> - <?php if(!$if7){?> - <span><?php echo nl2br(' '); ?></span> - <?php } ?> + <td class=""> + <?php $if7=(isset($compareid)); if($if7) { ?> + <input type="radio" name="compareid" disabled="" value="<?php echo encodeHtml(htmlentities(@$id)) ?>" checked="<?php echo encodeHtml(htmlentities(@$compareid)) ?>" class=""> + </input> + <?php } ?> + <?php if(!$if7) { ?> + <span class=""> + </span> + <?php } ?> </td> - <td> - <?php $if7=(isset($compareid)); if($if7){?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_withid_<?php echo $id ?>" name="<?php if ('') echo ''.'_' ?>withid<?php if (false) echo '_disabled' ?>" value="<?php echo $id ?>"<?php if($id==@$withid)echo ' checked="checked"' ?> /> - <?php } ?> - <?php if(!$if7){?> - <span><?php echo nl2br(' '); ?></span> - <?php } ?> + <td class=""> + <?php $if7=(isset($compareid)); if($if7) { ?> + <input type="radio" name="withid" disabled="" value="<?php echo encodeHtml(htmlentities(@$id)) ?>" checked="<?php echo encodeHtml(htmlentities(@$withid)) ?>" class=""> + </input> + <?php } ?> + <?php if(!$if7) { ?> + <span class=""> + </span> + <?php } ?> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($date); ?> + <?php } ?> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($user))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$user)) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($value))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$value)) ?> + </span> </td> - <?php $if6=($public); if($if6){?> - <td> - <strong><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_PUBLIC'.'')))); ?></strong> + <?php $if6=($public); if($if6) { ?> + <td class=""> + <strong class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_PUBLIC'))) ?> + </strong> </td> - <?php } ?> - <?php if(!$if6){?> - <?php $if7=(isset($releaseUrl)); if($if7){?> + <?php } ?> + <?php if(!$if6) { ?> + <?php $if7=(isset($releaseUrl)); if($if7) { ?> <td class="clickable"> - <a title="<?php echo lang('GLOBAL_RELEASE_DESC') ?>" target="_self" data-type="post" data-action="" data-method="release" data-id="<?php echo $objectid ?>" data-extra="{'valueid':'<?php echo $valueid ?>'}" data-data="{"action":"pageelement","subaction":"release","id":"<?php echo $objectid ?>","token":"<?php echo token() ?>","valueid":"<?php echo $valueid ?>","none":"0"}"> - <strong><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_RELEASE'.'')))); ?></strong> + <a title="<?php echo encodeHtml(htmlentities(@lang('GLOBAL_RELEASE_DESC'))) ?>" target="_self" data-type="post" data-action="" data-method="release" data-id="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" data-extra="{'valueid':'<?php echo encodeHtml(htmlentities(@$valueid)) ?>'}" data-data="{"action":"pageelement","subaction":"release","id":"<?php echo encodeHtml(htmlentities(@$objectid)) ?>",\"token":"<?php echo token() ?>","valueid":"<?php echo encodeHtml(htmlentities(@$valueid)) ?>","none":"0"}"" class=""> + <strong class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_RELEASE'))) ?> + </strong> </a> </td> - <?php } ?> - <?php if(!$if7){?> - <td> - <em><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_INACTIVE'.'')))); ?></em> + <?php } ?> + <?php if(!$if7) { ?> + <td class=""> + <em class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_INACTIVE'))) ?> + </em> </td> - <?php } ?> - <?php } ?> - <?php $if6=($active); if($if6){?> - <td> - <em><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_ACTIVE'.'')))); ?></em> + <?php } ?> + <?php } ?> + <?php $if6=($active); if($if6) { ?> + <td class=""> + <em class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_ACTIVE'))) ?> + </em> </td> - <?php } ?> - <?php if(!$if6){?> - <?php $if7=(isset($useUrl)); if($if7){?> + <?php } ?> + <?php if(!$if6) { ?> + <?php $if7=(isset($useUrl)); if($if7) { ?> <td class="clickable"> - <a title="<?php echo lang('GLOBAL_USE_DESC') ?>" target="_self" data-type="post" data-action="" data-method="use" data-id="<?php echo $objectid ?>" data-extra="{'valueid':'<?php echo $valueid ?>'}" data-data="{"action":"pageelement","subaction":"use","id":"<?php echo $objectid ?>","token":"<?php echo token() ?>","valueid":"<?php echo $valueid ?>","none":"0"}"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_USE'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('GLOBAL_USE_DESC'))) ?>" target="_self" data-type="post" data-action="" data-method="use" data-id="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" data-extra="{'valueid':'<?php echo encodeHtml(htmlentities(@$valueid)) ?>'}" data-data="{"action":"pageelement","subaction":"use","id":"<?php echo encodeHtml(htmlentities(@$objectid)) ?>",\"token":"<?php echo token() ?>","valueid":"<?php echo encodeHtml(htmlentities(@$valueid)) ?>","none":"0"}"" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_USE'))) ?> + </span> </a> </td> - <?php } ?> - <?php if(!$if7){?> - <td> + <?php } ?> + <?php if(!$if7) { ?> + <td class=""> </td> - <?php } ?> - <?php } ?> + <?php } ?> + <?php } ?> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('compare') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/history.tpl.src.xml b/modules/cms-ui/themes/default/html/views/pageelement/history.tpl.src.xml @@ -1,6 +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"> - <form method="get" subaction="diff" label="message:compare" + <form method="get" subaction="diff" label="#{compare}" cancel="false" visible="true"> <table widths="5%,5%,5%,15%,15%,35%,10%,10%"> <row class="headline"> @@ -45,7 +45,7 @@ </column> <column> <if present="compareid"> - <radio name="compareid" value="var:id"></radio> + <radio name="compareid" value="${id}"></radio> </if> <else> <text raw="_" /> @@ -53,14 +53,14 @@ </column> <column> <if present="compareid"> - <radio name="withid" value="var:id"></radio> + <radio name="withid" value="${id}"></radio> </if> <else> <text raw="_" /> </else> </column> <column> - <date date="var:date"></date> + <date date="${date}"></date> </column> <column> <text var="user"></text> @@ -68,7 +68,7 @@ <column> <text var="value"></text> </column> - <if true="var:public"> + <if true="${public}"> <column> <text key="GLOBAL_PUBLIC" type="strong"></text> </column> @@ -77,7 +77,7 @@ <if present="releaseUrl"> <column class="clickable"> <link type="post" subaction="release" var1="valueid" - value1="var:valueid" id="var:objectid" title="message:GLOBAL_RELEASE_DESC"> + value1="${valueid}" id="${objectid}" title="#{GLOBAL_RELEASE_DESC}"> <text key="GLOBAL_RELEASE" type="strong"></text> </link> </column> @@ -88,7 +88,7 @@ </column> </else> </else> - <if true="var:active"> + <if true="${active}"> <column> <text key="GLOBAL_ACTIVE" type="emphatic"></text> </column> @@ -96,8 +96,8 @@ <else> <if present="useUrl"> <column class="clickable"> - <link type="post" subaction="use" var1="valueid" value1="var:valueid" - id="var:objectid" title="message:GLOBAL_USE_DESC"> + <link type="post" subaction="use" var1="valueid" value1="${valueid}" + id="${objectid}" title="#{GLOBAL_USE_DESC}"> <text key="GLOBAL_USE"></text> </link> </column> 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,22 +1,19 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="import" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form pageelement" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="pageelement" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="import" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_type" name="type" title="" class=""<?php if (count($types)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($types,$type,0,0) ?><?php if (count($types)==0) { ?><input type="hidden" name="type" value="" /><?php } ?><?php if (count($types)==1) { ?><input type="hidden" name="type" value="<?php echo array_keys($types)[0] ?>" /><?php } ?> - </select></div> + <form name="" target="_self" data-target="view" action="./" data-method="import" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form pageelement"> + <tr class=""> + <td class=""> + <input name="type" value="<?php echo encodeHtml(htmlentities(@$type)) ?>" size="1" class=""> + </input> </td> </tr> - <tr> - <td> - <input size="40" id="req0_file" type="file" name="file" class="upload" /> + <tr class=""> + <td class=""> + <input id="req0_file" name="file" size="40" class="upload"> + </input> </td> </tr> - <tr> - <td> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> + <tr class=""> + <td class=""> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/info.php b/modules/cms-ui/themes/default/html/views/pageelement/info.php @@ -1,79 +1,103 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('name')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> <td class="name"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </td> </tr> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('description')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('description'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$description)) ?> + </span> </td> </tr> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('type')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + </span> </td> <td class="filename"> - <i class="image-icon image-icon--action-el_<?php echo $element_type ?>"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'el_'.$element_type.''.'')))); ?></span> + <i class="image-icon image-icon--action-el_<?php echo encodeHtml(htmlentities(@$element_type)) ?>"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('el_${element_type'))) ?>} + </span> </td> </tr> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'template'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('template'))) ?> + </span> </td> <td class="clickable"> - <a target="_self" data-type="open" data-action="template" data-method="info" data-id="<?php echo $template_id ?>" data-extra="[]" href="./#/template/<?php echo $template_id ?>"> - <i class="image-icon image-icon--action-template"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> + <a target="_self" data-type="open" data-action="template" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$template_id)) ?>" data-extra="[]" href="/#/template/<?php echo encodeHtml(htmlentities(@$template_id)) ?>" class=""> + <i class="image-icon image-icon--action-template"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$template_name)) ?> + </span> </a> </td> </tr> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'element'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('element'))) ?> + </span> </td> <td class="clickable"> - <a target="_self" date-name="<?php echo $element_name ?>" name="<?php echo $element_name ?>" data-action="element" data-method="info" data-id="<?php echo $element_id ?>" data-extra="[]" href="./#/element/<?php echo $element_id ?>"> - <i class="image-icon image-icon--action-el_<?php echo $element_type ?>"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($element_name))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$element_name)) ?>" name="<?php echo encodeHtml(htmlentities(@$element_name)) ?>" data-action="element" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$element_id)) ?>" data-extra="[]" href="/#/element/<?php echo encodeHtml(htmlentities(@$element_id)) ?>" class=""> + <i class="image-icon image-icon--action-el_<?php echo encodeHtml(htmlentities(@$element_type)) ?>"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$element_name)) ?> + </span> </a> </td> </tr> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'format'.'')))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'element'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('format'))) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('element'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($element_format))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$element_format)) ?> + </span> </td> </tr> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'format'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('format'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($format))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$format)) ?> + </span> </td> </tr> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('lastchange')))); ?></span> - </td> - <td> - <i class="image-icon image-icon--action-el_date"></i> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> - <span><?php echo nl2br(', '); ?></span> - <i class="image-icon image-icon--action-user"></i> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($lastchange_user) ?> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('lastchange'))) ?> + </span> + </td> + <td class=""> + <i class="image-icon image-icon--action-el_date"> + </i> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php } ?> + <span class="">, + </span> + <i class="image-icon image-icon--action-user"> + </i> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($lastchange_user); ?> + <?php } ?> </td> </tr> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/pageelement/info.tpl.src.xml @@ -22,8 +22,8 @@ <text text="type"></text> </column> <column class="filename"> - <image elementtype="var:element_type"></image> - <text key="tpl:el_{element_type}"></text> + <image elementtype="${element_type}"></image> + <text key="el_${element_type}"></text> </column> </row> <row class="data"> @@ -31,7 +31,7 @@ <text key="template"></text> </column> <column class="clickable"> - <link type="open" action="template" id="var:template_id"> + <link type="open" action="template" id="${template_id}"> <image action="template"></image> <text var="template_name"></text> </link> @@ -42,8 +42,8 @@ <text key="element"></text> </column> <column class="clickable"> - <link id="var:element_id" name="var:element_name" action="element"> - <image elementtype="var:element_type"></image> + <link id="${element_id}" name="${element_name}" action="element"> + <image elementtype="${element_type}"></image> <text var="element_name"></text> </link> </column> @@ -71,10 +71,10 @@ </column> <column> <image elementtype="date"></image> - <date date="var:lastchange_date"></date> + <date date="${lastchange_date}"></date> <text raw=", "></text> <image action="user"></image> - <user user="var:lastchange_user"></user> + <user user="${lastchange_user}"></user> </column> </row> </table> 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,78 +1,57 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="link" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form pageelement" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="pageelement" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="link" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> + <form name="" target="_self" data-target="view" action="./" data-method="link" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form pageelement"> + <tr class=""> <td colspan="2" class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities($desc))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$desc)) ?> + </span> </td> </tr> - <tr> - <td colspan="2"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_linkobjectid" name="linkobjectid" title="" class=""<?php if (count($objects)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($objects,$linkobjectid,0,0) ?><?php if (count($objects)==0) { ?><input type="hidden" name="linkobjectid" value="" /><?php } ?><?php if (count($objects)==1) { ?><input type="hidden" name="linkobjectid" value="<?php echo array_keys($objects)[0] ?>" /><?php } ?> - </select></div> + <tr class=""> + <td colspan="2" class=""> + <input name="linkobjectid" value="<?php echo encodeHtml(htmlentities(@$linkobjectid)) ?>" size="1" class=""> + </input> </td> </tr> - <?php $if5=(isset($release)); if($if5){?> - <?php $if6=(isset($publish)); if($if6){?> - <tr> - <td colspan="2"> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <?php $if5=(isset($release)); if($if5) { ?> + <?php $if6=(isset($publish)); if($if6) { ?> + <tr class=""> + <td colspan="2" class=""> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> </td> </tr> - <?php } ?> - <?php } ?> - <?php $if5=(isset($release)); if($if5){?> - <tr> - <td colspan="2"> - <?php { $tmpname = 'release';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_release" class="label"> - <span><?php echo nl2br(' '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_RELEASE')))); ?></span> + <?php } ?> + <?php } ?> + <?php $if5=(isset($release)); if($if5) { ?> + <tr class=""> + <td colspan="2" class=""> + <input type="checkbox" name="release" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$release)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_RELEASE'))) ?> + </span> </label> </td> </tr> - <?php } ?> - <?php $if5=(isset($publish)); if($if5){?> - <tr> - <td colspan="2"> - <?php { $tmpname = 'publish';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_publish" class="label"> - <span><?php echo nl2br(' '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_PUBLISH_AFTER_SAVE')))); ?></span> + <?php } ?> + <?php $if5=(isset($publish)); if($if5) { ?> + <tr class=""> + <td colspan="2" class=""> + <input type="checkbox" name="publish" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$publish)) ?>" class=""> + </input> + <label class="label"> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('PAGE_PUBLISH_AFTER_SAVE'))) ?> + </span> </label> </td> </tr> - <?php } ?> - <tr> + <?php } ?> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ 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,3 @@ <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 var="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 raw="_"></text><text text="GLOBAL_RELEASE"></text></label></column></row></if><if present="publish"><row><column colspan="2"><checkbox name="publish"></checkbox><label for="publish"><text raw="_"></text><text text="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 + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"><dummy><form><window name="element"><row><column colspan="2" class="help"><text var="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="#{options}"></group></column></row></if></if><if present="release"><row><column colspan="2"><checkbox name="release"></checkbox><label for="release"><text raw="_"></text><text text="GLOBAL_RELEASE"></text></label></column></row></if><if present="publish"><row><column colspan="2"><checkbox name="publish"></checkbox><label for="publish"><text raw="_"></text><text text="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 diff --git a/modules/cms-ui/themes/default/html/views/pageelement/preview.php b/modules/cms-ui/themes/default/html/views/pageelement/preview.php @@ -1,6 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="preview"> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('page_preview') ?></legend><div class="closable"> - <span><?php echo nl2br($preview); ?></span> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <span class=""><?php echo @$preview ?> + </span> </div></fieldset> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/preview.tpl.src.xml b/modules/cms-ui/themes/default/html/views/pageelement/preview.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <part class="preview"> - <group title="message:page_preview"> + <group title="#{page_preview}"> <text var="preview" escape="false"></text> </group> </part> diff --git a/modules/cms-ui/themes/default/html/views/pageelement/prop.php b/modules/cms-ui/themes/default/html/views/pageelement/prop.php @@ -1,95 +1,117 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form pageelement" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="pageelement" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('name')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form pageelement"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> <td class="name"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </td> </tr> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('description')))); ?></span> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('description'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$description)) ?> + </span> </td> </tr> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('type')))); ?></span> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + </span> </td> <td class="filename"> - <i class="image-icon image-icon--action-el_<?php echo $element_type ?>"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'el_'.$element_type.''.'')))); ?></span> + <i class="image-icon image-icon--action-el_<?php echo encodeHtml(htmlentities(@$element_type)) ?>"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('el_${element_type'))) ?>} + </span> </td> </tr> - <tr> - <td colspan="2"> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('additional_info') ?></legend><div class="closable"> + <tr class=""> + <td colspan="2" class=""> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> </td> </tr> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'template'.'')))); ?></span> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('template'))) ?> + </span> </td> - <td> - <?php $if6=(isset($template_url)); if($if6){?> - <a target="_self" data-url="<?php echo $template_url ?>" data-action="" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <img src="./modules/cms-ui/themes/default/images/icon/icon_template.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> + <td class=""> + <?php $if6=(isset($template_url)); if($if6) { ?> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$template_url)) ?>" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class=""> + <img src="./modules/cms-ui/themes/default/images/icon/icon_template.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$template_name)) ?> + </span> </a> - <?php } ?> - <?php $if6=(($template_url)==FALSE); if($if6){?> - <img src="./modules/cms-ui/themes/default/images/icon/icon_template.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> - <?php } ?> + <?php } ?> + <?php $if6=(($template_url)==FALSE); if($if6) { ?> + <img src="./modules/cms-ui/themes/default/images/icon/icon_template.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$template_name)) ?> + </span> + <?php } ?> </td> </tr> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'element'.'')))); ?></span> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('element'))) ?> + </span> </td> - <td> - <?php $if6=(isset($element_url)); if($if6){?> - <a target="_self" data-url="<?php echo $element_url ?>" data-action="" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <i class="image-icon image-icon--action-el_<?php echo $element_type ?>"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($element_name))); ?></span> + <td class=""> + <?php $if6=(isset($element_url)); if($if6) { ?> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$element_url)) ?>" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class=""> + <i class="image-icon image-icon--action-el_<?php echo encodeHtml(htmlentities(@$element_type)) ?>"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$element_name)) ?> + </span> </a> - <?php } ?> - <?php $if6=(($element_url)==FALSE); if($if6){?> - <img src="./modules/cms-ui/themes/default/images/icon/element.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($element_name))); ?></span> - <?php } ?> + <?php } ?> + <?php $if6=(($element_url)==FALSE); if($if6) { ?> + <img src="./modules/cms-ui/themes/default/images/icon/element.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$element_name)) ?> + </span> + <?php } ?> </td> </tr> - <tr> - <td colspan="2"> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('prop_userinfo') ?></legend><div class="closable"> + <tr class=""> + <td colspan="2" class=""> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> </td> </tr> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('lastchange')))); ?></span> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('lastchange'))) ?> + </span> </td> - <td> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <tr> - <td> - <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> + <td class=""> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <tr class=""> + <td class=""> + <img src="./modules/cms-ui/themes/default/images/icon/el_date.png" class=""> + </img> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php } ?> </td> - <td> - <img src="./modules/cms-ui/themes/default/images/icon/user.png" /> - <?php include_once( 'modules/template-engine/components/html/user/component-user.php') ?><?php component_user($lastchange_user) ?> + <td class=""> + <img src="./modules/cms-ui/themes/default/images/icon/user.png" class=""> + </img> + <?php include_once( 'modules/template-engine/components/html/user/component-user.php'); { component_user($lastchange_user); ?> + <?php } ?> </td> </tr> </table></div></div> </td> </tr> </table></div></div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/pageelement/prop.tpl.src.xml @@ -23,13 +23,13 @@ <text text="type"></text> </column> <column class="filename"> - <image elementtype="var:element_type"></image> - <text key="tpl:el_{element_type}"></text> + <image elementtype="${element_type}"></image> + <text key="el_${element_type}"></text> </column> </row> <row> <column colspan="2"> - <group title="message:additional_info"></group> + <group title="#{additional_info}"></group> </column> </row> <row> @@ -38,7 +38,7 @@ </column> <column> <if present="template_url"> - <link url="var:template_url" target="cms_main_main"> + <link url="${template_url}" target="cms_main_main"> <image file="icon_template"></image> <text var="template_name"></text> </link> @@ -55,8 +55,8 @@ </column> <column> <if present="element_url"> - <link url="var:element_url" target="cms_main_main"> - <image elementtype="var:element_type"></image> + <link url="${element_url}" target="cms_main_main"> + <image elementtype="${element_type}"></image> <text var="element_name"></text> </link> </if> @@ -68,7 +68,7 @@ </row> <row> <column colspan="2"> - <group title="message:prop_userinfo"></group> + <group title="#{prop_userinfo}"></group> </column> </row> <row> @@ -80,11 +80,11 @@ <row> <column> <image icon="el_date"></image> - <date date="var:lastchange_date"></date> + <date date="${lastchange_date}"></date> </column> <column> <image icon="user"></image> - <user user="var:lastchange_user"></user> + <user user="${lastchange_user}"></user> </column> </row> </table> diff --git a/modules/cms-ui/themes/default/html/views/pageelement/pub.php b/modules/cms-ui/themes/default/html/views/pageelement/pub.php @@ -1,32 +1,23 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('security','nopublish')); if($if2){?> + <?php $if2=(config('security','nopublish')); if($if2) { ?> <div class="message warn"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NOPUBLISH_DESC'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOPUBLISH_DESC'))) ?> + </span> </div> - <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form pageelement" data-async="true" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="pageelement" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pub" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="1" data-autosave="" class="or-form pageelement"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'files';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_files" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_files')))); ?></span> + <input type="checkbox" name="files" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$files)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_files'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/pub.tpl.src.xml b/modules/cms-ui/themes/default/html/views/pageelement/pub.tpl.src.xml @@ -4,7 +4,7 @@ <!-- Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. --> - <if true="config:security/nopublish"> + <if true="%{security/nopublish}"> <part class="message warn"> <text key="GLOBAL_NOPUBLISH_DESC" class="help"></text> </part> @@ -13,7 +13,7 @@ <form async="true"> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> diff --git a/modules/cms-ui/themes/default/html/views/pageelement/structure.php b/modules/cms-ui/themes/default/html/views/pageelement/structure.php @@ -1,6 +1,5 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(isset($text)); if($if2){?> + <?php $if2=(isset($text)); if($if2) { ?> <div class="structure"> - <?php $doc = new DocumentElement();$tmp_text = $text;if( !is_array($tmp_text))$tmp_text = explode("\n",$tmp_text);$doc->parse($tmp_text);echo $doc->render('application/html-dom');?> </div> - <?php } ?>- \ No newline at end of file + <?php } ?>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/pageelement/structure.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <if present="text"> <part class="structure"> - <editor type="dom" name="text"></editor> + <!--<editor type="dom" name="text"></editor>--> </part> </if> </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 @@ -1,241 +1,261 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form pageelement" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="pageelement" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="value" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="languageid" value="<?php echo $languageid ?>"/> - <input type="hidden" name="elementid" value="<?php echo $elementid ?>"/> - <input type="hidden" name="value_time" value="<?php echo $value_time ?>"/> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities($desc))); ?></span> - <?php $if3=($type=='date'); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('date') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="pageelement" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form pageelement"> + <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" class=""> + </input> + <input type="hidden" name="elementid" value="<?php echo encodeHtml(htmlentities(@$elementid)) ?>" class=""> + </input> + <input type="hidden" name="value_time" value="<?php echo encodeHtml(htmlentities(@$value_time)) ?>" class=""> + </input> + <span class="help"><?php echo encodeHtml(htmlentities(@$desc)) ?> + </span> + <?php $if3=($type=='date'); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('date') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_date" name="<?php if ('') echo ''.'_' ?>date<?php if (false) echo '_disabled' ?>" type="date" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$date) ?>" /><?php if (false) { ?><input type="hidden" name="date" value="<?php $date ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('time') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_time" name="<?php if ('') echo ''.'_' ?>time<?php if (false) echo '_disabled' ?>" type="time" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$time) ?>" /><?php if (false) { ?><input type="hidden" name="time" value="<?php $time ?>"/><?php } ?></div></span></label> + <label class="or-form-row or-form-input"><input name="date" disabled="" type="date" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$date)) ?>" class=""> + </input></label> + <label class="or-form-row or-form-input"><input name="time" disabled="" type="time" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$time)) ?>" class=""> + </input></label> </div> </div></fieldset> - <?php } ?> - <?php $if3=($type=='text'); if($if3){?> - <tr> - <td colspan="2"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_text" name="<?php if ('') echo ''.'_' ?>text<?php if (false) echo '_disabled' ?>" type="text" maxlength="255" class="text" value="<?php echo Text::encodeHtml(@$text) ?>" /><?php if (false) { ?><input type="hidden" name="text" value="<?php $text ?>"/><?php } ?></div> + <?php } ?> + <?php $if3=($type=='text'); if($if3) { ?> + <tr class=""> + <td colspan="2" class=""> + <input name="text" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$text)) ?>" class="text"> + </input> </td> </tr> - <?php } ?> - <?php $if3=($type=='longtext'); if($if3){?> - <input type="hidden" name="format" value="<?php echo $format ?>"/> - <?php $if4=(isset($preview)); if($if4){?> + <?php } ?> + <?php $if3=($type=='longtext'); if($if3) { ?> + <input type="hidden" name="format" value="<?php echo encodeHtml(htmlentities(@$format)) ?>" class=""> + </input> + <?php $if4=(isset($preview)); if($if4) { ?> <div class="preview"> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('page_preview') ?></legend><div class="closable"> - <span><?php echo nl2br($preview); ?></span> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <span class=""><?php echo @$preview ?> + </span> </div></fieldset> </div> - <?php } ?> - <?php $if4=($editor=='markdown'); if($if4){?> - <textarea name="<?php if ('') echo ''.'_' ?>text<?php if (false) echo '_disabled' ?>" class="editor markdown-editor"><?php echo htmlentities(${'text'}) ?></textarea> - <?php } ?> - <?php $if4=($editor=='html'); if($if4){?> - <textarea name="<?php if ('') echo ''.'_' ?>text<?php if (false) echo '_disabled' ?>" class="editor html-editor" id="pageelement_edit_editor"><?php echo ${'text'} ?></textarea> - <?php } ?> - <?php $if4=($editor=='wiki'); if($if4){?> - <?php $if5=(isset($languagetext)); if($if5){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo $languagename ?></legend><div class="closable"> - <span><?php echo nl2br(encodeHtml(htmlentities($languagetext))); ?></span> + <?php } ?> + <?php $if4=($editor=='markdown'); if($if4) { ?> + <textarea name="text" class="editor markdown-editor"> + </textarea> + <?php } ?> + <?php $if4=($editor=='html'); if($if4) { ?> + <textarea name="text" id="pageelement_edit_editor" class="editor html-editor"> + </textarea> + <?php } ?> + <?php $if4=($editor=='wiki'); if($if4) { ?> + <?php $if5=(isset($languagetext)); if($if5) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <span class=""><?php echo encodeHtml(htmlentities(@$languagetext)) ?> + </span> </div></fieldset> - <br/> - <br/> - <?php } ?> - <textarea name="<?php if ('') echo ''.'_' ?>text<?php if (false) echo '_disabled' ?>" class="editor wiki-editor"><?php echo ${'text'} ?></textarea> - <fieldset class="toggle-open-close<?php echo false?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('help') ?></legend><div class="closable"> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','strong-begin')))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_strong'.'')))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','strong-end')))); ?></span> - <br/> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','emphatic-begin')))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_emphatic'.'')))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','emphatic-end')))); ?></span> + <br> + </br> + <br> + </br> + <?php } ?> + <textarea name="text" class="editor wiki-editor"> + </textarea> + <fieldset class="or-group toggle-open-close closed show"><div class="closable"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','strong-begin'))) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('text_markup_strong'))) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','strong-end'))) ?> + </span> + <br> + </br> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','emphatic-begin'))) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('text_markup_emphatic'))) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','emphatic-end'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-numbered')))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_numbered_list'.'')))); ?></span> - <br/> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-numbered')))); ?></span> - <span><?php echo nl2br('...'); ?></span> - <br/> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','list-numbered'))) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('text_markup_numbered_list'))) ?> + </span> + <br> + </br> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','list-numbered'))) ?> + </span> + <span class="">... + </span> + <br> + </br> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-unnumbered')))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_unnumbered_list'.'')))); ?></span> - <br/> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-unnumbered')))); ?></span> - <span><?php echo nl2br('...'); ?></span> - <br/> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','list-unnumbered'))) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('text_markup_unnumbered_list'))) ?> + </span> + <br> + </br> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','list-unnumbered'))) ?> + </span> + <span class="">... + </span> + <br> + </br> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_table'.'')))); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - <span><?php echo nl2br('...'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - <span><?php echo nl2br('...'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - <br/> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - <span><?php echo nl2br('...'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - <span><?php echo nl2br('...'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - <span><?php echo nl2br('...'); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span> - <br/> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep'))) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('text_markup_table'))) ?> + </span> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep'))) ?> + </span> + <span class="">... + </span> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep'))) ?> + </span> + <span class="">... + </span> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep'))) ?> + </span> + <br> + </br> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep'))) ?> + </span> + <span class="">... + </span> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep'))) ?> + </span> + <span class="">... + </span> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep'))) ?> + </span> + <span class="">... + </span> + <span class=""><?php echo encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep'))) ?> + </span> + <br> + </br> </td> </table></div></div> </div></fieldset> - <?php } ?> - <?php $if4=($editor=='text'); if($if4){?> - <div class="inputholder"><textarea class="editor raw-editor" name="<?php if ('') echo ''.'_' ?>text<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml($text) ?></textarea></div> - <?php } ?> - <?php } ?> - <?php $if3=($type=='link'); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <?php } ?> + <?php $if4=($editor=='text'); if($if4) { ?> + <textarea name="text" disabled="" maxlength="0" class="editor raw-editor"><?php echo encodeHtml(htmlentities(@$text)) ?> + </textarea> + <?php } ?> + <?php } ?> + <?php $if3=($type=='link'); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_linkobjectid" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_target'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('link_target'))) ?> + </span> </label> </div> <div class="input"> - <div class="selector"> -<div class="inputholder or-droppable"> -<input type="hidden" class="or-selector-link-value" name="linkobjectid" value="<?php echo $linkobjectid ?>" /> -<input type="text" class="or-selector-link-name" value="<?php echo $linkname ?>" placeholder="<?php echo $linkname ?>" /> -</div> -<div class="dropdown"></div> -<div class="tree selector" data-types="{types}" data-init-id="<?php echo $linkobjectid ?>" data-init-folderid="<?php echo $rootfolderid ?>"> -</div> -</div> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_link_url" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_url'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('link_url'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_linkurl" name="<?php if ('') echo ''.'_' ?>linkurl<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$linkurl) ?>" /><?php if (false) { ?><input type="hidden" name="linkurl" value="<?php $linkurl ?>"/><?php } ?></div> + <input name="linkurl" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$linkurl)) ?>" class=""> + </input> </div> </div> </div></fieldset> - <?php } ?> - <?php $if3=($type=='list'); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> - <div> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_linkobjectid" name="linkobjectid" title="" class=""<?php if (count($objects)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($objects,$linkobjectid,0,0) ?><?php if (count($objects)==0) { ?><input type="hidden" name="linkobjectid" value="" /><?php } ?><?php if (count($objects)==1) { ?><input type="hidden" name="linkobjectid" value="<?php echo array_keys($objects)[0] ?>" /><?php } ?> - </select></div> + <?php } ?> + <?php $if3=($type=='list'); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <div class=""> + <input name="linkobjectid" value="<?php echo encodeHtml(htmlentities(@$linkobjectid)) ?>" size="1" class=""> + </input> </div> </div></fieldset> - <?php } ?> - <?php $if3=($type=='insert'); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> - <div> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_linkobjectid" name="linkobjectid" title="" class=""<?php if (count($objects)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($objects,$linkobjectid,0,0) ?><?php if (count($objects)==0) { ?><input type="hidden" name="linkobjectid" value="" /><?php } ?><?php if (count($objects)==1) { ?><input type="hidden" name="linkobjectid" value="<?php echo array_keys($objects)[0] ?>" /><?php } ?> - </select></div> + <?php } ?> + <?php $if3=($type=='insert'); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <div class=""> + <input name="linkobjectid" value="<?php echo encodeHtml(htmlentities(@$linkobjectid)) ?>" size="1" class=""> + </input> </div> </div></fieldset> - <?php } ?> - <?php $if3=($type=='number'); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> - <div> - <input type="hidden" name="decimals" value="decimals"/> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_number" name="<?php if ('') echo ''.'_' ?>number<?php if (false) echo '_disabled' ?>" type="text" maxlength="20" class="" value="<?php echo Text::encodeHtml(@$number) ?>" /><?php if (false) { ?><input type="hidden" name="number" value="<?php $number ?>"/><?php } ?></div> + <?php } ?> + <?php $if3=($type=='number'); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <div class=""> + <input type="hidden" name="decimals" value="decimals" class=""> + </input> + <input name="number" disabled="" type="text" maxlength="20" value="<?php echo encodeHtml(htmlentities(@$number)) ?>" class=""> + </input> </div> </div></fieldset> - <?php } ?> - <?php $if3=($type=='select'); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> - <div> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_text" name="text" title="" class=""<?php if (count($items)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($items,$text,0,0) ?><?php if (count($items)==0) { ?><input type="hidden" name="text" value="" /><?php } ?><?php if (count($items)==1) { ?><input type="hidden" name="text" value="<?php echo array_keys($items)[0] ?>" /><?php } ?> - </select></div> + <?php } ?> + <?php $if3=($type=='select'); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <div class=""> + <input name="text" value="<?php echo encodeHtml(htmlentities(@$text)) ?>" size="1" class=""> + </input> </div> </div></fieldset> - <?php } ?> - <?php $if3=($type=='longtext'); if($if3){?> - <?php $if4=($editor=='wiki'); if($if4){?> - <?php $if5=(isset($languages)); if($if5){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('editor_show_language') ?></legend><div class="closable"> - <div> - <?php foreach($languages as $languageid=>$languagename){ ?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_otherlanguageid_<?php echo $languageid ?>" name="<?php if ('') echo ''.'_' ?>otherlanguageid<?php if (false) echo '_disabled' ?>" value="<?php echo $languageid ?>"<?php if($languageid==@$otherlanguageid)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_<?php echo 'otherlanguageid_'.$languageid.'' ?>" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities($languagename))); ?></span> + <?php } ?> + <?php $if3=($type=='longtext'); if($if3) { ?> + <?php $if4=($editor=='wiki'); if($if4) { ?> + <?php $if5=(isset($languages)); if($if5) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <div class=""> + <?php foreach($languages as $languageid=>$languagename) { ?> + <input type="radio" name="otherlanguageid" disabled="" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" checked="<?php echo encodeHtml(htmlentities(@$otherlanguageid)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@$languagename)) ?> + </span> </label> - <br/> - <?php } ?> + <br> + </br> + <?php } ?> </div> </div></fieldset> - <?php } ?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('PAGE_PREVIEW') ?></legend><div class="closable"> - <div> - <?php { $tmpname = 'preview';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_preview" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'PAGE_PREVIEW'.'')))); ?></span> + <?php } ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <div class=""> + <input type="checkbox" name="preview" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$preview)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('PAGE_PREVIEW'))) ?> + </span> </label> </div> </div></fieldset> - <?php } ?> - <?php } ?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> - <?php $if4=(isset($release)); if($if4){?> - <div> - <?php { $tmpname = 'release';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_release" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_RELEASE')))); ?></span> + <?php } ?> + <?php } ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <?php $if4=(isset($release)); if($if4) { ?> + <div class=""> + <input type="checkbox" name="release" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$release)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_RELEASE'))) ?> + </span> </label> </div> - <?php } ?> - <?php $if4=(isset($publish)); if($if4){?> - <div> - <?php { $tmpname = 'publish';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_publish" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_PUBLISH_AFTER_SAVE')))); ?></span> + <?php } ?> + <?php $if4=(isset($publish)); if($if4) { ?> + <div class=""> + <input type="checkbox" name="publish" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$publish)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('PAGE_PUBLISH_AFTER_SAVE'))) ?> + </span> </label> </div> - <?php } ?> + <?php } ?> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="button" class="or-form-btn or-form-btn--primary or-form-btn--apply" value="<?php echo lang("APPLY") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('save') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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 @@ -1,12 +1,12 @@ <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 method="post" label="message:save" apply="true"> + <form method="post" label="#{save}" apply="true"> <hidden name="languageid" /> <hidden name="elementid" /> <hidden name="value_time" /> <text var="desc" class="help"></text> - <if value="var:type" equals="date"> - <group title="message:date"> + <if value="${type}" equals="date"> + <group title="#{date}"> <part class="line"> <input type="date" name="date" label="date" /> <input type="time" name="time" label="time" /> @@ -14,7 +14,7 @@ </group> </if> - <if value="var:type" equals="text"> + <if value="${type}" equals="text"> <row> <column colspan="2"> <input size="50" maxlength="255" class="text" name="text"></input> @@ -22,85 +22,85 @@ </row> </if> - <if value="var:type" equals="longtext"> + <if value="${type}" equals="longtext"> <hidden name="format" /> <if present="preview"> <part class="preview"> - <group title="message:page_preview"> + <group title="#{page_preview}"> <text var="preview" escape="false"></text> </group> </part> </if> - <if value="var:editor" equals="markdown"> + <if value="${editor}" equals="markdown"> <editor type="markdown" name="text"></editor> </if> - <if value="var:editor" equals="html"> + <if value="${editor}" equals="html"> <editor type="html" name="text"></editor> </if> - <if value="var:editor" equals="wiki"> + <if value="${editor}" equals="wiki"> <if present="languagetext"> - <group title="var:languagename"> + <group title="${languagename}"> <text var="languagetext"></text> </group> <newline></newline> <newline></newline> </if> <editor type="wiki" name="text"></editor> - <group title="message:help" open="false"> + <group title="#{help}" open="false"> <table> <column> - <text value="config:editor/text-markup/strong-begin"></text> + <text value="%{editor/text-markup/strong-begin}"></text> <text key="text_markup_strong"></text> - <text value="config:editor/text-markup/strong-end"></text> + <text value="%{editor/text-markup/strong-end}"></text> <newline></newline> - <text value="config:editor/text-markup/emphatic-begin"></text> + <text value="%{editor/text-markup/emphatic-begin}"></text> <text key="text_markup_emphatic"></text> - <text value="config:editor/text-markup/emphatic-end"></text> + <text value="%{editor/text-markup/emphatic-end}"></text> </column> <column> - <text value="config:editor/text-markup/list-numbered"></text> + <text value="%{editor/text-markup/list-numbered}"></text> <text key="text_markup_numbered_list"></text> <newline></newline> - <text value="config:editor/text-markup/list-numbered"></text> + <text value="%{editor/text-markup/list-numbered}"></text> <text raw="..."></text> <newline></newline> </column> <column> - <text value="config:editor/text-markup/list-unnumbered"></text> + <text value="%{editor/text-markup/list-unnumbered}"></text> <text key="text_markup_unnumbered_list"></text> <newline></newline> - <text value="config:editor/text-markup/list-unnumbered"></text> + <text value="%{editor/text-markup/list-unnumbered}"></text> <text raw="..."></text> <newline></newline> </column> <column> - <text value="config:editor/text-markup/table-cell-sep"></text> + <text value="%{editor/text-markup/table-cell-sep}"></text> <text key="text_markup_table"></text> - <text value="config:editor/text-markup/table-cell-sep"></text> + <text value="%{editor/text-markup/table-cell-sep}"></text> <text raw="..."></text> - <text value="config:editor/text-markup/table-cell-sep"></text> + <text value="%{editor/text-markup/table-cell-sep}"></text> <text raw="..."></text> - <text value="config:editor/text-markup/table-cell-sep"></text> + <text value="%{editor/text-markup/table-cell-sep}"></text> <newline></newline> - <text value="config:editor/text-markup/table-cell-sep"></text> + <text value="%{editor/text-markup/table-cell-sep}"></text> <text raw="..."></text> - <text value="config:editor/text-markup/table-cell-sep"></text> + <text value="%{editor/text-markup/table-cell-sep}"></text> <text raw="..."></text> - <text value="config:editor/text-markup/table-cell-sep"></text> + <text value="%{editor/text-markup/table-cell-sep}"></text> <text raw="..."></text> - <text value="config:editor/text-markup/table-cell-sep"></text> + <text value="%{editor/text-markup/table-cell-sep}"></text> <newline></newline> </column> </table> </group> </if> - <if value="var:editor" equals="text"> + <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="var:type" equals="link"> + <if value="${type}" equals="link"> <group> <part class="line"> <part class="label"> @@ -112,8 +112,8 @@ <!-- <selectbox list="objects" name="linkobjectid" addempty="true"></selectbox> --> - <selector param="linkobjectid" types="var:types" name="var:linkname" - id="var:linkobjectid" folderid="var:rootfolderid" /> + <selector param="linkobjectid" types="${types}" name="${linkname}" + id="${linkobjectid}" folderid="${rootfolderid}" /> </part> </part> @@ -130,7 +130,7 @@ </part> </group> </if> - <if value="var:type" equals="list"> + <if value="${type}" equals="list"> <group> <part> <selectbox list="objects" name="linkobjectid"></selectbox> @@ -138,7 +138,7 @@ </part> </group> </if> - <if value="var:type" equals="insert"> + <if value="${type}" equals="insert"> <group> <part> <selectbox list="objects" name="linkobjectid"></selectbox> @@ -146,7 +146,7 @@ </part> </group> </if> - <if value="var:type" equals="number"> + <if value="${type}" equals="number"> <group> <part> <hidden name="decimals" default="decimals"></hidden> @@ -154,21 +154,21 @@ </part> </group> </if> - <if value="var:type" equals="select"> + <if value="${type}" equals="select"> <group> <part> <selectbox list="items" name="text"></selectbox> </part> </group> </if> - <if value="var:type" equals="longtext"> - <if value="var:editor" equals="wiki"> + <if value="${type}" equals="longtext"> + <if value="${editor}" equals="wiki"> <if present="languages"> - <group title="message:editor_show_language"> + <group title="#{editor_show_language}"> <part> <list list="languages" key="languageid" value="languagename"> - <radio name="otherlanguageid" value="var:languageid"></radio> - <label for="tpl:otherlanguageid_{languageid}"> + <radio name="otherlanguageid" value="${languageid}"></radio> + <label for="otherlanguageid_${languageid}"> <text var="languagename"></text> </label> <newline></newline> @@ -176,7 +176,7 @@ </part> </group> </if> - <group title="message:PAGE_PREVIEW"> + <group title="#{PAGE_PREVIEW}"> <part> <checkbox name="preview"></checkbox> <label for="preview"> @@ -186,7 +186,7 @@ </group> </if> </if> - <group title="message:options"> + <group title="#{options}"> <if present="release"> <part> <checkbox name="release"></checkbox> diff --git a/modules/cms-ui/themes/default/html/views/profile/confirmmail.php b/modules/cms-ui/themes/default/html/views/profile/confirmmail.php @@ -1,28 +1,15 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="line logo"> - <div class="label"> - <img src="themes/default/images/logo_changemail.png ?>" - border="0" /> </div> - <div class="input"> - <h2> - <?php echo langHtml('logo_changemail') ?> - </h2> - <p> - <?php echo langHtml('logo_changemail_text') ?> - </p> - - </div> -</div> - </div> - <form name="" target="_self" data-target="view" action="./" data-method="confirmmail" data-action="profile" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form profile" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="profile" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="confirmmail" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="confirmmail" data-action="profile" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form profile"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_code" class="label"><?php echo lang('mail_code') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('mail_code'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_code" name="<?php if ('') echo ''.'_' ?>code<?php if (false) echo '_disabled' ?>" required="required" autofocus="autofocus" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$code) ?>" /><?php if (false) { ?><input type="hidden" name="code" value="<?php $code ?>"/><?php } ?></div> + <input name="code" disabled="" required="required" autofocus="autofocus" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$code)) ?>" class=""> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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,147 +1,139 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="profile" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form profile" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="profile" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="edit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('name') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="profile" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form profile"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('user_username') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_username'))) ?> </label> </div> <div class="input"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('MENU_PROFILE_MAIL') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_mail" class="label"><?php echo lang('user_mail') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_mail'))) ?> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($mail))); ?></span> - <br/> - <br/> + <span class=""><?php echo encodeHtml(htmlentities(@$mail)) ?> + </span> + <br> + </br> + <br> + </br> <div class="clickable"> - <a class="action" target="_self" date-name="<?php echo lang('mail') ?>" name="<?php echo lang('mail') ?>" data-type="dialog" data-action="profile" data-method="mail" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'profile','dialogMethod':'mail'}" href="./#/profile/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@lang('mail'))) ?>" name="<?php echo encodeHtml(htmlentities(@lang('mail'))) ?>" data-type="dialog" data-action="profile" data-method="mail" data-id="" data-extra="{'dialogAction':'profile','dialogMethod':'mail'}" href="/#/profile/" class="action"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('GLOBAL_PROP') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_fullname" class="label"><?php echo lang('user_fullname') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_fullname'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_fullname" name="<?php if ('') echo ''.'_' ?>fullname<?php if (false) echo '_disabled' ?>" type="text" maxlength="128" class="" value="<?php echo Text::encodeHtml(@$fullname) ?>" /><?php if (false) { ?><input type="hidden" name="fullname" value="<?php $fullname ?>"/><?php } ?></div> + <input name="fullname" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$fullname)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_tel" class="label"><?php echo lang('user_tel') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_tel'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_tel" name="<?php if ('') echo ''.'_' ?>tel<?php if (false) echo '_disabled' ?>" type="text" maxlength="128" class="" value="<?php echo Text::encodeHtml(@$tel) ?>" /><?php if (false) { ?><input type="hidden" name="tel" value="<?php $tel ?>"/><?php } ?></div> + <input name="tel" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$tel)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_desc" class="label"><?php echo lang('user_desc') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_desc'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_desc" name="<?php if ('') echo ''.'_' ?>desc<?php if (false) echo '_disabled' ?>" type="text" maxlength="128" class="" value="<?php echo Text::encodeHtml(@$desc) ?>" /><?php if (false) { ?><input type="hidden" name="desc" value="<?php $desc ?>"/><?php } ?></div> + <input name="desc" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$desc)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_style" class="label"><?php echo lang('user_style') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_style'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_style" name="style" title="" class="or-theme-chooser"<?php if (count($allstyles)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($allstyles,$style,0,0) ?><?php if (count($allstyles)==0) { ?><input type="hidden" name="style" value="" /><?php } ?><?php if (count($allstyles)==1) { ?><input type="hidden" name="style" value="<?php echo array_keys($allstyles)[0] ?>" /><?php } ?> - </select></div> + <input name="style" value="<?php echo encodeHtml(htmlentities(@$style)) ?>" size="1" class="or-theme-chooser"> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_timezone_offset" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'timezone'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('timezone'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_timezone" name="timezone" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($timezone_list,$timezone,1,0) ?><?php if (count($timezone_list)==0) { ?><input type="hidden" name="timezone" value="" /><?php } ?><?php if (count($timezone_list)==1) { ?><input type="hidden" name="timezone" value="<?php echo array_keys($timezone_list)[0] ?>" /><?php } ?> - </select></div> + <input name="timezone" value="<?php echo encodeHtml(htmlentities(@$timezone)) ?>" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> <label class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'language'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('language'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_language" name="language" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($language_list,$language,1,0) ?><?php if (count($language_list)==0) { ?><input type="hidden" name="language" value="" /><?php } ?><?php if (count($language_list)==1) { ?><input type="hidden" name="language" value="<?php echo array_keys($language_list)[0] ?>" /><?php } ?> - </select></div> + <input name="language" value="<?php echo encodeHtml(htmlentities(@$language)) ?>" size="1" class=""> + </input> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('security') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('user_password_expires')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('user_password_expires'))) ?> + </span> </div> <div class="input"> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($passwordExpires) ?> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($passwordExpires); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'totp';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_totp" class="label"><?php echo lang('user_totp') ?> + <input type="checkbox" name="totp" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$totp)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_totp'))) ?> </label> - <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo $totpSecretUrl ?>" title="?QRCODE_SHOW?"></i> + <i data-qrcode="<?php echo encodeHtml(htmlentities(@$totpSecretUrl)) ?>" title="<?php echo encodeHtml(htmlentities(@lang('QRCODE_SHOW'))) ?>" class="image-icon image-icon--menu-qrcode or-qrcode or-info"> + </i> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'hotp';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_hotp" class="label"><?php echo lang('user_hotp') ?> + <input type="checkbox" name="hotp" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$hotp)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_hotp'))) ?> </label> - <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo $hotpSecretUrl ?>" title="?QRCODE_SHOW?"></i> + <i data-qrcode="<?php echo encodeHtml(htmlentities(@$hotpSecretUrl)) ?>" title="<?php echo encodeHtml(htmlentities(@lang('QRCODE_SHOW'))) ?>" class="image-icon image-icon--menu-qrcode or-qrcode or-info"> + </i> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('global_save') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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,8 +1,8 @@ <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:global_save"> - <group title="message:name"> + <form label="#{global_save}"> + <group title="#{name}"> <part class="line"> <part class="label"> <label for="name" key="user_username"></label> @@ -12,7 +12,7 @@ </part> </part> </group> - <group title="message:MENU_PROFILE_MAIL"> + <group title="#{MENU_PROFILE_MAIL}"> <part class="line"> <part class="label"> <label for="mail" key="user_mail"></label> @@ -22,14 +22,14 @@ <newline /> <newline /> <part class="clickable"> - <link type="dialog" class="action" action="profile" subaction="mail" name="message:mail"> + <link type="dialog" class="action" action="profile" subaction="mail" name="#{mail}"> <text key="edit"></text> </link> </part> </part> </part> </group> - <group title="message:GLOBAL_PROP"> + <group title="#{GLOBAL_PROP}"> <part class="line"> <part class="label"> <label for="fullname" key="user_fullname"></label> @@ -85,13 +85,13 @@ </part> </part> </group> - <group title="message:security"> + <group title="#{security}"> <part class="line"> <part class="label"> <text text="user_password_expires" /> </part> <part class="input"> - <date date="var:passwordExpires" /> + <date date="${passwordExpires}" /> </part> </part> <part class="line"> @@ -99,7 +99,7 @@ </part> <part class="input"> <checkbox name="totp"/><label for="totp" key="user_totp"></label> - <qrcode value="var:totpSecretUrl" /> + <qrcode value="${totpSecretUrl}" /> </part> </part> <part class="line"> @@ -107,7 +107,7 @@ </part> <part class="input"> <checkbox name="hotp"/><label for="hotp" key="user_hotp"></label> - <qrcode value="var:hotpSecretUrl" /> + <qrcode value="${hotpSecretUrl}" /> </part> </part> </group> diff --git a/modules/cms-ui/themes/default/html/views/profile/history.php b/modules/cms-ui/themes/default/html/views/profile/history.php @@ -1,31 +1,37 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('project'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filename'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('filename'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'lastchange'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('lastchange'))) ?> + </span> </td> </tr> - <?php foreach($timeline as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($timeline as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <a target="_self" data-type="open" data-action="project" data-method="history" data-id="<?php echo $projectid ?>" data-extra="[]" href="./#/project/<?php echo $projectid ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($projectname))); ?></span> + <a target="_self" data-type="open" data-action="project" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$projectid)) ?>" data-extra="[]" href="/#/project/<?php echo encodeHtml(htmlentities(@$projectid)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$projectname)) ?> + </span> </a> </td> - <td title="<?php echo $filename ?>" class="clickable"> - <a target="_self" data-type="open" data-action="<?php echo $type ?>" data-method="history" data-id="<?php echo $objectid ?>" data-extra="[]" href="./#/<?php echo $type ?>/<?php echo $objectid ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $filename,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td title="<?php echo encodeHtml(htmlentities(@$filename)) ?>" class="clickable"> + <a target="_self" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$type)) ?>/<?php echo encodeHtml(htmlentities(@$objectid)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$filename)) ?> + </span> </a> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php } ?> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/profile/history.tpl.src.xml b/modules/cms-ui/themes/default/html/views/profile/history.tpl.src.xml @@ -16,17 +16,17 @@ <list list="timeline" extract="true"> <row class="data"> <column class="clickable"> - <link type="open" action="project" id="var:projectid"> + <link type="open" action="project" id="${projectid}"> <text var="projectname"></text> </link> </column> - <column title="var:filename" class="clickable"> - <link type="open" action="var:type" id="var:objectid"> + <column title="${filename}" class="clickable"> + <link type="open" action="${type}" id="${objectid}"> <text var="filename" maxlength="30"></text> </link> </column> <column> - <date date="var:lastchange_date" /> + <date date="${lastchange_date}" /> </column> </row> diff --git a/modules/cms-ui/themes/default/html/views/profile/mail.php b/modules/cms-ui/themes/default/html/views/profile/mail.php @@ -1,36 +1,25 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="mail" data-action="profile" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form profile" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="profile" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="mail" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="mail" data-action="profile" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form profile"> <div class="line logo"> - <div class="label"> - <img src="themes/default/images/logo_changemail.png ?>" - border="0" /> - </div> - <div class="input"> - <h2> - <?php echo langHtml('logo_changemail') ?> - </h2> - <p> - <?php echo langHtml('logo_changemail_text') ?> - </p> - - </div> -</div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('user_mail') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_mail" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('user_new_mail')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('user_new_mail'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_mail" name="<?php if ('') echo ''.'_' ?>mail<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$mail) ?>" /><?php if (false) { ?><input type="hidden" name="mail" value="<?php $mail ?>"/><?php } ?></div> + <input name="mail" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$mail)) ?>" class=""> + </input> </div> </div> </div></fieldset> <div class="clickable"> - <a target="_self" data-type="dialog" data-action="profile" data-method="confirmmail" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'profile','dialogMethod':'confirmmail'}" href="./#/profile/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'mail_code'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="profile" data-method="confirmmail" data-id="" data-extra="{'dialogAction':'profile','dialogMethod':'confirmmail'}" href="/#/profile/" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('mail_code'))) ?> + </span> </a> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/profile/mail.tpl.src.xml b/modules/cms-ui/themes/default/html/views/profile/mail.tpl.src.xml @@ -3,7 +3,7 @@ <form method="post"> <logo name="changemail"/> - <group title="message:user_mail"> + <group title="#{user_mail}"> <part class="line"> <part class="label"> <label for="mail"> diff --git a/modules/cms-ui/themes/default/html/views/profile/memberships.php b/modules/cms-ui/themes/default/html/views/profile/memberships.php @@ -1,22 +1,25 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> </tr> - <?php $if3=(($groups)==FALSE); if($if3){?> + <?php $if3=(($groups)==FALSE); if($if3) { ?> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NOT_FOUND'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> - <?php foreach($groups as $list_key=>$group){ ?> + <?php } ?> + <?php foreach($groups as $list_key=>$group) { ?> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($group))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$group)) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/profile/pw.php b/modules/cms-ui/themes/default/html/views/profile/pw.php @@ -1,60 +1,53 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="pw" data-action="profile" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form profile" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="profile" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pw" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if3=($pwchange_enabled); if($if3){?> + <form name="" target="_self" data-target="view" action="./" data-method="pw" data-action="profile" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form profile"> + <?php $if3=($pwchange_enabled); if($if3) { ?> <div class="line logo"> - <div class="label"> - <img src="themes/default/images/logo_changepassword.png ?>" - border="0" /> - </div> - <div class="input"> - <h2> - <?php echo langHtml('logo_changepassword') ?> - </h2> - <p> - <?php echo langHtml('logo_changepassword_text') ?> - </p> - - </div> -</div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('user_act_password') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_act_password" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('user_password')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('user_password'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input type="password" name="act_password" id="<?php echo REQUEST_ID ?>_act_password" size="40" maxlength="256" class="focus" value="<?php echo @$act_password?>" /></div> + <div class="inputholder"><input type="password" name="act_password" size="40" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$act_password)) ?>" class="focus"> + </input></div> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('user_new_password') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_password1" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('user_new_password')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('user_new_password'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input type="password" name="password1" id="<?php echo REQUEST_ID ?>_password1" size="40" maxlength="256" class="" value="<?php echo @$password1?>" /></div> + <div class="inputholder"><input type="password" name="password1" size="40" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$password1)) ?>" class=""> + </input></div> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_password2" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('user_new_password_repeat')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('user_new_password_repeat'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><input type="password" name="password2" id="<?php echo REQUEST_ID ?>_password2" size="40" maxlength="256" class="" value="<?php echo @$password2?>" /></div> + <div class="inputholder"><input type="password" name="password2" size="40" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$password2)) ?>" class=""> + </input></div> </div> </div> </div></fieldset> - <?php } ?> - <?php if(!$if3){?> + <?php } ?> + <?php if(!$if3) { ?> <div class="message warn"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'pwchange_not_allowed'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('pwchange_not_allowed'))) ?> + </span> </div> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/profile/pw.tpl.src.xml b/modules/cms-ui/themes/default/html/views/profile/pw.tpl.src.xml @@ -3,10 +3,10 @@ <form> - <if true="var:pwchange_enabled"> + <if true="${pwchange_enabled}"> <logo name="changepassword"></logo> - <group title="message:user_act_password"> + <group title="#{user_act_password}"> <part class="line"> <part class="label"> <label for="act_password"> @@ -18,7 +18,7 @@ </part> </part> </group> - <group title="message:user_new_password"> + <group title="#{user_new_password}"> <part class="line"> <part class="label"> <label for="password1"> diff --git a/modules/cms-ui/themes/default/html/views/project/add.php b/modules/cms-ui/themes/default/html/views/project/add.php @@ -1,39 +1,41 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="project" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form project" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="project" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td colspan="2"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('name')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="project" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form project"> + <tr class=""> + <td colspan="2" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <td class=""> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </td> </tr> - <tr> - <td colspan="3"> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> - <div> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_empty" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="empty"<?php if('empty'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_empty" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'empty'.'')))); ?></span> + <tr class=""> + <td colspan="3" class=""> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <div class=""> + <input type="radio" name="type" disabled="" value="empty" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('empty'))) ?> + </span> </label> </div> - <div> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_copy" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="copy"<?php if('copy'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_copy" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'copy'.'')))); ?></span> + <div class=""> + <input type="radio" name="type" disabled="" value="copy" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('copy'))) ?> + </span> </label> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_projectid" name="projectid" title="" class=""<?php if (count($projects)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($projects,$projectid,0,0) ?><?php if (count($projects)==0) { ?><input type="hidden" name="projectid" value="" /><?php } ?><?php if (count($projects)==1) { ?><input type="hidden" name="projectid" value="<?php echo array_keys($projects)[0] ?>" /><?php } ?> - </select></div> + <input name="projectid" value="<?php echo encodeHtml(htmlentities(@$projectid)) ?>" size="1" class=""> + </input> </div> </div></fieldset> </td> </tr> - <tr> + <tr class=""> <td colspan="3" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ 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 @@ -1,3 +1,3 @@ <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 method="post"><window icon="project" name="GLOBAL_PROJECTS" widths="20px,20%,80%" width="70%"><row><column colspan="2"><text text="name"></text></column><column><input name="name"></input></column></row><row><column colspan="3"><group title="message:options"><part><radio name="type" value="empty"></radio><label for="type_empty"><text key="empty"></text></label></part><part><radio name="type" value="copy"></radio><label for="type_copy"><text key="copy"></text></label><selectbox name="projectid" list="projects"></selectbox></part></group></column></row><row><column class="act" colspan="3"><button type="ok"></button></column></row></window></form><focus field="name"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"><dummy><form method="post"><window icon="project" name="GLOBAL_PROJECTS" widths="20px,20%,80%" width="70%"><row><column colspan="2"><text text="name"></text></column><column><input name="name"></input></column></row><row><column colspan="3"><group title="#{options}"><part><radio name="type" value="empty"></radio><label for="type_empty"><text key="empty"></text></label></part><part><radio name="type" value="copy"></radio><label for="type_copy"><text key="copy"></text></label><selectbox name="projectid" list="projects"></selectbox></part></group></column></row><row><column class="act" colspan="3"><button type="ok"></button></column></row></window></form><focus field="name"></focus></dummy></output>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/project/edit.php b/modules/cms-ui/themes/default/html/views/project/edit.php @@ -1,29 +1,37 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> - <span><?php echo nl2br(' / '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_TYPE'))) ?> + </span> + <span class=""> / + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> </tr> - <?php $if3=(isset($up_url)); if($if3){?> + <?php $if3=(isset($up_url)); if($if3) { ?> <tr class="data"> - <td> - <img src="./modules/cms-ui/themes/default/images/icon_folder_up.png" /> - <span><?php echo nl2br('..'); ?></span> + <td class=""> + <img src="./modules/cms-ui/themes/default/images/icon_folder_up.png" class=""> + </img> + <span class="">.. + </span> </td> </tr> - <?php } ?> - <?php foreach($content as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php } ?> + <?php foreach($content as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="<?php echo $type ?>" data-method="edit" data-id="<?php echo $id ?>" data-extra="[]" href="./#/<?php echo $type ?>/<?php echo $id ?>"> - <i class="image-icon image-icon--action-<?php echo $type ?>"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.$name.'')))); ?></span> - <span><?php echo nl2br(' '); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$type)) ?>/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$type)) ?>"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('${name'))) ?>} + </span> + <span class=""> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/project/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/project/edit.tpl.src.xml @@ -10,7 +10,7 @@ </row> <if present="up_url"> <row class="data"> - <column url="var:up_url"> + <column url="${up_url}"> <image type="folder_up"></image> <text raw=".."></text> </column> @@ -19,9 +19,9 @@ <list list="content" extract="true"> <row class="data"> <column class="clickable"> - <link type="open" id="var:id" name="var:name" action="var:type"> - <image action="var:type"></image> - <text key="var:name"></text> + <link type="open" id="${id}" name="${name}" action="${type}"> + <image action="${type}"></image> + <text key="${name}"></text> <text raw="_"></text> </link> </column> diff --git a/modules/cms-ui/themes/default/html/views/project/export.php b/modules/cms-ui/themes/default/html/views/project/export.php @@ -1,12 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="export" data-action="project" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form project" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="project" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="export" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="export" data-action="project" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form project"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_DATABASE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DATABASE'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dbid" name="dbid" title="" class=""<?php if (count($dbids)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dbids,'actdbid',0,0) ?><?php if (count($dbids)==0) { ?><input type="hidden" name="dbid" value="" /><?php } ?><?php if (count($dbids)==1) { ?><input type="hidden" name="dbid" value="<?php echo array_keys($dbids)[0] ?>" /><?php } ?> - </select></div> + <input name="dbid" value="actdbid" size="1" class=""> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/project/history.php b/modules/cms-ui/themes/default/html/views/project/history.php @@ -1,50 +1,63 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filename'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('filename'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'user_username'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('user_username'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'lastchange'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('lastchange'))) ?> + </span> </td> </tr> - <?php foreach($timeline as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <?php $if4=($typeid=='1'); if($if4){?> - <?php $type= 'folder'; ?> - <?php } ?> - <?php $if4=($typeid=='2'); if($if4){?> - <?php $type= 'file'; ?> - <?php } ?> - <?php $if4=($typeid=='3'); if($if4){?> - <?php $type= 'page'; ?> - <?php } ?> - <?php $if4=($typeid=='4'); if($if4){?> - <?php $type= 'link'; ?> - <?php } ?> - <?php $if4=($typeid=='5'); if($if4){?> - <?php $type= 'url'; ?> - <?php } ?> + <?php foreach($timeline as $list_key=>$list_value) { extract($list_value); ?> + <?php $if4=($typeid=='1'); if($if4) { ?> + <?php { $type= 'folder'; ?> + <?php } ?> + <?php } ?> + <?php $if4=($typeid=='2'); if($if4) { ?> + <?php { $type= 'file'; ?> + <?php } ?> + <?php } ?> + <?php $if4=($typeid=='3'); if($if4) { ?> + <?php { $type= 'page'; ?> + <?php } ?> + <?php } ?> + <?php $if4=($typeid=='4'); if($if4) { ?> + <?php { $type= 'link'; ?> + <?php } ?> + <?php } ?> + <?php $if4=($typeid=='5'); if($if4) { ?> + <?php { $type= 'url'; ?> + <?php } ?> + <?php } ?> <tr class="data"> <td class="clickable"> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="<?php echo $type ?>" data-method="history" data-id="<?php echo $objectid ?>" data-extra="[]" href="./#/<?php echo $type ?>/<?php echo $objectid ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$type)) ?>/<?php echo encodeHtml(htmlentities(@$objectid)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $filename,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$filename)) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($username))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$username)) ?> + </span> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php } ?> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/project/history.tpl.src.xml b/modules/cms-ui/themes/default/html/views/project/history.tpl.src.xml @@ -19,25 +19,25 @@ <list list="timeline" extract="true"> <!-- Den Typ des Objektes ermitteln --> - <if value="var:typeid" equals="1"> + <if value="${typeid}" equals="1"> <set var="type" value="folder" /> </if> - <if value="var:typeid" equals="2"> + <if value="${typeid}" equals="2"> <set var="type" value="file" /> </if> - <if value="var:typeid" equals="3"> + <if value="${typeid}" equals="3"> <set var="type" value="page" /> </if> - <if value="var:typeid" equals="4"> + <if value="${typeid}" equals="4"> <set var="type" value="link" /> </if> - <if value="var:typeid" equals="5"> + <if value="${typeid}" equals="5"> <set var="type" value="url" /> </if> <row class="data"> <column class="clickable"> - <link type="open" name="var:name" id="var:objectid" action="var:type"> + <link type="open" name="${name}" id="${objectid}" action="${type}"> <text var="name" maxlength="30"></text> </link> </column> @@ -48,7 +48,7 @@ <text var="username"></text> </column> <column> - <date date="var:lastchange_date" /> + <date date="${lastchange_date}" /> </column> </row> </list> diff --git a/modules/cms-ui/themes/default/html/views/project/info.php b/modules/cms-ui/themes/default/html/views/project/info.php @@ -1,6 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="project" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form project" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="project" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php foreach($info as $list_key=>$list_value){ ?> - <label class="or-form-row"><span class="or-form-label"><?php echo lang($list_key) ?></span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($list_value))); ?></span></span></label> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /></div></form>- \ No newline at end of file + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="project" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form project"> + <?php foreach($info as $list_key=>$list_value) { ?> + <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$list_value)) ?> + </span></span></label> + <?php } ?> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/project/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/project/info.tpl.src.xml @@ -3,7 +3,7 @@ <form readonly="true"> <list list="info"> - <text label="var:list_key" var="list_value"/> + <text label="${list_key}" var="list_value"/> </list> </form> </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,19 +1,25 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="maintenance" data-action="project" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form project" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="project" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="maintenance" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> - <div> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_check_limit" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="check_limit"<?php if('check_limit'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_check_limit" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project_check_limit'.'')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="maintenance" data-action="project" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form project"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <div class=""> + <span class=""> + </span> + <input type="radio" name="type" disabled="" value="check_limit" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('project_check_limit'))) ?> + </span> </label> </div> - <div> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_check_files" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="check_files"<?php if('check_files'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_check_files" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project_check_files'.'')))); ?></span> + <div class=""> + <span class=""> + </span> + <input type="radio" name="type" disabled="" value="check_files" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('project_check_files'))) ?> + </span> </label> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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 @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <header back="true" /> <form> - <group title="message:options"> + <group title="#{options}"> <part> <text value=""></text> <radio name="type" value="check_limit"></radio> 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,135 +1,103 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="project" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form project" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="project" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('NAME') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="project" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form project"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('PROJECT_NAME') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_NAME'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="128" class="name" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="name"> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_url" class="label"><?php echo lang('PROJECT_HOSTNAME') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_HOSTNAME'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_url" name="<?php if ('') echo ''.'_' ?>url<?php if (false) echo '_disabled' ?>" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$url) ?>" /><?php if (false) { ?><input type="hidden" name="url" value="<?php $url ?>"/><?php } ?></div> + <input name="url" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + </input> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('PUBLISH') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_target_dir" class="label"><?php echo lang('PROJECT_TARGET_DIR') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_TARGET_DIR'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_target_dir" name="<?php if ('') echo ''.'_' ?>target_dir<?php if (false) echo '_disabled' ?>" type="text" maxlength="255" class="filename" value="<?php echo Text::encodeHtml(@$target_dir) ?>" /><?php if (false) { ?><input type="hidden" name="target_dir" value="<?php $target_dir ?>"/><?php } ?></div> - </div> - </div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_cmd_after_publish" class="label"><?php echo lang('PROJECT_CMD_AFTER_PUBLISH') ?> - </label> - </div> - <div class="input"> - <div class="inputholder"><input<?php if (!config('publish','project','override_system_command')) echo ' disabled="true"' ?> id="<?php echo REQUEST_ID ?>_cmd_after_publish" name="<?php if ('') echo ''.'_' ?>cmd_after_publish<?php if (!config('publish','project','override_system_command')) echo '_disabled' ?>" type="text" maxlength="255" class="filename" value="<?php echo Text::encodeHtml(@$cmd_after_publish) ?>" /><?php if (!config('publish','project','override_system_command')) { ?><input type="hidden" name="cmd_after_publish" value="<?php $cmd_after_publish ?>"/><?php } ?></div> - </div> - </div> - <div class="line"> - <div class="label"> - </div> - <div class="input"> - <?php { $tmpname = 'publishFileExtension';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_publishFileExtension" class="label"><?php echo lang('PROJECT_publish_File_Extension') ?> - </label> + <input name="target_dir" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$target_dir)) ?>" class="filename"> + </input> </div> </div> + <?php $if4=(config('publish','project','override_system_command')); if($if4) { ?> + <div class="line"> + <div class="label"> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_CMD_AFTER_PUBLISH'))) ?> + </label> + </div> + <div class="input"> + <input name="cmd_after_publish" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$cmd_after_publish)) ?>" class="filename"> + </input> + </div> + </div> + <?php } ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'publishPageExtension';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_publishPageExtension" class="label"><?php echo lang('PROJECT_publish_page_Extension') ?> + <input type="checkbox" name="publishFileExtension" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$publishFileExtension)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_publish_File_Extension'))) ?> </label> </div> </div> - <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><input class="" type="radio" id="<?php echo REQUEST_ID ?>_linksAbsolute_0" name="<?php if ('') echo ''.'_' ?>linksAbsolute<?php if (false) echo '_disabled' ?>" value="0"<?php if('0'==@$linksAbsolute)echo ' checked="checked"' ?> /> ?LINKS_RELATIVE? </span></label> - <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><input class="" type="radio" id="<?php echo REQUEST_ID ?>_linksAbsolute_1" name="<?php if ('') echo ''.'_' ?>linksAbsolute<?php if (false) echo '_disabled' ?>" value="1"<?php if('1'==@$linksAbsolute)echo ' checked="checked"' ?> /> ?LINKS_ABSOLUTE? </span></label> - </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('project_FTP') ?></legend><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_ftp_url" class="label"><?php echo lang('PROJECT_FTP_URL') ?> - </label> </div> <div class="input"> - <div class="inputholder"><input<?php if (!config('publish','ftp','enable')) echo ' disabled="true"' ?> id="<?php echo REQUEST_ID ?>_ftp_url" name="<?php if ('') echo ''.'_' ?>ftp_url<?php if (!config('publish','ftp','enable')) echo '_disabled' ?>" type="text" maxlength="256" class="filename" value="<?php echo Text::encodeHtml(@$ftp_url) ?>" /><?php if (!config('publish','ftp','enable')) { ?><input type="hidden" name="ftp_url" value="<?php $ftp_url ?>"/><?php } ?></div> - <br/> - <?php { $tmpname = 'ftp_passive';$default = false;$readonly = !config('publish','ftp','enable');$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_ftp_passive" class="label"><?php echo lang('PROJECT_FTP_PASSIVE') ?> + <input type="checkbox" name="publishPageExtension" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$publishPageExtension)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_publish_page_Extension'))) ?> </label> </div> </div> + <label class="or-form-row or-form-radio"><input type="radio" name="linksAbsolute" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$linksAbsolute)) ?>" class=""> + </input></label> + <label class="or-form-row or-form-radio"><input type="radio" name="linksAbsolute" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$linksAbsolute)) ?>" class=""> + </input></label> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <?php $if3=('config:publish/ftp/enable'); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <div class="line"> + <div class="label"> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_FTP_URL'))) ?> + </label> + </div> + <div class="input"> + <input name="ftp_url" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$ftp_url)) ?>" class="filename"> + </input> + <br> + </br> + <input type="checkbox" name="ftp_passive" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$ftp_passive)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_FTP_PASSIVE'))) ?> + </label> + </div> + </div> + </div></fieldset> + <?php } ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'content_negotiation';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_content_negotiation" class="label"><?php echo lang('PROJECT_CONTENT_NEGOTIATION') ?> + <input type="checkbox" name="content_negotiation" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$content_negotiation)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_CONTENT_NEGOTIATION'))) ?> </label> </div> </div> @@ -137,22 +105,11 @@ <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'cut_index';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_cut_index" class="label"><?php echo lang('PROJECT_CUT_INDEX') ?> + <input type="checkbox" name="cut_index" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$cut_index)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('PROJECT_CUT_INDEX'))) ?> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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 @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <header views="remove,export,maintenance"></header> <form> - <group title="message:NAME"> + <group title="#{NAME}"> <part class="line"> <part class="label"> <label for="name" key="PROJECT_NAME"></label> @@ -20,7 +20,7 @@ </part> </part> </group> - <group title="message:PUBLISH"> + <group title="#{PUBLISH}"> <part class="line"> <part class="label"> <label for="target_dir" key="PROJECT_TARGET_DIR"></label> @@ -29,16 +29,19 @@ <input name="target_dir" class="filename" maxlength="255"></input> </part> </part> - <part class="line"> - <part class="label"> - <label for="cmd_after_publish" key="PROJECT_CMD_AFTER_PUBLISH"></label> - </part> - <part class="input"> - <input name="cmd_after_publish" class="filename" - readonly="not:config:publish/project/override_system_command" maxlength="255"></input> - + + <if true="%{publish/project/override_system_command}"> + <part class="line"> + <part class="label"> + <label for="cmd_after_publish" key="PROJECT_CMD_AFTER_PUBLISH"></label> + </part> + <part class="input"> + <input name="cmd_after_publish" class="filename" + maxlength="255"></input> + + </part> </part> - </part> + </if> <part class="line"> <part class="label"></part> <part class="input"> @@ -58,20 +61,23 @@ <radio name="linksAbsolute" value="1" label="LINKS_ABSOLUTE" /> </group> - <group title="message:project_FTP"> - <part class="line"> - <part class="label"> - <label for="ftp_url" key="PROJECT_FTP_URL"></label> - </part> - <part class="input"> - <input name="ftp_url" class="filename" readonly="not:config:publish/ftp/enable"></input> - <newline></newline> - <checkbox name="ftp_passive" readonly="not:config:publish/ftp/enable"></checkbox> - <label for="ftp_passive" key="PROJECT_FTP_PASSIVE"></label> + <if value="config:publish/ftp/enable"> + + <group title="#{project_FTP}"> + <part class="line"> + <part class="label"> + <label for="ftp_url" key="PROJECT_FTP_URL"/> + </part> + <part class="input"> + <input name="ftp_url" class="filename"/> + <newline/> + <checkbox name="ftp_passive"/> + <label for="ftp_passive" key="PROJECT_FTP_PASSIVE"/> + </part> </part> - </part> - </group> - <group title="message:options"> + </group> + </if> + <group title="#{options}"> <part class="line"> <part class="label"></part> <part class="input"> diff --git a/modules/cms-ui/themes/default/html/views/project/remove.php b/modules/cms-ui/themes/default/html/views/project/remove.php @@ -1,37 +1,29 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="project" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form project" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="project" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="project" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form project"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <div> - <?php { $tmpname = 'delete';$default = false;$readonly = false;$required = true; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_delete" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('CONFIRM_DELETE')))); ?></span> + <div class=""> + <input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" required="required" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> + </span> </label> </div> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/project/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/project/remove.tpl.src.xml @@ -10,7 +10,7 @@ <text var="name" class="name"></text> </part> </part> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> </part> diff --git a/modules/cms-ui/themes/default/html/views/projectlist/add.php b/modules/cms-ui/themes/default/html/views/projectlist/add.php @@ -1,30 +1,37 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="projectlist" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form projectlist" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="projectlist" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="projectlist" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form projectlist"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('name')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="128" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + </input> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_empty" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="empty"<?php if('empty'==@$type||true)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_empty" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'empty'.'')))); ?></span> + <input type="radio" name="type" disabled="" value="empty" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('empty'))) ?> + </span> </label> - <br/> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_copy" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="copy"<?php if('copy'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_copy" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'copy'.'')))); ?></span> + <br> + </br> + <input type="radio" name="type" disabled="" value="copy" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('copy'))) ?> + </span> </label> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_projectid" name="projectid" title="" class=""<?php if (count($projects)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($projects,'',0,0) ?><?php if (count($projects)==0) { ?><input type="hidden" name="projectid" value="" /><?php } ?><?php if (count($projects)==1) { ?><input type="hidden" name="projectid" value="<?php echo array_keys($projects)[0] ?>" /><?php } ?> - </select></div> + <input name="projectid" value="" size="1" class=""> + </input> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/projectlist/add.tpl.src.xml b/modules/cms-ui/themes/default/html/views/projectlist/add.tpl.src.xml @@ -10,7 +10,7 @@ </part> </part> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> </part> 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,25 +1,30 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> </tr> - <?php foreach($projects as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($projects as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="project" data-method="edit" data-id="<?php echo $id ?>" data-extra="[]" href="./#/project/<?php echo $id ?>"> - <i class="image-icon image-icon--action-project"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="project" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/project/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <i class="image-icon image-icon--action-project"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> <tr class="data"> <td class="clickable"> - <a target="_self" date-name="<?php echo lang('new') ?>" name="<?php echo lang('new') ?>" data-type="dialog" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@lang('new'))) ?>" name="<?php echo encodeHtml(htmlentities(@lang('new'))) ?>" data-type="dialog" data-action="" data-method="add" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </td> </tr> 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 @@ -10,16 +10,16 @@ <list list="projects" extract="true"> <row class="data"> <column class="clickable"> - <link type="open" id="var:id" name="var:name" action="project"> + <link type="open" id="${id}" name="${name}" action="project"> <image action="project"></image> - <text value="var:name" maxlength="30"></text> + <text value="${name}" maxlength="30"></text> </link> </column> </row> </list> <row class="data"> <column class="clickable"> - <link type="dialog" subaction="add" name="message:new"> + <link type="dialog" subaction="add" name="#{new}"> <image method="add" /> <text text="new" /> </link> diff --git a/modules/cms-ui/themes/default/html/views/projectlist/history.php b/modules/cms-ui/themes/default/html/views/projectlist/history.php @@ -1,35 +1,43 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('project'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filename'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('filename'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'user_username'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('user_username'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'lastchange'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('lastchange'))) ?> + </span> </td> </tr> - <?php foreach($timeline as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($timeline as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <a target="_self" data-type="post" data-action="start" data-method="projectmenu" data-id="<?php echo $projectid ?>" data-extra="[]" data-data="{"action":"start","subaction":"projectmenu","id":"<?php echo $projectid ?>","token":"<?php echo token() ?>","none":"0"}"> - <span><?php echo nl2br(encodeHtml(htmlentities($projectname))); ?></span> + <a target="_self" data-type="post" data-action="start" data-method="projectmenu" data-id="<?php echo encodeHtml(htmlentities(@$projectid)) ?>" data-extra="[]" data-data="{"action":"start","subaction":"projectmenu","id":"<?php echo encodeHtml(htmlentities(@$projectid)) ?>",\"token":"<?php echo token() ?>","none":"0"}"" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$projectname)) ?> + </span> </a> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $filename,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$filename)) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($username))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$username)) ?> + </span> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php } ?> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/projectlist/history.tpl.src.xml b/modules/cms-ui/themes/default/html/views/projectlist/history.tpl.src.xml @@ -19,7 +19,7 @@ <list list="timeline" extract="true"> <row class="data"> <column class="clickable"> - <link type="post" action="start" subaction="projectmenu" id="var:projectid"> + <link type="post" action="start" subaction="projectmenu" id="${projectid}"> <text var="projectname"></text> </link> </column> @@ -30,7 +30,7 @@ <text var="username"></text> </column> <column> - <date date="var:lastchange_date" /> + <date date="${lastchange_date}" /> </column> </row> diff --git a/modules/cms-ui/themes/default/html/views/search/edit.php b/modules/cms-ui/themes/default/html/views/search/edit.php @@ -1,108 +1,67 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="result" data-action="search" data-id="<?php echo OR_ID ?>" method="GET" enctype="application/x-www-form-urlencoded" class="or-form search" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="search" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="result" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="result" data-action="search" data-id="<?php echo OR_ID ?>" method="GET" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form search"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_value" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'value'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('value'))) ?> + </span> </label> - <br/> + <br> + </br> </div> <div class="input"> - <div class="inputholder"><input placeholder="<?php echo lang('search') ?>" id="<?php echo REQUEST_ID ?>_text" name="<?php if ('') echo ''.'_' ?>text<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$text) ?>" /><?php if (false) { ?><input type="hidden" name="text" value="<?php $text ?>"/><?php } ?></div> + <input name="text" disabled="" placeholder="<?php echo encodeHtml(htmlentities(@lang('search'))) ?>" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$text)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_value" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filter'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('filter'))) ?> + </span> </label> - <br/> + <br> + </br> </div> <div class="input"> - <?php { $tmpname = 'id';$default = config('search','quicksearch','flag','id');$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_id" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> + <input type="checkbox" name="id" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','id'))) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('id'))) ?> + </span> </label> - <br/> - <?php { $tmpname = 'name';$default = config('search','quicksearch','flag','name');$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <br> + </br> + <input type="checkbox" name="name" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','name'))) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </label> - <br/> - <?php { $tmpname = 'filename';$default = config('search','quicksearch','flag','filename');$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_filename" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filename'.'')))); ?></span> + <br> + </br> + <input type="checkbox" name="filename" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','filename'))) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('filename'))) ?> + </span> </label> - <br/> - <?php { $tmpname = 'description';$default = config('search','quicksearch','flag','description');$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_description" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'description'.'')))); ?></span> + <br> + </br> + <input type="checkbox" name="description" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','description'))) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('description'))) ?> + </span> </label> - <br/> - <?php { $tmpname = 'content';$default = config('search','quicksearch','flag','content');$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_content" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'content'.'')))); ?></span> + <br> + </br> + <input type="checkbox" name="content" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(config('search','quicksearch','flag','content'))) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('content'))) ?> + </span> </label> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/search/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/search/edit.tpl.src.xml @@ -9,7 +9,7 @@ <newline></newline> </part> <part class="input"> - <input name="text" hint="message:search"></input> + <input name="text" hint="#{search}"></input> </part> </part> <part class="line"> @@ -20,27 +20,27 @@ <newline></newline> </part> <part class="input"> - <checkbox name="id" default="config:search/quicksearch/flag/id" /> + <checkbox name="id" default="%{search/quicksearch/flag/id}" /> <label for="id"> <text key="id"></text> </label> <newline /> - <checkbox name="name" default="config:search/quicksearch/flag/name" /> + <checkbox name="name" default="%{search/quicksearch/flag/name}" /> <label for="name"> <text key="name"></text> </label> <newline /> - <checkbox name="filename" default="config:search/quicksearch/flag/filename" /> + <checkbox name="filename" default="%{search/quicksearch/flag/filename}" /> <label for="filename"> <text key="filename"></text> </label> <newline /> - <checkbox name="description" default="config:search/quicksearch/flag/description" /> + <checkbox name="description" default="%{search/quicksearch/flag/description}" /> <label for="description"> <text key="description"></text> </label> <newline /> - <checkbox name="content" default="config:search/quicksearch/flag/content" /> + <checkbox name="content" default="%{search/quicksearch/flag/content}" /> <label for="content"> <text key="content"></text> </label> diff --git a/modules/cms-ui/themes/default/html/views/search/result.php b/modules/cms-ui/themes/default/html/views/search/result.php @@ -1,24 +1,29 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <tr> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <tr class=""> <td class="header"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> <td class="header"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_LASTCHANGE'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LASTCHANGE'))) ?> + </span> </td> </tr> - <?php foreach($result as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($result as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="<?php echo $type ?>" data-method="result" data-id="<?php echo $id ?>" data-extra="[]" href="./#/<?php echo $type ?>/<?php echo $id ?>"> - <img src="./modules/cms-ui/themes/default/images/icon_<?php echo $type ?>.png" /> - <span title="<?php echo $desc ?>"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$type)) ?>/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <img src="./modules/cms-ui/themes/default/images/icon_<?php echo encodeHtml(htmlentities(@$type)) ?>.png" class=""> + </img> + <span title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php } ?> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/search/result.tpl.src.xml b/modules/cms-ui/themes/default/html/views/search/result.tpl.src.xml @@ -12,13 +12,13 @@ <list list="result" extract="true"> <row class="data"> <column class="clickable"> - <link type="open" action="var:type" name="var:name" id="var:id"> - <image type="var:type"></image> - <text var="name" title="var:desc"></text> + <link type="open" action="${type}" name="${name}" id="${id}"> + <image type="${type}"></image> + <text var="name" title="${desc}"></text> </link> </column> <column> - <date date="var:lastchange_date"></date> + <date date="${lastchange_date}"></date> </column> </row> </list> diff --git a/modules/cms-ui/themes/default/html/views/start/applications.php b/modules/cms-ui/themes/default/html/views/start/applications.php @@ -1,22 +1,25 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="data"> - <td colspan="2"> - <a target="_self" data-action="index" data-method="projectmenu" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/index/"> - <span><?php echo nl2br('OpenRat'); ?></span> + <td colspan="2" class=""> + <a target="_self" data-action="index" data-method="projectmenu" data-id="" data-extra="[]" href="/#/index/" class=""> + <span class="">OpenRat + </span> </a> </td> </tr> - <?php foreach($applications as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($applications as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <a target="_self" data-url="<?php echo $url ?>" data-action="" data-method="applications" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$url)) ?>" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$description)) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/start/applications.tpl.src.xml b/modules/cms-ui/themes/default/html/views/start/applications.tpl.src.xml @@ -11,7 +11,7 @@ <list list="applications" extract="true"> <row class="data"> <column> - <link url="var:url"> + <link url="${url}"> <text var="name"></text> </link> </column> diff --git a/modules/cms-ui/themes/default/html/views/start/projectmenu.php b/modules/cms-ui/themes/default/html/views/start/projectmenu.php @@ -1,63 +1,51 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <tr> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <tr class=""> <td colspan="2" class="logo"> <div class="line logo"> - <div class="label"> - <img src="themes/default/images/logo_projectmenu.png ?>" - border="0" /> - </div> - <div class="input"> - <h2> - <?php echo langHtml('logo_projectmenu') ?> - </h2> - <p> - <?php echo langHtml('logo_projectmenu_text') ?> - </p> - - </div> -</div> </div> </td> </tr> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('project'))) ?> + </span> </td> </tr> - <?php foreach($projects as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($projects as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <a title="<?php echo lang('TREE_CHOOSE_PROJECT') ?>" target="_self" data-type="post" data-action="" data-method="projectmenu" data-id="<?php echo $id ?>" data-extra="[]" data-data="{"action":"start","subaction":"projectmenu","id":"<?php echo $id ?>","token":"<?php echo token() ?>","none":"0"}"> - <?php $project= 'project'; ?> - <img src="./modules/cms-ui/themes/default/images/icon_project.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('TREE_CHOOSE_PROJECT'))) ?>" target="_self" data-type="post" data-action="" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" data-data="{"action":"start","subaction":"projectmenu","id":"<?php echo encodeHtml(htmlentities(@$id)) ?>",\"token":"<?php echo token() ?>","none":"0"}"" class=""> + <?php { $project= 'project'; ?> + <?php } ?> + <img src="./modules/cms-ui/themes/default/images/icon_project.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> <div class="onrowvisible"> <div class="arrow-down"> </div> <div class="dropdown"> - <form name="" target="_self" data-target="view" action="./" data-method="project" data-action="index" data-id="<?php echo $id ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form index" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="index" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="project" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $id ?>" /> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> - <tr> - <td> - <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php') ?><?php component_radio_box('modelid',$models,$defaultmodelid) ?> + <form name="" target="_self" data-target="view" action="./" data-method="project" data-action="index" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form index"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> + <tr class=""> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php'); { <?php component_radio_box(modelid,$models,${defaultmodelid}) ?> ?> + <?php } ?> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php') ?><?php component_radio_box('languageid',$languages,$defaultlanguageid) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php'); { <?php component_radio_box(languageid,$languages,${defaultlanguageid}) ?> ?> + <?php } ?> </td> - <td> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?message:start_DESC?" - value=" ?message:start? " /> - </div> + <td class=""> </td> </tr> </table></div></div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> + </form> </div> </div> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/start/projectmenu.tpl.src.xml b/modules/cms-ui/themes/default/html/views/start/projectmenu.tpl.src.xml @@ -14,7 +14,7 @@ <list list="projects" extract="true"> <row class="data"> <column class="clickable"> - <link type="post" id="var:id" title="message:TREE_CHOOSE_PROJECT"> + <link type="post" id="${id}" title="#{TREE_CHOOSE_PROJECT}"> <set var="project" value="project"></set> <image type="project"></image> <text var="name" maxlength="30"></text> @@ -22,18 +22,18 @@ <part class="onrowvisible"> <part class="arrow-down" /> <part class="dropdown"> - <form action="index" subaction="project" id="var:id"> + <form action="index" subaction="project" id="${id}"> <table widths="150px,150px"> <row> <column> - <radiobox list="models" name="modelid" default="var:defaultmodelid"></radiobox> + <radiobox list="models" name="modelid" default="${defaultmodelid}"></radiobox> </column> <column> <radiobox list="languages" name="languageid" - default="var:defaultlanguageid"></radiobox> + default="${defaultlanguageid}"></radiobox> </column> <column> - <button type="ok" text="message:start"></button> + <button type="ok" text="#{start}"></button> </column> </row> </table> diff --git a/modules/cms-ui/themes/default/html/views/start/userprojecttimeline.php b/modules/cms-ui/themes/default/html/views/start/userprojecttimeline.php @@ -1,41 +1,51 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filename'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('filename'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'lastchange'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('lastchange'))) ?> + </span> </td> </tr> - <?php foreach($timeline as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <?php $if4=($typeid=='1'); if($if4){?> - <?php $type= 'folder'; ?> - <?php } ?> - <?php $if4=($typeid=='2'); if($if4){?> - <?php $type= 'file'; ?> - <?php } ?> - <?php $if4=($typeid=='4'); if($if4){?> - <?php $type= 'link'; ?> - <?php } ?> - <?php $if4=($typeid=='3'); if($if4){?> - <?php $type= 'page'; ?> - <?php } ?> + <?php foreach($timeline as $list_key=>$list_value) { extract($list_value); ?> + <?php $if4=($typeid=='1'); if($if4) { ?> + <?php { $type= 'folder'; ?> + <?php } ?> + <?php } ?> + <?php $if4=($typeid=='2'); if($if4) { ?> + <?php { $type= 'file'; ?> + <?php } ?> + <?php } ?> + <?php $if4=($typeid=='4'); if($if4) { ?> + <?php { $type= 'link'; ?> + <?php } ?> + <?php } ?> + <?php $if4=($typeid=='3'); if($if4) { ?> + <?php { $type= 'page'; ?> + <?php } ?> + <?php } ?> <tr class="data"> <td class="clickable"> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="<?php echo $type ?>" data-method="userprojecttimeline" data-id="<?php echo $objectid ?>" data-extra="[]" href="./#/<?php echo $type ?>/<?php echo $objectid ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$type)) ?>/<?php echo encodeHtml(htmlentities(@$objectid)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $filename,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$filename)) ?> + </span> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php } ?> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/start/userprojecttimeline.tpl.src.xml b/modules/cms-ui/themes/default/html/views/start/userprojecttimeline.tpl.src.xml @@ -16,22 +16,22 @@ <list list="timeline" extract="true"> <!-- Den Typ des Objektes ermitteln --> - <if value="var:typeid" equals="1"> + <if value="${typeid}" equals="1"> <set var="type" value="folder" /> </if> - <if value="var:typeid" equals="2"> + <if value="${typeid}" equals="2"> <set var="type" value="file" /> </if> - <if value="var:typeid" equals="4"> + <if value="${typeid}" equals="4"> <set var="type" value="link" /> </if> - <if value="var:typeid" equals="3"> + <if value="${typeid}" equals="3"> <set var="type" value="page" /> </if> <row class="data"> <column class="clickable"> - <link type="open" name="var:name" id="var:objectid" action="var:type"> + <link type="open" name="${name}" id="${objectid}" action="${type}"> <text var="name" maxlength="30"></text> </link> </column> @@ -39,7 +39,7 @@ <text var="filename" maxlength="30"></text> </column> <column> - <date date="var:lastchange_date" /> + <date date="${lastchange_date}" /> </column> </row> 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,45 +1,39 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="addel" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form template" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="template" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="addel" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="addel" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form template"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_name'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" required="required" autofocus="autofocus" type="text" maxlength="50" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" required="required" autofocus="autofocus" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('element_type')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('element_type'))) ?> + </span> </div> <div class="input"> - <?php $text= 'text'; ?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_typeid" name="typeid" title="" class=""<?php if (count($types)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($types,$typeid,0,1) ?><?php if (count($types)==0) { ?><input type="hidden" name="typeid" value="" /><?php } ?><?php if (count($types)==1) { ?><input type="hidden" name="typeid" value="<?php echo array_keys($types)[0] ?>" /><?php } ?> - </select></div> + <?php { $text= 'text'; ?> + <?php } ?> + <input name="typeid" value="<?php echo encodeHtml(htmlentities(@$typeid)) ?>" size="1" class=""> + </input> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> </div> <div class="input"> - <label for="<?php echo REQUEST_ID ?>_addtotemplate" class="label"> - <?php { $tmpname = 'addtotemplate';$default = true;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_template_srcelement'.'')))); ?></span> + <label class="label"> + <input type="checkbox" name="addtotemplate" disabled="" value="1" checked="1" class=""> + </input> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_template_srcelement'))) ?> + </span> </label> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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 @@ -22,7 +22,7 @@ </part> </part> - <group title="message:options"></group> + <group title="#{options}"></group> <part class="line"> <part class="label"> 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,51 +1,63 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'type'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + </span> </td> </tr> - <?php foreach($elements as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($elements as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="element" data-method="edit" data-id="<?php echo $id ?>" data-extra="[]" href="./#/element/<?php echo $id ?>"> - <i class="image-icon image-icon--action-el_<?php echo $type ?>"></i> - <span title="<?php echo $description ?>"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="element" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/element/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <i class="image-icon image-icon--action-el_<?php echo encodeHtml(htmlentities(@$type)) ?>"> + </i> + <span title="<?php echo encodeHtml(htmlentities(@$description)) ?>" class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_'.$type.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('${type'))) ?>} + </span> </td> </tr> - <?php } ?> - <?php $if3=(($elements)==FALSE); if($if3){?> - <tr> - <td colspan="2"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NOT_FOUND'.'')))); ?></span> + <?php } ?> + <?php $if3=(($elements)==FALSE); if($if3) { ?> + <tr class=""> + <td colspan="2" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> <tr class="data"> <td colspan="2" class="clickable"> - <a target="_self" data-type="dialog" data-action="template" data-method="addel" data-id="<?php echo $templateid ?>" data-extra="{'dialogAction':'template','dialogMethod':'addel'}" href="./#/template/<?php echo $templateid ?>"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_template_addel'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="template" data-method="addel" data-id="<?php echo encodeHtml(htmlentities(@$templateid)) ?>" data-extra="{'dialogAction':'template','dialogMethod':'addel'}" href="/#/template/<?php echo encodeHtml(htmlentities(@$templateid)) ?>" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_template_addel'))) ?> + </span> </a> </td> </tr> </table></div></div> - <?php foreach($models as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo $name ?></legend><div class="closable"> + <?php foreach($models as $list_key=>$list_value) { extract($list_value); ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="clickable"> - <code><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $source,200,'..',constant('STR_PAD_BOTH') )))); ?></code> - <br/> - <a class="or-form-button" target="_self" data-type="edit" data-action="" data-method="src" data-id="<?php echo OR_ID ?>" data-extra="{'modelid':'<?php echo $modelid ?>'}" href="./#//"> - <i class="image-icon image-icon--action-template"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <code class=""><?php echo encodeHtml(htmlentities(@$source)) ?> + </code> + <br> + </br> + <a target="_self" data-type="edit" data-action="" data-method="src" data-id="" data-extra="{'modelid':'<?php echo encodeHtml(htmlentities(@$modelid)) ?>'}" href="/#//" class="or-form-button"> + <i class="image-icon image-icon--action-template"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div></fieldset> - <?php } ?>- \ No newline at end of file + <?php } ?>+ \ No newline at end of file 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 @@ -14,13 +14,13 @@ <list list="elements" extract="true"> <row class="data"> <column class="clickable"> - <link type="open" id="var:id" name="var:name" action="element"> - <image elementtype="var:type"></image> - <text var="name" title="var:description"></text> + <link type="open" id="${id}" name="${name}" action="element"> + <image elementtype="${type}"></image> + <text var="name" title="${description}"></text> </link> </column> <column> - <text key="var:type" prefix="EL_"></text> + <text key="${type}" prefix="EL_"></text> </column> </row> </list> @@ -33,7 +33,7 @@ </if> <row class="data"> <column colspan="2" class="clickable"> - <link type="dialog" subaction="addel" action="template" id="var:templateid"> + <link type="dialog" subaction="addel" action="template" id="${templateid}"> <image method="add" /> <text key="menu_template_addel"></text> </link> @@ -43,13 +43,13 @@ <list list="models" extract="true"> - <group title="var:name"> + <group title="${name}"> <part class="clickable"> <text var="source" escape="true" type="code" maxlength="200"></text> <newline/> - <link type="edit" subaction="src" var1="modelid" value1="var:modelid" class="or-form-button"> + <link type="edit" subaction="src" var1="modelid" value1="${modelid}" class="or-form-button"> <image action="template"/> <text key="edit"></text> </link> diff --git a/modules/cms-ui/themes/default/html/views/template/extension.php b/modules/cms-ui/themes/default/html/views/template/extension.php @@ -1,9 +1,11 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="extension" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form template" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="template" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="extension" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php foreach($extension as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo $name ?></legend><div class="closable"> - <?php $$name= $extension; ?> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('template_extension') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_<?php echo $name ?>" name="<?php if ('') echo ''.'_' ?><?php echo $name ?><?php if (false) echo '_disabled' ?>" required="required" type="text" maxlength="10" class="" value="<?php echo Text::encodeHtml(@$$name) ?>" /><?php if (false) { ?><input type="hidden" name="<?php echo $name ?>" value="<?php $$name ?>"/><?php } ?></div></span></label> + <form name="" target="_self" data-target="view" action="./" data-method="extension" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form template"> + <?php foreach($extension as $list_key=>$list_value) { extract($list_value); ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <?php { $$name= $extension; ?> + <?php } ?> + <label class="or-form-row or-form-input"><input name="<?php echo encodeHtml(htmlentities(@$name)) ?>" disabled="" required="required" type="text" maxlength="10" value="<?php echo encodeHtml(htmlentities(@$${name)) ?>}" class=""> + </input></label> </div></fieldset> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/extension.tpl.src.xml b/modules/cms-ui/themes/default/html/views/template/extension.tpl.src.xml @@ -3,10 +3,10 @@ <form> <list list="extension" extract="true"> - <group title="var:name"> + <group title="${name}"> - <set var="var:name" value="var:extension"/> - <input name="var:name" label="template_extension" required="true" maxlength="10"/> + <set var="${name}" value="${extension}"/> + <input name="${name}" label="template_extension" required="true" maxlength="10"/> </group> </list> diff --git a/modules/cms-ui/themes/default/html/views/template/info.php b/modules/cms-ui/themes/default/html/views/template/info.php @@ -1,26 +1,31 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="data"> - <td colspan="1"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> + <td colspan="1" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('id'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($id))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$id)) ?> + </span> </td> </tr> <tr class="headline"> - <td colspan="2"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'pages'.'')))); ?></span> + <td colspan="2" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('pages'))) ?> + </span> </td> </tr> - <?php foreach($pages as $pageid=>$name){ ?> + <?php foreach($pages as $pageid=>$name) { ?> <tr class="data"> <td colspan="2" class="clickable"> - <a target="_self" data-type="open" data-action="page" data-method="info" data-id="<?php echo $pageid ?>" data-extra="[]" href="./#/page/<?php echo $pageid ?>"> - <i class="image-icon image-icon--action-page"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <a target="_self" data-type="open" data-action="page" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$pageid)) ?>" data-extra="[]" href="/#/page/<?php echo encodeHtml(htmlentities(@$pageid)) ?>" class=""> + <i class="image-icon image-icon--action-page"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/template/info.tpl.src.xml @@ -17,7 +17,7 @@ <list list="pages" value="name" key="pageid"> <row class="data"> <column colspan="2" class="clickable"> - <link type="open" action="page" id="var:pageid"> + <link type="open" action="page" id="${pageid}"> <image action="page"></image> <text var="name"></text> </link> 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,21 +1,25 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> </tr> - <?php foreach($templates as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($templates as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <?php $if4=(($templates)==FALSE); if($if4){?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NO_TEMPLATES_AVAILABLE_DESC')))); ?></span> - <?php } ?> - <a class="action" target="_self" data-action="template" data-method="add" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/template/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_template_add'.'')))); ?></span> + <?php $if4=(($templates)==FALSE); if($if4) { ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NO_TEMPLATES_AVAILABLE_DESC'))) ?> + </span> + <?php } ?> + <a target="_self" data-action="template" data-method="add" data-id="" data-extra="[]" href="/#/template/" class="action"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_template_add'))) ?> + </span> </a> \ 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 @@ -11,7 +11,7 @@ </row> <list list="templates" extract="true"> <row class="data"> - <column url="var:url"> + <column url="${url}"> <text var="name"></text> </column> </row> diff --git a/modules/cms-ui/themes/default/html/views/template/preview.php b/modules/cms-ui/themes/default/html/views/template/preview.php @@ -1,16 +1,21 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="self" action="./" data-method="preview" data-action="template" data-id="<?php echo OR_ID ?>" method="GET" enctype="application/x-www-form-urlencoded" class="or-form template" data-async="false" data-autosave="true"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="template" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="preview" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_modelid" name="modelid" title="" class=""<?php if (count($models)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($models,$modelid,0,0) ?><?php if (count($models)==0) { ?><input type="hidden" name="modelid" value="" /><?php } ?><?php if (count($models)==1) { ?><input type="hidden" name="modelid" value="<?php echo array_keys($models)[0] ?>" /><?php } ?> - </select></div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('preview') ?></legend><div class="closable"> - <iframe src="<?php echo $preview_url ?>"></iframe> - <a class="action" target="_self" data-action="file" data-method="edit" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/file/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/edit.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_file_edit'.'')))); ?></span> + <form name="" target="_self" data-target="self" action="./" data-method="preview" data-action="template" data-id="<?php echo OR_ID ?>" method="GET" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="1" class="or-form template"> + <input name="modelid" value="<?php echo encodeHtml(htmlentities(@$modelid)) ?>" size="1" class=""> + </input> + </form> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <iframe src="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>" class=""> + </iframe> + <a target="_self" data-action="file" data-method="edit" data-id="" data-extra="[]" href="/#/file/" class="action"> + <img src="./modules/cms-ui/themes/default/images/icon/icon/edit.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_file_edit'))) ?> + </span> </a> - <a class="action" target="_self" data-action="file" data-method="editvalue" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/file/"> - <img src="./modules/cms-ui/themes/default/images/icon/icon/editvalue.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_file_editvalue'.'')))); ?></span> + <a target="_self" data-action="file" data-method="editvalue" data-id="" data-extra="[]" href="/#/file/" class="action"> + <img src="./modules/cms-ui/themes/default/images/icon/icon/editvalue.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_file_editvalue'))) ?> + </span> </a> </div></fieldset> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/preview.tpl.src.xml b/modules/cms-ui/themes/default/html/views/template/preview.tpl.src.xml @@ -3,15 +3,15 @@ <form action="template" method="GET" target="self" subaction="preview" autosave="true" cancel="false"> - <selectbox name="modelid" list="models" default="var:modelid"> + <selectbox name="modelid" list="models" default="${modelid}"> </selectbox> </form> - <group title="message:preview"> + <group title="#{preview}"> - <insert url="var:preview_url"></insert> + <insert url="${preview_url}"></insert> <link class="action" action="file" subaction="edit"> <image file="icon/edit"></image> 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,42 +1,49 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form template" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="template" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form template"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('TEMPLATE_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('TEMPLATE_NAME'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="50" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'file_extension'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('file_extension'))) ?> + </span> </div> <div class="input"> - <a target="_self" data-type="view" data-action="" data-method="extension" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> + <a target="_self" data-type="view" data-action="" data-method="extension" data-id="" data-extra="[]" href="/#//" class=""> <div class="inputholder"> - <span><?php echo nl2br(encodeHtml(htmlentities($extension))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$extension)) ?> + </span> </div> </a> <div class="clickable"> - <a class="action" target="_self" data-type="view" data-action="" data-method="extension" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <a target="_self" data-type="view" data-action="" data-method="extension" data-id="" data-extra="[]" href="/#//" class="action"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'file_mimetype'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('file_mimetype'))) ?> + </span> </div> <div class="input"> - <a target="_self" data-action="template" data-method="extension" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/template/"> + <a target="_self" data-action="template" data-method="extension" data-id="" data-extra="[]" href="/#/template/" class=""> <div class="inputholder"> - <span><?php echo nl2br(encodeHtml(htmlentities($mime_type))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$mime_type)) ?> + </span> </div> </a> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/pub.php b/modules/cms-ui/themes/default/html/views/template/pub.php @@ -1,32 +1,23 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('security','nopublish')); if($if2){?> + <?php $if2=(config('security','nopublish')); if($if2) { ?> <div class="message warn"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NOPUBLISH_DESC'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOPUBLISH_DESC'))) ?> + </span> </div> - <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form template" data-async="true" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="template" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pub" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="1" data-autosave="" class="or-form template"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'pages';$default = true;$readonly = true;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_files" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('publish')))); ?></span> + <input type="checkbox" name="pages" disabled="1" value="1" checked="1" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('publish'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/pub.tpl.src.xml b/modules/cms-ui/themes/default/html/views/template/pub.tpl.src.xml @@ -4,7 +4,7 @@ <!-- Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. --> - <if true="config:security/nopublish"> + <if true="%{security/nopublish}"> <part class="message warn"> <text key="GLOBAL_NOPUBLISH_DESC" class="help"></text> </part> @@ -13,7 +13,7 @@ <form async="true"> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> diff --git a/modules/cms-ui/themes/default/html/views/template/remove.php b/modules/cms-ui/themes/default/html/views/template/remove.php @@ -1,37 +1,29 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form template" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="template" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form template"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </div> <div class="input"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'delete';$default = false;$readonly = false;$required = true; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_delete" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('CONFIRM_DELETE')))); ?></span> + <input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" required="required" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/template/remove.tpl.src.xml @@ -12,7 +12,7 @@ </part> </group> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> diff --git a/modules/cms-ui/themes/default/html/views/template/src.php b/modules/cms-ui/themes/default/html/views/template/src.php @@ -1,7 +1,9 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="src" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form template" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="template" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="src" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <input type="hidden" name="modelid" value="<?php echo $modelid ?>"/> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('source') ?></legend><div class="closable"> - <textarea name="<?php if ('') echo ''.'_' ?>source<?php if (false) echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"><?php echo htmlentities(${'source'}) ?></textarea> + <form name="" target="_self" data-target="view" action="./" data-method="src" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form template"> + <input type="hidden" name="modelid" value="<?php echo encodeHtml(htmlentities(@$modelid)) ?>" class=""> + </input> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <textarea name="source" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"> + </textarea> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="button" class="or-form-btn or-form-btn--primary or-form-btn--apply" value="<?php echo lang("APPLY") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/src.tpl.src.xml b/modules/cms-ui/themes/default/html/views/template/src.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <form apply="true"> <hidden name="modelid" /> - <group title="message:source"> + <group title="#{source}"> <editor type="code" name="source" mode="htmlmixed" /> </group> 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,39 +1,45 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="srcelement" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form template" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="template" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="srcelement" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <?php $if3=(isset($elements)); if($if3){?> + <form name="" target="_self" data-target="view" action="./" data-method="srcelement" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form template"> + <?php $if3=(isset($elements)); if($if3) { ?> <div class="line"> <div class="label"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_addelement" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="addelement"<?php if('addelement'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_addelement" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'value'.'')))); ?></span> + <input type="radio" name="type" disabled="" value="addelement" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('value'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_elementid" name="elementid" title="" class=""<?php if (count($elements)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($elements,$elementid,0,0) ?><?php if (count($elements)==0) { ?><input type="hidden" name="elementid" value="" /><?php } ?><?php if (count($elements)==1) { ?><input type="hidden" name="elementid" value="<?php echo array_keys($elements)[0] ?>" /><?php } ?> - </select></div> + <input name="elementid" value="<?php echo encodeHtml(htmlentities(@$elementid)) ?>" size="1" class=""> + </input> </div> </div> - <?php } ?> - <?php $if3=(isset($writable_elements)); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <?php } ?> + <?php $if3=(isset($writable_elements)); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_addicon" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="addicon"<?php if('addicon'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_addicon" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_ICON'.'')))); ?></span> + <input type="radio" name="type" disabled="" value="addicon" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_ICON'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_writable_elementid" name="writable_elementid" title="" class=""<?php if (count($writable_elements)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($writable_elements,$writable_elementid,0,0) ?><?php if (count($writable_elements)==0) { ?><input type="hidden" name="writable_elementid" value="" /><?php } ?><?php if (count($writable_elements)==1) { ?><input type="hidden" name="writable_elementid" value="<?php echo array_keys($writable_elements)[0] ?>" /><?php } ?> - </select></div> + <input name="writable_elementid" value="<?php echo encodeHtml(htmlentities(@$writable_elementid)) ?>" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_addifempty" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="addifempty"<?php if('addifempty'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_addifempty" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'TEMPLATE_SRC_IFEMPTY'.'')))); ?></span> + <input type="radio" name="type" disabled="" value="addifempty" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('TEMPLATE_SRC_IFEMPTY'))) ?> + </span> </label> </div> <div class="input"> @@ -41,13 +47,15 @@ </div> <div class="line"> <div class="label"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_addifnotempty" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="addifnotempty"<?php if('addifnotempty'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_addifnotempty" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'TEMPLATE_SRC_IFNOTEMPTY'.'')))); ?></span> + <input type="radio" name="type" disabled="" value="addifnotempty" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('TEMPLATE_SRC_IFNOTEMPTY'))) ?> + </span> </label> </div> <div class="input"> </div> </div> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/templatelist/add.php b/modules/cms-ui/themes/default/html/views/templatelist/add.php @@ -1,47 +1,55 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="templatelist" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form templatelist" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="templatelist" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="templatelist" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form templatelist"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('name')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="50" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class=""> + </input> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_empty" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="empty"<?php if('empty'==@$type)echo ' checked="checked"' ?> /> + <input type="radio" name="type" disabled="" value="empty" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> </div> <div class="input"> - <label for="<?php echo REQUEST_ID ?>_type_empty" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'empty'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('empty'))) ?> + </span> </label> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_type_copy" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'copy'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('copy'))) ?> + </span> </label> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_copy" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="copy"<?php if('copy'==@$type)echo ' checked="checked"' ?> /> + <input type="radio" name="type" disabled="" value="copy" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_templateid" name="templateid" title="" class=""<?php if (count($templates)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($templates,$templateid,0,0) ?><?php if (count($templates)==0) { ?><input type="hidden" name="templateid" value="" /><?php } ?><?php if (count($templates)==1) { ?><input type="hidden" name="templateid" value="<?php echo array_keys($templates)[0] ?>" /><?php } ?> - </select></div> + <input name="templateid" value="<?php echo encodeHtml(htmlentities(@$templateid)) ?>" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_type_example" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'example'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('example'))) ?> + </span> </label> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_example" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="example"<?php if('example'==@$type)echo ' checked="checked"' ?> /> + <input type="radio" name="type" disabled="" value="example" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_example" name="example" title="" class=""<?php if (count($examples)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($examples,$example,0,0) ?><?php if (count($examples)==0) { ?><input type="hidden" name="example" value="" /><?php } ?><?php if (count($examples)==1) { ?><input type="hidden" name="example" value="<?php echo array_keys($examples)[0] ?>" /><?php } ?> - </select></div> + <input name="example" value="<?php echo encodeHtml(htmlentities(@$example)) ?>" size="1" class=""> + </input> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/templatelist/add.tpl.src.xml b/modules/cms-ui/themes/default/html/views/templatelist/add.tpl.src.xml @@ -9,7 +9,7 @@ <input name="name" maxlength="50"></input> </part> </part> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> <radio name="type" value="empty"></radio> diff --git a/modules/cms-ui/themes/default/html/views/templatelist/show.php b/modules/cms-ui/themes/default/html/views/templatelist/show.php @@ -1,30 +1,36 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> </tr> - <?php foreach($templates as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($templates as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <i class="image-icon image-icon--action-template"></i> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="template" data-method="show" data-id="<?php echo $id ?>" data-extra="[]" href="./#/template/<?php echo $id ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <i class="image-icon image-icon--action-template"> + </i> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="template" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/template/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> </tr> - <?php } ?> - <?php $if3=(($templates)==FALSE); if($if3){?> - <tr> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NO_TEMPLATES_AVAILABLE_DESC')))); ?></span> + <?php } ?> + <?php $if3=(($templates)==FALSE); if($if3) { ?> + <tr class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NO_TEMPLATES_AVAILABLE_DESC'))) ?> + </span> </tr> - <?php } ?> + <?php } ?> <tr class="data"> <td colspan="1" class="clickable"> - <a target="_self" data-type="dialog" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="add" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/templatelist/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/templatelist/show.tpl.src.xml @@ -10,7 +10,7 @@ <row class="data"> <column class="clickable"> <image action="template" /> - <link type="open" id="var:id" name="var:name" action="template"> + <link type="open" id="${id}" name="${name}" action="template"> <text var="name"></text> </link> </column> diff --git a/modules/cms-ui/themes/default/html/views/text/compress.php b/modules/cms-ui/themes/default/html/views/text/compress.php @@ -1,25 +1,33 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="compress" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form text" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="text" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="compress" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('OPTIONS') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="compress" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form text"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('type')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + </span> </div> <div class="input"> - <?php $gz= 'gz'; ?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_format" name="format" title="" class=""<?php if (count($formats)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($formats,'gz',0,0) ?><?php if (count($formats)==0) { ?><input type="hidden" name="format" value="" /><?php } ?><?php if (count($formats)==1) { ?><input type="hidden" name="format" value="<?php echo array_keys($formats)[0] ?>" /><?php } ?> - </select></div> - <?php $replace= '1'; ?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_1" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="1"<?php if('1'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_1" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'replace'.'')))); ?></span> + <?php { $gz= 'gz'; ?> + <?php } ?> + <input name="format" value="gz" size="1" class=""> + </input> + <?php { $replace= '1'; ?> + <?php } ?> + <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + </span> </label> - <br/> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="0"<?php if('0'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_0" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <br> + </br> + <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/compress.tpl.src.xml b/modules/cms-ui/themes/default/html/views/text/compress.tpl.src.xml @@ -1,7 +1,7 @@ <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> - <group title="message:OPTIONS"> + <group title="#{OPTIONS}"> <part class="line"> <part class="label"> <text text="type"></text> diff --git a/modules/cms-ui/themes/default/html/views/text/edit.php b/modules/cms-ui/themes/default/html/views/text/edit.php @@ -1,13 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form text" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="text" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="edit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form text"> <div class="line"> <div class="label"> </div> <div class="input"> - <br/> - <input size="40" id="req0_file" type="file" name="file" class="upload" /> - <br/> - <br/> + <br> + </br> + <input id="req0_file" name="file" size="40" class="upload"> + </input> + <br> + </br> + <br> + </br> </div> </div> <div class="line or-dropzone-upload"> @@ -16,4 +20,4 @@ <div class="input"> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file 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,11 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="extract" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form text" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="text" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="extract" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> + <form name="" target="_self" data-target="view" action="./" data-method="extract" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form text"> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/preview.php b/modules/cms-ui/themes/default/html/views/text/preview.php @@ -1,2 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <iframe src="<?php echo $preview_url ?>"></iframe>- \ No newline at end of file + <iframe src="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>" class=""> + </iframe>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/preview.tpl.src.xml b/modules/cms-ui/themes/default/html/views/text/preview.tpl.src.xml @@ -1,5 +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"> - <insert url="var:preview_url"></insert> + <insert url="${preview_url}"></insert> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/pub.php b/modules/cms-ui/themes/default/html/views/text/pub.php @@ -1,21 +1,19 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php $if2=(config('security','nopublish')); if($if2){?> + <?php $if2=(config('security','nopublish')); if($if2) { ?> <div class="message warn"> - <span class="help"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NOPUBLISH_DESC'.'')))); ?></span> + <span class="help"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOPUBLISH_DESC'))) ?> + </span> </div> - <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form text" data-async="true" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="text" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pub" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <br/> + <?php } ?> + <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="1" data-autosave="" class="or-form text"> + <tr class=""> + <td class=""> + <br> + </br> </td> </tr> - <tr> + <tr class=""> <td class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('publish') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/pub.tpl.src.xml b/modules/cms-ui/themes/default/html/views/text/pub.tpl.src.xml @@ -4,13 +4,13 @@ <!-- Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. --> - <if true="config:security/nopublish"> + <if true="%{security/nopublish}"> <part class="message warn"> <text key="GLOBAL_NOPUBLISH_DESC" class="help"></text> </part> </if> - <form cancel="true" label="message:publish" async="true"> + <form cancel="true" label="#{publish}" async="true"> <row> <column> <newline></newline> diff --git a/modules/cms-ui/themes/default/html/views/text/remove.php b/modules/cms-ui/themes/default/html/views/text/remove.php @@ -1,39 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form text" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="text" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form text"> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </td> </tr> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DELETE')))); ?></span> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DELETE'))) ?> + </span> </td> - <td> - <?php { $tmpname = 'delete';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <td class=""> + <input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + </input> </td> </tr> - <tr> - <td colspan="2"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> + <tr class=""> + <td colspan="2" class=""> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/show.php b/modules/cms-ui/themes/default/html/views/text/show.php @@ -1 +1,2 @@ -<?php if (!defined('OR_TITLE')) die('Forbidden'); ?><?php echo $value; ?>- \ No newline at end of file +<?php if (!defined('OR_TITLE')) die('Forbidden'); ?> +<?php echo @$value ?>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/size.php b/modules/cms-ui/themes/default/html/views/text/size.php @@ -1,94 +1,99 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="size" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form text" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="text" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="size" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="size" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form text"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('IMAGE_OLD_SIZE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('IMAGE_OLD_SIZE'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($width))); ?></span> - <span><?php echo nl2br(' * '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($height))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$width)) ?> + </span> + <span class=""> * + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$height)) ?> + </span> </div> </div> - <?php $if3=!(($formats)==FALSE); if($if3){?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('IMAGE_NEW_SIZE') ?></legend><div class="closable"> + <?php $if3=!(($formats)==FALSE); if($if3) { ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_factor" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="factor"<?php if('factor'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_factor" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_IMAGE_SIZE_FACTOR')))); ?></span> + <input type="radio" name="type" disabled="" value="factor" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_SIZE_FACTOR'))) ?> + </span> </label> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_factor" name="factor" title="" class=""<?php if (count($factors)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($factors,$factor,0,0) ?><?php if (count($factors)==0) { ?><input type="hidden" name="factor" value="" /><?php } ?><?php if (count($factors)==1) { ?><input type="hidden" name="factor" value="<?php echo array_keys($factors)[0] ?>" /><?php } ?> - </select></div> - <?php $factor= '1'; ?> + <input name="factor" value="<?php echo encodeHtml(htmlentities(@$factor)) ?>" size="1" class=""> + </input> + <?php { $factor= '1'; ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_input" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="input"<?php if('input'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_input" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_IMAGE_NEW_WIDTH_HEIGHT')))); ?></span> + <input type="radio" name="type" disabled="" value="input" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_NEW_WIDTH_HEIGHT'))) ?> + </span> </label> </div> <div class="label"> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_width" name="<?php if ('') echo ''.'_' ?>width<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$width) ?>" /><?php if (false) { ?><input type="hidden" name="width" value="<?php $width ?>"/><?php } ?></div> - <span><?php echo nl2br(' * '); ?></span> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_height" name="<?php if ('') echo ''.'_' ?>height<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$height) ?>" /><?php if (false) { ?><input type="hidden" name="height" value="<?php $height ?>"/><?php } ?></div> + <input name="width" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" class=""> + </input> + <span class=""> * + </span> + <input name="height" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" class=""> + </input> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_format" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_IMAGE_FORMAT')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_FORMAT'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_format" name="format" title="" class=""<?php if (count($formats)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($formats,$format,0,0) ?><?php if (count($formats)==0) { ?><input type="hidden" name="format" value="" /><?php } ?><?php if (count($formats)==1) { ?><input type="hidden" name="format" value="<?php echo array_keys($formats)[0] ?>" /><?php } ?> - </select></div> + <input name="format" value="<?php echo encodeHtml(htmlentities(@$format)) ?>" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_jpeglist_compression" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_IMAGE_JPEG_COMPRESSION')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_JPEG_COMPRESSION'))) ?> + </span> </label> </div> <div class="input"> - <?php $jpeg_compression= '70'; ?> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_jpeg_compression" name="jpeg_compression" title="" class=""<?php if (count($jpeglist)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($jpeglist,$jpeg_compression,0,0) ?><?php if (count($jpeglist)==0) { ?><input type="hidden" name="jpeg_compression" value="" /><?php } ?><?php if (count($jpeglist)==1) { ?><input type="hidden" name="jpeg_compression" value="<?php echo array_keys($jpeglist)[0] ?>" /><?php } ?> - </select></div> + <?php { $jpeg_compression= '70'; ?> + <?php } ?> + <input name="jpeg_compression" value="<?php echo encodeHtml(htmlentities(@$jpeg_compression)) ?>" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'copy';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_copy" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'copy'.'')))); ?></span> + <input type="checkbox" name="copy" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$copy)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('copy'))) ?> + </span> </label> </div> </div> </div></fieldset> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/size.tpl.src.xml b/modules/cms-ui/themes/default/html/views/text/size.tpl.src.xml @@ -12,7 +12,7 @@ </part> </part> <if not="" empty="formats"> - <group title="message:IMAGE_NEW_SIZE"> + <group title="#{IMAGE_NEW_SIZE}"> <part class="line"> <part class="label"></part> @@ -44,7 +44,7 @@ </part> </part> </group> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"> <label for="format"> diff --git a/modules/cms-ui/themes/default/html/views/text/structure.php b/modules/cms-ui/themes/default/html/views/text/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/text/structure.tpl.src.xml @@ -1,7 +1,7 @@ <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"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/uncompress.php b/modules/cms-ui/themes/default/html/views/text/uncompress.php @@ -1,21 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="uncompress" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form text" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="text" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="uncompress" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="uncompress" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form text"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> </div> <div class="input"> - <?php $replace= '1'; ?> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_1" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="1"<?php if('1'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_1" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'replace'.'')))); ?></span> + <?php { $replace= '1'; ?> + <?php } ?> + <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + </span> </label> - <br/> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if (false) echo '_disabled' ?>" value="0"<?php if('0'==@$replace)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_replace_0" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'new'.'')))); ?></span> + <br> + </br> + <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" class=""> + </input> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </label> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/uncompress.tpl.src.xml b/modules/cms-ui/themes/default/html/views/text/uncompress.tpl.src.xml @@ -1,7 +1,7 @@ <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> - <group title="message:options"></group> + <group title="#{options}"></group> <part class="line"> <part class="label"> </part> diff --git a/modules/cms-ui/themes/default/html/views/text/value.php b/modules/cms-ui/themes/default/html/views/text/value.php @@ -1,19 +1,17 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form text" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="text" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="value" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <tr> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_VALUE')))); ?></span> + <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form text"> + <tr class=""> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_VALUE'))) ?> + </span> </td> - <td> - <textarea name="<?php if ('') echo ''.'_' ?>value<?php if (false) echo '_disabled' ?>" data-extension="<?php echo $extension ?>" data-mimetype="<?php echo $mimetype ?>" data-mode="htmlmixed" class="editor code-editor"><?php echo htmlentities(${'value'}) ?></textarea> + <td class=""> + <textarea name="value" data-extension="<?php echo encodeHtml(htmlentities(@$extension)) ?>" data-mimetype="<?php echo encodeHtml(htmlentities(@$mimetype)) ?>" data-mode="htmlmixed" class="editor code-editor"> + </textarea> </td> </tr> - <tr> + <tr class=""> <td colspan="2" class="act"> - <div class="invisible"><input type="submit" name="ok" class="%class%" - title="?button_ok_DESC?" - value=" ?button_ok? " /> - </div> </td> </tr> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="button" class="or-form-btn or-form-btn--primary or-form-btn--apply" value="<?php echo lang("APPLY") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ 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 @@ -7,7 +7,7 @@ <text text="GLOBAL_VALUE"></text> </column> <column> - <editor name="value" type="code" extension="var:extension" mimetype="var:mimetype"></editor> + <editor name="value" type="code" extension="${extension}" mimetype="${mimetype}"></editor> </column> </row> <row> diff --git a/modules/cms-ui/themes/default/html/views/title/ping.php b/modules/cms-ui/themes/default/html/views/title/ping.php @@ -1,2 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <span><?php echo nl2br(encodeHtml(htmlentities('1'))); ?></span>- \ No newline at end of file + <span class="">1 + </span>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/title/show.php b/modules/cms-ui/themes/default/html/views/title/show.php @@ -2,342 +2,440 @@ <div class="or-menu"> <div class="or-menu-group"> <div class="toolbar-icon toggle-nav-open-close"> - <i class="image-icon image-icon--menu-menu"></i> + <i class="image-icon image-icon--menu-menu"> + </i> </div> <div class="toolbar-icon toggle-nav-small"> - <i class="image-icon image-icon--menu-minimize"></i> + <i class="image-icon image-icon--menu-minimize"> + </i> </div> - <?php $if4=(isset($$dbname)); if($if4){?> + <?php $if4=(isset($dbname)); if($if4) { ?> <div class="toolbar-icon"> - <i class="image-icon image-icon--action-database"></i> - <span class="label"><?php echo nl2br(' '); ?></span> + <i class="image-icon image-icon--action-database"> + </i> + <span class="label"> + </span> <div class="arrow arrow-down"> </div> <div class="dropdown"> <div class="entry"> - <span title="<?php echo $dbid ?>"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $dbname,50,'..',constant('STR_PAD_BOTH') )))); ?></span> + <span title="<?php echo encodeHtml(htmlentities(@$dbid)) ?>" class=""><?php echo encodeHtml(htmlentities(@$dbname)) ?> + </span> </div> </div> </div> - <?php } ?> - <?php $if4=($isLoggedIn); if($if4){?> + <?php } ?> + <?php $if4=($isLoggedIn); if($if4) { ?> <div class="toolbar-icon clickable filtered on-action-folder on-action-page on-action-file on-action-projectlist on-action-templatelist on-action-userlist on-action-grouplist on-action-languagelist on-action-modellist"> - <a title="<?php echo lang('menu_new_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_new_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="add" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> </a> </div> - <?php } ?> - <?php $if4=($isLoggedIn); if($if4){?> + <?php } ?> + <?php $if4=($isLoggedIn); if($if4) { ?> <div class="toolbar-icon clickable filtered on-action-folder on-action-page on-action-file on-action-image on-action-text on-action-pageelement on-action-template"> - <a title="<?php echo lang('menu_pub_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="pub" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'pub'}" href="./#//"> - <i class="image-icon image-icon--method-publish"></i> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_pub_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="pub" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'pub'}" href="/#//" class=""> + <i class="image-icon image-icon--method-publish"> + </i> </a> </div> - <?php } ?> - <?php $if4=($isLoggedIn); if($if4){?> + <?php } ?> + <?php $if4=($isLoggedIn); if($if4) { ?> <div class="toolbar-icon menu"> - <i class="image-icon image-icon--action-file"></i> - <span class="label"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'file'.'')))); ?></span> + <i class="image-icon image-icon--action-file"> + </i> + <span class="label"><?php echo encodeHtml(htmlentities(@lang('file'))) ?> + </span> <div class="arrow arrow-down"> </div> <div class="dropdown"> <div class="entry clickable filtered on-action-folder on-action-page on-action-file on-action-projectlist on-action-templatelist on-action-userlist on-action-grouplist on-action-languagelist on-action-modellist"> - <a title="<?php echo lang('menu_new_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_new'.'')))); ?></span> - <span class="keystroke"><?php echo nl2br(encodeHtml(htmlentities(config('ui','keybinding','method','add')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_new_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="add" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_new'))) ?> + </span> + <span class="keystroke"><?php echo encodeHtml(htmlentities(config('ui','keybinding','method','add'))) ?> + </span> </a> </div> <div class="divide"> </div> <div class="entry clickable filtered on-action-folder"> - <a title="<?php echo lang('menu_createfolder_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createfolder" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createfolder'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createfolder'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_createfolder_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="createfolder" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createfolder'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createfolder'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-folder"> - <a title="<?php echo lang('menu_createpage_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createpage" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createpage'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createpage'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_createpage_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="createpage" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createpage'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createpage'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-folder"> - <a title="<?php echo lang('menu_createfile_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createfile" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createfile'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createfile'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_createfile_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="createfile" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createfile'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createfile'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-folder"> - <a title="<?php echo lang('menu_createimage_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createimage" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createimage'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createimage'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_createimage_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="createimage" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createimage'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createimage'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-folder"> - <a title="<?php echo lang('menu_createtext_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createtext" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createtext'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createtext'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_createtext_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="createtext" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createtext'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createtext'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-folder"> - <a title="<?php echo lang('menu_createlink_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createlink" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createlink'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createlink'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_createlink_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="createlink" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createlink'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createlink'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-folder"> - <a title="<?php echo lang('menu_createurl_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createurl" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createurl'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createurl'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_createurl_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="createurl" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createurl'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_createurl'))) ?> + </span> </a> </div> <div class="divide"> </div> <div class="entry clickable filtered on-action-file"> - <a title="<?php echo lang('menu_compress_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="compress" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'compress'}" href="./#//"> - <i class="image-icon image-icon--method-compress"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_compress'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_compress_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="compress" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'compress'}" href="/#//" class=""> + <i class="image-icon image-icon--method-compress"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_compress'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-file"> - <a title="<?php echo lang('menu_decompress_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="decompress" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'decompress'}" href="./#//"> - <i class="image-icon image-icon--method-decompress"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_decompress'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_decompress_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="decompress" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'decompress'}" href="/#//" class=""> + <i class="image-icon image-icon--method-decompress"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_decompress'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-file"> - <a title="<?php echo lang('menu_extract_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="extract" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'extract'}" href="./#//"> - <i class="image-icon image-icon--method-extract"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_extract'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_extract_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="extract" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'extract'}" href="/#//" class=""> + <i class="image-icon image-icon--method-extract"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_extract'))) ?> + </span> </a> </div> <div class="divide"> </div> <div class="entry clickable"> - <a class="entry" title="<?php echo lang('USER_LOGOUT_DESC') ?>" target="_self" data-type="post" data-action="login" data-method="logout" data-id="<?php echo OR_ID ?>" data-extra="[]" data-data="{"action":"login","subaction":"logout","id":"<?php echo OR_ID ?>","token":"<?php echo token() ?>","none":"0"}"> - <i class="image-icon image-icon--method-logout"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_LOGOUT'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('USER_LOGOUT_DESC'))) ?>" target="_self" data-type="post" data-action="login" data-method="logout" data-id="" data-extra="[]" data-data="{"action":"login","subaction":"logout","id":"",\"token":"<?php echo token() ?>","none":"0"}"" class="entry"> + <i class="image-icon image-icon--method-logout"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_LOGOUT'))) ?> + </span> </a> </div> </div> </div> - <?php } ?> - <?php $if4=($isLoggedIn); if($if4){?> + <?php } ?> + <?php $if4=($isLoggedIn); if($if4) { ?> <div class="toolbar-icon menu"> - <i class="image-icon image-icon--menu-edit"></i> - <span class="label"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <i class="image-icon image-icon--menu-edit"> + </i> + <span class="label"><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> <div class="arrow arrow-down"> </div> <div class="dropdown"> <div class="entry clickable filtered on-action-user on-action-project on-action-link on-action-folder on-action-page on-action-template on-action-element on-action-file on-action-url on-action-image on-action-text on-action-language on-action-model"> - <a title="<?php echo lang('menu_prop_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'prop'}" href="./#//"> - <i class="image-icon image-icon--method-prop"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_prop'.'')))); ?></span> - <span class="keystroke"><?php echo nl2br(encodeHtml(htmlentities(config('ui','keybinding','method','prop')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_prop_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="prop" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'prop'}" href="/#//" class=""> + <i class="image-icon image-icon--method-prop"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_prop'))) ?> + </span> + <span class="keystroke"><?php echo encodeHtml(htmlentities(config('ui','keybinding','method','prop'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-link on-action-folder on-action-page on-action-file on-action-text on-action-url on-action-image"> - <a title="<?php echo lang('menu_settings_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="settings" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'settings'}" href="./#//"> - <i class="image-icon image-icon--method-settings"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_settings'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_settings_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="settings" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'settings'}" href="/#//" class=""> + <i class="image-icon image-icon--method-settings"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_settings'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-page on-action-file on-action-folder on-action-text on-action-image on-action-pageelement on-action-template"> - <a title="<?php echo lang('menu_pub_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="pub" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'pub'}" href="./#//"> - <i class="image-icon image-icon--method-publish"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_pub'.'')))); ?></span> - <span class="keystroke"><?php echo nl2br(encodeHtml(htmlentities(config('ui','keybinding','method','pub')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_pub_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="pub" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'pub'}" href="/#//" class=""> + <i class="image-icon image-icon--method-publish"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_pub'))) ?> + </span> + <span class="keystroke"><?php echo encodeHtml(htmlentities(config('ui','keybinding','method','pub'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-pageelement"> - <a class="entry" title="<?php echo lang('menu_archive_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="archive" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'archive'}" href="./#//"> - <i class="image-icon image-icon--method-archive"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_archive'.'')))); ?></span> - <span class="keystroke"><?php echo nl2br(encodeHtml(htmlentities(config('ui','keybinding','method','archive')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_archive_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="archive" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'archive'}" href="/#//" class="entry"> + <i class="image-icon image-icon--method-archive"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_archive'))) ?> + </span> + <span class="keystroke"><?php echo encodeHtml(htmlentities(config('ui','keybinding','method','archive'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-project on-action-folder on-action-link on-action-user on-action-group on-action-page on-action-file on-action-image on-action-text on-action-url"> - <a title="<?php echo lang('menu_rights_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="rights" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'rights'}" href="./#//"> - <i class="image-icon image-icon--method-rights"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_rights'.'')))); ?></span> - <span class="keystroke"><?php echo nl2br(encodeHtml(htmlentities(config('ui','keybinding','method','rights')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_rights_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="rights" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'rights'}" href="/#//" class=""> + <i class="image-icon image-icon--method-rights"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_rights'))) ?> + </span> + <span class="keystroke"><?php echo encodeHtml(htmlentities(config('ui','keybinding','method','rights'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-pageelement on-action-user on-action-group on-action-page on-action-project on-action-projectlist"> - <a title="<?php echo lang('menu_history_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="history" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'history'}" href="./#//"> - <i class="image-icon image-icon--method-history"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_history'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_history_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="history" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'history'}" href="/#//" class=""> + <i class="image-icon image-icon--method-history"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_history'))) ?> + </span> </a> </div> <div class="divide"> </div> <div class="entry clickable filtered on-action-project on-action-template on-action-page on-action-element on-action-image on-action-file on-action-folder on-action-url on-action-image on-action-text on-action-link on-action-language on-action-model on-action-user on-action-group"> - <a title="<?php echo lang('menu_delete_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="remove" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'remove'}" href="./#//"> - <i class="image-icon image-icon--method-delete"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_delete'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_delete_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="remove" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'remove'}" href="/#//" class=""> + <i class="image-icon image-icon--method-delete"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_delete'))) ?> + </span> </a> </div> <div class="divide"> </div> <div class="entry clickable filtered on-action-page on-action-file on-action-image on-action-template on-action-pageelement"> - <a title="<?php echo lang('menu_preview_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="preview" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'preview'}" href="./#//"> - <i class="image-icon image-icon--method-preview"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_preview'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_preview_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="preview" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'preview'}" href="/#//" class=""> + <i class="image-icon image-icon--method-preview"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_preview'))) ?> + </span> </a> </div> </div> </div> - <?php } ?> - <?php $if4=($isLoggedIn); if($if4){?> + <?php } ?> + <?php $if4=($isLoggedIn); if($if4) { ?> <div class="toolbar-icon menu"> - <i class="image-icon image-icon--menu-extra"></i> - <span class="label"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'extras'.'')))); ?></span> + <i class="image-icon image-icon--menu-extra"> + </i> + <span class="label"><?php echo encodeHtml(htmlentities(@lang('extras'))) ?> + </span> <div class="arrow arrow-down"> </div> <div class="dropdown"> <div class="entry clickable filtered on-action-user"> - <a title="<?php echo lang('menu_password_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="pw" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'pw'}" href="./#//"> - <i class="image-icon image-icon--method-password"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_password'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_password_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="pw" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'pw'}" href="/#//" class=""> + <i class="image-icon image-icon--method-password"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_password'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-user on-action-group"> - <a title="<?php echo lang('menu_memberships_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="memberships" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'memberships'}" href="./#//"> - <i class="image-icon image-icon--method-membership"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_memberships'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_memberships_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="memberships" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'memberships'}" href="/#//" class=""> + <i class="image-icon image-icon--method-membership"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_memberships'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-folder on-action-element on-action-file on-action-image on-action-text on-action-pageelement"> - <a title="<?php echo lang('menu_advanced_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="advanced" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'advanced'}" href="./#//"> - <i class="image-icon image-icon--method-advanced"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_advanced'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_advanced_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="advanced" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'advanced'}" href="/#//" class=""> + <i class="image-icon image-icon--method-advanced"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_advanced'))) ?> + </span> </a> </div> <div class="divide"> </div> <div class="entry clickable filtered on-action-page"> - <a title="<?php echo lang('menu_changetemplate_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="changetemplate" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'changetemplate'}" href="./#//"> - <i class="image-icon image-icon--method-changetemplate"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_changetemplate'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_changetemplate_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="changetemplate" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'changetemplate'}" href="/#//" class=""> + <i class="image-icon image-icon--method-changetemplate"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_changetemplate'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-template on-action-configuration on-action-page"> - <a title="<?php echo lang('menu_src_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="src" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'src'}" href="./#//"> - <i class="image-icon image-icon--method-code"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_src'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_src_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="src" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'src'}" href="/#//" class=""> + <i class="image-icon image-icon--method-code"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_src'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-template"> - <a title="<?php echo lang('menu_extension_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="extension" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'extension'}" href="./#//"> - <i class="image-icon image-icon--method-extension"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_extension'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_extension_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="extension" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'extension'}" href="/#//" class=""> + <i class="image-icon image-icon--method-extension"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_extension'))) ?> + </span> </a> </div> <div class="divide"> </div> <div class="entry clickable filtered on-action-text"> - <a title="<?php echo lang('menu_value_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="value" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'value'}" href="./#//"> - <i class="image-icon image-icon--method-value"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_value'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_value_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="value" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'value'}" href="/#//" class=""> + <i class="image-icon image-icon--method-value"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_value'))) ?> + </span> </a> </div> <div class="entry clickable filtered on-action-folder"> - <a title="<?php echo lang('menu_order_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="order" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'order'}" href="./#//"> - <i class="image-icon image-icon--method-order"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_order'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_order_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="order" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'order'}" href="/#//" class=""> + <i class="image-icon image-icon--method-order"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_order'))) ?> + </span> </a> </div> <div class="divide"> </div> <div class="entry clickable filtered on-action-image"> - <a title="<?php echo lang('menu_size_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="size" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'size'}" href="./#//"> - <i class="image-icon image-icon--method-size"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_size'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_size_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="size" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'size'}" href="/#//" class=""> + <i class="image-icon image-icon--method-size"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_size'))) ?> + </span> </a> </div> <div class="divide"> </div> <div class="entry clickable filtered on-action-project"> - <a title="<?php echo lang('menu_maintenance_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="maintenance" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'maintenance'}" href="./#//"> - <i class="image-icon image-icon--method-maintenance"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_maintenance'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_maintenance_desc'))) ?>" target="_self" data-type="dialog" data-action="" data-method="maintenance" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'maintenance'}" href="/#//" class=""> + <i class="image-icon image-icon--method-maintenance"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_maintenance'))) ?> + </span> </a> </div> </div> </div> - <?php } ?> + <?php } ?> </div> <div class="or-menu-group"> <div class="toolbar-icon user menu"> - <i class="image-icon image-icon--action-user"></i> - <span class="label"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $userfullname,25,'..',constant('STR_PAD_BOTH') )))); ?></span> + <i class="image-icon image-icon--action-user"> + </i> + <span class="label"><?php echo encodeHtml(htmlentities(@$userfullname)) ?> + </span> <div class="arrow arrow-down"> </div> <div class="dropdown"> - <?php $if6=($isLoggedIn); if($if6){?> + <?php $if6=($isLoggedIn); if($if6) { ?> <div class="entry clickable"> - <a title="<?php echo lang('menu_PROFILE_DESC') ?>" target="_self" data-type="dialog" data-action="profile" data-method="edit" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'profile','dialogMethod':'edit'}" href="./#/profile/"> - <i class="image-icon image-icon--action-user"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_profile'.'')))); ?></span> - <span class="keystroke"><?php echo nl2br(encodeHtml(htmlentities(config('ui','keybinding','action','profile')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_PROFILE_DESC'))) ?>" target="_self" data-type="dialog" data-action="profile" data-method="edit" data-id="" data-extra="{'dialogAction':'profile','dialogMethod':'edit'}" href="/#/profile/" class=""> + <i class="image-icon image-icon--action-user"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_profile'))) ?> + </span> + <span class="keystroke"><?php echo encodeHtml(htmlentities(config('ui','keybinding','action','profile'))) ?> + </span> </a> </div> <div class="entry clickable"> - <a title="<?php echo lang('menu_password_DESC') ?>" target="_self" data-type="dialog" data-action="profile" data-method="pw" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'profile','dialogMethod':'pw'}" href="./#/profile/"> - <i class="image-icon image-icon--method-password"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_password'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_password_DESC'))) ?>" target="_self" data-type="dialog" data-action="profile" data-method="pw" data-id="" data-extra="{'dialogAction':'profile','dialogMethod':'pw'}" href="/#/profile/" class=""> + <i class="image-icon image-icon--method-password"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_password'))) ?> + </span> </a> </div> <div class="entry clickable"> - <a title="<?php echo lang('menu_mail_DESC') ?>" target="_self" data-type="dialog" data-action="profile" data-method="mail" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'profile','dialogMethod':'mail'}" href="./#/profile/"> - <i class="image-icon image-icon--method-mail"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_mail'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_mail_DESC'))) ?>" target="_self" data-type="dialog" data-action="profile" data-method="mail" data-id="" data-extra="{'dialogAction':'profile','dialogMethod':'mail'}" href="/#/profile/" class=""> + <i class="image-icon image-icon--method-mail"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_mail'))) ?> + </span> </a> </div> <div class="entry clickable"> - <a title="<?php echo lang('menu_license_DESC') ?>" target="_self" data-type="dialog" data-action="login" data-method="license" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'login','dialogMethod':'license'}" href="./#/login/"> - <i class="image-icon image-icon--method-info"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_info'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_license_DESC'))) ?>" target="_self" data-type="dialog" data-action="login" data-method="license" data-id="" data-extra="{'dialogAction':'login','dialogMethod':'license'}" href="/#/login/" class=""> + <i class="image-icon image-icon--method-info"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_info'))) ?> + </span> </a> </div> <div class="divide"> </div> <div class="entry clickable"> - <a title="<?php echo lang('menu_history_desc') ?>" target="_self" data-type="dialog" data-action="profile" data-method="history" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'profile','dialogMethod':'history'}" href="./#/profile/"> - <i class="image-icon image-icon--method-history"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_history'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('menu_history_desc'))) ?>" target="_self" data-type="dialog" data-action="profile" data-method="history" data-id="" data-extra="{'dialogAction':'profile','dialogMethod':'history'}" href="/#/profile/" class=""> + <i class="image-icon image-icon--method-history"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('menu_history'))) ?> + </span> </a> </div> <div class="divide"> </div> <div class="entry clickable"> - <a data-after-success="reloadAll" class="entry" title="<?php echo lang('USER_LOGOUT_DESC') ?>" target="_self" data-type="post" data-action="login" data-method="logout" data-id="<?php echo OR_ID ?>" data-extra="[]" data-data="{"action":"login","subaction":"logout","id":"<?php echo OR_ID ?>","token":"<?php echo token() ?>","none":"0"}"> - <i class="image-icon image-icon--method-logout"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_LOGOUT'.'')))); ?></span> + <a data-after-success="reloadAll" title="<?php echo encodeHtml(htmlentities(@lang('USER_LOGOUT_DESC'))) ?>" target="_self" data-type="post" data-action="login" data-method="logout" data-id="" data-extra="[]" data-data="{"action":"login","subaction":"logout","id":"",\"token":"<?php echo token() ?>","none":"0"}"" class="entry"> + <i class="image-icon image-icon--method-logout"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_LOGOUT'))) ?> + </span> </a> </div> - <?php } ?> - <?php if(!$if6){?> + <?php } ?> + <?php if(!$if6) { ?> <div class="entry clickable"> - <a title="<?php echo lang('USER_LOGIN_DESC') ?>" target="_self" data-type="dialog" data-action="login" data-method="login" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'login','dialogMethod':'login'}" href="./#/login/"> - <i class="image-icon image-icon--method-user"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_LOGIN'.'')))); ?></span> + <a title="<?php echo encodeHtml(htmlentities(@lang('USER_LOGIN_DESC'))) ?>" target="_self" data-type="dialog" data-action="login" data-method="login" data-id="" data-extra="{'dialogAction':'login','dialogMethod':'login'}" href="/#/login/" class=""> + <i class="image-icon image-icon--method-user"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_LOGIN'))) ?> + </span> </a> </div> - <?php } ?> + <?php } ?> </div> </div> - <?php $if4=($isLoggedIn); if($if4){?> + <?php $if4=($isLoggedIn); if($if4) { ?> <div class="toolbar-icon menu search"> - <i class="image-icon image-icon--method-search"></i> - <div class="inputholder"><input placeholder="<?php echo lang('search') ?>" id="<?php echo REQUEST_ID ?>_text" name="<?php if ('') echo ''.'_' ?>text<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$text) ?>" /><?php if (false) { ?><input type="hidden" name="text" value="<?php $text ?>"/><?php } ?></div> + <i class="image-icon image-icon--method-search"> + </i> + <input name="text" disabled="" placeholder="<?php echo encodeHtml(htmlentities(@lang('search'))) ?>" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$text)) ?>" class=""> + </input> <div class="arrow arrow-down"> </div> <div class="dropdown"> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <span class=""> + </span> </div> </div> - <?php } ?> + <?php } ?> </div> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/title/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/title/show.tpl.src.xml @@ -16,14 +16,14 @@ </part> <!-- Info-Meldung anzeigen (sofern vorhanden) --> - <if present="var:dbname"> + <if present="dbname"> <part class="toolbar-icon"> <image action="database"></image> <text class="label" raw="_"/> <part class="arrow arrow-down"/> <part class="dropdown"> <part class="entry"> - <text title="var:dbid" var="dbname" + <text title="${dbid}" var="dbname" maxlength="50"></text> </part> </part> @@ -31,12 +31,12 @@ </if> - <if true="var:isLoggedIn"> + <if true="${isLoggedIn}"> <!-- <part class="toolbar-icon clickable filtered on-action-folder on-action-file on-action-page on-action-link on-action-template on-action-element"> - <link type="dialog" subaction="prop" title="message:menu_prop_desc"> + <link type="dialog" subaction="prop" title="#{menu_prop_desc}"> <image method="prop"></image> <text class="label" key="menu_prop"></text> </link> @@ -44,7 +44,7 @@ --> <part class="toolbar-icon clickable filtered on-action-folder on-action-page on-action-file on-action-projectlist on-action-templatelist on-action-userlist on-action-grouplist on-action-languagelist on-action-modellist"> - <link type="dialog" title="message:menu_new_desc" subaction="add"> + <link type="dialog" title="#{menu_new_desc}" subaction="add"> <image method="add"></image> <!-- <text key="menu_new"></text> @@ -55,12 +55,12 @@ <!-- Falls eingeloggt: Weitere Aktionsbuttons --> - <if true="var:isLoggedIn"> + <if true="${isLoggedIn}"> <!-- <part class="toolbar-icon clickable filtered on-action-folder on-action-file on-action-page on-action-link on-action-template on-action-element"> - <link type="dialog" subaction="prop" title="message:menu_prop_desc"> + <link type="dialog" subaction="prop" title="#{menu_prop_desc}"> <image method="prop"></image> <text class="label" key="menu_prop"></text> </link> @@ -68,7 +68,7 @@ --> <part class="toolbar-icon clickable filtered on-action-folder on-action-page on-action-file on-action-image on-action-text on-action-pageelement on-action-template"> - <link type="dialog" subaction="pub" title="message:menu_pub_desc"> + <link type="dialog" subaction="pub" title="#{menu_pub_desc}"> <image method="publish"></image> <!-- <text class="label" key="menu_pub"></text> @@ -79,7 +79,7 @@ <!-- Menü: Datei --> - <if true="var:isLoggedIn"> + <if true="${isLoggedIn}"> <part class="toolbar-icon menu"> <image action="file"></image> <text class="label" key="file"></text> @@ -87,10 +87,10 @@ <part class="dropdown"> <part class="entry clickable filtered on-action-folder on-action-page on-action-file on-action-projectlist on-action-templatelist on-action-userlist on-action-grouplist on-action-languagelist on-action-modellist"> - <link type="dialog" title="message:menu_new_desc" subaction="add"> + <link type="dialog" title="#{menu_new_desc}" subaction="add"> <image method="add"></image> <text key="menu_new"></text> - <text class="keystroke" value="config:ui/keybinding/method/add"></text> + <text class="keystroke" value="%{ui/keybinding/method/add}"></text> </link> </part> @@ -98,49 +98,49 @@ <part class="entry clickable filtered on-action-folder"> - <link type="dialog" title="message:menu_createfolder_desc" subaction="createfolder"> + <link type="dialog" title="#{menu_createfolder_desc}" subaction="createfolder"> <image method="add"></image> <text key="menu_createfolder"></text> </link> </part> <part class="entry clickable filtered on-action-folder"> - <link type="dialog" title="message:menu_createpage_desc" subaction="createpage"> + <link type="dialog" title="#{menu_createpage_desc}" subaction="createpage"> <image method="add"></image> <text key="menu_createpage"></text> </link> </part> <part class="entry clickable filtered on-action-folder"> - <link type="dialog" title="message:menu_createfile_desc" subaction="createfile"> + <link type="dialog" title="#{menu_createfile_desc}" subaction="createfile"> <image method="add"></image> <text key="menu_createfile"></text> </link> </part> <part class="entry clickable filtered on-action-folder"> - <link type="dialog" title="message:menu_createimage_desc" subaction="createimage"> + <link type="dialog" title="#{menu_createimage_desc}" subaction="createimage"> <image method="add"></image> <text key="menu_createimage"></text> </link> </part> <part class="entry clickable filtered on-action-folder"> - <link type="dialog" title="message:menu_createtext_desc" subaction="createtext"> + <link type="dialog" title="#{menu_createtext_desc}" subaction="createtext"> <image method="add"></image> <text key="menu_createtext"></text> </link> </part> <part class="entry clickable filtered on-action-folder"> - <link type="dialog" title="message:menu_createlink_desc" subaction="createlink"> + <link type="dialog" title="#{menu_createlink_desc}" subaction="createlink"> <image method="add"></image> <text key="menu_createlink"></text> </link> </part> <part class="entry clickable filtered on-action-folder"> - <link type="dialog" title="message:menu_createurl_desc" subaction="createurl"> + <link type="dialog" title="#{menu_createurl_desc}" subaction="createurl"> <image method="add"></image> <text key="menu_createurl"></text> </link> @@ -150,13 +150,13 @@ <part class="divide"/> <part class="entry clickable"> - <link type="post" title="message:menu_save_desc" subaction="save"> + <link type="post" title="#{menu_save_desc}" subaction="save"> <image method="save"></image> <text key="menu_save"></text> </link> </part> <part class="entry clickable"> - <link type="post" title="message:menu_saveall_desc" subaction="saveall"> + <link type="post" title="#{menu_saveall_desc}" subaction="saveall"> <image method="save"></image> <text key="menu_saveall"></text> </link> @@ -166,7 +166,7 @@ <!-- <part class="entry clickable filtered on-action-page on-action-file on-action-image on-action-template on-action-pageelement"> - <link type="dialog" title="message:menu_preview_desc" + <link type="dialog" title="#{menu_preview_desc}" subaction="preview"> <image method="preview"></image> <text key="menu_preview"></text> @@ -176,21 +176,21 @@ <part class="divide"/> <part class="entry clickable filtered on-action-file"> - <link type="dialog" title="message:menu_compress_desc" + <link type="dialog" title="#{menu_compress_desc}" subaction="compress"> <image method="compress"></image> <text key="menu_compress"></text> </link> </part> <part class="entry clickable filtered on-action-file"> - <link type="dialog" title="message:menu_decompress_desc" + <link type="dialog" title="#{menu_decompress_desc}" subaction="decompress"> <image method="decompress"></image> <text key="menu_decompress"></text> </link> </part> <part class="entry clickable filtered on-action-file"> - <link type="dialog" title="message:menu_extract_desc" + <link type="dialog" title="#{menu_extract_desc}" subaction="extract"> <image method="extract"></image> <text key="menu_extract"></text> @@ -199,7 +199,7 @@ <part class="divide"/> <part class="entry clickable"> - <link type="post" class="entry" title="message:USER_LOGOUT_DESC" + <link type="post" class="entry" title="#{USER_LOGOUT_DESC}" action="login" subaction="logout"> <image method="logout"></image> <text key="USER_LOGOUT"></text> @@ -210,7 +210,7 @@ </if> <!-- Menü: Bearbeiten --> - <if true="var:isLoggedIn"> + <if true="${isLoggedIn}"> <part class="toolbar-icon menu"> <image menu="edit"></image> @@ -219,48 +219,48 @@ <part class="dropdown"> <part class="entry clickable filtered on-action-user on-action-project on-action-link on-action-folder on-action-page on-action-template on-action-element on-action-file on-action-url on-action-image on-action-text on-action-language on-action-model"> - <link type="dialog" title="message:menu_prop_desc" subaction="prop"> + <link type="dialog" title="#{menu_prop_desc}" subaction="prop"> <image method="prop"></image> <text key="menu_prop"></text> - <text class="keystroke" value="config:ui/keybinding/method/prop"></text> + <text class="keystroke" value="%{ui/keybinding/method/prop}"></text> </link> </part> <part class="entry clickable filtered on-action-link on-action-folder on-action-page on-action-file on-action-text on-action-url on-action-image"> - <link type="dialog" title="message:menu_settings_desc" subaction="settings"> + <link type="dialog" title="#{menu_settings_desc}" subaction="settings"> <image method="settings"></image> <text key="menu_settings"></text> </link> </part> <part class="entry clickable filtered on-action-page on-action-file on-action-folder on-action-text on-action-image on-action-pageelement on-action-template"> - <link type="dialog" title="message:menu_pub_desc" subaction="pub"> + <link type="dialog" title="#{menu_pub_desc}" subaction="pub"> <image method="publish"></image> <text key="menu_pub"></text> - <text class="keystroke" value="config:ui/keybinding/method/pub"></text> + <text class="keystroke" value="%{ui/keybinding/method/pub}"></text> </link> </part> <part class="entry clickable filtered on-action-pageelement"> <link type="dialog" class="entry" subaction="archive" - title="message:menu_archive_desc"> + title="#{menu_archive_desc}"> <image method="archive"></image> <text key="menu_archive"></text> - <text class="keystroke" value="config:ui/keybinding/method/archive"></text> + <text class="keystroke" value="%{ui/keybinding/method/archive}"></text> </link> </part> <part class="entry clickable filtered on-action-project on-action-folder on-action-link on-action-user on-action-group on-action-page on-action-file on-action-image on-action-text on-action-url"> - <link type="dialog" title="message:menu_rights_desc" + <link type="dialog" title="#{menu_rights_desc}" subaction="rights"> <image method="rights"></image> <text key="menu_rights"></text> - <text class="keystroke" value="config:ui/keybinding/method/rights"></text> + <text class="keystroke" value="%{ui/keybinding/method/rights}"></text> </link> </part> <part class="entry clickable filtered on-action-pageelement on-action-user on-action-group on-action-page on-action-project on-action-projectlist"> - <link type="dialog" title="message:menu_history_desc" + <link type="dialog" title="#{menu_history_desc}" subaction="history"> <image method="history"></image> <text key="menu_history"></text> @@ -270,7 +270,7 @@ <part class="divide"/> <part class="entry clickable filtered on-action-project on-action-template on-action-page on-action-element on-action-image on-action-file on-action-folder on-action-url on-action-image on-action-text on-action-link on-action-language on-action-model on-action-user on-action-group"> - <link type="dialog" title="message:menu_delete_desc" + <link type="dialog" title="#{menu_delete_desc}" subaction="remove"> <image method="delete"></image> <text key="menu_delete"></text> @@ -281,7 +281,7 @@ <part class="entry clickable filtered on-action-page on-action-file on-action-image on-action-template on-action-pageelement"> - <link type="dialog" title="message:menu_preview_desc" + <link type="dialog" title="#{menu_preview_desc}" subaction="preview"> <image method="preview"></image> <text key="menu_preview"></text> @@ -293,7 +293,7 @@ <!-- Menü: Extras --> - <if true="var:isLoggedIn"> + <if true="${isLoggedIn}"> <part class="toolbar-icon menu"> <image menu="extra"></image> @@ -302,14 +302,14 @@ <part class="dropdown"> <part class="entry clickable filtered on-action-user"> - <link type="dialog" title="message:menu_password_desc" + <link type="dialog" title="#{menu_password_desc}" subaction="pw"> <image method="password"></image> <text key="menu_password"></text> </link> </part> <part class="entry clickable filtered on-action-user on-action-group"> - <link type="dialog" title="message:menu_memberships_desc" + <link type="dialog" title="#{menu_memberships_desc}" subaction="memberships"> <image method="membership"></image> <text key="menu_memberships"></text> @@ -317,7 +317,7 @@ </part> <part class="entry clickable filtered on-action-folder on-action-element on-action-file on-action-image on-action-text on-action-pageelement"> - <link type="dialog" title="message:menu_advanced_desc" + <link type="dialog" title="#{menu_advanced_desc}" subaction="advanced"> <image method="advanced"></image> <text key="menu_advanced"></text> @@ -327,7 +327,7 @@ <part class="divide"/> <part class="entry clickable filtered on-action-page"> - <link type="dialog" title="message:menu_changetemplate_desc" + <link type="dialog" title="#{menu_changetemplate_desc}" subaction="changetemplate"> <image method="changetemplate"></image> <text key="menu_changetemplate"></text> @@ -335,7 +335,7 @@ </part> <part class="entry clickable filtered on-action-template on-action-configuration on-action-page"> - <link type="dialog" title="message:menu_src_desc" + <link type="dialog" title="#{menu_src_desc}" subaction="src"> <image method="code"></image> <text key="menu_src"></text> @@ -343,7 +343,7 @@ </part> <part class="entry clickable filtered on-action-template"> - <link type="dialog" title="message:menu_extension_desc" + <link type="dialog" title="#{menu_extension_desc}" subaction="extension"> <image method="extension"></image> <text key="menu_extension"></text> @@ -353,7 +353,7 @@ <part class="divide"/> <part class="entry clickable filtered on-action-text"> - <link type="dialog" title="message:menu_value_desc" + <link type="dialog" title="#{menu_value_desc}" subaction="value"> <image method="value"></image> <text key="menu_value"></text> @@ -361,7 +361,7 @@ </part> <part class="entry clickable filtered on-action-folder"> - <link type="dialog" title="message:menu_order_desc" + <link type="dialog" title="#{menu_order_desc}" subaction="order"> <image method="order"></image> <text key="menu_order"></text> @@ -371,7 +371,7 @@ <part class="divide"/> <part class="entry clickable filtered on-action-image"> - <link type="dialog" title="message:menu_size_desc" + <link type="dialog" title="#{menu_size_desc}" subaction="size"> <image method="size"></image> <text key="menu_size"></text> @@ -382,7 +382,7 @@ <part class="divide"/> <part class="entry clickable filtered on-action-project"> - <link type="dialog" title="message:menu_maintenance_desc" + <link type="dialog" title="#{menu_maintenance_desc}" subaction="maintenance"> <image method="maintenance"></image> <text key="menu_maintenance"></text> @@ -390,7 +390,7 @@ </part> <!-- <part class="entry clickable filtered on-action-project"> - <link type="dialog" title="message:menu_export_desc" + <link type="dialog" title="#{menu_export_desc}" subaction="export"> <image method="export"></image> <text key="menu_export"></text> @@ -404,14 +404,14 @@ <!-- Menü: Projekt --> <!-- - <if true="var:isLoggedIn"> + <if true="${isLoggedIn}"> <part class="toolbar-icon projects menu"> <image action="project"></image> <text class="titletext" key="GLOBAL_PROJECT"></text> <part class="dropdown"> - <if true="var:isAdmin"> + <if true="${isAdmin}"> <part class="entry clickable"> <link type="post" class="entry" action="start" subaction="administration" target="tree" id="-1"> @@ -426,8 +426,8 @@ <list list="languages" key="id" value="name"> <part class="entry clickable"> <image action="language"></image> - <link type="post" action="tree" subaction="language" id="var:id" - title="message:select_language"> + <link type="post" action="tree" subaction="language" id="${id}" + title="#{select_language}"> <text var="name"></text> </link> </part> @@ -439,8 +439,8 @@ <list list="models" key="id" value="name"> <part class="entry clickable"> <image action="model"></image> - <link type="post" action="tree" subaction="model" id="var:id" - title="message:select_model"> + <link type="post" action="tree" subaction="model" id="${id}" + title="#{select_model}"> <text var="name"></text> </link> </part> @@ -452,8 +452,8 @@ <list list="projects" key="id" value="name"> <part class="entry clickable"> <image action="project"></image> - <link type="post" action="start" subaction="projectmenu" id="var:id" - title="message:select_project"> + <link type="post" action="start" subaction="projectmenu" id="${id}" + title="#{select_project}"> <text var="name" maxlength="45"></text> </link> </part> @@ -467,14 +467,14 @@ <!-- Info-Meldung anzeigen (sofern vorhanden) --> <!-- - <if not="" empty="config:login/motd"> + <if not="" empty="%{login/motd}"> <part class="toolbar-icon menu"> <image method="motd"></image> <text class="label" raw="_"/> <part class="arrow arrow-down"/> <part class="dropdown"> <part class="entry"> - <text value="config:login/motd"></text> + <text value="%{login/motd}"></text> </part> </part> </part> @@ -494,7 +494,7 @@ <part class="arrow arrow-down"/> <part class="dropdown"> <part class="entry clickable"> - <link type="dialog" title="message:menu_license_DESC" action="login" subaction="license"> + <link type="dialog" title="#{menu_license_DESC}" action="login" subaction="license"> <image method="license"></image> <text key="menu_license"></text> </link> @@ -512,30 +512,30 @@ <part class="dropdown"> - <if true="var:isLoggedIn"> + <if true="${isLoggedIn}"> <part class="entry clickable"> - <link type="dialog" title="message:menu_PROFILE_DESC" action="profile" subaction="edit"> + <link type="dialog" title="#{menu_PROFILE_DESC}" action="profile" subaction="edit"> <image action="user"></image> <text key="menu_profile"></text> - <text class="keystroke" value="config:ui/keybinding/action/profile"></text> + <text class="keystroke" value="%{ui/keybinding/action/profile}"></text> </link> </part> <part class="entry clickable"> - <link type="dialog" title="message:menu_password_DESC" action="profile" subaction="pw"> + <link type="dialog" title="#{menu_password_DESC}" action="profile" subaction="pw"> <image method="password"></image> <text key="menu_password"></text> </link> </part> <part class="entry clickable"> - <link type="dialog" title="message:menu_mail_DESC" action="profile" subaction="mail"> + <link type="dialog" title="#{menu_mail_DESC}" action="profile" subaction="mail"> <image method="mail"></image> <text key="menu_mail"></text> </link> </part> <!-- Lizenzhinweise --> <part class="entry clickable"> - <link type="dialog" title="message:menu_license_DESC" action="login" subaction="license"> + <link type="dialog" title="#{menu_license_DESC}" action="login" subaction="license"> <image method="info"></image> <text key="menu_info"></text> </link> @@ -544,7 +544,7 @@ <part class="divide"/> <part class="entry clickable"> - <link type="dialog" title="message:menu_history_desc" action="profile" subaction="history"> + <link type="dialog" title="#{menu_history_desc}" action="profile" subaction="history"> <image method="history"></image> <text key="menu_history"></text> </link> @@ -553,7 +553,7 @@ <part class="divide"/> <part class="entry clickable"> - <link type="post" class="entry" title="message:USER_LOGOUT_DESC" + <link type="post" class="entry" title="#{USER_LOGOUT_DESC}" action="login" subaction="logout" afterSuccess="reloadAll" > <image method="logout"></image> <text key="USER_LOGOUT"></text> @@ -562,7 +562,7 @@ </if> <else> <part class="entry clickable"> - <link type="dialog" title="message:USER_LOGIN_DESC" action="login" subaction="login"> + <link type="dialog" title="#{USER_LOGIN_DESC}" action="login" subaction="login"> <image method="user"></image> <text key="USER_LOGIN"></text> </link> @@ -574,10 +574,10 @@ <!-- Suche --> - <if true="var:isLoggedIn"> + <if true="${isLoggedIn}"> <part class="toolbar-icon menu search"> <image method="search"></image> - <input name="text" hint="message:search"></input> + <input name="text" hint="#{search}"></input> <part class="arrow arrow-down"/> <part class="dropdown"> <text raw=""></text> diff --git a/modules/cms-ui/themes/default/html/views/url/edit.php b/modules/cms-ui/themes/default/html/views/url/edit.php @@ -1,13 +1,15 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="url" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form url" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="url" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="edit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="url" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form url"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('link_url')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('link_url'))) ?> + </span> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_url" name="<?php if ('') echo ''.'_' ?>url<?php if (false) echo '_disabled' ?>" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$url) ?>" /><?php if (false) { ?><input type="hidden" name="url" value="<?php $url ?>"/><?php } ?></div> + <input name="url" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" class=""> + </input> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/url/preview.php b/modules/cms-ui/themes/default/html/views/url/preview.php @@ -1,5 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="toolbar-icon"> - <i class="image-icon image-icon--menu-refresh"></i> + <i class="image-icon image-icon--menu-refresh"> + </i> </div> - <iframe name="preview" src="<?php echo $preview_url ?>"></iframe>- \ No newline at end of file + <iframe name="preview" src="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>" class=""> + </iframe>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/url/preview.tpl.src.xml b/modules/cms-ui/themes/default/html/views/url/preview.tpl.src.xml @@ -7,7 +7,7 @@ <!-- <part class="toolbar-icon clickable"> - <link type="popup" class="action" url="var:preview_url"> + <link type="popup" class="action" url="${preview_url}"> <image menu="open_in_new"></image> <text key="link_open_in_new_window"></text> @@ -15,6 +15,6 @@ </part> --> - <insert url="var:preview_url" name="preview"></insert> + <insert url="${preview_url}" name="preview" /> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/url/remove.php b/modules/cms-ui/themes/default/html/views/url/remove.php @@ -1,17 +1,7 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="url" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form url" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="url" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <label class="or-form-row"><span class="or-form-label"><?php echo lang('GLOBAL_NAME') ?></span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> - <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'delete';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> ?GLOBAL_DELETE? </span></label> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="url" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form url"> + <label class="or-form-row"><span class="or-form-input"><span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span></span></label> + <label class="or-form-row or-form-checkbox"><input type="checkbox" name="delete" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$delete)) ?>" class=""> + </input></label> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/url/structure.php b/modules/cms-ui/themes/default/html/views/url/structure.php @@ -1,4 +1,3 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> <div class="structure tree"> - <?php include_once( 'modules/template-engine/components/html/tree/component-tree.php') ?><?php component_tree($outline) ?> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/url/structure.tpl.src.xml b/modules/cms-ui/themes/default/html/views/url/structure.tpl.src.xml @@ -1,7 +1,7 @@ <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"> <part class="structure tree"> - <tree tree="var:outline"></tree> + <tree tree="${outline}"></tree> </part> </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,12 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="user" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form user" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="user" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="user" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form user"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('user_username') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_username'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/history.php b/modules/cms-ui/themes/default/html/views/user/history.php @@ -1,31 +1,37 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('project'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filename'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('filename'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'lastchange'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('lastchange'))) ?> + </span> </td> </tr> - <?php foreach($timeline as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($timeline as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> <td class="clickable"> - <a target="_self" data-type="open" data-action="project" data-method="history" data-id="<?php echo $projectid ?>" data-extra="[]" href="./#/project/<?php echo $projectid ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($projectname))); ?></span> + <a target="_self" data-type="open" data-action="project" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$projectid)) ?>" data-extra="[]" href="/#/project/<?php echo encodeHtml(htmlentities(@$projectid)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$projectname)) ?> + </span> </a> </td> - <td title="<?php echo $filename ?>" class="clickable"> - <a target="_self" data-type="open" data-action="<?php echo $type ?>" data-method="history" data-id="<?php echo $objectid ?>" data-extra="[]" href="./#/<?php echo $type ?>/<?php echo $objectid ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $filename,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td title="<?php echo encodeHtml(htmlentities(@$filename)) ?>" class="clickable"> + <a target="_self" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$type)) ?>/<?php echo encodeHtml(htmlentities(@$objectid)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$filename)) ?> + </span> </a> </td> - <td> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> + <td class=""> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> + <?php } ?> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/history.tpl.src.xml b/modules/cms-ui/themes/default/html/views/user/history.tpl.src.xml @@ -16,17 +16,17 @@ <list list="timeline" extract="true"> <row class="data"> <column class="clickable"> - <link type="open" action="project" id="var:projectid"> + <link type="open" action="project" id="${projectid}"> <text var="projectname"></text> </link> </column> - <column title="var:filename" class="clickable"> - <link type="open" action="var:type" id="var:objectid"> + <column title="${filename}" class="clickable"> + <link type="open" action="${type}" id="${objectid}"> <text var="filename" maxlength="30"></text> </link> </column> <column> - <date date="var:lastchange_date" /> + <date date="${lastchange_date}" /> </column> </row> diff --git a/modules/cms-ui/themes/default/html/views/user/info.php b/modules/cms-ui/themes/default/html/views/user/info.php @@ -1,184 +1,193 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="user" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form user" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="user" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <span class="headline"><?php echo nl2br(encodeHtml(htmlentities($fullname))); ?></span> - <?php $if3=!(($image)==FALSE); if($if3){?> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="user" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form user"> + <span class="headline"><?php echo encodeHtml(htmlentities(@$fullname)) ?> + </span> + <?php $if3=!(($image)==FALSE); if($if3) { ?> <div class="line"> <div class="input"> - <img src="<?php echo $image ?>" /> + <img src="<?php echo encodeHtml(htmlentities(@$image)) ?>" class=""> + </img> </div> </div> - <?php } ?> + <?php } ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'user_username'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('user_username'))) ?> + </span> </div> <div class="input"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('ADDITIONAL_INFO') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'user_fullname'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('user_fullname'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($fullname))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$fullname)) ?> + </span> </div> </div> - <?php $if4=(config('security','user','show_admin_mail')); if($if4){?> + <?php $if4=(config('security','user','show_admin_mail')); if($if4) { ?> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_mail" class="label"><?php echo lang('user_mail') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_mail'))) ?> </label> </div> <div class="input"> - <a target="_self" data-url="<?php echo 'mailto:'.$mail.'' ?>" data-type="external" data-action="" data-method="info" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo 'mailto:'.$mail.'' ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities($mail))); ?></span> + <a target="_self" data-url="mailto:<?php echo encodeHtml(htmlentities(@$mail)) ?>" data-type="external" data-action="" data-method="" data-id="" data-extra="[]" href="mailto:<?php echo encodeHtml(htmlentities(@$mail)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$mail)) ?> + </span> </a> - <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo 'mailto:'.$mail.'' ?>" title="?QRCODE_SHOW?"></i> + <i data-qrcode="mailto:<?php echo encodeHtml(htmlentities(@$mail)) ?>" title="<?php echo encodeHtml(htmlentities(@lang('QRCODE_SHOW'))) ?>" class="image-icon image-icon--menu-qrcode or-qrcode or-info"> + </i> </div> </div> - <?php } ?> + <?php } ?> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'description'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('description'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($desc))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$desc)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_tel" class="label"><?php echo lang('user_tel') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_tel'))) ?> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($tel))); ?></span> - <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo 'tel:'.$tel.'' ?>" title="?QRCODE_SHOW?"></i> + <span class=""><?php echo encodeHtml(htmlentities(@$tel)) ?> + </span> + <i data-qrcode="tel:<?php echo encodeHtml(htmlentities(@$tel)) ?>" title="<?php echo encodeHtml(htmlentities(@lang('QRCODE_SHOW'))) ?>" class="image-icon image-icon--menu-qrcode or-qrcode or-info"> + </i> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'timezone'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('timezone'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($timezone))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$timezone)) ?> + </span> </div> </div> <div class="line"> <div class="label"> <label class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'language'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('language'))) ?> + </span> </label> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($language))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$language)) ?> + </span> </div> </div> <div class="line"> <div class="label"> </div> <div class="input clickable"> - <a class="or-link-btn" target="_self" data-type="dialog" data-action="" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'prop'}" href="./#//"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="" data-method="prop" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'prop'}" href="/#//" class="or-link-btn"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + </span> </a> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo false?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close closed show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'is_admin';$default = false;$readonly = true;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_is_admin" class="label"><?php echo lang('user_admin') ?> + <input type="checkbox" name="is_admin" disabled="1" value="1" checked="<?php echo encodeHtml(htmlentities(@$is_admin)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_admin'))) ?> </label> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'user_ldapdn'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang(':user_ldapdn'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($ldap_dn))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$ldap_dn)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'user_style'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('user_style'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($style))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$style)) ?> + </span> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo false?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('security') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close closed show"><div class="closable"> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('user_password_expires')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('user_password_expires'))) ?> + </span> </div> <div class="input"> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($passwordExpires) ?> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($passwordExpires); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> </div> <div class="input clickable"> - <a class="or-link-btn" target="_self" data-type="dialog" data-action="user" data-method="pw" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'user','dialogMethod':'pw'}" href="./#/user/"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit_password'.'')))); ?></span> + <a target="_self" data-type="dialog" data-action="user" data-method="pw" data-id="" data-extra="{'dialogAction':'user','dialogMethod':'pw'}" href="/#/user/" class="or-link-btn"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('edit_password'))) ?> + </span> </a> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('user_last_login')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('user_last_login'))) ?> + </span> </div> <div class="input"> - <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastLogin) ?> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php'); { component_date($lastLogin); ?> + <?php } ?> </div> </div> <div class="line"> <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('token')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('token'))) ?> + </span> </div> <div class="input"> - <span><?php echo nl2br(encodeHtml(htmlentities($totpToken))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@$totpToken)) ?> + </span> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_totp" class="label"><?php echo lang('user_totp') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_totp'))) ?> </label> </div> <div class="input"> - <?php { $tmpname = 'totp';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_totp" class="label"><?php echo lang('user_totp') ?> + <input type="checkbox" name="totp" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$totp)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_totp'))) ?> </label> - <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo $totpSecretUrl ?>" title="?QRCODE_SHOW?"></i> + <i data-qrcode="<?php echo encodeHtml(htmlentities(@$totpSecretUrl)) ?>" title="<?php echo encodeHtml(htmlentities(@lang('QRCODE_SHOW'))) ?>" class="image-icon image-icon--menu-qrcode or-qrcode or-info"> + </i> </div> - </div>- \ No newline at end of file + </div> + </div></fieldset> + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/user/info.tpl.src.xml @@ -7,7 +7,7 @@ <if not="true" empty="image"> <part class="line"> <part class="input"> - <image url="var:image" size="80x80"/> + <image url="${image}" size="80x80"/> </part> </part> </if> @@ -21,7 +21,7 @@ </part> </part> - <group title="message:ADDITIONAL_INFO"> + <group title="#{ADDITIONAL_INFO}"> <part class="line"> <part class="label"> <text key="user_fullname" /> @@ -30,17 +30,17 @@ <text var="fullname" /> </part> </part> - <if true="config:security/user/show_admin_mail"> + <if true="%{security/user/show_admin_mail}"> <part class="line"> <part class="label"> <label for="mail" key="user_mail"></label> </part> <part class="input"> - <link url="tpl:mailto:{mail}" type="external"> + <link url="mailto:${mail}" type="external"> <text var="mail"/> </link> - <qrcode value="tpl:mailto:{mail}"/> + <qrcode value="mailto:${mail}"/> </part> </part> </if> @@ -58,7 +58,7 @@ </part> <part class="input"> <text var="tel" /> - <qrcode value="tpl:tel:{tel}"/> + <qrcode value="tel:${tel}"/> </part> </part> @@ -94,7 +94,7 @@ </group> - <group title="message:options" open="false"> + <group title="#{options}" open="false"> <part class="line"> <part class="label"> </part> @@ -120,13 +120,13 @@ </part> </part> </group> - <group title="message:security" open="false"> + <group title="#{security}" open="false"> <part class="line"> <part class="label"> <text text="user_password_expires"/> </part> <part class="input"> - <date date="var:passwordExpires"/> + <date date="${passwordExpires}"/> </part> </part> <part class="line"> @@ -144,7 +144,7 @@ <text text="user_last_login"/> </part> <part class="input"> - <date date="var:lastLogin"/> + <date date="${lastLogin}"/> </part> </part> @@ -154,7 +154,7 @@ <text text="token"/> </part> <part class="input"> - <text value="var:totpToken"/> + <text value="${totpToken}"/> </part> </part> <part class="line"> @@ -166,11 +166,11 @@ <label for="totp" key="user_totp"></label> <!--<text var="otpSecret"></text>--> - <qrcode value="var:totpSecretUrl"/> + <qrcode value="${totpSecretUrl}"/> </part> </part> - <!-- HOTP is not implemented -- + <!-- HOTP is not implemented - <part class="line"> <part class="label"> <label for="otpsecret" key="user_hotp"></label> @@ -179,7 +179,7 @@ <checkbox name="hotp"/> <label for="hotp" key="user_hotp"></label> - <qrcode value="var:hotpSecretUrl"/> + <qrcode value="${hotpSecretUrl}"/> </part> </part> --> 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,36 +1,47 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <img src="./modules/cms-ui/themes/default/images/icon_user.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <img src="./modules/cms-ui/themes/default/images/icon_user.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LOGIN'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LOGIN'))) ?> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td> - <img src="./modules/cms-ui/themes/default/images/icon_user.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <img src="./modules/cms-ui/themes/default/images/icon_user.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities($fullname))); ?></span> - <?php $if8=($isAdmin); if($if8){?> - <span><?php echo nl2br(' ('); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_ADMIN'.'')))); ?></span> - <span><?php echo nl2br(')'); ?></span> - <?php } ?> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@$fullname)) ?> + </span> + <?php $if8=($isAdmin); if($if8) { ?> + <span class=""> ( + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_ADMIN'))) ?> + </span> + <span class="">) + </span> + <?php } ?> </td> - <td> - <a target="_self" data-action="index" data-method="switchuser" data-id="<?php echo $userid ?>" data-extra="[]" href="./#/index/<?php echo $userid ?>"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LOGIN'.'')))); ?></span> + <td class=""> + <a target="_self" data-action="index" data-method="switchuser" data-id="<?php echo encodeHtml(htmlentities(@$userid)) ?>" data-extra="[]" href="/#/index/<?php echo encodeHtml(htmlentities(@$userid)) ?>" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LOGIN'))) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> \ 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,3 +1,3 @@ <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="GLOBAL_USERS" width="70%"><table><row class="headline"><column><image type="user"></image><text key="name"></text></column><column><text raw=""></text></column><column><text key="LOGIN"></text></column></row><list list="el" extract="true"><row class="data"><column url="var:url"><image type="user"></image><text var="name"></text></column><column url="var:url"><text value="var:fullname"></text><if true="var:isAdmin"><text raw="_("></text><text key="USER_ADMIN"></text><text raw=")"></text></if></column><column><link target="_top" action="index" subaction="switchuser" id="var:userid"><text key="LOGIN"></text></link></column></row></list></table></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"><dummy><window icon="user" name="GLOBAL_USERS" width="70%"><table><row class="headline"><column><image type="user"></image><text key="name"></text></column><column><text raw=""></text></column><column><text key="LOGIN"></text></column></row><list list="el" extract="true"><row class="data"><column url="${url}"><image type="user"></image><text var="name"></text></column><column url="${url}"><text value="${fullname}"></text><if true="${isAdmin}"><text raw="_("></text><text key="USER_ADMIN"></text><text raw=")"></text></if></column><column><link target="_top" action="index" subaction="switchuser" id="${userid}"><text key="LOGIN"></text></link></column></row></list></table></window></dummy></output>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/memberships.php b/modules/cms-ui/themes/default/html/views/user/memberships.php @@ -1,35 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="memberships" data-action="user" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form user" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="user" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="memberships" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <form name="" target="_self" data-target="view" action="./" data-method="memberships" data-action="user" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form user"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td colspan="2"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'group'.'')))); ?></span> + <td colspan="2" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('group'))) ?> + </span> </td> </tr> - <?php foreach($memberships as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($memberships as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td width="10%"> - <?php { $tmpname = $var;$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <td width="10%" class=""> + <input type="checkbox" name="group<?php echo encodeHtml(htmlentities(@$id)) ?>" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$member)) ?>" class=""> + </input> </td> - <td> - <label for="<?php echo REQUEST_ID ?>_<?php echo $var ?>" class="label"> - <i class="image-icon image-icon--action-group"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td class=""> + <label class="label"> + <i class="image-icon image-icon--action-group"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </label> </td> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/memberships.tpl.src.xml b/modules/cms-ui/themes/default/html/views/user/memberships.tpl.src.xml @@ -10,10 +10,10 @@ <list list="memberships" extract="true"> <row class="data"> <column width="10%"> - <checkbox name="var:var"></checkbox> + <checkbox name="group${id}" default="${member}"></checkbox> </column> <column> - <label for="var:var"> + <label for="${var}"> <image action="group"/> <text var="name"/> </label> diff --git a/modules/cms-ui/themes/default/html/views/user/prop.php b/modules/cms-ui/themes/default/html/views/user/prop.php @@ -1,164 +1,143 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="user" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form user" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="user" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="user" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form user"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('user_username') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_username'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="128" class="name,focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="name,focus"> + </input> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('ADDITIONAL_INFO') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_fullname" class="label"><?php echo lang('user_fullname') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_fullname'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_fullname" name="<?php if ('') echo ''.'_' ?>fullname<?php if (false) echo '_disabled' ?>" type="text" maxlength="128" class="" value="<?php echo Text::encodeHtml(@$fullname) ?>" /><?php if (false) { ?><input type="hidden" name="fullname" value="<?php $fullname ?>"/><?php } ?></div> + <input name="fullname" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$fullname)) ?>" class=""> + </input> </div> </div> - <?php $if4=(config('security','user','show_admin_mail')); if($if4){?> + <?php $if4=(config('security','user','show_admin_mail')); if($if4) { ?> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_mail" class="label"><?php echo lang('user_mail') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_mail'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_mail" name="<?php if ('') echo ''.'_' ?>mail<?php if (false) echo '_disabled' ?>" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$mail) ?>" /><?php if (false) { ?><input type="hidden" name="mail" value="<?php $mail ?>"/><?php } ?></div> - <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo 'mailto:'.$mail.'' ?>" title="?QRCODE_SHOW?"></i> + <input name="mail" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$mail)) ?>" class=""> + </input> + <i data-qrcode="mailto:<?php echo encodeHtml(htmlentities(@$mail)) ?>" title="<?php echo encodeHtml(htmlentities(@lang('QRCODE_SHOW'))) ?>" class="image-icon image-icon--menu-qrcode or-qrcode or-info"> + </i> </div> </div> - <?php } ?> + <?php } ?> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_desc" class="label"><?php echo lang('user_desc') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_desc'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_desc" name="<?php if ('') echo ''.'_' ?>desc<?php if (false) echo '_disabled' ?>" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$desc) ?>" /><?php if (false) { ?><input type="hidden" name="desc" value="<?php $desc ?>"/><?php } ?></div> + <input name="desc" disabled="" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$desc)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_tel" class="label"><?php echo lang('user_tel') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_tel'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_tel" name="<?php if ('') echo ''.'_' ?>tel<?php if (false) echo '_disabled' ?>" type="text" maxlength="128" class="" value="<?php echo Text::encodeHtml(@$tel) ?>" /><?php if (false) { ?><input type="hidden" name="tel" value="<?php $tel ?>"/><?php } ?></div> - <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo 'tel:'.$tel.'' ?>" title="?QRCODE_SHOW?"></i> + <input name="tel" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$tel)) ?>" class=""> + </input> + <i data-qrcode="tel:<?php echo encodeHtml(htmlentities(@$tel)) ?>" title="<?php echo encodeHtml(htmlentities(@lang('QRCODE_SHOW'))) ?>" class="image-icon image-icon--menu-qrcode or-qrcode or-info"> + </i> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_timezone_offset" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'timezone'.'')))); ?></span> + <label class="label"> + <span class=""><?php echo encodeHtml(htmlentities(@lang('timezone'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_timezone" name="timezone" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($timezone_list,$timezone,1,0) ?><?php if (count($timezone_list)==0) { ?><input type="hidden" name="timezone" value="" /><?php } ?><?php if (count($timezone_list)==1) { ?><input type="hidden" name="timezone" value="<?php echo array_keys($timezone_list)[0] ?>" /><?php } ?> - </select></div> + <input name="timezone" value="<?php echo encodeHtml(htmlentities(@$timezone)) ?>" size="1" class=""> + </input> </div> </div> <div class="line"> <div class="label"> <label class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'language'.'')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('language'))) ?> + </span> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_language" name="language" title="" class="" size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($language_list,$language,1,0) ?><?php if (count($language_list)==0) { ?><input type="hidden" name="language" value="" /><?php } ?><?php if (count($language_list)==1) { ?><input type="hidden" name="language" value="<?php echo array_keys($language_list)[0] ?>" /><?php } ?> - </select></div> + <input name="language" value="<?php echo encodeHtml(htmlentities(@$language)) ?>" size="1" class=""> + </input> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'is_admin';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_is_admin" class="label"><?php echo lang('user_admin') ?> + <input type="checkbox" name="is_admin" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$is_admin)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_admin'))) ?> </label> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_ldap_dn" class="label"><?php echo lang('user_ldapdn') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang(':user_ldapdn'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_ldap_dn" name="<?php if ('') echo ''.'_' ?>ldap_dn<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$ldap_dn) ?>" /><?php if (false) { ?><input type="hidden" name="ldap_dn" value="<?php $ldap_dn ?>"/><?php } ?></div> + <input name="ldap_dn" disabled="" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$ldap_dn)) ?>" class=""> + </input> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_style" class="label"><?php echo lang('user_style') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_style'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_style" name="style" title="" class=""<?php if (count($allstyles)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($allstyles,$style,0,0) ?><?php if (count($allstyles)==0) { ?><input type="hidden" name="style" value="" /><?php } ?><?php if (count($allstyles)==1) { ?><input type="hidden" name="style" value="<?php echo array_keys($allstyles)[0] ?>" /><?php } ?> - </select></div> + <input name="style" value="<?php echo encodeHtml(htmlentities(@$style)) ?>" size="1" class=""> + </input> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('security') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'totp';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_totp" class="label"><?php echo lang('user_totp') ?> + <input type="checkbox" name="totp" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$totp)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_totp'))) ?> </label> - <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo $totpSecretUrl ?>" title="?QRCODE_SHOW?"></i> + <i data-qrcode="<?php echo encodeHtml(htmlentities(@$totpSecretUrl)) ?>" title="<?php echo encodeHtml(htmlentities(@lang('QRCODE_SHOW'))) ?>" class="image-icon image-icon--menu-qrcode or-qrcode or-info"> + </i> </div> </div> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'hotp';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_hotp" class="label"><?php echo lang('user_hotp') ?> + <input type="checkbox" name="hotp" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$hotp)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_hotp'))) ?> </label> - <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo $hotpSecretUrl ?>" title="?QRCODE_SHOW?"></i> + <i data-qrcode="<?php echo encodeHtml(htmlentities(@$hotpSecretUrl)) ?>" title="<?php echo encodeHtml(htmlentities(@lang('QRCODE_SHOW'))) ?>" class="image-icon image-icon--menu-qrcode or-qrcode or-info"> + </i> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/user/prop.tpl.src.xml @@ -9,7 +9,7 @@ <input name="name" size="20" class="name,focus" maxlength="128"></input> </part> </part> - <group title="message:ADDITIONAL_INFO"> + <group title="#{ADDITIONAL_INFO}"> <part class="line"> <part class="label"> <label for="fullname" key="user_fullname"></label> @@ -18,14 +18,14 @@ <input name="fullname" maxlength="128"></input> </part> </part> - <if true="config:security/user/show_admin_mail"> + <if true="%{security/user/show_admin_mail}"> <part class="line"> <part class="label"> <label for="mail" key="user_mail"></label> </part> <part class="input"> <input name="mail" maxlength="255"></input> - <qrcode value="tpl:mailto:{mail}" /> + <qrcode value="mailto:${mail}" /> </part> </part> </if> @@ -43,7 +43,7 @@ </part> <part class="input"> <input name="tel" maxlength="128"></input> - <qrcode value="tpl:tel:{tel}" /> + <qrcode value="tel:${tel}" /> </part> </part> @@ -69,7 +69,7 @@ </part> </part> </group> - <group title="message:options"> + <group title="#{options}"> <part class="line"> <part class="label"></part> <part class="input"> @@ -94,7 +94,7 @@ </part> </part> </group> - <group title="message:security"> + <group title="#{security}"> <part class="line"> <part class="label"> </part> @@ -102,7 +102,7 @@ <checkbox name="totp"/><label for="totp" key="user_totp"></label> <!--<text var="otpSecret"></text>--> - <qrcode value="var:totpSecretUrl" /> + <qrcode value="${totpSecretUrl}" /> </part> </part> <part class="line"> @@ -111,7 +111,7 @@ <part class="input"> <checkbox name="hotp"/><label for="hotp" key="user_hotp"></label> - <qrcode value="var:hotpSecretUrl" /> + <qrcode value="${hotpSecretUrl}" /> </part> </part> </group> diff --git a/modules/cms-ui/themes/default/html/views/user/pw.php b/modules/cms-ui/themes/default/html/views/user/pw.php @@ -1,78 +1,76 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="pw" data-action="user" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form user" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="user" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pw" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="pw" data-action="user" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form user"> <div class="line"> <div class="label"> </div> <div class="input"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_proposal" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="proposal"<?php if('proposal'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_proposal" class="label"><?php echo $password_proposal ?> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_new_password'.'')))); ?></span> - <span><?php echo nl2br('text:: '); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities($password_proposal))); ?></span> + <input type="radio" name="type" disabled="" value="proposal" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@$password_proposal)) ?> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_new_password'))) ?> + </span> + <span class=""> + </span> + <span class=""><?php echo encodeHtml(htmlentities(@$password_proposal)) ?> + </span> </label> - <input type="hidden" name="password_proposal" value="<?php echo $password_proposal ?>"/> + <input type="hidden" name="password_proposal" value="<?php echo encodeHtml(htmlentities(@$password_proposal)) ?>" class=""> + </input> </div> </div> - <?php $if3=(config('mail','enabled')); if($if3){?> + <?php $if3=(config('mail','enabled')); if($if3) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_random" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="random"<?php if('random'==@$type)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_random" class="label"><?php echo lang('user_random_password') ?> + <input type="radio" name="type" disabled="" value="random" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_random_password'))) ?> </label> </div> </div> - <?php } ?> + <?php } ?> <div class="line"> <div class="label"> </div> <div class="input"> - <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_input" name="<?php if ('') echo ''.'_' ?>type<?php if (false) echo '_disabled' ?>" value="input"<?php if('input'==@$type||true)echo ' checked="checked"' ?> /> - <label for="<?php echo REQUEST_ID ?>_type_input" class="label"><?php echo lang('USER_NEW_PASSWORD_INPUT') ?> + <input type="radio" name="type" disabled="" value="input" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('USER_NEW_PASSWORD_INPUT'))) ?> </label> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_password1" class="label"><?php echo lang('USER_new_password') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('USER_new_password'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input type="password" name="password1" id="<?php echo REQUEST_ID ?>_password1" size="40" maxlength="256" class="" value="<?php echo @$password1?>" /></div> + <div class="inputholder"><input type="password" name="password1" size="40" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$password1)) ?>" class=""> + </input></div> </div> </div> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_password2" class="label"><?php echo lang('USER_new_password_repeat') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('USER_new_password_repeat'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input type="password" name="password2" id="<?php echo REQUEST_ID ?>_password2" size="40" maxlength="256" class="" value="<?php echo @$password2?>" /></div> + <div class="inputholder"><input type="password" name="password2" size="40" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$password2)) ?>" class=""> + </input></div> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> - <?php $if3=(config('mail','enabled')); if($if3){?> - <?php $if4=(isset($mail)); if($if4){?> + <?php $if3=(config('mail','enabled')); if($if3) { ?> + <?php $if4=(isset($mail)); if($if4) { ?> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'email';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_email" class="label"><?php echo lang('user_mail_new_password') ?> + <input type="checkbox" name="email" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$email)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_mail_new_password'))) ?> </label> </div> </div> @@ -80,23 +78,12 @@ <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'timeout';$default = false;$readonly = false;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_timeout" class="label"><?php echo lang('user_password_timeout') ?> + <input type="checkbox" name="timeout" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$timeout)) ?>" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_password_timeout'))) ?> </label> </div> </div> - <?php } ?> - <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <?php } ?> + <?php } ?> + </form>+ \ No newline at end of file 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 @@ -5,16 +5,16 @@ <part class="label"></part> <part class="input"> <radio name="type" value="proposal"></radio> - <label for="type" value="proposal" text="var:password_proposal"> + <label for="type" value="proposal" text="${password_proposal}"> <text key="USER_new_password" /> - <text raw="text:: " /> + <text raw=" " /> <text var="password_proposal" /> </label> <hidden name="password_proposal" /> </part> </part> - <if true="config:mail/enabled"> + <if true="%{mail/enabled}"> <part class="line"> <part class="label"></part> <part class="input"> @@ -47,8 +47,8 @@ <password name="password2"></password> </part> </part> - <group title="message:options"></group> - <if true="config:mail/enabled"> + <group title="#{options}"></group> + <if true="%{mail/enabled}"> <if present="mail"> <part class="line"> <part class="label"></part> diff --git a/modules/cms-ui/themes/default/html/views/user/remove.php b/modules/cms-ui/themes/default/html/views/user/remove.php @@ -1,37 +1,27 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="user" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form user" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="user" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="remove" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('NAME') ?></legend><div class="closable"> + <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="user" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form user"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> <div class="line"> <div class="label"> - <label class="label"><?php echo lang('user_username') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_username'))) ?> </label> </div> <div class="input"> - <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </div> </div> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div class="closable"> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'confirm';$default = false;$readonly = false;$required = true; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> - <label for="<?php echo REQUEST_ID ?>_confirm" class="label"><?php echo lang('delete') ?> + <input type="checkbox" name="confirm" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$confirm)) ?>" required="required" class=""> + </input> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('delete'))) ?> </label> </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/user/remove.tpl.src.xml @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <form> - <group title="message:NAME"> + <group title="#{NAME}"> <part class="line"> <part class="label"> <label key="user_username"></label> @@ -11,7 +11,7 @@ <text var="name" class="name"></text> </part> </part> - <group title="message:options"></group> + <group title="#{options}"></group> <part class="line"> <part class="label"></part> <part class="input"> diff --git a/modules/cms-ui/themes/default/html/views/user/rights.php b/modules/cms-ui/themes/default/html/views/user/rights.php @@ -1,80 +1,87 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <?php foreach($projects as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo $projectname ?></legend><div class="closable"> - <?php $if4=(($rights)==FALSE); if($if4){?> - <div> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <?php foreach($projects as $list_key=>$list_value) { extract($list_value); ?> + <fieldset class="or-group toggle-open-close open show"><div class="closable"> + <?php $if4=(($rights)==FALSE); if($if4) { ?> + <div class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + </span> </div> - <?php } ?> - <?php $if4=!(($rights)==FALSE); if($if4){?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <?php } ?> + <?php $if4=!(($rights)==FALSE); if($if4) { ?> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_USER')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_USER'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + </span> </td> <td class="help"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_LANGUAGE')))); ?></span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LANGUAGE'))) ?> + </span> </td> - <?php foreach($show as $list_key=>$t){ ?> + <?php foreach($show as $list_key=>$t) { ?> <td class="help"> - <span title="<?php echo lang('acl_'.$t.'') ?>"><?php echo nl2br(encodeHtml(htmlentities(lang('acl_'.$t.'_abbrev')))); ?></span> + <span title="message:acl<?php echo encodeHtml(htmlentities()) ?>" class=""><?php echo encodeHtml(htmlentities(@lang('${t'))) ?>} + </span> </td> - <?php } ?> + <?php } ?> </tr> - <?php foreach($rights as $aclid=>$acl){ ?><?php extract($acl) ?> + <?php foreach($rights as $aclid=>$acl) { extract($acl); ?> <tr class="data clickable"> - <td> - <?php $if9=(isset($username)); if($if9){?> - <i class="image-icon image-icon--action-user"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $username,20,'..',constant('STR_PAD_BOTH') )))); ?></span> - <?php } ?> - <?php $if9=(isset($groupname)); if($if9){?> - <i class="image-icon image-icon--action-group"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $groupname,20,'..',constant('STR_PAD_BOTH') )))); ?></span> - <?php } ?> - <?php $if9=!(isset($username)); if($if9){?> - <?php $if10=!(isset($groupname)); if($if10){?> - <i class="image-icon image-icon--action-group"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_all'.'')))); ?></span> - <?php } ?> - <?php } ?> - <?php unset($username) ?> - <?php unset($groupname) ?> + <td class=""> + <?php $if9=(isset($username)); if($if9) { ?> + <i class="image-icon image-icon--action-user"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$username)) ?> + </span> + <?php } ?> + <?php $if9=(isset($groupname)); if($if9) { ?> + <i class="image-icon image-icon--action-group"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$groupname)) ?> + </span> + <?php } ?> + <?php $if9=!(isset($username)); if($if9) { ?> + <?php $if10=!(isset($groupname)); if($if10) { ?> + <i class="image-icon image-icon--action-group"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('global_all'))) ?> + </span> + <?php } ?> + <?php } ?> + <?php { unset($username) ?> + <?php } ?> + <?php { unset($groupname) ?> + <?php } ?> </td> - <td> - <i class="image-icon image-icon--action-<?php echo $objecttype ?>"></i> - <a target="_self" data-type="open" data-action="<?php echo $objecttype ?>" data-method="rights" data-id="<?php echo $objectid ?>" data-extra="[]" href="./#/<?php echo $objecttype ?>/<?php echo $objectid ?>"> - <span title="<?php echo lang('select') ?>"><?php echo nl2br(encodeHtml(htmlentities($objectname))); ?></span> + <td class=""> + <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$objecttype)) ?>"> + </i> + <a target="_self" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$objecttype)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$objecttype)) ?>/<?php echo encodeHtml(htmlentities(@$objectid)) ?>" class=""> + <span title="<?php echo encodeHtml(htmlentities(@lang('select'))) ?>" class=""><?php echo encodeHtml(htmlentities(@$objectname)) ?> + </span> </a> </td> - <td> - <i class="image-icon image-icon--action-language"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $languagename,20,'..',constant('STR_PAD_BOTH') )))); ?></span> + <td class=""> + <i class="image-icon image-icon--action-language"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$languagename)) ?> + </span> </td> - <?php foreach($show as $list_key=>$list_value){ ?> - <td> - <?php $$list_value= $bits[$list_value]; ?> - <?php { $tmpname = $list_value;$default = false;$readonly = true;$required = false; - if ( isset($$tmpname) ) - $checked = $$tmpname; - else - $checked = $default; - - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php - - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php - } - } ?> + <?php foreach($show as $list_key=>$list_value) { ?> + <td class=""> + <?php { $$list_value= $bits[$list_value]; ?> + <?php } ?> + <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$list_value)) ?>" disabled="1" value="1" checked="<?php echo encodeHtml(htmlentities(@$${list_value)) ?>}" class=""> + </input> </td> - <?php } ?> + <?php } ?> </tr> - <?php } ?> + <?php } ?> </table></div></div> - <?php } ?> + <?php } ?> </div></fieldset> - <?php } ?>- \ No newline at end of file + <?php } ?>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/rights.tpl.src.xml b/modules/cms-ui/themes/default/html/views/user/rights.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <list list="projects" extract="true"> - <group title="var:projectname"> + <group title="${projectname}"> <if empty="rights"> <part> <text text="GLOBAL_NOT_FOUND"></text> @@ -22,7 +22,7 @@ </column> <list list="show" value="t"> <column class="help"> - <text key="var:t" prefix="acl_" suffix="_abbrev" title="message:acl_{t}"></text> + <text key="${t}" prefix="acl_" suffix="_abbrev" title="message:acl_{t}"></text> </column> </list> </row> @@ -47,9 +47,9 @@ <set var="groupname"></set> </column> <column> - <image action="var:objecttype"></image> - <link type="open" action="var:objecttype" id="var:objectid"> - <text var="objectname" title="message:select"></text> + <image action="${objecttype}"></image> + <link type="open" action="${objecttype}" id="${objectid}"> + <text var="objectname" title="#{select}"></text> </link> </column> <column> @@ -58,8 +58,8 @@ </column> <list list="show"> <column> - <set var="var:list_value" value="var:bits" key="var:list_value"></set> - <checkbox name="var:list_value" readonly="true"></checkbox> + <set var="${list_value}" value="${bits}" key="${list_value}"></set> + <checkbox name="${list_value}" readonly="true"></checkbox> </column> </list> </row> diff --git a/modules/cms-ui/themes/default/html/views/userlist/add.php b/modules/cms-ui/themes/default/html/views/userlist/add.php @@ -1,12 +1,13 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="userlist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form userlist" data-async="false" data-autosave="false"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="userlist" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="userlist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form userlist"> <div class="line"> <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('user_username') ?> + <label class="label"><?php echo encodeHtml(htmlentities(@lang('user_username'))) ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="128" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <input name="name" disabled="" type="text" maxlength="128" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus"> + </input> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + </form>+ \ 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,45 +1,58 @@ <?php if (!defined('OR_TITLE')) die('Forbidden'); ?> - <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%" class=""> <tr class="headline"> - <td> - <img src="./modules/cms-ui/themes/default/images/icon_user.png" /> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <td class=""> + <img src="./modules/cms-ui/themes/default/images/icon_user.png" class=""> + </img> + <span class=""><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <td class=""> + <span class=""> + </span> </td> - <td> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LOGIN'.'')))); ?></span> + <td class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LOGIN'))) ?> + </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> <tr class="data"> - <td data-name="<?php echo $name ?>" data-action="user" data-id="<?php echo $id ?>" class="clickable clickable"> - <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="user" data-method="show" data-id="<?php echo $id ?>" data-extra="[]" href="./#/user/<?php echo $id ?>"> - <i class="image-icon image-icon--action-user"></i> - <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <td data-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-action="user" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="clickable clickable"> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="user" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/user/<?php echo encodeHtml(htmlentities(@$id)) ?>" class=""> + <i class="image-icon image-icon--action-user"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@$name)) ?> + </span> </a> </td> - <td data-name="<?php echo $name ?>" data-action="user" data-id="<?php echo $id ?>" class="clickable"> - <span><?php echo nl2br(encodeHtml(htmlentities($fullname))); ?></span> - <?php $if6=($isAdmin); if($if6){?> - <span><?php echo nl2br(' ('); ?></span> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_ADMIN'.'')))); ?></span> - <span><?php echo nl2br(')'); ?></span> - <?php } ?> + <td data-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-action="user" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="clickable"> + <span class=""><?php echo encodeHtml(htmlentities(@$fullname)) ?> + </span> + <?php $if6=($isAdmin); if($if6) { ?> + <span class=""> ( + </span> + <span class=""><?php echo encodeHtml(htmlentities(@lang('USER_ADMIN'))) ?> + </span> + <span class="">) + </span> + <?php } ?> </td> <td class="clickable"> - <a target="_self" data-type="post" data-action="user" data-method="switch" data-id="<?php echo $userid ?>" data-extra="[]" data-data="{"action":"user","subaction":"switch","id":"<?php echo $userid ?>","token":"<?php echo token() ?>","none":"0"}"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LOGIN'.'')))); ?></span> + <a target="_self" data-type="post" data-action="user" data-method="switch" data-id="<?php echo encodeHtml(htmlentities(@$userid)) ?>" data-extra="[]" data-data="{"action":"user","subaction":"switch","id":"<?php echo encodeHtml(htmlentities(@$userid)) ?>",\"token":"<?php echo token() ?>","none":"0"}"" class=""> + <span class=""><?php echo encodeHtml(htmlentities(@lang('LOGIN'))) ?> + </span> </a> </td> </tr> - <?php } ?> + <?php } ?> <tr class="data"> <td colspan="3" class="clickable"> - <a target="_self" date-name="<?php echo lang('add') ?>" name="<?php echo lang('add') ?>" data-type="dialog" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="./#//"> - <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span> + <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@lang('add'))) ?>" name="<?php echo encodeHtml(htmlentities(@lang('add'))) ?>" data-type="dialog" data-action="" data-method="add" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="/#//" class=""> + <i class="image-icon image-icon--method-add"> + </i> + <span class=""><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + </span> </a> </td> </tr> 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 @@ -16,23 +16,23 @@ </row> <list list="el" extract="true"> <row class="data"> - <column id="var:id" name="var:name" action="user" class="clickable"> - <link type="open" id="var:id" name="var:name" action="user"> + <column id="${id}" name="${name}" action="user" class="clickable"> + <link type="open" id="${id}" name="${name}" action="user"> <image action="user"></image> <text var="name"></text> </link> </column> - <column id="var:id" name="var:name" action="user"> - <text value="var:fullname"></text> - <if true="var:isAdmin"> + <column id="${id}" name="${name}" action="user"> + <text value="${fullname}"></text> + <if true="${isAdmin}"> <text raw="_("></text> <text key="USER_ADMIN"></text> <text raw=")"></text> </if> </column> <column class="clickable"> - <link type="post" action="user" subaction="switch" id="var:userid"> + <link type="post" action="user" subaction="switch" id="${userid}"> <text key="LOGIN"></text> </link> </column> @@ -40,7 +40,7 @@ </list> <row class="data"> <column colspan="3" class="clickable"> - <link type="dialog" subaction="add" name="message:add"> + <link type="dialog" subaction="add" name="#{add}"> <image method="add"/> <text text="new"/> </link> diff --git a/modules/template-engine/CMSElement.class.php b/modules/template-engine/CMSElement.class.php @@ -0,0 +1,26 @@ +<?php + + +namespace modules\template_engine; + + +use template_engine\components\Expression; + +class CMSElement extends HtmlElement +{ + + /* + public function getAttribute($name) + { + $e = new Expression( parent::getAttribute($name) ); + return $e->getHTMLValue(); + }*/ + + + + public function __construct( $name ) + { + parent::__construct( $name ); + } + +}+ \ No newline at end of file diff --git a/modules/template-engine/Element.class.php b/modules/template-engine/Element.class.php @@ -11,11 +11,38 @@ class Element private $content = ''; private $selfClosing = true; + /** + * @var array + */ + private $parents = []; + + private $children = []; + + /** + * @param $wrapperElement Element + * @return $this + */ + public function addWrapper($wrapperElement ) { + $wrapperElement->selfClosing(false); + $this->parents[] = $wrapperElement; + return $this; + } + + public function addChild($child ) { + $this->selfClosing(false ); + $this->children[] = $child; + return $this; + } + public function __construct( $name ) { $this->name = $name; } + protected function getAttribute( $name ){ + return (new Value($this->attributes[$name]))->render(Value::CONTEXT_HTML ); + } + public function content( $content ) { $this->content = $content; @@ -24,18 +51,41 @@ class Element public function getBegin() { - return '<'.$this->name.array_reduce( array_keys($this->attributes),function($carry,$key){return $carry.' '.$key.'="'.htmlspecialchars($this->attributes[$key]).'"';},'').(($this->selfClosing && !$this->content)?' /':'').'>'.$this->content; + $content = array_reduce( array_reverse($this->parents), function($carry,$item) { + //$content = ''; + //foreach( $item->children as $child) { + // $content .= $child->getBegin().$child->getEnd(); + //} + return $carry.$item->getBegin(); + }, '' ); + + if ( $this->name ) + $content .= '<'.$this->name. + array_reduce( array_keys($this->attributes),function($carry,$key){return $carry.' '.$key.'="'.$this->getAttribute($key).'"';},'').(($this->selfClosing && !$this->content && !$this->children)?' /':'').'>'; + + $content .= $this->getContent(); + + return $content; } public function getEnd() { - if ( $this->selfClosing && !$this->content) - return ''; + + $content = ''; + if ( $this->selfClosing && !$this->content && !$this->children) + ; else - return '</'.$this->name.'>'; + if ( $this->name ) + $content .= '</'.$this->name.'>'; + + $content .= array_reduce( $this->parents, function($carry,$item) { + return $carry.$item->getEnd(); + }, '' ); + + return $content; } - public function attr($key,$value) { + public function addAttribute($key, $value) { $this->attributes[$key] = $value; return $this; } @@ -44,4 +94,117 @@ class Element $this->selfClosing = boolval($selfClosing); return $this; } + + protected function getContent() + { + return $this->content; + } +} + + + + +class Value { + private $value; + private $expressions = []; + + const CONTEXT_PHP = 0; + const CONTEXT_HTML = 1; + const CONTEXT_RAW = 2; + + public static function createExpression( $type, $name ) { + return $type.'{'.$name.'}'; + } + + public function __construct( $value ) + { + while( true ) { + if ( ! $value ) + break; + + $epos = strpos($value,'{',1); + $fpos = strpos($value,'}',1); + + if ( $epos === false || $fpos === false ) + break; + + $type = substr($value,$epos-1,1 ); + $name = substr($value,$epos+1,$fpos-$epos-1); + + $this->expressions[] = new ValueExpression($type,$name,$epos-1); + $value = substr($value,0,$epos-1).substr($value,$fpos+1); + } + $this->value = $value; + } + + + public function render( $context ) { + switch( $context ) { + case Value::CONTEXT_PHP: + return "'".array_reduce(array_reverse($this->expressions),function($carry,$expr) { + return substr($carry, 0,$expr->position)."'.".$expr->render().'.\''.substr($carry,$expr->position); + },$this->value)."'"; + + case Value::CONTEXT_HTML: + case Value::CONTEXT_RAW: + $escape = function($expr) use($context) { + if ( $context == self::CONTEXT_HTML ) + return 'encodeHtml(htmlentities('.$expr.'))'; + else + return $expr; + }; + return array_reduce(array_reverse($this->expressions),function($carry,$expr) use ($escape) { + //echo "carry:".$carry.";expr:".$expr->position.':'.$expr->name; + return substr($carry, 0,$expr->position)."<?php echo ".$escape($expr->render()).' ?>'.substr($carry,$expr->position); + },$this->value); + } + } +} + + + +class ValueExpression { + + public $type; + public $name; + public $position; + + const TYPE_DATA_VAR = '$'; + const TYPE_MESSAGE = '#'; + const TYPE_CONFIG = '%'; + + /** + * ValueExpression constructor. + * @param $type + * @param $name + * @param $position + */ + public function __construct($type, $name, $position) + { + $this->type = $type; + $this->name = $name; + $this->position = $position; + } + + public function render() + { + switch( $this->type ) { + case self::TYPE_DATA_VAR: + $parts = explode('.', $this->name); + + return array_reduce($parts, function ($carry, $item) { + if (!$carry) + return '@$' . $item; + else + return $carry.'[\'' . $item . '\']'; + }, ''); + case self::TYPE_MESSAGE: + return '@lang(\'' . $this->name . '\')'; + + case self::TYPE_CONFIG: + $config_parts = explode('/', $this->name); + return 'config(' . "'" . implode("'" . ',' . "'", $config_parts) . "'" . ')'; + } + } + } \ No newline at end of file diff --git a/modules/template-engine/HtmlElement.class.php b/modules/template-engine/HtmlElement.class.php @@ -0,0 +1,57 @@ +<?php + + +namespace modules\template_engine; + + +class HtmlElement extends Element +{ + private $styleClasses = []; + + /** + * Auto-escaping the content. + * + * @var bool + */ + private $escape = true; + + + public function addStyleClass( $clazz ) { + $this->styleClasses[] = $clazz; + return $this; + } + + + public function setEscaping( $escape ) { + $this->escape = $escape; + return $this; + } + + + public function getAttribute($name) + { + return parent::getAttribute(htmlspecialchars($name)); + } + + public function getBegin() + { + $this->addAttribute('class', implode(' ',$this->styleClasses) ); + return parent::getBegin(); + } + + + public function __construct( $name ) + { + parent::__construct( $name ); + } + + + protected function getContent() + { + $context = $this->escape ? Value::CONTEXT_HTML : Value::CONTEXT_RAW; + + return (new Value(parent::getContent()))->render( $context ); + } + + +}+ \ No newline at end of file diff --git a/modules/template-engine/PHPBlockElement.class.php b/modules/template-engine/PHPBlockElement.class.php @@ -0,0 +1,170 @@ +<?php + + +namespace modules\template_engine; + + +class PHPBlockElement extends HtmlElement +{ + public $beforeBlock; + public $inBlock; + + public function __construct() + { + parent::__construct( null ); + } + + + public function getBegin() + { + return '<?php '.$this->beforeBlock.' { '.$this->inBlock.' ?>'; + } + + + public function getEnd() + { + return ' <?php } ?>'; + } + + + + + + public function textasvarname($value) + { + $expr = new Expression($value); + return $expr->getTextAsVarName(); + + } + + + public function varname($value) + { + $expr = new Expression($value); + return $expr->getVarName(); + } + + + + public function htmlvalue($value) + { + $expr = new Expression($value); + return $expr->getHTMLValue(); + } + + + + public function value( $value ) + { + $expr = new Expression($value); + return $expr->getPHPValue(); + } + + + public function includeResource($file ) + { + return "include_once( 'modules/template-engine/components/html/".$file."');"; + } + +} + + + +class Expression +{ + public $type; + public $value; + public $invert = false; + + public function getHTMLValue() + { + switch ($this->type) { + case 'text': + return $this->value; + + default: + return '<' . '?php echo ' . $this->getPHPValue() . ' ?>'; + } + } + + + public function __construct($value) + { + // Falls der Wert 'true' oder 'false' ist. + if (is_bool($value)) + $value = $value ? 'true' : 'false'; + + // Negierung berücksichtigen. + if (substr($value, 0, 4) == 'not:') { + $value = substr($value, 4); + $this->invert = true; + } + + if ($value && strlen($value) >= 3 && $value[1] == '{') { + $this->type = $value[0]; + $this->value = substr($value, 2, -1); + } else { + $this->type = 'text'; + $this->value = $value; + } + } + + + public function getVarName() + { + switch ($this->type) { + case '$': + return '$' . $this->value; + case 'text': + return $this->value; + default: + throw new \LogicException("Invalid expression type '$this->type' in attribute value. Allowed: text|var"); + } + } + + + public function getTextAsVarName() + { + switch ($this->type) { + case '$': + return '$$' . $this->value; + case 'text': + return '$' . $this->value; + default: + return $this->getPHPValue(); + } + } + + + public function getPHPValue() + { + $value = $this->value; + + $invert = $this->invert ? '!' : ''; + + switch ($this->type) { + case 'text': + // Sonderf�lle f�r die Attributwerte "true" und "false". + // Hinweis: Die Zeichenkette "false" entspricht in PHP true. + // Siehe http://de.php.net/manual/de/language.types.boolean.php + if ($value == 'true' || $value == 'false') + return $value; + else + return "'" . $value . "'"; + case '$': + return $invert . '$' . $value; + case 'size': + return '@count($' . $value . ')'; + case '#': + // macht aus "text1{var}text2" => "text1".$var."text2" + $value = preg_replace('/{(\w+)\}/', '\'.$\\1.\'', $value); + return 'lang(' . "'" . $value . "'" . ')'; + case '%': + $config_parts = explode('/', $value); + return $invert . 'config(' . "'" . implode("'" . ',' . "'", $config_parts) . "'" . ')'; + + default: + throw new \LogicException("Unknown expression type '{$this->type}' in attribute value. Allowed: var|function|method|text|size|property|message|messagevar|arrayvar|config or none"); + } + } +}+ \ No newline at end of file diff --git a/modules/template-engine/TemplateCompiler.php b/modules/template-engine/TemplateCompiler.php @@ -23,8 +23,12 @@ echo "Searching in $dir\n"; foreach(FileUtils::readDir( $dir ) as $action ) { + if ( !is_dir($dir.'/'.$action ) ) + continue; + echo "Action: $action\n"; + foreach(FileUtils::readDir( $dir.'/'.$action ) as $file ) { if ( substr($file,-12 ) == '.tpl.src.xml' ) diff --git a/modules/template-engine/components/html/Component.class.php b/modules/template-engine/components/html/Component.class.php @@ -22,7 +22,6 @@ abstract class Component public function __construct() { - $this->element = $this->createElement(); } public function getDepth() @@ -46,195 +45,24 @@ abstract class Component */ public function getBegin() { - if ( $this->element ) - return $this->element->getBegin(); - - ob_start(); - $this->begin(); - $src = ob_get_contents(); - ob_end_clean(); - return $src; + return $this->element->getBegin(); } public function getEnd() { - if ( $this->element ) - return $this->element->getEnd(); - - ob_start(); - $this->end(); - $src = ob_get_contents(); - ob_end_clean(); - return $src; + return $this->element->getEnd(); } - /** - * Outputs the beginning of this component. - */ - protected function begin() - {} - - protected function end() - {} - - - protected function textasvarname($value) + public function init() { - $expr = new Expression($value); - return $expr->getTextAsVarName(); - - } - - - protected function varname($value) - { - $expr = new Expression($value); - return $expr->getVarName(); - } - - - - protected function htmlvalue($value) - { - $expr = new Expression($value); - return $expr->getHTMLValue(); - } - - - - protected function value( $value ) - { - $expr = new Expression($value); - return $expr->getPHPValue(); - } - + $this->element = $this->createElement(); - protected function includeResource($file ) - { - echo "<?php include_once( 'modules/template-engine/components/html/".$file."') ?>"; + if ( $this->element) + $this->element->selfClosing(false); } - -} - - -class Expression -{ - public $type; - public $value; - public $invert = false; - - public function __construct( $value ) - { - // Falls der Wert 'true' oder 'false' ist. - if ( is_bool($value)) - $value = $value?'true':'false'; - - // Negierung berücksichtigen. - if ( substr($value,0,4)=='not:' ) - { - $value = substr($value,4); - $this->invert = true; - } - - // Trennung 'type:value' - $parts = explode( ':', $value, 2 ); - - if ( count($parts) < 2 ) - $parts = array('',$value); - - list( $this->type,$this->value ) = $parts; - - // Fallback: Typ = 'text'. - if ( empty($this->type)) - $this->type = 'text'; - - } - - public function getHTMLValue() - { - switch( $this->type ) - { - case 'text': - return $this->value; - - default: - return '<'.'?php echo '.$this->getPHPValue().' ?>'; - } - } - - - public function getVarName() - { - switch( $this->type ) - { - case 'var': - return '$'.$this->value; - case 'text': - return $this->value; - default: - throw new \LogicException("Invalid expression type '$this->type' in attribute value. Allowed: text|var"); - } - } - - - public function getTextAsVarName() - { - switch( $this->type ) - { - case 'var': - return '$$'.$this->value; - case 'text': - return '$'.$this->value; - default: - return $this->getPHPValue(); - } - } - - - public function getPHPValue() - { - $value = $this->value; - - $invert = $this->invert?'!':''; - - switch( $this->type ) - { - case 'text': - // Sonderf�lle f�r die Attributwerte "true" und "false". - // Hinweis: Die Zeichenkette "false" entspricht in PHP true. - // Siehe http://de.php.net/manual/de/language.types.boolean.php - if ( $value == 'true' || $value == 'false' ) - return $value; - else - return "'".$value."'"; - case 'tpl': - // macht aus "text1{var}text2" => "text1".$var."text2" - $value = preg_replace('/{(\w+)\}/','\'.$\\1.\'',$value); - return "'".$value."'"; - case 'var': - return $invert.'$'.$value; - case 'size': - return '@count($'.$value.')'; - case 'message': - // macht aus "text1{var}text2" => "text1".$var."text2" - $value = preg_replace('/{(\w+)\}/','\'.$\\1.\'',$value); - return 'lang('."'".$value."'".')'; - case 'arrayvar': - list($arr,$key) = explode(':',$value.':none'); - return $invert.'@$'.$arr.'['.$key.']'; - case 'config': - $config_parts = explode('/',$value); - return $invert.'config('."'".implode("'".','."'",$config_parts)."'".')'; - - default: - throw new \LogicException("Unknown expression type '{$this->type}' in attribute value. Allowed: var|function|method|text|size|property|message|messagevar|arrayvar|config or none"); - } - } - - } diff --git a/modules/template-engine/components/html/FieldComponent.class.php b/modules/template-engine/components/html/FieldComponent.class.php @@ -3,26 +3,12 @@ namespace template_engine\components; +use modules\template_engine\Element; + abstract class FieldComponent extends HtmlComponent { public $prefix; public $name; public $readonly = false; - - - protected function outputNameAttribute() { - - $out = ' name="'; - - if(isset($this->readonly)) - $out .= '<?php if ('.$this->value($this->prefix).') '."echo ".$this->value($this->prefix).".'_' ?>"; - $out .= $this->htmlvalue($this->name); - - if(isset($this->readonly)) - $out .= '<?php if ('.$this->value($this->readonly).') '."echo '_disabled' ?>"; - $out .= '"'; - - return $out; - } } diff --git a/modules/template-engine/components/html/button/Button.class.php b/modules/template-engine/components/html/button/Button.class.php @@ -2,6 +2,9 @@ namespace template_engine\components; +use modules\template_engine\Element; + +/* @DEPRECATED */ class ButtonComponent extends Component { @@ -13,7 +16,12 @@ class ButtonComponent extends Component private $tmp_src; - protected function begin() + public function createElement() + { + return new Element(null); + } + + protected function unused_begin() { echo <<<'HTML' <div class="invisible"> diff --git a/modules/template-engine/components/html/checkbox/Checkbox.class.php b/modules/template-engine/components/html/checkbox/Checkbox.class.php @@ -2,6 +2,10 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; + class CheckboxComponent extends Component { @@ -11,39 +15,34 @@ class CheckboxComponent extends Component public $required = false; public $label; - protected function begin(){ - - if ( $this->label ) - echo '<label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input">'; + public function createElement() + { + $checkbox = (new CMSElement('input'))->addAttribute('type','checkbox'); + if ( $this->label ) { + $label = new CMSElement('label'); + $label->addStyleClass('or-form-row')->addStyleClass('or-form-checkbox'); + $label->addChild( (new CMSElement('span'))->addStyleClass('or-form-label')->content($this->label)); + $checkbox->addWrapper($label); + } - echo '<?php { '; - echo '$tmpname = '.$this->value($this->name).';'; - echo '$default = '.$this->value($this->default).';'; - echo '$readonly = '.$this->value($this->readonly).';'; - echo '$required = '.$this->value($this->required).';'; + $checkbox->addAttribute('name',$this->name); + $checkbox->addAttribute('disabled',$this->readonly); + $checkbox->addAttribute('value','1'); - echo <<<'HTML' - - if ( isset($$tmpname) ) - $checked = $$tmpname; + if ( $this->default ) + $checkbox->addAttribute('checked',$this->default); else - $checked = $default; + $checkbox->addAttribute('checked',Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->name)); - ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php + if ( $this->required ) + $checkbox->addAttribute( 'required','required'); - if ( $readonly && $checked ) - { - ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php + if ( $this->readonly && $this->required ) { + $hidden = (new CMSElement('input'))->addAttribute('type','hidden')->addAttribute('name',$this->name)->addAttribute('value','1'); + $checkbox->addChild( $hidden ); } - } ?> -HTML; - - if ( $this->label ) - echo ' '.lang($this->label).' </span></label>'; + return $checkbox; } } - - -?>- \ No newline at end of file diff --git a/modules/template-engine/components/html/column/Column.class.php b/modules/template-engine/components/html/column/Column.class.php @@ -2,6 +2,8 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; + class ColumnComponent extends Component { public $width; @@ -16,47 +18,37 @@ class ColumnComponent extends Component public $id; public $name; - protected function begin() + public function createElement() { - $styleClasses = array(); - echo '<'.($this->header?'th':'td'); - if ( ! empty($this->width)) - echo ' width="'.$this->htmlvalue($this->width).'"'; - if ( ! empty($this->style)) - echo ' style="'.$this->htmlvalue($this->style).'"'; - - if ( ! empty($this->colspan)) - echo ' colspan="'.$this->htmlvalue($this->colspan).'"'; - if ( ! empty($this->rowspan)) - echo ' rowspan="'.$this->htmlvalue($this->rowspan).'"'; - if ( ! empty($this->rowspan)) - echo ' rowspan="'.$this->htmlvalue($this->rowspan).'"'; - if ( ! empty($this->title)) - echo ' title="'.$this->htmlvalue($this->title).'"'; - - if ( ! empty($this->id)) - { - echo ' data-name="'.$this->htmlvalue($this->name).'"'; - echo ' data-action="'.$this->htmlvalue($this->action).'"'; - echo ' data-id="'.$this->htmlvalue($this->id).'"'; - $styleClasses[] = 'clickable'; - } - if ( ! empty($this->class)) - $styleClasses[] = $this->htmlvalue($this->class); + $column = new CMSElement( ($this->header?'th':'td') ); - if ( sizeof($styleClasses) > 0) - echo ' class="'.implode(' ',$styleClasses).'"'; + if ( $this->width ) + $column->addAttribute('width',$this->width); - echo '>'; - } - - - protected function end() - { - echo '</'.($this->header?'th':'td').'>'; - } - -} + if ( $this->style ) + $column->addAttribute('style',$this->style); + if ( $this->colspan ) + $column->addAttribute('colspan',$this->colspan); -?>- \ No newline at end of file + if ( $this->rowspan ) + $column->addAttribute('rowspan',$this->rowspan); + + if ( $this->rowspan ) + $column->addAttribute('rowspan',$this->rowspan); + if ( $this->title ) + $column->addAttribute('title',$this->title); + + if ( $this->id ) + { + $column->addAttribute('data-name' ,$this->name ); + $column->addAttribute('data-action',$this->action); + $column->addAttribute('data-id' ,$this->id ); + $column->addStyleClass('clickable'); + } + if ( $this->class ) + $column->addStyleClass( $this->class ); + + return $column; + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/date/Date.class.php b/modules/template-engine/components/html/date/Date.class.php @@ -2,18 +2,18 @@ namespace template_engine\components; +use modules\template_engine\PHPBlockElement; + class DateComponent extends Component { public $date; - - protected function begin() - { - $date = $this->date; - - $this->includeResource( 'date/component-date.php'); - echo '<?php component_date('.$this->value($this->date).') ?>'; - } -} + public function createElement() + { + $date = new PHPBlockElement(); + $date->beforeBlock = $date->includeResource( 'date/component-date.php'); + $date->inBlock = 'component_date('.$date->value($this->date).');'; -?>- \ No newline at end of file + return $date; + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/dummy/Dummy.class.php b/modules/template-engine/components/html/dummy/Dummy.class.php @@ -2,9 +2,12 @@ namespace template_engine\components; +use modules\template_engine\Element; + class DummyComponent extends Component { -} - - -?>- \ No newline at end of file + public function createElement() + { + return new Element(null); + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/editor/Editor.class.php b/modules/template-engine/components/html/editor/Editor.class.php @@ -2,57 +2,57 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; + class EditorComponent extends FieldComponent { public $type; public $name; - public $mode='htmlmixed'; - public $extension=''; - public $mimetype = ''; + public $mode ='htmlmixed'; + public $extension =''; + public $mimetype = ''; - protected function begin() + public function createElement() { + $textarea = new CMSElement('textarea'); + $textarea->addAttribute('name',$this->name); + + $textarea->addStyleClass('editor')->setEscaping(false); + switch( $this->type ) { case 'html': - echo '<textarea '.$this->outputNameAttribute().' class="editor html-editor" id="pageelement_edit_editor"><?php echo ${'.$this->value($this->name).'} ?></textarea>'; + $textarea->addStyleClass('html-editor')->addAttribute('id','pageelement_edit_editor'); + break; case 'wiki': - echo '<textarea '.$this->outputNameAttribute().' class="editor wiki-editor"><?php echo ${'.$this->value($this->name).'} ?></textarea>'; + $textarea->addStyleClass('wiki-editor'); break; case 'text': case 'raw': - echo '<textarea '.$this->outputNameAttribute().' class="editor text-editor"><?php echo ${'.$this->value($this->name).'} ?></textarea>'; + $textarea->addStyleClass('text-editor'); break; case 'markdown': - echo '<textarea '.$this->outputNameAttribute().' class="editor markdown-editor"><?php echo htmlentities(${'.$this->value($this->name).'}) ?></textarea>'; + $textarea->setEscaping(true)->addStyleClass('markdown-editor'); break; case 'code': - echo '<textarea '.$this->outputNameAttribute().' data-extension="'.$this->htmlvalue($this->extension).'" data-mimetype="'.$this->htmlvalue($this->mimetype).'" data-mode="'.$this->htmlvalue($this->mode).'" class="editor code-editor"><?php echo htmlentities(${'.$this->value($this->name).'}) ?></textarea>'; + $textarea->setEscaping(true); + $textarea->addStyleClass('code-editor') + ->addAttribute('data-extension',$this->extension) + ->addAttribute('data-mimetype',$this->mimetype) + ->addAttribute('data-mode',$this->mode); break; - case 'dom': - case 'tree': - echo '<?php '; - echo '$doc = new DocumentElement();'; - echo '$tmp_text = '.$this->textasvarname($this->name).';'; - echo 'if( !is_array($tmp_text))$tmp_text = explode("\n",$tmp_text);'; - echo '$doc->parse($tmp_text);'; - echo 'echo $doc->render(\'application/html-dom\');'; - echo '?>'; - break; - default: throw new \LogicException("Unknown editor type: ".$this->type); } - } -} - -?>- \ No newline at end of file + return $textarea; + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/else/Else.class.php b/modules/template-engine/components/html/else/Else.class.php @@ -2,18 +2,15 @@ namespace template_engine\components; +use modules\template_engine\PHPBlockElement; + class ElseComponent extends Component { - public function begin() + public function createElement() { - echo '<?php if(!$if'.$this->getDepth().'){?>'; + $else = new PHPBlockElement(); + $else->beforeBlock = 'if(!$if' . $this->getDepth() . ')'; + return $else; } - - - public function end() { - echo '<?php } ?>'; - } -} - -?>- \ No newline at end of file +}+ \ 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 @@ -2,26 +2,13 @@ namespace template_engine\components; +use modules\template_engine\Element; + class FocusComponent extends Component { - public function begin() + public function createElement() { - /* - echo <<<'HTML' -<script name="JavaScript" type="text/javascript"><!-- -// Auskommentiert, da JQuery sonst abbricht und die Success-Function des LoadEvents nicht mehr ausführt. -//document.forms[0].<?php echo $attr_field ?>.focus(); -//document.forms[0].<?php echo $attr_field ?>.select(); -// --> -</script> -HTML; - */ + return new Element(null); } - - - public function end() { - } -} - -?>- \ No newline at end of file +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/form/Form.class.php b/modules/template-engine/components/html/form/Form.class.php @@ -2,6 +2,11 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; +use modules\template_engine\HtmlElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; + class FormComponent extends Component { @@ -16,19 +21,19 @@ class FormComponent extends Component public $id = '<?php echo OR_ID ?>'; public $languageid = null; - public $modelid = null; + public $modelid = null; - public $label; + public $label = '#{button_ok}'; - public $apply = false; + public $apply = false; public $cancel = true; public $readonly = false; - /** - * 'view' = Loads Action in the same view - * 'top' = Replaces whole workbench. - * @var string - */ + /** + * 'view' = Loads Action in the same view + * 'top' = Replaces whole workbench. + * @var string + */ public $target = 'view'; public $enctype = 'application/x-www-form-urlencoded'; @@ -41,79 +46,121 @@ class FormComponent extends Component public $afterSuccess; - protected function begin() - { - if ( ! $this->label ) - $this->label = 'message:BUTTON_OK'; - - if ($this->type == 'upload') - $this->submitFunction = ''; - - // Default: Target is the actual action/method-pair. - if(empty($this->action)) - $this->action = $this->request->action; - if(empty($this->subaction)) - $this->subaction = $this->request->method; - - echo '<form'; - echo ' name="' . $this->htmlvalue($this->name) . '"'; - - echo ' target="_self"'; - echo ' data-target="' . $this->htmlvalue($this->target) . '"'; - echo ' action="./"'; - echo ' data-method="' . $this->htmlvalue($this->subaction) . '"'; - echo ' data-action="' . $this->htmlvalue($this->action) . '"'; - echo ' data-id="' . $this->htmlvalue($this->id) . '"'; - echo ' method="' . $this->htmlvalue($this->method) . '"'; - echo ' enctype="' . $this->htmlvalue($this->enctype) . '"'; - echo ' class="or-form ' . $this->htmlvalue($this->action) . '"'; - echo ' data-async="' . $this->htmlvalue($this->async) . '"'; - echo ' data-autosave="' . $this->htmlvalue($this->autosave) . '"'; - - if ( $this->afterSuccess ) - echo ' data-after-success="' . $this->htmlvalue($this->afterSuccess) . '"'; - - echo '>'; - - // Enable Submit on Enter - no need for...we have a submit button at the end. - // echo '<input type="submit" class="invisible" />'; - - if ( !empty($this->languageid)) - echo '<input type="hidden" name="'.REQ_PARAM_LANGUAGE_ID.'" value="' . $this->htmlvalue($this->languageid) . '" />'; - if ( !empty($this->modelid)) - echo '<input type="hidden" name="'.REQ_PARAM_MODEL_ID.'" value="' . $this->htmlvalue($this->modelid) . '" />'; - echo '<input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" />'; - echo '<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="' . $this->htmlvalue($this->action) . '" />'; - echo '<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="' . $this->htmlvalue($this->subaction) . '" />'; - echo '<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="' . $this->htmlvalue($this->id) . '" />'; - } - protected function end() + public function createElement() { - $label = $this->htmlvalue($this->label); - - echo '<div class="or-form-actionbar">'; - //echo "<div class=\"command {$this->visible}\">"; - - // Cancel-Button nicht anzeigen, wenn cancel==false. - if ($this->cancel) - { - echo '<input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" />'; - } + if ( ! $this->action ) + $this->action = $this->request->action; - if ($this->apply && !$this->readonly) - { - echo '<input type="button" class="or-form-btn or-form-btn--primary or-form-btn--apply" value="<?php echo lang("APPLY") ?>" />'; - } + if ( ! $this->subaction ) + $this->subaction = $this->request->method; - if ( !$this->readonly ) - echo "<input type=\"submit\" class=\"or-form-btn or-form-btn--primary or-form-btn--save\" value=\"{$label}\" />"; + if ( ! $this->id ) + $this->id = $this->request->id; - //echo '</div>'; - echo '</div>'; - echo '</form>'; + $form = new CMSElement('form'); - } -} + if ($this->type == 'upload') + $this->submitFunction = ''; -?>- \ No newline at end of file + $form->addAttribute('name', $this->name); + $form->addAttribute('target', '_self'); + $form->addAttribute('data-target', $this->target); + $form->addAttribute('action', './'); + $form->addAttribute('data-method', $this->subaction); + $form->addAttribute('data-action', $this->action); + $form->addAttribute('data-id', $this->id); + $form->addAttribute('method', $this->method); + $form->addAttribute('enctype', $this->enctype); + $form->addStyleClass('or-form')->addStyleClass($this->action); + $form->addAttribute('data-async', $this->async); + $form->addAttribute('data-autosave', $this->autosave); + + if ($this->afterSuccess) + $form->addAttribute('data-after-success', $this->afterSuccess); + + if ($this->languageid) + $form->addChild( + (new CMSElement('input')) + ->addAttribute('type', 'hidden') + ->addAttribute('name', REQ_PARAM_LANGUAGE_ID) + ->addAttribute('value', $this->languageid) + ); + + if ($this->modelid) + $form->addChild( + (new CMSElement('input')) + ->addAttribute('type', 'hidden') + ->addAttribute('name', REQ_PARAM_MODEL_ID) + ->addAttribute('value', $this->modelid) + ); + + $form->addChild( + (new CMSElement('input')) + ->addAttribute('type', 'hidden') + ->addAttribute('name', REQ_PARAM_TOKEN) + ->addAttribute('value', '<?php token();') // TODO escaping + ); + + $form->addChild( + (new CMSElement('input')) + ->addAttribute('type', 'hidden') + ->addAttribute('name', REQ_PARAM_ACTION) + ->addAttribute('value', $this->action) + ); + $form->addChild( + (new CMSElement('input')) + ->addAttribute('type', 'hidden') + ->addAttribute('name', REQ_PARAM_SUBACTION) + ->addAttribute('value', $this->subaction) + ); + $form->addChild( + (new CMSElement('input')) + ->addAttribute('type', 'hidden') + ->addAttribute('name', REQ_PARAM_ID) + ->addAttribute('value', $this->id) + ); + + $actionBar = (new HtmlElement('div'))->addStyleClass('or-form-actionbar'); + + // Cancel-Button nicht anzeigen, wenn cancel==false. + if ($this->cancel) { + $actionBar->addChild( + (new CMSElement('input')) + ->addAttribute('type', 'button') + ->addStyleClass('or-form-btn') + ->addStyleClass('or-form-btn--secondary') + ->addStyleClass('or-form-btn--cancel') + ->addAttribute('value', + Value::createExpression(ValueExpression::TYPE_MESSAGE, 'CANCEL') + ) + ); + } + + if ($this->apply && !$this->readonly) { + $actionBar->addChild( + (new CMSElement('input')) + ->addAttribute('type', 'button') + ->addStyleClass('or-form-btn') + ->addStyleClass('or-form-btn--primary') + ->addStyleClass('or-form-btn--apply') + ->addAttribute('value', + Value::createExpression(ValueExpression::TYPE_MESSAGE, 'APPLY') + ) + ); + } + + if (!$this->readonly) { + $actionBar->addChild( + (new CMSElement('input')) + ->addAttribute('type', 'submit') + ->addStyleClass('or-form-btn') + ->addStyleClass('or-form-btn--primary') + ->addStyleClass('or-form-btn--save') + ->addAttribute('value', $this->label) + ); + } + + return $form; + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/group/Group.class.php b/modules/template-engine/components/html/group/Group.class.php @@ -2,6 +2,12 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; +use modules\template_engine\HtmlElement; + +/** + * A group. + */ class GroupComponent extends Component { @@ -10,31 +16,42 @@ class GroupComponent extends Component public $title; public $icon; - public function begin() + public function createElement() { - echo '<fieldset'; - echo ' class="toggle-open-close'; - echo '<?php echo '.$this->value($this->open).'?" open":" closed" ?>'; - echo '<?php echo '.$this->value($this->show).'?" show":"" ?>'; - echo '">'; - - if ( !empty($this->title)) + $fieldset = new HtmlElement('fieldset'); + $fieldset->addStyleClass('or-group'); + $fieldset->addStyleClass('toggle-open-close'); + + if ( $this->open ) + $fieldset->addStyleClass('open'); + else + $fieldset->addStyleClass('closed'); + + if ( $this->show ) + $fieldset->addStyleClass('show' ); + + if ( $this->title ) { - echo '<legend class="on-click-open-close">'; - if ( !empty($this->icon)) - echo '<img src="/themes/default/images/icon/method/'.$this->htmlvalue($this->icon).'.svg" />'; - - echo '<div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div>'; - echo $this->htmlvalue($this->title); - echo '</legend>'; + $legend = new HtmlElement('legend'); + $legend->addStyleClass('on-click-open-close'); + $legend->content( $this->title ); + + $image = new CMSElement('img'); + if ( $this->icon ) + $image->addAttribute('src','themes/default/images/icon/method/'.$this->icon.'.svg" />'); + $legend->addChild( $image ); + + $arrowRight = (new HtmlElement('div'))->addStyleClass('arrow')->addStyleClass('arrow-right')->addStyleClass('on-closed'); + $legend->addChild($arrowRight ); + + $arrowDown = (new HtmlElement('div'))->addStyleClass('arrow')->addStyleClass('arrow-down' )->addStyleClass('on-open' ); + $legend->addChild($arrowDown ); } - echo '<div class="closable">'; - } + $group = new HtmlElement('div'); + $group->addStyleClass('closable')->addWrapper($fieldset); - public function end() { - echo '</div></fieldset>'; + return $group; } -} -?>- \ No newline at end of file +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/group/group.css b/modules/template-engine/components/html/group/group.css @@ -1,8 +1,8 @@ -fieldset { +.or-group { border: 1px solid; - border-bottom: 0px; - border-left: 0px; - border-right: 0px; + border-bottom: 0; + border-left: 0; + border-right: 0; margin-top: 20px; margin-bottom: 20px; margin-left: 0px; diff --git a/modules/template-engine/components/html/group/group.js b/modules/template-engine/components/html/group/group.js @@ -1,5 +1,5 @@ Openrat.Workbench.afterViewLoadedHandler.add( function(element ) { - registerOpenClose( $(element).find('fieldset.toggle-open-close') ); + registerOpenClose( $(element).find('.or-group.toggle-open-close') ); }); diff --git a/modules/template-engine/components/html/group/group.less b/modules/template-engine/components/html/group/group.less @@ -1,17 +1,16 @@ -fieldset +.or-group { border:1px solid; - border-bottom:0px; - border-left:0px; - border-right:0px; + border-bottom:0; + border-left:0; + border-right:0; margin-top:20px; margin-bottom:20px; margin-left:0px; margin-right:0px; padding:10px; - } diff --git a/modules/template-engine/components/html/group/group.min.css b/modules/template-engine/components/html/group/group.min.css @@ -1 +1 @@ -fieldset{border: 1px solid;border-bottom: 0px;border-left: 0px;border-right: 0px;margin-top: 20px;margin-bottom: 20px;margin-left: 0px;margin-right: 0px;padding: 10px}- \ No newline at end of file +.or-group{border: 1px solid;border-bottom: 0;border-left: 0;border-right: 0;margin-top: 20px;margin-bottom: 20px;margin-left: 0px;margin-right: 0px;padding: 10px}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/group/group.min.js b/modules/template-engine/components/html/group/group.min.js @@ -1 +1 @@ -;Openrat.Workbench.afterViewLoadedHandler.add(function(e){registerOpenClose($(e).find('fieldset.toggle-open-close'))});- \ No newline at end of file +;Openrat.Workbench.afterViewLoadedHandler.add(function(e){registerOpenClose($(e).find('.or-group.toggle-open-close'))});+ \ 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 @@ -2,11 +2,18 @@ namespace template_engine\components; +use modules\template_engine\Element; + class HeaderComponent extends Component { public $views; - public function begin() + public function createElement() + { + return new Element(null); + } + + public function begin() { if(false) // DEACTIVATED if (isset($this->views)) { diff --git a/modules/template-engine/components/html/hidden/Hidden.class.php b/modules/template-engine/components/html/hidden/Hidden.class.php @@ -2,28 +2,26 @@ namespace template_engine\components; -class HiddenComponent extends Component -{ - - public $name; +use modules\template_engine\CMSElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; +class HiddenComponent extends FieldComponent +{ public $default; - public function begin() + public function createElement() { - echo '<input'; - echo ' type="hidden"'; - echo ' name="' . $this->htmlvalue($this->name) . '"'; - echo ' value="'; - - if (isset($this->default)) - echo $this->htmlvalue($this->default); + $input = (new CMSElement('input'))->addAttribute('type','hidden'); + $input->addAttribute('name',$this->name); + + if ($this->default) + $input->addAttribute('value',$this->default); else - echo '<?php echo $' . $this->varname($this->name) . ' ?>'; - - echo '"'; - echo '/>'; - } -} + $input->addAttribute('value',Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->name)); + + //$input->addWrapper( (new HtmlElement('div'))->addStyleClass('inputholder')); -?>- \ No newline at end of file + return $input; + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/if/If.class.php b/modules/template-engine/components/html/if/If.class.php @@ -2,6 +2,8 @@ namespace template_engine\components; +use modules\template_engine\PHPBlockElement; + class IfComponent extends Component { public $true; @@ -15,38 +17,36 @@ class IfComponent extends Component public $present; public $not; - - public function begin() + + public function createElement() { - echo <<<'HTML' -HTML; + $if = new PHPBlockElement(); - echo '<?php $if'.$this->getDepth().'='.(!isset($this->not)?'':'!').'('; - if ( !empty($this->true )) - echo $this->value($this->true); - elseif (! empty($this->false)) - echo '!' . $this->value($this->false); - elseif (! empty($this->contains)) - echo 'in_array('.$this->value($this->value).',explode(",",'.$this->value($this->contains).')'; - elseif (! empty($this->equals)) - echo '' . $this->value($this->value).'=='.$this->value($this->equals); - elseif (strlen($this->lessthan)>0) - echo 'intval(' . $this->value($this->lessthan).')>intval('.$this->value($this->value).')'; - elseif (strlen($this->greaterthan)>0) - echo 'intval(' . $this->value($this->greaterthan).')<intval('.$this->value($this->value).')'; + $expr = '$if'.$this->getDepth().'='.(!isset($this->not)?'':'!').'('; + if ( $this->true ) + $expr .= $if->value($this->true); + elseif ($this->false) + $expr .= '!' . $if->value($this->false); + elseif ($this->contains) + $expr .= 'in_array('.$if->value($this->value).',explode(",",'.$if->value($this->contains).')'; + elseif ($this->equals) + $expr .= '' . $if->value($this->value).'=='.$if->value($this->equals); + elseif ($this->lessthan) + $expr .= 'intval(' . $if->value($this->lessthan).')>intval('.$if->value($this->value).')'; + elseif ($this->greaterthan) + $expr .= 'intval(' . $if->value($this->greaterthan).')<intval('.$if->value($this->value).')'; elseif (! empty($this->present)) - echo 'isset(' . $this->textasvarname($this->present).')'; // 'isset' verwenden! Nicht empty(), da false empty ist. + $expr .= 'isset(' . '$'.$this->present.')'; // 'isset' verwenden! Nicht empty(), da false empty ist. elseif (! empty($this->empty)) - echo '(' . $this->textasvarname($this->empty).')==FALSE'; + $expr .= '(' . $if->textasvarname($this->empty).')==FALSE'; + elseif ($this->value) + $expr .= $if->value($this->value); else throw new \LogicException("Element 'if' has not enough parameters."); - - echo '); if($if'.$this->getDepth().'){?>'; - } + $expr .= ');'; + + $if->beforeBlock = $expr . ' if($if'.$this->getDepth().')'; - public function end() { - echo '<?php } ?>'; + return $if; } } - -?>- \ No newline at end of file diff --git a/modules/template-engine/components/html/image/Image.class.php b/modules/template-engine/components/html/image/Image.class.php @@ -2,6 +2,8 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; + class ImageComponent extends Component { public $class; @@ -20,92 +22,85 @@ class ImageComponent extends Component public $size; public $title; - protected function begin() + public function createElement() { - $styleClass = ''; + $styleClasses = []; $tagName = 'img'; $file = ''; $selfClosing = true; - if ( !empty($this->menu) ) + if ( $this->menu ) { $tagName = 'i'; - $styleClass = 'image-icon image-icon--menu-'.$this->htmlvalue($this->menu); + $styleClasses = ['image-icon','image-icon--menu-'.$this->menu]; $selfClosing = false; } - elseif ( !empty($this->elementtype) ) + elseif ( $this->elementtype ) { $tagName = 'i'; - $styleClass = 'image-icon image-icon--action-el_'.$this->htmlvalue($this->elementtype); + $styleClasses = ['image-icon','image-icon--action-el_'.$this->elementtype]; $selfClosing = false; } - elseif ( !empty($this->action) ) + elseif ( $this->action ) { $tagName = 'i'; - $styleClass = 'image-icon image-icon--action-'.$this->htmlvalue($this->action); + $styleClasses = ['image-icon','image-icon--action-'.$this->action]; $selfClosing = false; } - elseif ( !empty($this->method) ) + elseif ( $this->method ) { $tagName = 'i'; - $styleClass = 'image-icon image-icon--method-'.$this->htmlvalue($this->method); + $styleClasses = ['image-icon','image-icon--method-'.$this->method]; $selfClosing = false; } - elseif ( !empty($this->type) ) + elseif ( $this->type ) { - $file = OR_THEMES_DIR.'default/images/icon_'.$this->htmlvalue($this->type).IMG_ICON_EXT; + $file = OR_THEMES_DIR.'default/images/icon_'.$this->type.IMG_ICON_EXT; } - elseif ( !empty($this->icon) ) + elseif ( $this->icon ) { - $file = OR_THEMES_DIR.'default/images/icon/'.$this->htmlvalue($this->icon).IMG_ICON_EXT; + $file = OR_THEMES_DIR.'default/images/icon/'.$this->icon.IMG_ICON_EXT; } - elseif ( !empty($this->notice) ) + elseif ( $this->notice ) { - $file = OR_THEMES_DIR.'default/images/notice_'.$this->htmlvalue($this->notice).IMG_ICON_EXT; + $file = OR_THEMES_DIR.'default/images/notice_'.$this->notice.IMG_ICON_EXT; } - elseif ( !empty($this->tree) ) + elseif ( $this->tree ) { - $file = OR_THEMES_DIR.'default/images/tree_'.$this->htmlvalue($this->tree).IMG_EXT; + $file = OR_THEMES_DIR.'default/images/tree_'.$this->tree.IMG_EXT; } - elseif ( !empty($this->url) ) + elseif ( $this->url ) { - $file = $this->htmlvalue($this->url); + $file = $this->url; } - elseif ( !empty($this->fileext) ) + elseif ( $this->fileext ) { - $file = OR_THEMES_DIR.'default/images/icon/'.$this->htmlvalue($this->fileext); + $file = OR_THEMES_DIR.'default/images/icon/'.$this->fileext; } - elseif ( !empty($this->file) ) + elseif ( $this->file ) { - $file = OR_THEMES_DIR.'default/images/icon/'.$this->htmlvalue($this->file).IMG_ICON_EXT; + $file = OR_THEMES_DIR.'default/images/icon/'.$this->file.IMG_ICON_EXT; } - if ( !empty($this->class) ) + if ( $this->class ) { - $styleClass .= ' '.$this->class; + $styleClasses .= ' '.$this->class; } - echo '<'.$tagName.''; + $image = new CMSElement($tagName ); - if( $styleClass ) - echo ' class="'.$styleClass.'"'; + foreach( $styleClasses as $styleClass ) + $image->addStyleClass($styleClass); if($this->title) - echo ' title="'.$this->htmlvalue($this->title).'"'; + $image->addAttribute('title',$this->title); if ( $file) - echo ' src="'.$file.'"'; + $image->addAttribute('src',$file); - if ( $selfClosing ) - echo ' />'; - else - echo '></'.$tagName.'>'; - } + $image->selfClosing( $selfClosing ); - protected function end() - { + return $image; } -} - -?>- \ No newline at end of file +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/include/Include.class.php b/modules/template-engine/components/html/include/Include.class.php @@ -2,6 +2,10 @@ namespace template_engine\components; +/** + * Pseudo-Component. + * The include component is a pseudo component. The template compiler will resolve this component first and is including another xml source file. + */ class IncludeComponent extends Component { @@ -9,4 +13,3 @@ class IncludeComponent extends Component } -?>- \ No newline at end of file diff --git a/modules/template-engine/components/html/input/Input.class.php b/modules/template-engine/components/html/input/Input.class.php @@ -2,6 +2,10 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; + class InputComponent extends FieldComponent { public $default; @@ -32,89 +36,47 @@ class InputComponent extends FieldComponent public $label; - public function begin() - { - if ( $this->label ) - { - echo '<label class="or-form-row"><span class="or-form-label">'.'<?php echo lang('.$this->value($this->label).') ?>'.'</span><span class="or-form-input">'; - } - - if(!$this->type == 'hidden') - { - // Verstecktes Feld. - $this->outputHiddenField(); - } - else - { - echo '<div class="inputholder">'; - echo '<input'; - if($this->readonly) - echo '<?php if ('.$this->value($this->readonly).') '."echo ' disabled=\"true\"' ?>"; - if (!empty($this->hint)) - echo ' placeholder="'.$this->htmlvalue($this->hint).'"'; - - echo ' id="'.'<?php echo REQUEST_ID ?>_'.$this->htmlvalue($this->name).'"'; - - // Output Attribute name="..." - echo $this->outputNameAttribute(); - if($this->required) - echo ' required="required"'; - if($this->focus) - echo ' autofocus="autofocus"'; + public function createElement() + { + $input = (new CMSElement('input')); - echo ' type="'.$this->htmlvalue($this->type).'"'; - echo ' maxlength="'.$this->htmlvalue($this->maxlength).'"'; - echo ' class="'.$this->htmlvalue($this->class).'"'; - - echo ' value="<?php echo Text::encodeHtml('; - if (isset($this->default)) - echo $this->value($this->default); - else - echo '@$'.$this->varname($this->name); - echo ') ?>"'; - - echo ' />'; - - if(isset($this->readonly)) - { - echo '<?php if ('.$this->value($this->readonly).') { ?>'; - $this->outputHiddenField(); - echo '<?php } ?>'; - } - - - if(isset($this->icon)) - echo '<img src="'.OR_THEMES_DIR.'default/images/icon_'.$this->htmlvalue($this->icon). IMG_ICON_EXT .'" width="16" height="16" />'; - - echo '</div>'; + if ( $this->label ) { + $label = new CMSElement('label'); + $label->addStyleClass('or-form-row')->addStyleClass('or-form-input'); + $label->addChild( (new CMSElement('span'))->addStyleClass('or-form-label')->content($this->label)); + $input->addWrapper($label); } + $input->addAttribute('name',$this->name); + $input->addAttribute('disabled',$this->readonly); - if ( $this->label ) - { - echo '</span></label>'; - } - } + if ( $this->required ) + $input->addAttribute( 'required','required'); - private function outputHiddenField() - { - echo '<input'; - echo ' type="hidden"'; - echo ' name="'.$this->htmlvalue($this->name).'"'; + if ( $this->hint ) + $input->addAttribute( 'placeholder',$this->hint ); + + if($this->focus) + $input->addAttribute( 'autofocus','autofocus'); - echo ' value="<?php '; - if(isset($this->default)) - echo $this->value($this->default); + $input->addAttribute('type',$this->type); + $input->addAttribute('maxlength',$this->maxlength); + + if ( $this->class ) + $input->addStyleClass($this->class); + + if (isset($this->default)) + $input->addAttribute('value',$this->default); else - echo '$'.$this->varname($this->name); + $input->addAttribute('value',Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->name)); - echo ' ?>"'; - echo '/>'; + // Unused: + //if(isset($this->icon)) + // echo '<img src="'.OR_THEMES_DIR.'default/images/icon_'.$this->htmlvalue($this->icon). IMG_ICON_EXT .'" width="16" height="16" />'; + return $input; } -} - -?>- \ No newline at end of file +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/inputarea/Inputarea.class.php b/modules/template-engine/components/html/inputarea/Inputarea.class.php @@ -2,6 +2,10 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; + class InputareaComponent extends FieldComponent { @@ -19,43 +23,49 @@ class InputareaComponent extends FieldComponent public $class = 'inputarea'; + public $required = false; + public $default; public $maxlength = 0; public $label; - - public function begin() + + + public function createElement() { - if ( $this->label ) - { - echo '<label class="or-form-row"><span class="or-form-label">'.lang($this->label).'</span><span class="or-form-input">'; - } + $textarea = (new CMSElement('textarea')); + + if ( $this->label ) { + $label = new CMSElement('label'); + $label->addStyleClass('or-form-row')->addStyleClass('or-form-checkbox'); + $label->addChild( (new CMSElement('span'))->addStyleClass('or-form-label')->content($this->label)); + + $textarea->addWrapper($label); + } - echo '<div class="inputholder">'; - echo '<textarea'; - echo ' class="'.$this->htmlvalue($this->class).'"'; + $textarea->addAttribute('name',$this->name); + $textarea->addAttribute('disabled',$this->readonly); + $textarea->addAttribute('maxlength',$this->maxlength); - echo $this->outputNameAttribute(); + if ( $this->required ) + $textarea->addAttribute( 'required','required'); - if (!empty($this->maxlength)) - echo ' maxlength="'.intval($this->maxlength).'"'; + if ( $this->readonly && $this->required ) { + $hidden = (new CMSElement('input'))->addAttribute('type','hidden')->addAttribute('name',$this->name)->addAttribute('value','1'); + $textarea->addChild( $hidden ); + } - echo '>'; - echo '<?php echo Text::encodeHtml('; - if (isset($this->default)) - echo $this->value($this->default); + if ($this->class ) + $textarea->addStyleClass($this->class); + + + + if (isset($this->default)) + $textarea->content($this->default); else - echo '$'.$this->varname($this->name).''; - echo ') ?>'; - echo '</textarea>'; - echo '</div>'; - - if ( $this->label ) - { - echo '</span></label>'; - } - } -} + $textarea->content(Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->name)); -?>- \ No newline at end of file + return $textarea; + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/insert/Insert.class.php b/modules/template-engine/components/html/insert/Insert.class.php @@ -2,35 +2,38 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; + class InsertComponent extends Component { - public $name= ''; + public $name; public $url; public $function; - public function begin() + public function createElement() { - if ( !empty($this->function)) + if ( $this->function ) { // JS-Function einbinden - echo '<script type="text/javascript" name="JavaScript">'.$this->htmlvalue($this->function).'();</script>'; + $script = new CMSElement('script'); + $script->addAttribute('type','text/javascript')->addAttribute('name','JavaScript'); + $script->content( $this->function.'();' ); + + return $script; } - elseif ( !empty($this->url)) + elseif ( $this->url ) { // IFrame - echo '<iframe'; - if ( !empty($this->name)) - echo ' name="'.$this->htmlvalue($this->name).'"'; - if ( !empty($this->url)) - echo ' src="'.$this->htmlvalue($this->url).'"'; - echo '></iframe>'; + $iframe = new CMSElement('iframe'); + $iframe->selfClosing(false); + if ( $this->name ) + $iframe->addAttribute('name', $this->name); + if ( $this->url ) + $iframe->addAttribute('src' ,$this->url); + + return $iframe; } - } - - public function end() - { + else + return null; } } - - -?>- \ No newline at end of file diff --git a/modules/template-engine/components/html/label/Label.class.php b/modules/template-engine/components/html/label/Label.class.php @@ -2,44 +2,41 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; + class LabelComponent extends Component { + /** + * @deprecated + * @var + */ public $for; + /** + * @deprecated + * @var + */ public $value; public $key; public $text; - public function begin() + public function createElement() { - echo '<label'; - - if (! empty($this->for)) - { - - echo ' for="<?php echo REQUEST_ID ?>_' . $this->htmlvalue($this->for); - if (isset($this->value)) - echo '_' . $this->htmlvalue($this->value); - echo '"'; - } - - echo ' class="label"'; - echo '>'; - - if ( !empty($this->key)) - echo '<?php echo lang(' . $this->value($this->key) . ') ?>'; + $label = new CMSElement('label'); + $label->addStyleClass('label'); + + if ( $this->key ) + $label->content(Value::createExpression(ValueExpression::TYPE_MESSAGE,$this->key)); - if (isset($this->text)) - echo $this->htmlvalue($this->text); - } + if ($this->text) + $label->content($this->text); - public function end() - { - echo '</label>'; + return $label; } -} -?>- \ No newline at end of file +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/link/Link.class.php b/modules/template-engine/components/html/link/Link.class.php @@ -4,6 +4,7 @@ namespace template_engine\components; use Html; use JSON; +use modules\template_engine\CMSElement; /** * Erzeugt einen HTML-Link. @@ -64,59 +65,56 @@ class LinkComponent extends Component public $afterSuccess; - /** - * Link-Beginn - * {@inheritDoc} - * @see Component::begin() - */ - public function begin() + + + public function createElement() { - echo '<a'; - + + $link = new CMSElement('a'); if ( $this->afterSuccess ) - echo ' data-after-success="' . $this->htmlvalue($this->afterSuccess) . '"'; + $link->addAttribute('data-after-success',$this->afterSuccess); - if (isset($this->class)) - echo ' class="' . $this->htmlvalue($this->class) . '"'; + if ( $this->class ) + $link->addStyleClass($this->class); - if (isset($this->title)) - echo ' title="' . $this->htmlvalue($this->title) . '"'; + if ( $this->title ) + $link->addAttribute('title',$this->title); - if (isset($this->accesskey)) - echo ' accesskey="' . $this->htmlvalue($this->accesskey) . '"'; + if ( $this->accesskey ) + $link->addAttribute('accesskey',$this->accesskey); - if (isset($this->frame)) - echo ' target="' . $this->htmlvalue($this->frame) . '"'; + if ( $this->frame ) + $link->addAttribute('target',$this->frame); - if (isset($this->name)) - echo ' date-name="' . $this->htmlvalue($this->name) . '" name="' . $this->htmlvalue($this->name) . '"'; + if ( $this->name ) + $link->addAttribute('date-name',$this->name)->addAttribute('name',$this->name); - if (isset($this->url)) - echo ' data-url="' . $this->htmlvalue($this->url) . '"'; + if ( $this->url ) + $link->addAttribute('data-url',$this->url); - if (isset($this->type)) - echo ' data-type="' . $this->htmlvalue($this->type) . '"'; + if ( $this->type ) + $link->addAttribute('data-type',$this->type); - if (!empty($this->action)) - echo ' data-action="' . $this->htmlvalue($this->action) . '"'; + if ( $this->action ) + $link->addAttribute('data-action',$this->action); else - echo ' data-action=""'; + $link->addAttribute('data-action',''); - if (isset($this->subaction)) - echo ' data-method="' . $this->htmlvalue($this->subaction) . '"'; + if ( $this->subaction ) + $link->addAttribute('data-method',$this->subaction); else - echo ' data-method="'.$this->request->method.'"'; + $link->addAttribute('data-method',''); - if (isset($this->id)) - echo ' data-id="' . $this->htmlvalue($this->id) . '"'; + if ( $this->id ) + $link->addAttribute('data-id',$this->id); else - echo ' data-id="<?php echo OR_ID ?>"'; + $link->addAttribute('data-id',''); $json = new JSON(); $arrayvalues = array(); foreach( $this->getExtraParamArray() as $varname => $varvalue ) - $arrayvalues[ $this->htmlvalue($varname) ] = $this->htmlvalue($varvalue); - echo ' data-extra="'.str_replace('"',"'",str_replace(array("\t", "\r", "\n"),'',$json->encode($arrayvalues))).'"'; + $arrayvalues[ $varname ] = $varvalue; + $link->addAttribute('data-extra',str_replace('"',"'",str_replace(array("\t", "\r", "\n"),'',$json->encode($arrayvalues)))); switch ($this->type) { @@ -124,71 +122,53 @@ class LinkComponent extends Component // Zusammenbau eines einzeligen JSON-Strings. // Aufpassen: Keine doppelten Hochkommas, keine Zeilenumbrüche. - echo ' data-data="{'; + $data = '{'; - echo ""action":""; + $data.= "\"action\":\""; if (! empty($this->action)) - echo $this->htmlvalue($this->action); + $data.= $this->action; else - echo $this->htmlvalue($this->request->action); - echo "","; + $data.= $this->request->action; + $data.= "\","; - echo ""subaction":""; + $data.= "\"subaction\":\""; if (! empty($this->subaction)) - echo $this->htmlvalue($this->subaction); + $data.= $this->subaction; else - echo $this->request->method; - echo "","; + $data.= $this->request->method; + $data.= "\","; - echo ""id":""; + $data.= "\"id\":\""; if (! empty($this->id)) - echo $this->htmlvalue($this->id); + $data.= $this->id; else - echo "<?php echo OR_ID ?>"; - echo "","; + $data.= ""; + $data.= "\","; - echo '"'.REQ_PARAM_TOKEN . "":"" . '<?php echo token() ?>' . "","; + $data.= '\"'.REQ_PARAM_TOKEN . "\":\"" . '<?php echo token() ?>' . "\","; foreach( $this->getExtraParamArray() as $varname => $varvalue ) - echo """.$this->htmlvalue($varname)."":"" . $this->htmlvalue($varvalue) . "","; + $data.= "\"".$varname."\":\"" . $varvalue . "\","; - echo ""none":"0"}\""; - + $data.= "\"none\":\"0\"}\""; + + $link->addAttribute('data-data',$data); break; - + case 'html': - - echo ' href="' . $this->htmlvalue($this->url) . '"'; - break; - case 'external': - echo ' href="' . $this->htmlvalue($this->url) . '"'; + $link->addAttribute('href',$this->url); break; default: - //echo ' href="<?php echo Html::url('.$this->value($this->action).','.$this->value($this->subaction).','.$this->value($this->id); - echo ' href="./#/'.$this->htmlvalue($this->action).'/'.$this->htmlvalue($this->id).'"'; - -// Verlinkungen von draußen brauchen nichts weiter. -// $arrayvalues = array(); -// foreach( $this->getExtraParamArray() as $varname => $varvalue ) -// $arrayvalues[] = $this->value($varname) . '=>'.$this->value($varvalue); -// -// echo ',array('.implode(',',$arrayvalues).')'; -// -/* echo ') ?>"';*/ + $link->addAttribute('href','/#/'.$this->action.'/'.$this->id); + } - - echo '>'; - } - public function end() - { - echo '</a>'; + return $link; } - private function getExtraParamArray() { $vars = array(); @@ -206,3 +186,4 @@ class LinkComponent extends Component } } ?> + diff --git a/modules/template-engine/components/html/list/List.class.php b/modules/template-engine/components/html/list/List.class.php @@ -2,6 +2,8 @@ namespace template_engine\components; +use modules\template_engine\PHPBlockElement; + class ListComponent extends Component { @@ -13,18 +15,15 @@ class ListComponent extends Component public $value = 'list_value'; - public function begin() + public function createElement() { - echo '<?php foreach($' . $this->varname($this->list) . ' as $' . $this->varname($this->key) . '=>$' . $this->varname($this->value) . '){ ?>'; - + $list = new PHPBlockElement(); + $list->beforeBlock = 'foreach($'.$this->list.' as $' . $this->key . '=>$' . $this->value . ')'; + if ($this->extract) - echo '<?php extract($' . $this->varname($this->value) . ') ?>'; - } + $list->inBlock = 'extract($' . $this->value . ');'; - public function end() - { - echo '<?php } ?>'; + return $list; } -} -?>- \ No newline at end of file +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/logo/Logo.class.php b/modules/template-engine/components/html/logo/Logo.class.php @@ -2,39 +2,33 @@ namespace template_engine\components; +use modules\template_engine\CMSElement;use modules\template_engine\HtmlElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; + class LogoComponent extends Component { public $name; - - public function begin() - { - echo <<<HTML -<div class="line logo"> - <div class="label"> - <img src="themes/default/images/logo_{$this->name}.png ?>" - border="0" /> - </div> - <div class="input"> - <h2> - <?php echo langHtml('logo_{$this->name}') ?> - </h2> - <p> - <?php echo langHtml('logo_{$this->name}_text') ?> - </p> - - </div> -</div> -HTML; - } - - public function end() + + public function createElement() { - echo '</div>'; - } - - - -} + $logo = new CMSElement('div'); + $logo->addStyleClass('line logo'); + + $label = (new HtmlElement('div'))->addStyleClass('label'); + $image = (new CMSElement('img'))->addAttribute('src','themes/default/images/logo_'.$this->name.'.png')->addAttribute('border','0'); + $label->addChild($image); -?>- \ No newline at end of file + $logo->addChild($label); + + $holder = (new HtmlElement('div'))->addStyleClass('input'); + $logo->addChild($holder); + + $holder->addChild( (new CMSElement('h2'))->content(Value::createExpression( ValueExpression::TYPE_MESSAGE,'logo_'.$this->name ))); + $holder->addChild( (new CMSElement('p') )->content(Value::createExpression( ValueExpression::TYPE_MESSAGE,'logo_'.$this->name.'_text'))); + + return $logo; + } + +} diff --git a/modules/template-engine/components/html/newline/Newline.class.php b/modules/template-engine/components/html/newline/Newline.class.php @@ -4,6 +4,9 @@ namespace template_engine\components; use modules\template_engine\Element; +/** + * Newline-Component + */ class NewlineComponent extends Component { diff --git a/modules/template-engine/components/html/output/Output.class.php b/modules/template-engine/components/html/output/Output.class.php @@ -2,9 +2,13 @@ namespace template_engine\components; +use modules\template_engine\Element; + class OutputComponent extends Component { -} - - -?>- \ No newline at end of file + public function createElement() + { + // No content. + return new Element(null ); + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/page/Page.class.php b/modules/template-engine/components/html/page/Page.class.php @@ -0,0 +1,15 @@ +<?php + +namespace template_engine\components; + +use modules\template_engine\Element; + +class PageComponent extends Component +{ + public function createElement() + { + // No content. + return new Element(null ); + } +} + diff --git a/modules/template-engine/components/html/page/Window.class.php b/modules/template-engine/components/html/page/Window.class.php @@ -1,10 +0,0 @@ -<?php - -namespace template_engine\components; - -class WindowComponent extends Component -{ -} - - -?>- \ No newline at end of file diff --git a/modules/template-engine/components/html/part/Part.class.php b/modules/template-engine/components/html/part/Part.class.php @@ -2,28 +2,25 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; +use modules\template_engine\HtmlElement; + class PartComponent extends Component { public $class = ''; public $id; - public function begin() + public function createElement() { - echo '<div'; + $element = (new CMSElement('div'))->selfClosing(false); - $this->class = strtr($this->class,[','=>' ']); + foreach( explode(',',$this->class ) as $styleClass ) + $element->addStyleClass( $styleClass ); - if ( !empty($this->class)) - echo ' class="'.$this->htmlvalue($this->class).'"'; - - if ( !empty($this->id)) - echo ' id="'.$this->htmlvalue($this->id).'"'; + if ( $this->id ) + $element->addAttribute('id',$this->id); - echo '>'; + return $element; } - public function end() - { - echo '</div>'; - } } diff --git a/modules/template-engine/components/html/password/Password.class.php b/modules/template-engine/components/html/password/Password.class.php @@ -2,41 +2,40 @@ namespace template_engine\components; -class PasswordComponent extends Component -{ +use modules\template_engine\CMSElement; +use modules\template_engine\HtmlElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; - public $name; +class PasswordComponent extends FieldComponent +{ public $default; - public $class; - public $size = 40; public $maxlength = 256; - public function begin() + public function createElement() { - echo '<div class="inputholder">'; - - echo '<input type="password"'; - echo ' name="' . $this->htmlvalue($this->name) . '"'; - echo ' id="<?php echo REQUEST_ID ?>_' . $this->htmlvalue($this->name) . '"'; - - echo ' size="' . $this->htmlvalue($this->size) . '"'; - echo ' maxlength="' . $this->htmlvalue($this->maxlength) . '"'; - echo ' class="' . $this->htmlvalue($this->class) . '"'; - - echo ' value="'; - if (isset($this->default)) - echo $this->htmlvalue($this->default); + $input = (new CMSElement('input'))->addAttribute('type','password'); + + $input->addAttribute('name',$this->name); + /*echo ' id="<?php echo REQUEST_ID ?>_' . $this->htmlvalue($this->name) . '"'; + */ + + $input->addAttribute('size',$this->size); + $input->addAttribute('maxlength',$this->maxlength); + $input->addStyleClass($this->class); + + + if ($this->default) + $input->addAttribute('value',$this->default); else - echo '<?php echo @$' . $this->varname($this->name) . '?>'; - - echo '" />'; - - echo '</div>'; - } -} + $input->addAttribute('value',Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->name)); -?>- \ No newline at end of file + $input->addWrapper( (new HtmlElement('div'))->addStyleClass('inputholder')); + + return $input; + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/qrcode/Qrcode.class.php b/modules/template-engine/components/html/qrcode/Qrcode.class.php @@ -2,22 +2,26 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; + class QrcodeComponent extends Component { - public $title; - + public $value; - - protected function begin() - { - $value = $this->htmlvalue($this->value); - $title = lang('QRCODE_SHOW'); - echo <<<HTML -<i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="{$value}" title="{$title}"></i> -HTML; - } -} + public function createElement() + { + $qrcode = (new CMSElement('i')) + ->addStyleClass('image-icon') + ->addStyleClass('image-icon--menu-qrcode') + ->addStyleClass('or-qrcode') + ->addStyleClass('or-info') + ->addAttribute('data-qrcode', $this->value) + ->addAttribute('title', Value::createExpression(ValueExpression::TYPE_MESSAGE, 'QRCODE_SHOW')); -?>- \ No newline at end of file + return $qrcode; + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/radio/Radio.class.php b/modules/template-engine/components/html/radio/Radio.class.php @@ -2,6 +2,10 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; + class RadioComponent extends FieldComponent { @@ -24,33 +28,33 @@ class RadioComponent extends FieldComponent public $label = ''; - public function begin() - { - if ( $this->label ) - echo '<label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input">'; - echo '<input '; - echo ' class="'.$this->htmlvalue($this->class).'"'; - echo ' type="radio"'; - echo ' id="<?php echo REQUEST_ID ?>_'.$this->htmlvalue($this->name).'_'.$this->htmlvalue($this->value).'"'; + public function createElement() + { - echo parent::outputNameAttribute(); - //"<? php if ( $attr_readonly ) echo ' disabled="disabled"' ? > - echo ' value="'.$this->htmlvalue($this->value).'"'; + $radio = (new CMSElement('input'))->addAttribute('type','radio'); - echo '<?php if('; - echo ''.''.$this->value($this->value).'==@$'.$this->varname($this->name); - if(isset($this->checked)) - echo '||'.$this->value($this->checked); - echo ")echo ' checked=\"checked\"'".' ?>'; + if ( $this->label ) { + $label = new CMSElement('label'); + $label->addStyleClass('or-form-row')->addStyleClass('or-form-radio'); + $label->addChild( (new CMSElement('span'))->addStyleClass('or-form-label')->content($this->label)); + $radio->addWrapper($label); + } - echo ' />'; + $radio->addAttribute('name',$this->name); + $radio->addAttribute('disabled',$this->readonly); + $radio->addAttribute('value',$this->value); + $radio->addAttribute('checked',Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->name)); - if ( $this->label ) - echo ' '.lang($this->label).' </span></label>'; + if ( $this->readonly && $this->required ) { + $hidden = (new CMSElement('input'))->addAttribute('type','hidden')->addAttribute('name',$this->name)->addAttribute('value','1'); + $radio->addChild( $hidden ); + } + if ( $this->class ) + $radio->addStyleClass($this->class); + + return $radio; } } - -?>- \ No newline at end of file diff --git a/modules/template-engine/components/html/radiobox/Radiobox.class.php b/modules/template-engine/components/html/radiobox/Radiobox.class.php @@ -2,6 +2,10 @@ namespace template_engine\components; +use modules\template_engine\PHPBlockElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; + class RadioboxComponent extends Component { @@ -16,17 +20,22 @@ class RadioboxComponent extends Component public $title; public $class; - - public function begin() + + + public function createElement() { - $this->includeResource( 'radiobox/component-radio-box.php'); + $radiobox = new PHPBlockElement(); + + $radiobox->beforeBlock = $radiobox->includeResource( 'radiobox/component-radio-box.php'); - if ( isset($this->default)) - $value = $this->value($this->default); + if ( $this->default ) + $value = $this->default; else - $value = '$'.$this->varname($this->name); + $value = Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->name); - echo '<?php component_radio_box('.$this->value($this->name).',$'.$this->varname($this->list).','.$value.') ?>'; + $radiobox->inBlock = '<?php component_radio_box('.$this->name.',$'.$this->list.','.$value.') ?>'; + + return $radiobox; } } diff --git a/modules/template-engine/components/html/row/Row.class.php b/modules/template-engine/components/html/row/Row.class.php @@ -2,6 +2,8 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; + class RowComponent extends Component { @@ -9,21 +11,16 @@ class RowComponent extends Component public $id = ''; - public function begin() + public function createElement() { - echo '<tr'; + $row = new CMSElement('tr' ); - if (! empty($this->class)) - echo ' class="' . $this->htmlvalue($this->class) . '"'; + if ($this->class) + $row->addStyleClass($this->class); - if (! empty($this->id)) - echo ' data-id="' . $this->htmlvalue($this->id) . '"'; - echo '>'; - } + if ($this->id) + $row->addAttribute('data-id',$this->id); - public function end() - { - echo '</tr>'; + return $row; } } -?> diff --git a/modules/template-engine/components/html/selectbox/Selectbox.class.php b/modules/template-engine/components/html/selectbox/Selectbox.class.php @@ -2,6 +2,11 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; +use modules\template_engine\PHPBlockElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; + class SelectboxComponent extends Component { @@ -48,56 +53,59 @@ class SelectboxComponent extends Component public $label; - - public function begin() + + + + public function createElement() { - if ( $this->label ) - { - echo '<label class="or-form-row"><span class="or-form-label">'.lang($this->label).'</span><span class="or-form-input">'; - } - - echo '<div class="inputholder">'; - echo '<select '; - echo ' id="'.'<?php echo REQUEST_ID ?>_'.$this->htmlvalue($this->name).'"'; - echo ' name="'.$this->htmlvalue($this->name).($this->multiple?'[]':'').'"'; - echo ' title="'.$this->htmlvalue($this->title).'"'; - echo ' class="'.$this->htmlvalue($this->class).'"'; - - if (! $this->addempty ) - echo '<?php if (count($'.$this->varname($this->list).')<=1)'." echo ' disabled=\"disabled\"'; ?>"; - - - if($this->multiple) - echo ' multiple="multiple"'; - - echo ' size="'.$this->htmlvalue($this->size).'"'; - echo '>'; - + $selectbox = (new CMSElement('input')); + + if ( $this->label ) { + $label = new CMSElement('label'); + $label->addStyleClass('or-form-row')->addStyleClass('or-form-input'); + $label->addChild( (new CMSElement('span'))->addStyleClass('or-form-label')->content($this->label)); + $selectbox->addWrapper($label); + } + + $selectbox->addAttribute('name',$this->name); + //$selectbox->addAttribute('disabled',$this->readonly); + + + if ( $this->class ) + $selectbox->addStyleClass($this->class); + + if ( $this->title ) + $selectbox->addAttribute('title',$this->title); + + if (isset($this->default)) + $selectbox->addAttribute('value',$this->default); + else + $selectbox->addAttribute('value',Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->name)); + + if ( $this->multiple ) + $selectbox->addAttribute('multiple','multiple'); + + $selectbox->addAttribute('size',$this->size); + + $code = new PHPBlockElement(); + $selectbox->addChild( $code ); + + //if ( ! $this->addempty ) + //$code->inBlock .= 'if (count($'.$this->varname($this->list).')<=1)'." echo ' disabled=\"disabled\"';"; + if ( isset($this->default)) - $value = $this->value($this->default); + $value = $this->default; else - $value = '$'.$this->varname($this->name); + $value = '$'.$this->name; - $this->includeResource( 'selectbox/component-select-box.php'); - echo '<?php component_select_option_list($'.$this->varname($this->list).','.$value.','.intval(boolval($this->addempty)).','.intval(boolval($this->lang)).') ?>'; + $code->beforeBlock = $code->includeResource( 'selectbox/component-select-box.php'); + $code->inBlock .= 'component_select_option_list($'.$this->list.','.$value.','.intval(boolval($this->addempty)).','.intval(boolval($this->lang)).')'; // Keine Einträge in der Liste, wir benötigen ein verstecktes Feld. - echo '<?php if (count($'.$this->varname($this->list).')==0) { ?>'.'<input type="hidden" name="'.$this->htmlvalue($this->name).'" value="" />'.'<?php } ?>'; + //echo '< ? php if (count($'.$this->varname($this->list).')==0) { ? >'.'<input type="hidden" name="'.$this->htmlvalue($this->name).'" value="" />'.'<?php } ? >'; // Nur 1 Eintrag in Liste, da die Selectbox 'disabled' ist, muss ein hidden-Feld her. - echo '<?php if (count($'.$this->varname($this->list).')==1) { ?>'.'<input type="hidden" name="'.$this->htmlvalue($this->name).'" value="'.'<?php echo array_keys($'.$this->varname($this->list).')[0] ?>'.'" />'.'<?php } ?>'; - } - - public function end() - { - echo '</select>'; - echo '</div>'; + //echo '< ? php if (count($'.$this->varname($this->list).')==1) { ? >'.'<input type="hidden" name="'.$this->htmlvalue($this->name).'" value="'.'< ? php echo array_keys($'.$this->varname($this->list).')[0] ? >'.'" />'.'< ? php } ? >'; - - if ( $this->label ) - { - echo '</span></label>'; - } + return $selectbox; } } - -?>- \ No newline at end of file diff --git a/modules/template-engine/components/html/selector/Selector.class.php b/modules/template-engine/components/html/selector/Selector.class.php @@ -2,6 +2,8 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; + class SelectorComponent extends Component { @@ -15,9 +17,14 @@ class SelectorComponent extends Component public $param; - public function begin() + public function createElement() + { + return new CMSElement(null); + } + + public function unused____begin() { - $types = $this->htmlvalue($this->types); + $types = mlvalue($this->types); $name = $this->htmlvalue($this->name); $id = $this->htmlvalue($this->id); $folderid = $this->htmlvalue($this->folderid); diff --git a/modules/template-engine/components/html/set/Set.class.php b/modules/template-engine/components/html/set/Set.class.php @@ -2,27 +2,31 @@ namespace template_engine\components; +use modules\template_engine\PHPBlockElement; + class SetComponent extends Component { public $var; public $value; public $key; - - protected function begin() + + + public function createElement() { - if (!empty($this->value)) + $set = new PHPBlockElement(); + + if ($this->value) { - if (!empty($this->key)) - echo '<?php $'.$this->varname($this->var).'= '.$this->value($this->value).'['.$this->value($this->key).']; ?>'; + if ($this->key) + $set->inBlock = '$'.$set->varname($this->var).'= '.$set->value($this->value).'['.$set->value($this->key).'];'; else - echo '<?php $'.$this->varname($this->var).'= '.$this->value($this->value).'; ?>'; + $set->inBlock = '$'.$set->varname($this->var).'= '.$set->value($this->value).';'; } else { // Unset - echo '<?php unset($'.$this->varname($this->var).') ?>'; + $set->inBlock = 'unset($'.$set->varname($this->var).')'; } - } -} - -?>- \ No newline at end of file + return $set; + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/table/Table.class.php b/modules/template-engine/components/html/table/Table.class.php @@ -2,37 +2,41 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; +use modules\template_engine\HtmlElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; + class TableComponent extends HtmlComponent { public $filter = true; public $width = '100%'; - - public function begin() + + + public function createElement() { - echo '<div class="or-table-wrapper">'; + $tableWrapper = (new HtmlElement('div'))->addStyleClass('or-table-wrapper'); if ( $this->filter) - echo '<div class="or-table-filter"><input type="search" name="filter" placeholder="'.$this->htmlvalue('message:SEARCH_FILTER').'" /></div>'; + { + $filterInput = (new CMSElement('input'))->addAttribute('type','search')->addAttribute('name','filter')->addAttribute('placeholder',Value::createExpression(ValueExpression::TYPE_MESSAGE,'SEARCH_FILTER')); + $filter = (new HtmlElement('div'))->addStyleClass('or-table-filter')->addChild( $filterInput ); + $tableWrapper->addChild($filter); + } - echo '<div class="or-table-area">'; - echo '<table'; + $tableContent = (new HtmlElement('div'))->addStyleClass('or-table-area'); - if ( !empty($this->class)) - echo ' class="'.$this->htmlvalue($this->class).'"'; + $table = new CMSElement('table'); - if ( !empty($this->width)) - echo ' width="'.$this->htmlvalue($this->width).'"'; + if ( $this->class) + $table->addStyleClass($this->class); - echo '>'; - } + if ( $this->width) + $table->addAttribute('width',$this->width); - public function end() - { - echo '</table>'; - echo '</div>'; - echo '</div>'; - } -} + $table->addWrapper($tableContent)->addWrapper($tableWrapper); -?>- \ No newline at end of file + return $table; + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/text/Text.class.php b/modules/template-engine/components/html/text/Text.class.php @@ -2,6 +2,10 @@ namespace template_engine\components; +use modules\template_engine\CMSElement;use modules\template_engine\HtmlElement; +use modules\template_engine\Value; +use modules\template_engine\ValueExpression; + class TextComponent extends HtmlComponent { public $prefix = ''; @@ -14,23 +18,19 @@ class TextComponent extends HtmlComponent public $key; public $raw; public $value; - public $maxlength; + public $maxlength; // DEPRECATED - use CSS. public $accesskey; public $cut = 'both'; public $label; public $newline = true; - public function begin() + public function createElement() { - if ( $this->label ) - echo '<label class="or-form-row"><span class="or-form-label">'.'<?php echo lang('.$this->value($this->label).') ?>'.'</span><span class="or-form-input">'; - if ( $this->raw ) - $this->escape = false; - switch( $this->type ) { case 'none': + case 'raw': $tag = ''; break; case 'emphatic': @@ -61,83 +61,47 @@ class TextComponent extends HtmlComponent $tag = 'span'; } - if ( $tag ) - { + $text = new CMSElement($tag); + + $text->setEscaping($this->escape); - echo '<'.$tag; - if ( !empty($this->class)) - echo ' class="'.$this->htmlvalue($this->class).'"'; + if ( $this->class) + $text->addStyleClass( $this->class); - if ( !empty($this->title)) - echo ' title="'.$this->htmlvalue($this->title).'"'; + if ( $this->title ) + $text->addAttribute('title',$this->title); - echo '>'; - } - echo '<?php '; + //if ( $this->newline) + // $functions[] = 'nl2br(@)'; - $functions = array(); // Funktionen, durch die der Text gefiltert wird. + //if ( !empty($this->accesskey) ) + // $functions[] = "Text::accessKey('".$this->accesskey."',@)"; - if ( $this->newline) - $functions[] = 'nl2br(@)'; + if ( $this->key ) + $text->content( Value::createExpression(ValueExpression::TYPE_MESSAGE,$this->key) ); - - if ( $this->escape ) - { - // When using UTF-8 as a charset, htmlentities will only convert 1-byte and 2-byte characters. - // Use this function if you also want to convert 3-byte and 4-byte characters: - // converts a UTF8-string into HTML entities - $functions[] = 'encodeHtml(@)'; - $functions[] = 'htmlentities(@)'; - } + elseif ( $this->text ) + $text->content( Value::createExpression(ValueExpression::TYPE_MESSAGE,$this->text) ); - if ( !empty($this->maxlength) ) - $functions[] = 'Text::maxLength( @,'.intval($this->maxlength).",'..',constant('STR_PAD_".strtoupper($this->cut)."') )"; - - if ( !empty($this->accesskey) ) - $functions[] = "Text::accessKey('".$this->accesskey."',@)"; - + elseif ( $this->var ) + $text->content( Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->var) ); - - - $value =''; - - if ( isset($this->key)) - { - $value = "'".$this->prefix."'.".$this->value($this->key).".'".$this->suffix."'"; - $functions[] = "lang(@)"; - } - elseif ( isset($this->text)) - { - $value = $this->value($this->text); - $functions[] = "lang(@)"; - } - elseif ( isset($this->var)) - $value = '$'.$this->varname($this->var); - - elseif ( isset($this->raw)) - $value = "'".str_replace('_',' ',$this->raw)."'"; + elseif ( $this->raw ) + $text->content( str_replace('_',' ',$this->raw) ); - elseif ( isset($this->value)) - $value = $this->value($this->value); + elseif ( $this->value ) + $text->content( $this->value ); - foreach( array_reverse($functions) as $f ) - { - list($before,$after) = explode('@',$f); - $value = $before.$value.$after; - } - echo "echo $value;"; - - echo ' ?>'; - if ( $tag ) - echo '</'.$tag.'>'; // Tag schliessen. + if ( $this->label ) { + $text->addWrapper( (new HtmlElement('span' ))->addStyleClass('or-form-input') ); + $text->addWrapper( (new HtmlElement('label'))->addStyleClass('or-form-row')->addChild( (new CMSElement('span'))->addStyleClass('or-form-label')->content('message:'.$this->label))); + } - if ( $this->label ) - echo '</span></label>'; - } + return $text; + } } -?>- \ No newline at end of file diff --git a/modules/template-engine/components/html/tree/Tree.class.php b/modules/template-engine/components/html/tree/Tree.class.php @@ -2,17 +2,20 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; + class TreeComponent extends Component { public $tree; - - public function begin() + + public function createElement() + { + return new CMSElement(null); + } + + public function unsed__begin() { parent::includeResource('tree/component-tree.php'); echo '<?php component_tree('.$this->value($this->tree).') ?>'; - } -} - - -?>- \ No newline at end of file +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/upload/Upload.class.php b/modules/template-engine/components/html/upload/Upload.class.php @@ -2,36 +2,33 @@ namespace template_engine\components; +use modules\template_engine\CMSElement; + class UploadComponent extends Component { - public $size = 40; - public $name; - public $multiple = false; - public $class = 'upload'; - public $maxlength = ''; + public $size = 40; + public $name = ''; + public $multiple = false; + public $class = 'upload'; + public $maxlength = 0; - public function begin() + public function createElement() { - $class = $this->htmlvalue($this->class); - $name = $this->htmlvalue($this->name); - $size = $this->htmlvalue($this->size); - $request_id = REQUEST_ID; - - if ( !empty($this->maxlength)) - $maxlength = ' maxlength="'.$this->htmlvalue($this->maxlength).'"'; - else - $maxlength = ''; - + $input = new CMSElement('input'); + + $input->selfClosing(true); + $input->addStyleClass( $this->class ); + if ( $this->multiple ) - $multiple = ' multiple="multiple"'; - else - $multiple = ''; - - echo <<<HTML -<input size="$size" id="{$request_id}_{$name}" type="file"$maxlength name="$name" class="$class" $multiple /> -HTML; - } -} + $input->addAttribute( 'multiple','multiple' ); + + $input->addAttribute('id',REQUEST_ID.'_'.$this->name); + $input->addAttribute('name',$this->name); + $input->addAttribute('size',$this->size); + if ( $this->maxlength ) + $input->addAttribute( 'maxlength',$this->maxlength ); -?>- \ No newline at end of file + return $input; + } +}+ \ No newline at end of file diff --git a/modules/template-engine/components/html/user/User.class.php b/modules/template-engine/components/html/user/User.class.php @@ -2,18 +2,19 @@ namespace template_engine\components; +use modules\template_engine\PHPBlockElement; + class UserComponent extends Component { public $user; public $id; - - protected function begin() + + public function createElement() { - parent::includeResource('user/component-user.php'); - - echo '<?php component_user('.$this->value($this->user).') ?>'; + $user = new PHPBlockElement(); + $user->beforeBlock = $user->includeResource( 'user/component-user.php'); + $user->inBlock = 'component_user('.$user->value($this->user).');'; + + return $user; } } - - -?>- \ 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 @@ -2,8 +2,17 @@ namespace template_engine\components; + +use modules\template_engine\Element; + class WindowComponent extends Component { + + public function createElement() + { + // No content. + return new Element(null ); + } } diff --git a/modules/template-engine/engine/TemplateEngine.class.php b/modules/template-engine/engine/TemplateEngine.class.php @@ -28,6 +28,8 @@ class TemplateEngine private $srcFilename; private $debug = false; + const CSS_PREFIX = 'or-'; + /** * Erzeugt einen Templateparser. @@ -164,6 +166,7 @@ class TemplateEngine $component->$attributeName = $attributeValue; } + $output = $component->init(); $output = $component->getBegin(); if($this->debug) $output = '<!-- Begin '.$tag.' -->'.$output; @@ -187,7 +190,7 @@ class TemplateEngine - private function processHTMLElement(DOMElement $element, $outFile, $depth) + private function processHTMLElement($element, $outFile, $depth) { $attributes = $element->attributes; $tag = $element->localName; diff --git a/modules/template-engine/require.php b/modules/template-engine/require.php @@ -3,3 +3,6 @@ include( dirname(__FILE__) . '/TemplateEngineInfo.class.php'); include( dirname(__FILE__) . '/engine/TemplateEngine.class.php'); include( dirname(__FILE__) . '/Element.class.php'); +include( dirname(__FILE__) . '/HtmlElement.class.php'); +include( dirname(__FILE__) . '/CMSElement.class.php'); +include( dirname(__FILE__) . '/PHPBlockElement.class.php'); diff --git a/modules/util/Http.class.php b/modules/util/Http.class.php @@ -55,7 +55,7 @@ class Http * @param String URL * @return Http */ - public function Http( $url = '' ) + public function __construct( $url = '' ) { $this->setURL( $url ); $this->header['User-Agent'] = 'Mozilla/5.0 (OpenRat CMS)';