commit 1bb5fab3d5910f9543b67e0f07afef5493d30a3e parent 96848a806006b75c84dda12c5ec7dbaf9f932027 Author: Jan Dankert <develop@jandankert.de> Date: Wed, 4 Sep 2019 00:11:56 +0200 New: TemplateCompiler zum Umwandeln aller Templates. Ggf. entfällt dann das Adhoc-Compiling der Templates. Diffstat:
131 files changed, 1715 insertions(+), 519 deletions(-)
diff --git a/dev-helper/update.html b/dev-helper/update.html @@ -3,7 +3,17 @@ <body> <h1>XSD Generator</h1> -<a href="../modules/template-engine/components/XSDGenerator.php">XSD Generator</a> + +<ul> + <li> + <a href="../modules/template-engine/components/XSDGenerator.php">XSD Generator</a> + </li> + + <li> + <a href="../modules/template-engine/TemplateCompiler.php">Template Compiler</a> + </li> + +</ul> </body> </html> diff --git a/modules/cms-ui/themes/default/html/views/alias/info.php b/modules/cms-ui/themes/default/html/views/alias/info.php @@ -1,6 +1,6 @@ - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form link" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="alias" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form alias" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="alias" /><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 '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> 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,6 +1,6 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> <td class="help"> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> @@ -23,5 +23,5 @@ </td> </tr> <?php } ?> - </table> + </table></div></div> \ No newline at end of file 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,3 +1,3 @@ - <textarea name="source" data-extension="" data-mimetype="" data-mode="yaml" class="editor code-editor"><?php echo ${'source'} ?></textarea> + <textarea name="<?php if ('') echo ''.'_' ?>source<?php if ('') echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="yaml" class="editor code-editor"><?php echo htmlentities(${'source'}) ?></textarea> \ No newline at end of file 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,6 +1,6 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="data"> <td colspan="1"> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'type'.'')))); ?></span> @@ -36,5 +36,5 @@ </td> </tr> - </table> + </table></div></div> \ No newline at end of file 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,7 +1,7 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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">Dateiendung</span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_extension" name="<?php if ('') echo ''.'_' ?>extension<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="extension" value="<?php echo Text::encodeHtml(@$extension) ?>" /><?php if ('') { ?><input type="hidden" name="extension" value="<?php $extension ?>"/><?php } ?></div></span></label> + <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="" data-autosave=""><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 ('') echo '_disabled' ?>" type="text" maxlength="256" class="extension" value="<?php echo Text::encodeHtml(@$extension) ?>" /><?php if ('') { ?><input type="hidden" name="extension" value="<?php $extension ?>"/><?php } ?></div></span></label> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></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 @@ -0,0 +1,35 @@ + + + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" 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 class="line"> + <div class="label"> + <span><?php echo nl2br(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 ('') 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> + + </label> + <br/> + + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if ('') 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> + + </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" value="?BUTTON_OK?" /></div></form> + + \ No newline at end of file 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,6 +1,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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" class="or-form file" data-async="" data-autosave=""><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 ?>" /> <div class="line"> <div class="label"> </div> @@ -21,5 +21,5 @@ <div class="input"> </div> </div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/extract.php b/modules/cms-ui/themes/default/html/views/file/extract.php @@ -0,0 +1,17 @@ + + + + <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="" data-autosave=""><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> + <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" value="?BUTTON_OK?" /></div></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,7 +1,7 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div> + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> @@ -43,7 +43,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_full_filename" class="label"> @@ -80,11 +80,10 @@ <br/> - <a class="action" target="_self" data-action="file" data-method="size" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('file','size','',array()) ?>"> + <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> </a> - </div> </div> <div class="line"> @@ -125,21 +124,20 @@ </label> </div> <div class="input"> - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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="<?php echo Html::url('','','',array()) ?>"> + <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> </a> - </td> </tr> <?php } ?> - </table> + </table></div></div> <?php $if6=(($pages)==FALSE); if($if6){?> <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> @@ -147,7 +145,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> @@ -205,5 +203,5 @@ </div> </div> </div></fieldset> - <div class="or-form-actionbar"></div></form> + <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 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,10 +1,9 @@ <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="<?php echo Html::url('','','',array()) ?>"> + <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> - </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/pub.php b/modules/cms-ui/themes/default/html/views/file/pub.php @@ -6,7 +6,7 @@ </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="1" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="1" data-autosave=""><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/> @@ -16,10 +16,10 @@ <tr> <td class="act"> <div class="invisible"><input type="submit" name="ok" class="%class%" - title="Bestätigen" - value=" OK " /> + 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" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('publish') ?>" /></div></form> + <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" value="<?php echo lang('publish') ?>" /></div></form> \ No newline at end of file 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,7 +1,7 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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">Name</span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> + <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="" data-autosave=""><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 = '';$readonly = '';$required = ''; if ( isset($$tmpname) ) @@ -15,7 +15,7 @@ { ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } - } ?> Löschen </span></label> + } ?> ?GLOBAL_DELETE? </span></label> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></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 @@ -0,0 +1,25 @@ + + + + + <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> + + </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> + </td> + </tr> + + + + \ 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 @@ -0,0 +1,29 @@ + + + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" 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></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 ('') 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> + + </label> + <br/> + + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if ('') 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> + + </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" value="?BUTTON_OK?" /></div></form> + + \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/value.php b/modules/cms-ui/themes/default/html/views/file/value.php @@ -1,27 +1,27 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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 class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_VALUE')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_VALUE')))); ?></span> </td> <td> - <textarea name="<?php if ('') echo ''.'_' ?>value<?php if ('') echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"><?php echo ${'value'} ?></textarea> + <textarea name="<?php if ('') echo ''.'_' ?>value<?php if ('') echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"><?php echo htmlentities(${'value'}) ?></textarea> </td> </tr> <tr> <td colspan="2" class="act"> <div class="invisible"><input type="submit" name="ok" class="%class%" - title="Bestätigen" - value=" OK " /> + 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" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></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,7 +1,7 @@ <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"> + <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 class="headline"> <td class="help"> <?php { $tmpname = 'checkall';$default = '';$readonly = '';$required = ''; @@ -54,7 +54,7 @@ </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="edit" data-id="<?php echo $objectid ?>" data-extra="[]" href="<?php echo Html::url($type,'',$objectid,array()) ?>"> + <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 Html::url($type,'',$objectid,array()) ?>"> <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> @@ -90,7 +90,7 @@ </td> </tr> - </table></div> + </table></div></div> <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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; ?> diff --git a/modules/cms-ui/themes/default/html/views/folder/createfolder.php b/modules/cms-ui/themes/default/html/views/folder/createfolder.php @@ -25,5 +25,5 @@ </div> </div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('add') ?>" /></div></form> + <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" value="<?php echo lang('add') ?>" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createurl.php b/modules/cms-ui/themes/default/html/views/folder/createurl.php @@ -37,5 +37,5 @@ </div> </div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="OK" /></div></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 @@ -18,13 +18,12 @@ <?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="<?php echo Html::url('folder','',$parentid,array()) ?>"> + <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> </a> - </td> <td> <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> @@ -39,13 +38,12 @@ </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 Html::url($type,'',$id,array()) ?>"> + <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> </a> - </td> <td> <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($date) ?> @@ -63,12 +61,11 @@ <?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="<?php echo Html::url('folder','create','',array('dialogAction'=>'folder','dialogMethod'=>'create')) ?>"> + <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> - </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/info.php b/modules/cms-ui/themes/default/html/views/folder/info.php @@ -1,7 +1,7 @@ - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="" data-autosave=""><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="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('global_name') ?> @@ -33,7 +33,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_full_filename" class="label"><?php echo lang('FULL_FILENAME') ?> @@ -55,7 +55,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_create_user" class="label"><?php echo lang('global_created') ?> 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,7 +1,7 @@ <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table class="or-table--sortable" width="100%"></div> + <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%"> <tr class="headline"> <td class="help"> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'FOLDER_ORDER'.'')))); ?></span> @@ -50,8 +50,8 @@ </td> </tr> <?php } ?> - </table> + </table></div></div> <input type="hidden" name="order" value=""/> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="OK" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/pub.php b/modules/cms-ui/themes/default/html/views/folder/pub.php @@ -63,7 +63,7 @@ </div> </div> <?php } ?> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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){?> <div class="line"> <div class="label"> diff --git a/modules/cms-ui/themes/default/html/views/folder/remove.php b/modules/cms-ui/themes/default/html/views/folder/remove.php @@ -29,7 +29,7 @@ { ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } - } ?> ?GLOBAL_DELETE_WITH_CHILDREN? </span></label> + } ?> Löschen mit Unterelementen </span></label> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="OK" /></div></form> \ 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 @@ -2,19 +2,22 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <table> <row class="headline"> - <column class="help"> - <text key="GLOBAL_TYPE"></text> - <text raw="_/_"></text> - <text key="GLOBAL_NAME"></text> + <column header="true"> + <text key="TYPE"></text> </column> - <column class="help"> - <text key="GLOBAL_LASTCHANGE"></text> + <column header="true"> + <text key="NAME"></text> + </column> + <column header="true"> + <text key="LASTCHANGE"></text> </column> </row> <if present="up_url"> - <row class="data"> + <row class="data clickable"> + <column> + <image action="folder" /> + </column> <column url="var:up_url"> - <image type="folder"></image> <text raw=".."></text> </column> <column> @@ -41,13 +44,13 @@ </column> </row> </if> - <row class="data"> - <column colspan="2"> - <link type="view" action="folder" subaction="create"> - <image file="icon/create"></image> - <text key="menu_folder_create"></text> - </link> - </column> - </row> </table> -</output>- \ No newline at end of file + + <part class="clickable"> + + <link type="view" action="folder" subaction="create" class="or-link-btn"> + <image action="new" /> + <text key="new"></text> + </link> + </part> +</output> 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,15 +1,15 @@ - <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="grouplist" data-async="" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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" class="or-form grouplist" data-async="" data-autosave=""><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 ?>" /> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('name') ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="name<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> </div> </div> - <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form> + <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" value="?BUTTON_OK?" /></div></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 @@ -2,7 +2,7 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> <td> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> @@ -12,26 +12,24 @@ <?php foreach($el as $list_key=>$list_value){ ?><?php 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="<?php echo Html::url('group','',$id,array()) ?>"> + <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> </a> - </td> </tr> <?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="<?php echo Html::url('','add','',array('dialogAction'=>'','dialogMethod'=>'add')) ?>"> + <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> - </td> </tr> - </table> + </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/include/timestamps.inc.xml b/modules/cms-ui/themes/default/html/views/include/timestamps.inc.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"> - <group title="message:prop_userinfo"> + <group title="message:prop_userinfo" open="false"> <part class="line"> <part class="label"> <label for="create_date"> diff --git a/modules/cms-ui/themes/default/html/views/language/add.php b/modules/cms-ui/themes/default/html/views/language/add.php @@ -0,0 +1,15 @@ + + + <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="" data-autosave=""><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 ?>" /> + <div class="line"> + <div class="label"> + <span><?php echo nl2br(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> + </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" value="?BUTTON_OK?" /></div></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,6 +1,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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> <div class="line"> @@ -27,11 +27,10 @@ <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="<?php echo Html::url('language','prop','',array()) ?>"> + <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> - </div> </div> <div class="or-form-actionbar"></div></form> diff --git a/modules/cms-ui/themes/default/html/views/language/listing.php b/modules/cms-ui/themes/default/html/views/language/listing.php @@ -0,0 +1,65 @@ + + + + + <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 class="headline"> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + + </td> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + + </td> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + + </td> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + + </td> + </tr> + <?php foreach($el as $list_key=>$list_value){ ?><?php 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> + <td> + <span><?php echo nl2br(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> + <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> + </tr> + <?php unset($select_url) ?> + + <?php unset($default_url) ?> + + <?php } ?> + </table></div></div> + + + + \ 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 @@ -2,7 +2,7 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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" class="or-form language" data-async="" data-autosave=""><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 ?>" /> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> @@ -45,5 +45,5 @@ </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" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/remove.php b/modules/cms-ui/themes/default/html/views/language/remove.php @@ -2,8 +2,8 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div> + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> @@ -15,7 +15,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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 class="line"> <div class="label"> </div> @@ -41,5 +41,5 @@ </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></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,6 +1,6 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> <td> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NAME'.'')))); ?></span> @@ -66,5 +66,5 @@ </td> </tr> - </table> + </table></div></div> \ No newline at end of file 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,7 +1,7 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div> + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('link_target')))); ?></span> @@ -18,5 +18,5 @@ </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/link/info.php b/modules/cms-ui/themes/default/html/views/link/info.php @@ -1,7 +1,7 @@ - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form link" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form link" data-async="" data-autosave=""><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="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_name')))); ?></span> @@ -23,7 +23,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_objectid" class="label"> @@ -37,7 +37,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label class="label"> @@ -79,5 +79,5 @@ </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file 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,7 +1,7 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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">Name</span><span class="or-form-input"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> + <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="" data-autosave=""><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 = '';$readonly = '';$required = ''; if ( isset($$tmpname) ) @@ -15,7 +15,7 @@ { ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } - } ?> Löschen </span></label> + } ?> ?GLOBAL_DELETE? </span></label> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></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 @@ -0,0 +1,7 @@ + + + <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/login/license.php b/modules/cms-ui/themes/default/html/views/login/license.php @@ -94,7 +94,7 @@ </div> </div></fieldset> <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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="table-wrapper"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%"> <tr class="headline"> <td> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> @@ -112,7 +112,6 @@ <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> </a> - </td> <td> <span><?php echo nl2br(encodeHtml(htmlentities($license))); ?></span> @@ -120,7 +119,7 @@ </td> </tr> <?php } ?> - </table></div> + </table></div></div> </div></fieldset> </div> \ No newline at end of file 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,15 +1,12 @@ - - - <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="" data-autosave=""><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 ?>" /> + <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="" data-autosave="" 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="<?php echo Html::url('','','',array()) ?>"> + <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') ?>" /> </a> - <?php } ?> <?php if(!$if4){?> <img src="<?php echo config('login','logo','image') ?>" /> @@ -92,7 +89,7 @@ </div> </div> <?php } ?> - <fieldset class="toggle-open-close<?php echo ''?" open":" closed" ?><?php echo ''?" 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> + <fieldset class="toggle-open-close<?php echo ''?" open":" closed" ?><?php echo ''?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_password1" class="label"> @@ -118,7 +115,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo ''?" open":" closed" ?><?php echo ''?" 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> + <fieldset class="toggle-open-close<?php echo ''?" open":" closed" ?><?php echo ''?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_user_token" class="label"> @@ -133,7 +130,7 @@ </div> </div></fieldset> <?php $if3=(intval('1')<intval(@count($dbids))); if($if3){?> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_dbid" class="label"> 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,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 views="password,register,license"></header> - <form cancel="false" label="message:menu_login" visible="true" action="login" subaction="login" target="top"> + + <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"> diff --git a/modules/cms-ui/themes/default/html/views/login/openid.php b/modules/cms-ui/themes/default/html/views/login/openid.php @@ -0,0 +1,67 @@ + + + + + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" 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"> + <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 } ?> + </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 ('') 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 ('') echo '_disabled' ?>" type="text" maxlength="256" class="name" value="<?php echo Text::encodeHtml(@$openid_url) ?>" /><?php if ('') { ?><input type="hidden" name="openid_url" value="<?php $openid_url ?>"/><?php } ?></div> + + <?php } ?> + </div> + </div> + </div></fieldset> + <?php $if4=(intval('1')<intval(@count($dbids))); if($if4){?> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> + <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> + </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"/> + + </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){?> + <div class="message error"> + <span><?php echo nl2br(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" value="?BUTTON_OK?" /></div></form> + + \ 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 @@ -0,0 +1,51 @@ + + + + + <?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="" data-autosave=""><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 ?>" /> + <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> + + </div> + <div class="input"> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_username" name="<?php if ('') echo ''.'_' ?>username<?php if ('') echo '_disabled' ?>" autofocus="autofocus" type="text" maxlength="128" class="" value="<?php echo Text::encodeHtml(@$username) ?>" /><?php if ('') { ?><input type="hidden" name="username" value="<?php $username ?>"/><?php } ?></div> + + </div> + </div> + <div class="line"> + <div class="label"> + <span><?php echo nl2br(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> + </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" value="?BUTTON_OK?" /></div></form> + <?php } ?> + <?php if(!$if2){?> + <div class="message error"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'PASSWORD_NOT_ENABLED'.'')))); ?></span> + + </div> + <?php } ?> + + \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/passwordcode.php b/modules/cms-ui/themes/default/html/views/login/passwordcode.php @@ -0,0 +1,49 @@ + + + + <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="" data-autosave=""><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> + <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> + + </td> + <td> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_code" name="<?php if ('') echo ''.'_' ?>code<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$code) ?>" /><?php if ('') { ?><input type="hidden" name="code" value="<?php $code ?>"/><?php } ?></div> + + </td> + </tr> + <tr> + <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" value="?BUTTON_OK?" /></div></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,7 +1,7 @@ <?php $if2=(config('login','register')); if($if2){?> - <form name="" target="_self" action="<?php echo OR_ACTION ?>" data-method="<?php echo OR_METHOD ?>" data-action="<?php echo OR_ACTION ?>" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="<?php echo OR_ACTION ?>" data-async="" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo OR_ACTION ?>" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo OR_METHOD ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <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="" data-autosave=""><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 ?>" /> <div class="line logo"> <div class="label"> <img src="themes/default/images/logo_register.png ?>" @@ -21,12 +21,12 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_mail" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('USER_MAIL')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('USER_MAIL')))); ?></span> </label> </div> <div class="input"> - <div class="inputholder"><input<?php if ('') echo ' disabled="true"' ?> id="<?php echo REQUEST_ID ?>_mail" name="mail<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml('') ?>" /><?php if ('') { ?><input type="hidden" name="mail" value="<?php '' ?>"/><?php } ?></div> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_mail" name="<?php if ('') echo ''.'_' ?>mail<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml('') ?>" /><?php if ('') { ?><input type="hidden" name="mail" value="<?php '' ?>"/><?php } ?></div> </div> </div> @@ -36,11 +36,11 @@ <div class="input"> </div> </div> - <div class="bottom"><div class="command "><input type="button" class="submit ok" value="OK" /></div></div></form> + <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" value="?BUTTON_OK?" /></div></form> <?php } ?> <?php if(!$if2){?> <div class="message error"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'REGISTER_NOT_ENABLED'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'REGISTER_NOT_ENABLED'.'')))); ?></span> </div> <?php } ?> diff --git a/modules/cms-ui/themes/default/html/views/login/registercode.php b/modules/cms-ui/themes/default/html/views/login/registercode.php @@ -0,0 +1,61 @@ + + + <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="" data-autosave=""><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 ?>" /> + <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> + + </div> + <div class="input"> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_code" name="<?php if ('') echo ''.'_' ?>code<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml('') ?>" /><?php if ('') { ?><input type="hidden" name="code" value="<?php '' ?>"/><?php } ?></div> + + </div> + </div> + <div class="line"> + <div class="label"> + <span><?php echo nl2br(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 ('') echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$username) ?>" /><?php if ('') { ?><input type="hidden" name="username" value="<?php $username ?>"/><?php } ?></div> + + </div> + </div> + <div class="line"> + <div class="label"> + <span><?php echo nl2br(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> + </div> + <div class="line"> + <div class="label"> + <span><?php echo nl2br(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> + </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" value="?BUTTON_OK?" /></div></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,6 +1,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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> <div class="line"> @@ -11,11 +11,10 @@ <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="<?php echo Html::url('model','prop','',array()) ?>"> + <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> </a> - </div> </div> <div class="or-form-actionbar"></div></form> diff --git a/modules/cms-ui/themes/default/html/views/model/listing.php b/modules/cms-ui/themes/default/html/views/model/listing.php @@ -0,0 +1,59 @@ + + + + + <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 class="headline"> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + + </td> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + + </td> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + + </td> + </tr> + <?php foreach($el as $list_key=>$list_value){ ?><?php 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> + + </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> + <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> + </tr> + <?php unset($select_url) ?> + + <?php unset($default_url) ?> + + <?php } ?> + </table></div></div> + + + + \ 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,6 +1,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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" class="or-form model" data-async="" data-autosave=""><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 ?>" /> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> @@ -33,5 +33,5 @@ </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" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/remove.php b/modules/cms-ui/themes/default/html/views/model/remove.php @@ -0,0 +1,45 @@ + + + + + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> + <div class="line"> + <div class="label"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + + </div> + <div class="input"> + <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + + </div> + </div> + </div></fieldset> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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 class="line"> + <div class="label"> + </div> + <div class="input"> + <?php { $tmpname = 'confirm';$default = '';$readonly = '';$required = '1'; + 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> + + </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" value="?BUTTON_OK?" /></div></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,6 +1,6 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> <td> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> @@ -18,13 +18,12 @@ <?php foreach($el as $list_key=>$list_value){ ?><?php 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="<?php echo Html::url('model','',$id,array()) ?>"> + <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> - </td> <?php $if5=(!$is_default); if($if5){?> <td class="clickable"> @@ -33,7 +32,6 @@ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_make_default')))); ?></span> </a> - <?php } ?> </td> <?php } ?> @@ -51,14 +49,13 @@ <?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="<?php echo Html::url('','add','',array('dialogAction'=>'','dialogMethod'=>'add')) ?>"> + <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> - </td> </tr> - </table> + </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/inherit.php b/modules/cms-ui/themes/default/html/views/object/inherit.php @@ -0,0 +1,37 @@ + + + + + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" 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 class="line"> + <div class="label"> + </div> + <div class="input"> + <?php $inherit= '1'; ?> + + <?php { $tmpname = 'inherit';$default = '';$readonly = '';$required = ''; + 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> + + </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" value="?BUTTON_OK?" /></div></form> + + \ No newline at end of file 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,12 +1,12 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" 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 ('') echo '_disabled' ?>" autofocus="autofocus" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$filename) ?>" /><?php if ('') { ?><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 ('') echo '_disabled' ?>" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$alias_filename) ?>" /><?php if ('') { ?><input type="hidden" name="alias_filename" value="<?php $alias_filename ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label">Verzeichnis</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 } ?> + <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> </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" value="<?php echo lang('global_save') ?>" /></div></form> diff --git a/modules/cms-ui/themes/default/html/views/object/rights.php b/modules/cms-ui/themes/default/html/views/object/rights.php @@ -8,7 +8,7 @@ <?php } ?> - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> <td class="help"> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> @@ -80,20 +80,18 @@ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_DELETE'.'')))); ?></span> </a> - </td> </tr> <?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="<?php echo Html::url('','aclform','',array('dialogAction'=>'','dialogMethod'=>'aclform')) ?>"> + <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> - </td> </tr> - </table> + </table></div></div> \ No newline at end of file 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,7 +1,7 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 '1'?" open":" closed" ?><?php echo '1'?" 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> + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_validity_from_date" class="label"> @@ -31,7 +31,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_settings" class="label"> @@ -45,5 +45,5 @@ </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file 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,28 +1,27 @@ - <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="page" data-async="" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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 ?>"/> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('page_template_old')))); ?></span> + <span><?php echo nl2br(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="<?php echo Html::url('','','',array()) ?>"> - <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_template.png" /> + <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 class="text"><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> </a> - </div> </div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('page_template_new')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('page_template_new')))); ?></span> </div> <div class="input"> @@ -30,5 +29,5 @@ </select></div> </div> </div> - <div class="bottom"><div class="command 1"><input type="submit" class="submit ok" value="<?php echo lang('BUTTON_NEXT') ?>" /><input type="button" class="submit cancel" value="<?php echo lang("CANCEL") ?>" /></div></div></form> + <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" value="<?php echo lang('BUTTON_NEXT') ?>" /></div></form> \ No newline at end of file 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,12 +1,12 @@ - <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="page" data-async="" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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) ?> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> </div> <div class="input"> @@ -15,5 +15,5 @@ </div> </div> <?php } ?> - <div class="bottom"><div class="command 1"><input type="submit" class="submit ok" value="<?php echo lang('MENU_CHANGETEMPLATE') ?>" /><input type="button" class="submit cancel" value="<?php echo lang("CANCEL") ?>" /></div></div></form> + <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" value="<?php echo lang('MENU_CHANGETEMPLATE') ?>" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/edit.php b/modules/cms-ui/themes/default/html/views/page/edit.php @@ -26,13 +26,12 @@ <?php foreach($elements as $list_key=>$list_value){ ?><?php 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="<?php echo Html::url('pageelement','',$pageelementid,array()) ?>"> + <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> </a> - </td> <td title="<?php echo $desc ?>"> <span><?php echo nl2br(encodeHtml(htmlentities($desc))); ?></span> diff --git a/modules/cms-ui/themes/default/html/views/page/form.php b/modules/cms-ui/themes/default/html/views/page/form.php @@ -0,0 +1,131 @@ + + + + <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="" data-autosave=""><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> + + </td> + </tr> + <?php } ?> + <?php $if6=!(($el)==FALSE); if($if6){?> + <tr> + <td class="help"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_ELEMENT_NAME')))); ?></span> + + </td> + <td class="help"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_CHANGE')))); ?></span> + + </td> + <td class="help"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_VALUE')))); ?></span> + + </td> + </tr> + <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <tr class="data"> + <td> + <label for="<?php echo REQUEST_ID ?>_<?php echo $saveid ?>" class="label"> + <i class="image-icon image-icon--element-<?php echo $type ?>"></i> + + <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + + </label> + </td> + <td> + <?php { $tmpname = $saveid;$default = '';$readonly = '';$required = ''; + 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> + <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 ('') echo '_disabled' ?>" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml($value) ?>" /><?php if ('') { ?><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 ('') 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> + </tr> + <?php } ?> + <?php } ?> + </table></div></div> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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 = '';$readonly = '';$required = ''; + 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> + + </label> + </div> + <?php } ?> + <?php $if6=(isset($publish)); if($if6){?> + <div> + <?php { $tmpname = 'publish';$default = '';$readonly = '';$required = ''; + 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> + + </label> + </div> + <?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" value="?BUTTON_OK?" /></div></form> + + + \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/info.php b/modules/cms-ui/themes/default/html/views/page/info.php @@ -2,7 +2,7 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> @@ -40,11 +40,10 @@ <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="<?php echo Html::url('','prop','',array('dialogAction'=>'','dialogMethod'=>'prop')) ?>"> + <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> - </div> </div> </div></fieldset> @@ -57,11 +56,10 @@ <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> <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="<?php echo Html::url('page','name','',array('languageid'=>$languageid)) ?>"> + <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> - </div> </div></fieldset> <?php } ?> @@ -100,13 +98,12 @@ <div class="input"> <?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="<?php echo Html::url('template','',$templateid,array()) ?>"> + <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> - </div> <?php } ?> <?php if(!$if6){?> 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,18 +1,18 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" 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 ('') echo '_disabled' ?>" required="required" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label">Beschreibung</span><span class="or-form-input"><div class="inputholder"><textarea class="description" name="<?php if ('') echo ''.'_' ?>description<?php if ('') echo '_disabled' ?>" maxlength="255"><?php echo Text::encodeHtml($description) ?></textarea></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 ('') echo '_disabled' ?>" maxlength="255"><?php echo Text::encodeHtml($description) ?></textarea></div></span></label> </div></fieldset> <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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 ('') echo '_disabled' ?>" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$alias_filename) ?>" /><?php if ('') { ?><input type="hidden" name="alias_filename" value="<?php $alias_filename ?>"/><?php } ?></div></span></label> - <label class="or-form-row"><span class="or-form-label">Verzeichnis</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 } ?> + <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 = '';$required = ''; if ( isset($$tmpname) ) diff --git a/modules/cms-ui/themes/default/html/views/page/preview.php b/modules/cms-ui/themes/default/html/views/page/preview.php @@ -5,13 +5,12 @@ </div> <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="<?php echo Html::url('','','',array()) ?>"> + <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> - </div> <iframe name="preview" src="<?php echo $preview_url ?>"></iframe> diff --git a/modules/cms-ui/themes/default/html/views/page/pub.php b/modules/cms-ui/themes/default/html/views/page/pub.php @@ -6,8 +6,8 @@ </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="1" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 '1'?" open":" closed" ?><?php echo '1'?" 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> + <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="1" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" 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 class="line"> <div class="label"> </div> @@ -33,5 +33,5 @@ </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/remove.php b/modules/cms-ui/themes/default/html/views/page/remove.php @@ -0,0 +1,21 @@ + + + <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="" data-autosave=""><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 = '';$readonly = '';$required = ''; + 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" value="?BUTTON_OK?" /></div></form> + + \ 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,3 +1,3 @@ - <textarea name="src" data-extension="" data-mimetype="" data-mode="html" class="editor code-editor"><?php echo ${'src'} ?></textarea> + <textarea name="<?php if ('') echo ''.'_' ?>src<?php if ('') echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="html" class="editor code-editor"><?php echo htmlentities(${'src'}) ?></textarea> \ 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,19 +1,19 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> - <td> + <th> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'language'.'')))); ?></span> - </td> - <td> + </th> + <th> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'value'.'')))); ?></span> - </td> - <td> + </th> + <th> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'editor'.'')))); ?></span> - </td> + </th> </tr> <?php foreach($languages as $list_key=>$list_value){ ?><?php extract($list_value) ?> <tr class="data"> @@ -22,24 +22,22 @@ </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="<?php echo Html::url('pageelement','value','',array('languageid'=>$languageid)) ?>"> + <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> - </td> <td> <?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="<?php echo Html::url('pageelement','value','',array('languageid'=>$languageid,'format'=>$id)) ?>"> + <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> - </div> <?php } ?> </td> </tr> <?php } ?> - </table> + </table></div></div> \ No newline at end of file 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,6 +1,6 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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> </td> @@ -67,9 +67,9 @@ <?php unset($right) ?> <?php } ?> - </table> + </table></div></div> <div class="invisible"><input type="submit" name="ok" class="%class%" - title="Zurück" - value=" Zurück " /> + title="?BUTTON_BACK_DESC?" + value=" ?BUTTON_BACK? " /> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/edit.php b/modules/cms-ui/themes/default/html/views/pageelement/edit.php @@ -18,11 +18,10 @@ </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="<?php echo Html::url('pageelement','value','',array('languageid'=>$languageid)) ?>"> + <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> </a> - </td> </tr> <?php } ?> diff --git a/modules/cms-ui/themes/default/html/views/pageelement/export.php b/modules/cms-ui/themes/default/html/views/pageelement/export.php @@ -0,0 +1,25 @@ + + + + <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="" data-autosave=""><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> + </td> + </tr> + <tr> + <td> + <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" value="?BUTTON_OK?" /></div></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,7 +1,7 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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="" data-autosave=""><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%"> <tr class="headline"> <td class="help"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NR')))); ?></span> @@ -54,7 +54,7 @@ </td> <td> <?php $if7=(isset($compareid)); if($if7){?> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_compareid_<?php echo $id ?>" name="compareid" value="<?php echo $id ?>"<?php if($id==@$compareid)echo ' checked="checked"' ?> /> + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_compareid_<?php echo $id ?>" name="<?php if ('') echo ''.'_' ?>compareid<?php if ('') echo '_disabled' ?>" value="<?php echo $id ?>"<?php if($id==@$compareid)echo ' checked="checked"' ?> /> <?php } ?> <?php if(!$if7){?> @@ -64,7 +64,7 @@ </td> <td> <?php $if7=(isset($compareid)); if($if7){?> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_withid_<?php echo $id ?>" name="withid" value="<?php echo $id ?>"<?php if($id==@$withid)echo ' checked="checked"' ?> /> + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_withid_<?php echo $id ?>" name="<?php if ('') echo ''.'_' ?>withid<?php if ('') echo '_disabled' ?>" value="<?php echo $id ?>"<?php if($id==@$withid)echo ' checked="checked"' ?> /> <?php } ?> <?php if(!$if7){?> @@ -97,7 +97,6 @@ <strong><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_RELEASE'.'')))); ?></strong> </a> - </td> <?php } ?> <?php if(!$if7){?> @@ -120,7 +119,6 @@ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_USE'.'')))); ?></span> </a> - </td> <?php } ?> <?php if(!$if7){?> @@ -130,6 +128,6 @@ <?php } ?> </tr> <?php } ?> - </table> + </table></div></div> <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('compare') ?>" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/import.php b/modules/cms-ui/themes/default/html/views/pageelement/import.php @@ -0,0 +1,31 @@ + + + + <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="" data-autosave=""><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> + </td> + </tr> + <tr> + <td> + <input size="40" id="req0_file" type="file" name="file" class="upload" /> + + </td> + </tr> + <tr> + <td> + <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" value="?BUTTON_OK?" /></div></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,6 +1,6 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="data"> <td> <span><?php echo nl2br(encodeHtml(htmlentities(lang('name')))); ?></span> @@ -97,5 +97,5 @@ </td> </tr> - </table> + </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/link.php b/modules/cms-ui/themes/default/html/views/pageelement/link.php @@ -1,11 +1,11 @@ - <form name="" target="_self" action="<?php echo OR_ACTION ?>" data-method="<?php echo OR_METHOD ?>" data-action="<?php echo OR_ACTION ?>" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="<?php echo OR_ACTION ?>" data-async="" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo OR_ACTION ?>" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo OR_METHOD ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <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="" data-autosave=""><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> <td colspan="2" class="help"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($desc))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($desc))); ?></span> </td> </tr> @@ -15,26 +15,26 @@ </select></div> </td> </tr> - <?php $if5=(!empty($release)); if($if5){?> - <?php $if6=(!empty($publish)); if($if6){?> + <?php $if5=(isset($release)); if($if5){?> + <?php $if6=(isset($publish)); if($if6){?> <tr> <td colspan="2"> - <fieldset class="<?php echo '1'?" open":"" ?><?php echo '1'?" show":"" ?>"><legend><div class="arrow-right closed" /><div class="arrow-down open" /><?php echo lang('options') ?></legend><div> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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></fieldset> </td> </tr> <?php } ?> <?php } ?> - <?php $if5=(!empty($release)); if($if5){?> + <?php $if5=(isset($release)); if($if5){?> <tr> <td colspan="2"> - <?php { $tmpname = 'release';$default = '';$readonly = ''; + <?php { $tmpname = 'release';$default = '';$readonly = '';$required = ''; 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 + ?><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 ) { @@ -43,24 +43,24 @@ } ?> <label for="<?php echo REQUEST_ID ?>_release" class="label"> - <span class="text"><?php echo nl2br(' '); ?></span> + <span><?php echo nl2br(' '); ?></span> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_RELEASE')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_RELEASE')))); ?></span> </label> </td> </tr> <?php } ?> - <?php $if5=(!empty($publish)); if($if5){?> + <?php $if5=(isset($publish)); if($if5){?> <tr> <td colspan="2"> - <?php { $tmpname = 'publish';$default = '';$readonly = ''; + <?php { $tmpname = 'publish';$default = '';$readonly = '';$required = ''; 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 + ?><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 ) { @@ -69,9 +69,9 @@ } ?> <label for="<?php echo REQUEST_ID ?>_publish" class="label"> - <span class="text"><?php echo nl2br(' '); ?></span> + <span><?php echo nl2br(' '); ?></span> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_PUBLISH_AFTER_SAVE')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_PUBLISH_AFTER_SAVE')))); ?></span> </label> </td> @@ -80,13 +80,13 @@ <tr> <td colspan="2" class="act"> <div class="invisible"><input type="submit" name="ok" class="%class%" - title="Bestätigen" - value=" OK " /> + title="?button_ok_DESC?" + value=" ?button_ok? " /> </div> </td> </tr> - <div class="bottom"><div class="command "><input type="button" class="submit ok" value="OK" /></div></div></form> + <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" value="?BUTTON_OK?" /></div></form> 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,7 +1,7 @@ <div class="preview"> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> </div></fieldset> 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,121 +1,119 @@ - <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="pageelement" data-async="" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> - <table width="100%"> + <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="" data-autosave=""><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 class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('name')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('name')))); ?></span> </td> <td class="name"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> </td> </tr> <tr> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('description')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('description')))); ?></span> </td> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> </td> </tr> <tr> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('type')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('type')))); ?></span> </td> <td class="filename"> - <img class="image-icon image-icon--element" title="" src="./modules/cms-ui/themes/default/images/icon/element/<?php echo $element_type ?>.svg" /> + <i class="image-icon image-icon--element-<?php echo $element_type ?>"></i> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'el_'.$element_type.''.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'el_'.$element_type.''.'')))); ?></span> </td> </tr> <tr> <td colspan="2"> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> </div></fieldset> </td> </tr> <tr> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'template'.'')))); ?></span> + <span><?php echo nl2br(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="<?php echo Html::url('','','',array()) ?>"> - <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/icon_template.png" /> + <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 class="text"><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> </a> - <?php } ?> - <?php $if6=(empty($template_url)); if($if6){?> - <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/icon_template.png" /> + <?php $if6=(($template_url)==FALSE); if($if6){?> + <img src="./modules/cms-ui/themes/default/images/icon/icon_template.png" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> <?php } ?> </td> </tr> <tr> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'element'.'')))); ?></span> + <span><?php echo nl2br(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="<?php echo Html::url('','','',array()) ?>"> - <img class="image-icon image-icon--element" title="" src="./modules/cms-ui/themes/default/images/icon/element/<?php echo $element_type ?>.svg" /> + <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--element-<?php echo $element_type ?>"></i> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($element_name))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($element_name))); ?></span> </a> - <?php } ?> - <?php $if6=(empty($element_url)); if($if6){?> - <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/element.png" /> + <?php $if6=(($element_url)==FALSE); if($if6){?> + <img src="./modules/cms-ui/themes/default/images/icon/element.png" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($element_name))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($element_name))); ?></span> <?php } ?> </td> </tr> <tr> <td colspan="2"> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> </div></fieldset> </td> </tr> <tr> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('lastchange')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('lastchange')))); ?></span> </td> <td> - <table width="100%"> + <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 class="" title="" src="./modules/cms-ui/themes/default/images/icon/el_date.png" /> + <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> <td> - <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/user.png" /> + <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> </tr> - </table> + </table></div></div> </td> </tr> - </table> - <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form> + </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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/pub.php b/modules/cms-ui/themes/default/html/views/pageelement/pub.php @@ -6,8 +6,8 @@ </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="1" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 '1'?" open":" closed" ?><?php echo '1'?" 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> + <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="1" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" 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 class="line"> <div class="label"> </div> @@ -33,5 +33,5 @@ </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file 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,6 @@ - <?php $if2=(!empty($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');?> 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,6 +1,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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 ?>"/> @@ -226,7 +226,7 @@ <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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="radio" type="radio" id="<?php echo REQUEST_ID ?>_otherlanguageid_<?php echo $languageid ?>" name="otherlanguageid" value="<?php echo $languageid ?>"<?php if($languageid==@$otherlanguageid)echo ' checked="checked"' ?> /> + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_otherlanguageid_<?php echo $languageid ?>" name="<?php if ('') echo ''.'_' ?>otherlanguageid<?php if ('') 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> diff --git a/modules/cms-ui/themes/default/html/views/profile/confirmmail.php b/modules/cms-ui/themes/default/html/views/profile/confirmmail.php @@ -16,16 +16,16 @@ </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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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" class="or-form profile" data-async="" data-autosave=""><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 ?>" /> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_code" class="label"><?php echo lang('mail_code') ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_code" name="code<?php if ('') echo '_disabled' ?>" required="required" autofocus="autofocus" type="text" maxlength="256" class="text" value="<?php echo Text::encodeHtml(@$code) ?>" /><?php if ('') { ?><input type="hidden" name="code" value="<?php $code ?>"/><?php } ?></div> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_code" name="<?php if ('') echo ''.'_' ?>code<?php if ('') echo '_disabled' ?>" required="required" autofocus="autofocus" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$code) ?>" /><?php if ('') { ?><input type="hidden" name="code" value="<?php $code ?>"/><?php } ?></div> </div> </div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></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 @@ -2,8 +2,8 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 '1'?" open":" closed" ?><?php echo '1'?" 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> + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('user_username') ?> @@ -15,7 +15,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_mail" class="label"><?php echo lang('user_mail') ?> @@ -29,16 +29,15 @@ <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="<?php echo Html::url('profile','mail','',array('dialogAction'=>'profile','dialogMethod'=>'mail')) ?>"> + <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> - </div> </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_fullname" class="label"><?php echo lang('user_fullname') ?> @@ -104,7 +103,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('user_password_expires')))); ?></span> @@ -135,7 +134,7 @@ <label for="<?php echo REQUEST_ID ?>_totp" class="label"><?php echo lang('user_totp') ?> </label> - <i class="image-icon image-icon--menu-qrcode qrcode" data-qrcode="<?php echo $totpSecretUrl ?>" title="QR-Code anzeigen"></i> + <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo $totpSecretUrl ?>" title="?QRCODE_SHOW?"></i> </div> </div> @@ -159,7 +158,7 @@ <label for="<?php echo REQUEST_ID ?>_hotp" class="label"><?php echo lang('user_hotp') ?> </label> - <i class="image-icon image-icon--menu-qrcode qrcode" data-qrcode="<?php echo $hotpSecretUrl ?>" title="QR-Code anzeigen"></i> + <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo $hotpSecretUrl ?>" title="?QRCODE_SHOW?"></i> </div> </div> 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,6 +1,6 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> <td> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project'.'')))); ?></span> @@ -18,18 +18,16 @@ <?php foreach($timeline as $list_key=>$list_value){ ?><?php 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="<?php echo Html::url('project','',$projectid,array()) ?>"> + <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> - </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 Html::url($type,'',$objectid,array()) ?>"> + <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> </a> - </td> <td> <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> @@ -37,5 +35,5 @@ </td> </tr> <?php } ?> - </table> + </table></div></div> \ No newline at end of file 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,6 +1,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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" class="or-form profile" data-async="" data-autosave=""><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 ?>" /> <div class="line logo"> <div class="label"> <img src="themes/default/images/logo_changemail.png ?>" @@ -17,7 +17,7 @@ </div> </div> </div> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_mail" class="label"> @@ -32,11 +32,10 @@ </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="<?php echo Html::url('profile','confirmmail','',array('dialogAction'=>'profile','dialogMethod'=>'confirmmail')) ?>"> + <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> - </div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/profile/memberships.php b/modules/cms-ui/themes/default/html/views/profile/memberships.php @@ -0,0 +1,27 @@ + + + <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 class="headline"> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + + </td> + </tr> + <?php $if3=(($groups)==FALSE); if($if3){?> + <tr class="data"> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NOT_FOUND'.'')))); ?></span> + + </td> + </tr> + <?php } ?> + <?php foreach($groups as $list_key=>$group){ ?> + <tr class="data"> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities($group))); ?></span> + + </td> + </tr> + <?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,6 +1,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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){?> <div class="line logo"> <div class="label"> @@ -18,7 +18,7 @@ </div> </div> </div> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_act_password" class="label"> @@ -32,7 +32,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_password1" class="label"> @@ -65,5 +65,5 @@ </div> <?php } ?> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ 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,6 +1,6 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> <td> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> @@ -24,7 +24,7 @@ <?php foreach($content as $list_key=>$list_value){ ?><?php 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 Html::url($type,'',$id,array()) ?>"> + <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> @@ -32,9 +32,8 @@ <span><?php echo nl2br(' '); ?></span> </a> - </td> </tr> <?php } ?> - </table> + </table></div></div> \ 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,21 +1,21 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> </td> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filename'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filename'.'')))); ?></span> </td> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'user_username'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'user_username'.'')))); ?></span> </td> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'lastchange'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'lastchange'.'')))); ?></span> </td> </tr> @@ -43,17 +43,17 @@ <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 Html::url($type,'',$objectid,array()) ?>"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,30,'..',constant('STR_PAD_BOTH') )))); ?></span> </a> </td> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $filename,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $filename,30,'..',constant('STR_PAD_BOTH') )))); ?></span> </td> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($username))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($username))); ?></span> </td> <td> @@ -62,5 +62,5 @@ </td> </tr> <?php } ?> - </table> + </table></div></div> \ No newline at end of file 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,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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> diff --git a/modules/cms-ui/themes/default/html/views/project/maintenance.php b/modules/cms-ui/themes/default/html/views/project/maintenance.php @@ -2,28 +2,28 @@ - <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="" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 '1'?" open":" closed" ?><?php echo '1'?" 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> + <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 '1'?" open":" closed" ?><?php echo '1'?" 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 class="text"><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_check_limit" name="type" value="check_limit"<?php if('check_limit'==@$type)echo ' checked="checked"' ?> /> <label for="<?php echo REQUEST_ID ?>_type_check_limit" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project_check_limit'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project_check_limit'.'')))); ?></span> </label> </div> <div> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_check_files" name="type" value="check_files"<?php if('check_files'==@$type)echo ' checked="checked"' ?> /> <label for="<?php echo REQUEST_ID ?>_type_check_files" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project_check_files'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project_check_files'.'')))); ?></span> </label> </div> </div></fieldset> - <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form> + <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" value="OK" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/project/prop.php b/modules/cms-ui/themes/default/html/views/project/prop.php @@ -90,9 +90,9 @@ </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 ('') 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_0" name="<?php if ('') echo ''.'_' ?>linksAbsolute<?php if ('') echo '_disabled' ?>" value="0"<?php if('0'==@$linksAbsolute)echo ' checked="checked"' ?> /> Relative Links </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 ('') echo '_disabled' ?>" value="1"<?php if('1'==@$linksAbsolute)echo ' checked="checked"' ?> /> ?LINKS_ABSOLUTE? </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 ('') echo '_disabled' ?>" value="1"<?php if('1'==@$linksAbsolute)echo ' checked="checked"' ?> /> Absolute Links </span></label> </div></fieldset> <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> 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,9 +1,9 @@ - <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="project" data-async="" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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" class="or-form project" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span> </div> <div class="input"> @@ -11,7 +11,7 @@ </div> </div> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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 class="line"> <div class="label"> </div> @@ -32,12 +32,12 @@ } ?> <label for="<?php echo REQUEST_ID ?>_delete" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('CONFIRM_DELETE')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('CONFIRM_DELETE')))); ?></span> </label> </div> </div> </div> </div></fieldset> - <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form> + <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" value="OK" /></div></form> \ No newline at end of file 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,6 +1,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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" class="or-form projectlist" data-async="" data-autosave=""><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 ?>" /> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('name')))); ?></span> @@ -11,12 +11,12 @@ </div> </div> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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 class="line"> <div class="label"> </div> <div class="input"> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_empty" name="type" value="empty"<?php if('empty'==@$type||'1')echo ' checked="checked"' ?> /> + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_empty" name="<?php if ('') echo ''.'_' ?>type<?php if ('') echo '_disabled' ?>" value="empty"<?php if('empty'==@$type||'1')echo ' checked="checked"' ?> /> <label for="<?php echo REQUEST_ID ?>_type_empty" class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'empty'.'')))); ?></span> @@ -24,7 +24,7 @@ </label> <br/> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_copy" name="type" value="copy"<?php if('copy'==@$type)echo ' checked="checked"' ?> /> + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_copy" name="<?php if ('') echo ''.'_' ?>type<?php if ('') 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> @@ -35,5 +35,5 @@ </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/projectlist/edit.php b/modules/cms-ui/themes/default/html/views/projectlist/edit.php @@ -2,7 +2,7 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> <td> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> @@ -12,26 +12,24 @@ <?php foreach($projects as $list_key=>$list_value){ ?><?php 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="<?php echo Html::url('project','',$id,array()) ?>"> + <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> - </td> </tr> <?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="<?php echo Html::url('','add','',array('dialogAction'=>'','dialogMethod'=>'add')) ?>"> + <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> - </td> </tr> - </table> + </table></div></div> \ No newline at end of file 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,6 +1,6 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> <td> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project'.'')))); ?></span> @@ -26,7 +26,6 @@ <span><?php echo nl2br(encodeHtml(htmlentities($projectname))); ?></span> </a> - </td> <td> <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $filename,30,'..',constant('STR_PAD_BOTH') )))); ?></span> @@ -42,5 +41,5 @@ </td> </tr> <?php } ?> - </table> + </table></div></div> \ No newline at end of file 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,24 +1,24 @@ - <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="search" data-async="" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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" class="or-form search" data-async="" data-autosave=""><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 ?>" /> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_value" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'value'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'value'.'')))); ?></span> </label> <br/> </div> <div class="input"> - <div class="inputholder"><input placeholder="<?php echo lang('search') ?>" id="<?php echo REQUEST_ID ?>_text" name="text<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="text" value="<?php echo Text::encodeHtml(@$text) ?>" /><?php if ('') { ?><input type="hidden" name="text" value="<?php $text ?>"/><?php } ?></div> + <div class="inputholder"><input placeholder="<?php echo lang('search') ?>" id="<?php echo REQUEST_ID ?>_text" name="<?php if ('') echo ''.'_' ?>text<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$text) ?>" /><?php if ('') { ?><input type="hidden" name="text" value="<?php $text ?>"/><?php } ?></div> </div> </div> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_value" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filter'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filter'.'')))); ?></span> </label> <br/> @@ -40,7 +40,7 @@ } ?> <label for="<?php echo REQUEST_ID ?>_id" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> </label> <br/> @@ -60,7 +60,7 @@ } ?> <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> </label> <br/> @@ -80,7 +80,7 @@ } ?> <label for="<?php echo REQUEST_ID ?>_filename" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filename'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filename'.'')))); ?></span> </label> <br/> @@ -100,7 +100,7 @@ } ?> <label for="<?php echo REQUEST_ID ?>_description" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'description'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'description'.'')))); ?></span> </label> <br/> @@ -120,10 +120,10 @@ } ?> <label for="<?php echo REQUEST_ID ?>_content" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'content'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'content'.'')))); ?></span> </label> </div> </div> - <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/search/result.php b/modules/cms-ui/themes/default/html/views/search/result.php @@ -0,0 +1,31 @@ + + + <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 class="header"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + + </td> + <td class="header"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_LASTCHANGE'.'')))); ?></span> + + </td> + </tr> + <?php foreach($result as $list_key=>$list_value){ ?><?php 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> + </td> + <td> + <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> + + </td> + </tr> + <?php } ?> + </table></div></div> + + \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/addel.php b/modules/cms-ui/themes/default/html/views/template/addel.php @@ -25,7 +25,7 @@ </select></div> </div> </div> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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></fieldset> <div class="line"> <div class="label"> @@ -51,5 +51,5 @@ </label> </div> </div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="OK" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/edit.php b/modules/cms-ui/themes/default/html/views/template/edit.php @@ -2,7 +2,7 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> <td> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> @@ -49,7 +49,7 @@ </td> </tr> - </table> + </table></div></div> <?php foreach($models as $list_key=>$list_value){ ?><?php extract($list_value) ?> <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="clickable"> 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,6 +1,6 @@ - <div class="table-wrapper"><table width="100%"> + <div class="or-table-wrapper"><div class="or-table-area"><table width="100%"> <tr class="data"> <td colspan="1"> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> @@ -30,5 +30,5 @@ </td> </tr> <?php } ?> - </table></div> + </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/prop.php b/modules/cms-ui/themes/default/html/views/template/prop.php @@ -13,7 +13,7 @@ </div> </div> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> </div></fieldset> <div class="line"> <div class="label"> @@ -52,5 +52,5 @@ </div> </div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="OK" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/src.php b/modules/cms-ui/themes/default/html/views/template/src.php @@ -3,7 +3,7 @@ <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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 ('') echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"><?php echo htmlentities(${'source'}) ?></textarea> </div></fieldset> 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,6 +1,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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" class="or-form templatelist" data-async="" data-autosave=""><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 ?>" /> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('name')))); ?></span> @@ -11,10 +11,10 @@ </div> </div> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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 class="line"> <div class="label"> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_empty" name="type" value="empty"<?php if('empty'==@$type)echo ' checked="checked"' ?> /> + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_empty" name="<?php if ('') echo ''.'_' ?>type<?php if ('') echo '_disabled' ?>" value="empty"<?php if('empty'==@$type)echo ' checked="checked"' ?> /> </div> <div class="input"> @@ -30,7 +30,7 @@ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'copy'.'')))); ?></span> </label> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_copy" name="type" value="copy"<?php if('copy'==@$type)echo ' checked="checked"' ?> /> + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_copy" name="<?php if ('') echo ''.'_' ?>type<?php if ('') echo '_disabled' ?>" value="copy"<?php if('copy'==@$type)echo ' checked="checked"' ?> /> </div> <div class="input"> @@ -44,7 +44,7 @@ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'example'.'')))); ?></span> </label> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_example" name="type" value="example"<?php if('example'==@$type)echo ' checked="checked"' ?> /> + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_example" name="<?php if ('') echo ''.'_' ?>type<?php if ('') echo '_disabled' ?>" value="example"<?php if('example'==@$type)echo ' checked="checked"' ?> /> </div> <div class="input"> @@ -53,5 +53,5 @@ </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file 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,6 +1,6 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> <td> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> @@ -12,11 +12,10 @@ <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="<?php echo Html::url('template','',$id,array()) ?>"> + <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> </a> - </td> </tr> <?php } ?> @@ -28,14 +27,13 @@ <?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="<?php echo Html::url('','add','',array('dialogAction'=>'','dialogMethod'=>'add')) ?>"> + <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> - </td> </tr> - </table> + </table></div></div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/compress.php b/modules/cms-ui/themes/default/html/views/text/compress.php @@ -0,0 +1,35 @@ + + + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" 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 class="line"> + <div class="label"> + <span><?php echo nl2br(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 ('') 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> + + </label> + <br/> + + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if ('') 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> + + </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" value="?BUTTON_OK?" /></div></form> + + \ No newline at end of file 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,15 +1,13 @@ - <form name="" target="_self" data-target="view" action="./" data-method="<?php echo OR_METHOD ?>" data-action="<?php echo OR_ACTION ?>" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="<?php echo OR_ACTION ?>" data-async="1" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo OR_ACTION ?>" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo OR_METHOD ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - - - <div class="label"> - </div> + <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="" data-autosave=""><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 ?>" /> <div class="line"> + <div class="label"> + </div> <div class="input"> <br/> - <input size="40" id="req15320413021465794880_file" type="file" name="file" class="upload" /> + <input size="40" id="req0_file" type="file" name="file" class="upload" /> <br/> @@ -17,5 +15,11 @@ </div> </div> - <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form> + <div class="line or-dropzone-upload"> + <div class="label"> + </div> + <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" value="?BUTTON_OK?" /></div></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 @@ -0,0 +1,17 @@ + + + + <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="" data-autosave=""><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> + <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" value="?BUTTON_OK?" /></div></form> + + + \ 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 @@ -0,0 +1,25 @@ + + + <?php $if2=(config('security','nopublish')); if($if2){?> + <div class="message warn"> + <span class="help"><?php echo nl2br(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="1" data-autosave=""><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/> + + </td> + </tr> + <tr> + <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" value="<?php echo lang('publish') ?>" /></div></form> + + \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/remove.php b/modules/cms-ui/themes/default/html/views/text/remove.php @@ -0,0 +1,45 @@ + + + <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="" data-autosave=""><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> + + </td> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + + </td> + </tr> + <tr> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DELETE')))); ?></span> + + </td> + <td> + <?php { $tmpname = 'delete';$default = '';$readonly = '';$required = ''; + 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> + </tr> + <tr> + <td colspan="2"> + <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" value="?BUTTON_OK?" /></div></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 @@ -0,0 +1,25 @@ + + + + + <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> + + </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> + </td> + </tr> + + + + \ 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 @@ -0,0 +1,113 @@ + + + <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="" data-autosave=""><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 ?>" /> + <div class="line"> + <div class="label"> + <span><?php echo nl2br(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> + + </div> + </div> + <?php $if3=!(($formats)==FALSE); if($if3){?> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> + <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 ('') 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> + + </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'; ?> + + </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 ('') 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> + + </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 ('') echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$width) ?>" /><?php if ('') { ?><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 ('') echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$height) ?>" /><?php if ('') { ?><input type="hidden" name="height" value="<?php $height ?>"/><?php } ?></div> + + </div> + </div> + </div></fieldset> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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 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> + </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> + </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> + </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> + </div> + </div> + <div class="line"> + <div class="label"> + </div> + <div class="input"> + <?php { $tmpname = 'copy';$default = '';$readonly = '';$required = ''; + 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> + + </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" value="?BUTTON_OK?" /></div></form> + + \ 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 @@ -0,0 +1,29 @@ + + + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" 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></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 ('') 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> + + </label> + <br/> + + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_replace_0" name="<?php if ('') echo ''.'_' ?>replace<?php if ('') 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> + + </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" value="?BUTTON_OK?" /></div></form> + + \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/value.php b/modules/cms-ui/themes/default/html/views/text/value.php @@ -1,6 +1,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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> @@ -14,12 +14,12 @@ <tr> <td colspan="2" class="act"> <div class="invisible"><input type="submit" name="ok" class="%class%" - title="Bestätigen" - value=" OK " /> + 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" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file 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,3 +1,5 @@ + <span><?php echo nl2br(encodeHtml(htmlentities(lang('1')))); ?></span> + \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/title/ping.tpl.src.xml b/modules/cms-ui/themes/default/html/views/title/ping.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"> - + <text text="1" /> </output> \ 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 @@ -28,20 +28,18 @@ <?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="<?php echo Html::url('','add','',array('dialogAction'=>'','dialogMethod'=>'add')) ?>"> + <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> - </div> <?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="<?php echo Html::url('','pub','',array('dialogAction'=>'','dialogMethod'=>'pub')) ?>"> + <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> - </div> <?php } ?> <?php $if4=($isLoggedIn); if($if4){?> @@ -54,7 +52,7 @@ </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="<?php echo Html::url('','add','',array('dialogAction'=>'','dialogMethod'=>'add')) ?>"> + <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> @@ -62,101 +60,90 @@ <span class="keystroke"><?php echo nl2br(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="<?php echo Html::url('','createfolder','',array('dialogAction'=>'','dialogMethod'=>'createfolder')) ?>"> + <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> - </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="<?php echo Html::url('','createpage','',array('dialogAction'=>'','dialogMethod'=>'createpage')) ?>"> + <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> - </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="<?php echo Html::url('','createfile','',array('dialogAction'=>'','dialogMethod'=>'createfile')) ?>"> + <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> - </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="<?php echo Html::url('','createimage','',array('dialogAction'=>'','dialogMethod'=>'createimage')) ?>"> + <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> - </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="<?php echo Html::url('','createtext','',array('dialogAction'=>'','dialogMethod'=>'createtext')) ?>"> + <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> - </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="<?php echo Html::url('','createlink','',array('dialogAction'=>'','dialogMethod'=>'createlink')) ?>"> + <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> - </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="<?php echo Html::url('','createurl','',array('dialogAction'=>'','dialogMethod'=>'createurl')) ?>"> + <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> - </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="<?php echo Html::url('','compress','',array('dialogAction'=>'','dialogMethod'=>'compress')) ?>"> + <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> - </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="<?php echo Html::url('','decompress','',array('dialogAction'=>'','dialogMethod'=>'decompress')) ?>"> + <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> - </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="<?php echo Html::url('','extract','',array('dialogAction'=>'','dialogMethod'=>'extract')) ?>"> + <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> - </div> <div class="divide"> </div> @@ -167,7 +154,6 @@ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_LOGOUT'.'')))); ?></span> </a> - </div> </div> </div> @@ -182,7 +168,7 @@ </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="edit" data-action="" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','prop','',array()) ?>"> + <a title="<?php echo lang('menu_prop_desc') ?>" target="_self" data-type="edit" data-action="" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> <i class="image-icon image-icon--method-prop"></i> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_prop'.'')))); ?></span> @@ -190,19 +176,17 @@ <span class="keystroke"><?php echo nl2br(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="<?php echo Html::url('','settings','',array('dialogAction'=>'','dialogMethod'=>'settings')) ?>"> + <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> - </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="<?php echo Html::url('','pub','',array('dialogAction'=>'','dialogMethod'=>'pub')) ?>"> + <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> @@ -210,10 +194,9 @@ <span class="keystroke"><?php echo nl2br(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="<?php echo Html::url('','archive','',array('dialogAction'=>'','dialogMethod'=>'archive')) ?>"> + <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> @@ -221,10 +204,9 @@ <span class="keystroke"><?php echo nl2br(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="<?php echo Html::url('','rights','',array('dialogAction'=>'','dialogMethod'=>'rights')) ?>"> + <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> @@ -232,38 +214,34 @@ <span class="keystroke"><?php echo nl2br(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="<?php echo Html::url('','history','',array('dialogAction'=>'','dialogMethod'=>'history')) ?>"> + <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> - </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="<?php echo Html::url('','remove','',array('dialogAction'=>'','dialogMethod'=>'remove')) ?>"> + <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> - </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="<?php echo Html::url('','preview','',array('dialogAction'=>'','dialogMethod'=>'preview')) ?>"> + <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> - </div> </div> </div> @@ -278,102 +256,92 @@ </div> <div class="dropdown"> <div class="entry clickable filtered on-action-user"> - <a title="<?php echo lang('menu_password_desc') ?>" target="_self" data-type="edit" data-action="" data-method="pw" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','pw','',array()) ?>"> + <a title="<?php echo lang('menu_password_desc') ?>" target="_self" data-type="edit" data-action="" data-method="pw" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> <i class="image-icon image-icon--method-password"></i> <span><?php echo nl2br(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="edit" data-action="" data-method="memberships" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','memberships','',array()) ?>"> + <a title="<?php echo lang('menu_memberships_desc') ?>" target="_self" data-type="edit" data-action="" data-method="memberships" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> <i class="image-icon image-icon--method-membership"></i> <span><?php echo nl2br(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="<?php echo Html::url('','advanced','',array('dialogAction'=>'','dialogMethod'=>'advanced')) ?>"> + <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> - </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="edit" data-action="" data-method="changetemplate" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','changetemplate','',array()) ?>"> + <a title="<?php echo lang('menu_changetemplate_desc') ?>" target="_self" data-type="edit" data-action="" data-method="changetemplate" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> <i class="image-icon image-icon--method-changetemplate"></i> <span><?php echo nl2br(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="edit" data-action="" data-method="src" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','src','',array()) ?>"> + <a title="<?php echo lang('menu_src_desc') ?>" target="_self" data-type="edit" data-action="" data-method="src" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> <i class="image-icon image-icon--method-code"></i> <span><?php echo nl2br(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="edit" data-action="" data-method="extension" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','extension','',array()) ?>"> + <a title="<?php echo lang('menu_extension_desc') ?>" target="_self" data-type="edit" data-action="" data-method="extension" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> <i class="image-icon image-icon--method-extension"></i> <span><?php echo nl2br(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="edit" data-action="" data-method="value" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','value','',array()) ?>"> + <a title="<?php echo lang('menu_value_desc') ?>" target="_self" data-type="edit" data-action="" data-method="value" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> <i class="image-icon image-icon--method-value"></i> <span><?php echo nl2br(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="<?php echo Html::url('','order','',array('dialogAction'=>'','dialogMethod'=>'order')) ?>"> + <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> - </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="edit" data-action="" data-method="size" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','size','',array()) ?>"> + <a title="<?php echo lang('menu_size_desc') ?>" target="_self" data-type="edit" data-action="" data-method="size" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#//"> <i class="image-icon image-icon--method-size"></i> <span><?php echo nl2br(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="<?php echo Html::url('','maintenance','',array('dialogAction'=>'','dialogMethod'=>'maintenance')) ?>"> + <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> - </div> </div> </div> @@ -390,7 +358,7 @@ <div class="dropdown"> <?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="<?php echo Html::url('profile','edit','',array('dialogAction'=>'profile','dialogMethod'=>'edit')) ?>"> + <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> @@ -398,67 +366,60 @@ <span class="keystroke"><?php echo nl2br(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="<?php echo Html::url('profile','pw','',array('dialogAction'=>'profile','dialogMethod'=>'pw')) ?>"> + <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> - </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="<?php echo Html::url('profile','mail','',array('dialogAction'=>'profile','dialogMethod'=>'mail')) ?>"> + <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> - </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="<?php echo Html::url('login','license','',array('dialogAction'=>'login','dialogMethod'=>'license')) ?>"> + <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> - </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="<?php echo Html::url('profile','history','',array('dialogAction'=>'profile','dialogMethod'=>'history')) ?>"> + <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> - </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"}"> + <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> - </div> <?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="<?php echo Html::url('login','login','',array('dialogAction'=>'login','dialogMethod'=>'login')) ?>"> + <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> - </div> <?php } ?> </div> 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 @@ -554,7 +554,7 @@ <part class="entry clickable"> <link type="post" class="entry" title="message:USER_LOGOUT_DESC" - action="login" subaction="logout"> + action="login" subaction="logout" afterSuccess="reloadAll" > <image method="logout"></image> <text key="USER_LOGOUT"></text> </link> 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,7 +1,7 @@ <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div class="closable"> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('link_url')))); ?></span> @@ -13,5 +13,5 @@ </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="OK" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/url/info.php b/modules/cms-ui/themes/default/html/views/url/info.php @@ -1,7 +1,7 @@ <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="url" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form url" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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="info" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_name')))); ?></span> @@ -23,7 +23,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_objectid" class="label"> @@ -37,7 +37,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label class="label"> @@ -79,5 +79,5 @@ </div> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="OK" /></div></form> \ 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 @@ -0,0 +1,17 @@ + + + + <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="" data-autosave=""><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 ?>" /> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo 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 ('') echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + + </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" value="?BUTTON_OK?" /></div></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,35 +1,33 @@ - <table width="100%"> + <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 class="headline"> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'project'.'')))); ?></span> </td> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filename'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'filename'.'')))); ?></span> </td> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'lastchange'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'lastchange'.'')))); ?></span> </td> </tr> <?php foreach($timeline as $list_key=>$list_value){ ?><?php 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="<?php echo Html::url('project','',$projectid,array()) ?>"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($projectname))); ?></span> + <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> - </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 Html::url($type,'',$objectid,array()) ?>"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $filename,30,'..',constant('STR_PAD_BOTH') )))); ?></span> + <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> </a> - </td> <td> <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?> @@ -37,5 +35,5 @@ </td> </tr> <?php } ?> - </table> + </table></div></div> \ No newline at end of file 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,6 +1,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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){?> @@ -21,7 +21,7 @@ </div> </div> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'user_fullname'.'')))); ?></span> @@ -43,8 +43,7 @@ <span><?php echo nl2br(encodeHtml(htmlentities($mail))); ?></span> </a> - - <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo 'mailto:'.$mail.'' ?>" title="QR-Code anzeigen"></i> + <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo 'mailto:'.$mail.'' ?>" title="?QRCODE_SHOW?"></i> </div> </div> @@ -67,7 +66,7 @@ <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="QR-Code anzeigen"></i> + <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo 'tel:'.$tel.'' ?>" title="?QRCODE_SHOW?"></i> </div> </div> @@ -97,15 +96,14 @@ <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="<?php echo Html::url('','prop','',array('dialogAction'=>'','dialogMethod'=>'prop')) ?>"> + <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> - </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo ''?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo ''?" open":" closed" ?><?php echo '1'?" 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 class="line"> <div class="label"> </div> @@ -149,7 +147,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo ''?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo ''?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <span><?php echo nl2br(encodeHtml(htmlentities(lang('user_password_expires')))); ?></span> @@ -164,11 +162,10 @@ <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="<?php echo Html::url('user','pw','',array('dialogAction'=>'user','dialogMethod'=>'pw')) ?>"> + <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> - </div> </div> <div class="line"> @@ -213,7 +210,7 @@ <label for="<?php echo REQUEST_ID ?>_totp" class="label"><?php echo lang('user_totp') ?> </label> - <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo $totpSecretUrl ?>" title="QR-Code anzeigen"></i> + <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo $totpSecretUrl ?>" title="?QRCODE_SHOW?"></i> </div> </div> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/listing.php b/modules/cms-ui/themes/default/html/views/user/listing.php @@ -0,0 +1,53 @@ + + + + + <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 class="headline"> + <td> + <img src="./modules/cms-ui/themes/default/images/icon_user.png" /> + + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'name'.'')))); ?></span> + + </td> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + + </td> + <td> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LOGIN'.'')))); ?></span> + + </td> + </tr> + <?php foreach($el as $list_key=>$list_value){ ?><?php 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> + <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> + <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> + + </a> + </td> + </tr> + <?php } ?> + </table></div></div> + + + + \ 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,6 +1,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> + <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="" data-autosave=""><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%"> <tr class="headline"> <td colspan="2"> @@ -37,5 +37,5 @@ </tr> <?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" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file 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,6 +1,6 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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" class="or-form user" data-async="" data-autosave=""><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 ?>" /> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('user_username') ?> @@ -11,7 +11,7 @@ </div> </div> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_fullname" class="label"><?php echo lang('user_fullname') ?> @@ -31,7 +31,7 @@ <div class="input"> <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_mail" name="<?php if ('') echo ''.'_' ?>mail<?php if ('') echo '_disabled' ?>" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$mail) ?>" /><?php if ('') { ?><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="QR-Code anzeigen"></i> + <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo 'mailto:'.$mail.'' ?>" title="?QRCODE_SHOW?"></i> </div> </div> @@ -54,7 +54,7 @@ <div class="input"> <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_tel" name="<?php if ('') echo ''.'_' ?>tel<?php if ('') echo '_disabled' ?>" type="text" maxlength="128" class="" value="<?php echo Text::encodeHtml(@$tel) ?>" /><?php if ('') { ?><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="QR-Code anzeigen"></i> + <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo 'tel:'.$tel.'' ?>" title="?QRCODE_SHOW?"></i> </div> </div> @@ -83,7 +83,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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 class="line"> <div class="label"> </div> @@ -127,7 +127,7 @@ </div> </div> </div></fieldset> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> </div> @@ -148,7 +148,7 @@ <label for="<?php echo REQUEST_ID ?>_totp" class="label"><?php echo lang('user_totp') ?> </label> - <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo $totpSecretUrl ?>" title="QR-Code anzeigen"></i> + <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo $totpSecretUrl ?>" title="?QRCODE_SHOW?"></i> </div> </div> @@ -172,10 +172,10 @@ <label for="<?php echo REQUEST_ID ?>_hotp" class="label"><?php echo lang('user_hotp') ?> </label> - <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo $hotpSecretUrl ?>" title="QR-Code anzeigen"></i> + <i class="image-icon image-icon--menu-qrcode or-qrcode or-info" data-qrcode="<?php echo $hotpSecretUrl ?>" title="?QRCODE_SHOW?"></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" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/pw.php b/modules/cms-ui/themes/default/html/views/user/pw.php @@ -1,11 +1,11 @@ - <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="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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" class="or-form user" data-async="" data-autosave=""><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 ?>" /> <div class="line"> <div class="label"> </div> <div class="input"> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_proposal" name="type" value="proposal"<?php if('proposal'==@$type)echo ' checked="checked"' ?> /> + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_proposal" name="<?php if ('') echo ''.'_' ?>type<?php if ('') 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> @@ -24,7 +24,7 @@ <div class="label"> </div> <div class="input"> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_random" name="type" value="random"<?php if('random'==@$type)echo ' checked="checked"' ?> /> + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_random" name="<?php if ('') echo ''.'_' ?>type<?php if ('') 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') ?> </label> @@ -35,7 +35,7 @@ <div class="label"> </div> <div class="input"> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_input" name="type" value="input"<?php if('input'==@$type||'1')echo ' checked="checked"' ?> /> + <input class="" type="radio" id="<?php echo REQUEST_ID ?>_type_input" name="<?php if ('') echo ''.'_' ?>type<?php if ('') echo '_disabled' ?>" value="input"<?php if('input'==@$type||'1')echo ' checked="checked"' ?> /> <label for="<?php echo REQUEST_ID ?>_type_input" class="label"><?php echo lang('USER_NEW_PASSWORD_INPUT') ?> </label> @@ -61,7 +61,7 @@ </div> </div> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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></fieldset> <?php $if3=(config('mail','enabled')); if($if3){?> <?php $if4=(isset($mail)); if($if4){?> @@ -113,5 +113,5 @@ <?php } ?> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file 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,9 +1,7 @@ - - - <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="user" data-async="" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 '1'?" open":" closed" ?><?php echo '1'?" 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> + <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="" data-autosave=""><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 '1'?" open":" closed" ?><?php echo '1'?" 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"> <div class="line"> <div class="label"> <label class="label"><?php echo lang('user_username') ?> @@ -14,13 +12,13 @@ </div> </div> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" 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></fieldset> <div class="line"> <div class="label"> </div> <div class="input"> - <?php { $tmpname = 'confirm';$default = '';$readonly = '';$required = ''; + <?php { $tmpname = 'confirm';$default = '';$readonly = '';$required = '1'; if ( isset($$tmpname) ) $checked = $$tmpname; else @@ -39,5 +37,5 @@ </div> </div> </div></fieldset> - <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form> + <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" value="?BUTTON_OK?" /></div></form> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/rights.php b/modules/cms-ui/themes/default/html/views/user/rights.php @@ -61,11 +61,10 @@ <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 Html::url($objecttype,'',$objectid,array()) ?>"> - <span title="<?php echo lang('select') ?>"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $objectname,20,'..',constant('STR_PAD_BOTH') )))); ?></span> + <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> </a> - </td> <td> <i class="image-icon image-icon--action-language"></i> 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,15 +1,15 @@ - <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="userlist" data-async="" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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" class="or-form userlist" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><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 ?>" /> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_name" class="label"><?php echo lang('user_username') ?> </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="name<?php if ('') echo '_disabled' ?>" type="text" maxlength="128" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if ('') echo '_disabled' ?>" type="text" maxlength="128" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> </div> </div> - <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form> + <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" value="OK" /></div></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 @@ -2,7 +2,7 @@ - <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> + <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 class="headline"> <td> <img src="./modules/cms-ui/themes/default/images/icon_user.png" /> @@ -62,5 +62,5 @@ </td> </tr> - </table> + </table></div></div> \ No newline at end of file diff --git a/modules/template-engine/TemplateCompiler.php b/modules/template-engine/TemplateCompiler.php @@ -0,0 +1,50 @@ +<?php + +header('Content-Type: text/plain'); + +/** + * Using the Component classes and generating a XSD-File. + */ +error_reporting(E_ALL); +ini_set('display_errors', 1); +ini_set('display_startup_errors', 1); + +use template_engine\TemplateEngine; + + + +$dir = __DIR__.'/../../modules/cms-ui/themes/default/html/views'; + +require('../../modules/util/require.php'); +require('../../modules/template-engine/require.php'); +require('../../modules/cms-core/require.php'); + +echo "Searching in $dir\n"; + +foreach(FileUtils::readDir( $dir ) as $action ) +{ + echo "Action: $action\n"; + + foreach(FileUtils::readDir( $dir.'/'.$action ) as $file ) + { + if ( substr($file,-12 ) == '.tpl.src.xml' ) + { + $method = substr($file, 0,-12 ); + echo "\tMethod $method\n"; + + $templateFile = $dir.'/'.$action.'/'.$file; + $outFile = $dir.'/'.$action.'/'.$method.'.php'; + + $engine = new TemplateEngine(); + $fakeRequest = new \cms\action\RequestParams(); + $fakeRequest->action = $action; + $fakeRequest->method = $method; + $engine->request = $fakeRequest; + + echo "\t\tcompiling $templateFile\n\t\t to $outFile\n"; + + $engine->compile( $templateFile,$outFile ); + } + } +} + diff --git a/modules/template-engine/engine/TemplateEngine.class.php b/modules/template-engine/engine/TemplateEngine.class.php @@ -189,7 +189,7 @@ class TemplateEngine $templateFile = dirname( $srcFile ).'/'.substr( basename($srcFile),0,strpos( basename($srcFile),'.')).'.php'; // In development mode, we are compiling every template on the fly. - if (DEVELOPMENT) { + if (DEVELOPMENT && false /*use dedicated template compiler in update.html */) { // Compile the template. // From a XML source file we are generating a PHP file. diff --git a/modules/util/Html.class.php b/modules/util/Html.class.php @@ -35,6 +35,7 @@ class Html * @param string Unteraktion, die innerhalb der Aktion aufgerufen werden soll * @param int Id fuer diesen Aufruf * @param array Weitere beliebige Parameter + * @deprecated Das ist Dialog-Logik. Besser im Frontend erzeugen. */ public static function url( $action,$subaction='',$id='',$params=array() ) {