openrat-cms

# OpenRat Content Management System
git clone http://git.code.weiherhei.de/openrat-cms.git
Log | Files | Refs

commit 81583c6da09908f5bc4966096668bc4b007f2b4d
parent 7e0f0e57567b2d9f22e02d91323222f0637e944b
Author: Jan Dankert <develop@jandankert.de>
Date:   Tue, 26 Nov 2019 23:20:44 +0100

New: Apply-Button.

Diffstat:
modules/cms-ui/themes/default/html/views/alias/info.php | 4++--
modules/cms-ui/themes/default/html/views/element/advanced.php | 4++--
modules/cms-ui/themes/default/html/views/element/name.php | 4++--
modules/cms-ui/themes/default/html/views/element/prop.php | 4++--
modules/cms-ui/themes/default/html/views/element/properties.php | 4++--
modules/cms-ui/themes/default/html/views/element/remove.php | 4++--
modules/cms-ui/themes/default/html/views/file/advanced.php | 4++--
modules/cms-ui/themes/default/html/views/file/compress.php | 4++--
modules/cms-ui/themes/default/html/views/file/edit.php | 4++--
modules/cms-ui/themes/default/html/views/file/extract.php | 4++--
modules/cms-ui/themes/default/html/views/file/pub.php | 4++--
modules/cms-ui/themes/default/html/views/file/remove.php | 4++--
modules/cms-ui/themes/default/html/views/file/uncompress.php | 4++--
modules/cms-ui/themes/default/html/views/file/value.php | 4++--
modules/cms-ui/themes/default/html/views/folder/advanced.php | 4++--
modules/cms-ui/themes/default/html/views/folder/createfile.php | 4++--
modules/cms-ui/themes/default/html/views/folder/createfolder.php | 4++--
modules/cms-ui/themes/default/html/views/folder/createimage.php | 4++--
modules/cms-ui/themes/default/html/views/folder/createlink.php | 4++--
modules/cms-ui/themes/default/html/views/folder/createpage.php | 4++--
modules/cms-ui/themes/default/html/views/folder/createtext.php | 4++--
modules/cms-ui/themes/default/html/views/folder/createurl.php | 4++--
modules/cms-ui/themes/default/html/views/folder/info.php | 4++--
modules/cms-ui/themes/default/html/views/folder/inherit.php | 4++--
modules/cms-ui/themes/default/html/views/folder/order.php | 4++--
modules/cms-ui/themes/default/html/views/folder/pub.php | 4++--
modules/cms-ui/themes/default/html/views/folder/remove.php | 4++--
modules/cms-ui/themes/default/html/views/group/add.php | 4++--
modules/cms-ui/themes/default/html/views/group/memberships.php | 4++--
modules/cms-ui/themes/default/html/views/group/prop.php | 4++--
modules/cms-ui/themes/default/html/views/group/remove.php | 4++--
modules/cms-ui/themes/default/html/views/grouplist/add.php | 4++--
modules/cms-ui/themes/default/html/views/image/compress.php | 4++--
modules/cms-ui/themes/default/html/views/image/edit.php | 4++--
modules/cms-ui/themes/default/html/views/image/extract.php | 4++--
modules/cms-ui/themes/default/html/views/image/info.php | 4++--
modules/cms-ui/themes/default/html/views/image/pub.php | 4++--
modules/cms-ui/themes/default/html/views/image/remove.php | 4++--
modules/cms-ui/themes/default/html/views/image/size.php | 4++--
modules/cms-ui/themes/default/html/views/image/uncompress.php | 4++--
modules/cms-ui/themes/default/html/views/image/value.php | 4++--
modules/cms-ui/themes/default/html/views/language/add.php | 4++--
modules/cms-ui/themes/default/html/views/language/prop.php | 4++--
modules/cms-ui/themes/default/html/views/language/remove.php | 4++--
modules/cms-ui/themes/default/html/views/languagelist/add.php | 4++--
modules/cms-ui/themes/default/html/views/link/edit.php | 4++--
modules/cms-ui/themes/default/html/views/link/info.php | 4++--
modules/cms-ui/themes/default/html/views/link/remove.php | 4++--
modules/cms-ui/themes/default/html/views/login/login.php | 4++--
modules/cms-ui/themes/default/html/views/login/openid.php | 4++--
modules/cms-ui/themes/default/html/views/login/password.php | 2+-
modules/cms-ui/themes/default/html/views/login/passwordcode.php | 4++--
modules/cms-ui/themes/default/html/views/login/register.php | 2+-
modules/cms-ui/themes/default/html/views/login/registercode.php | 4++--
modules/cms-ui/themes/default/html/views/model/prop.php | 4++--
modules/cms-ui/themes/default/html/views/model/remove.php | 4++--
modules/cms-ui/themes/default/html/views/modellist/add.php | 4++--
modules/cms-ui/themes/default/html/views/object/aclform.php | 4++--
modules/cms-ui/themes/default/html/views/object/copy.php | 4++--
modules/cms-ui/themes/default/html/views/object/inherit.php | 4++--
modules/cms-ui/themes/default/html/views/object/name.php | 4++--
modules/cms-ui/themes/default/html/views/object/prop.php | 4++--
modules/cms-ui/themes/default/html/views/object/settings.php | 4++--
modules/cms-ui/themes/default/html/views/page/changetemplate.php | 4++--
modules/cms-ui/themes/default/html/views/page/changetemplateselectelements.php | 4++--
modules/cms-ui/themes/default/html/views/page/form.php | 4++--
modules/cms-ui/themes/default/html/views/page/name.php | 4++--
modules/cms-ui/themes/default/html/views/page/preview.php | 2+-
modules/cms-ui/themes/default/html/views/page/pub.php | 4++--
modules/cms-ui/themes/default/html/views/page/remove.php | 4++--
modules/cms-ui/themes/default/html/views/page/src.php | 2+-
modules/cms-ui/themes/default/html/views/pageelement/export.php | 4++--
modules/cms-ui/themes/default/html/views/pageelement/history.php | 4++--
modules/cms-ui/themes/default/html/views/pageelement/import.php | 4++--
modules/cms-ui/themes/default/html/views/pageelement/link.php | 4++--
modules/cms-ui/themes/default/html/views/pageelement/prop.php | 4++--
modules/cms-ui/themes/default/html/views/pageelement/pub.php | 4++--
modules/cms-ui/themes/default/html/views/pageelement/value.php | 4++--
modules/cms-ui/themes/default/html/views/pageelement/value.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/profile/confirmmail.php | 4++--
modules/cms-ui/themes/default/html/views/profile/edit.php | 4++--
modules/cms-ui/themes/default/html/views/profile/mail.php | 4++--
modules/cms-ui/themes/default/html/views/profile/pw.php | 4++--
modules/cms-ui/themes/default/html/views/project/add.php | 4++--
modules/cms-ui/themes/default/html/views/project/export.php | 4++--
modules/cms-ui/themes/default/html/views/project/maintenance.php | 4++--
modules/cms-ui/themes/default/html/views/project/prop.php | 4++--
modules/cms-ui/themes/default/html/views/project/remove.php | 4++--
modules/cms-ui/themes/default/html/views/projectlist/add.php | 4++--
modules/cms-ui/themes/default/html/views/search/edit.php | 4++--
modules/cms-ui/themes/default/html/views/start/projectmenu.php | 2+-
modules/cms-ui/themes/default/html/views/template/addel.php | 4++--
modules/cms-ui/themes/default/html/views/template/extension.php | 4++--
modules/cms-ui/themes/default/html/views/template/preview.php | 2+-
modules/cms-ui/themes/default/html/views/template/prop.php | 4++--
modules/cms-ui/themes/default/html/views/template/pub.php | 4++--
modules/cms-ui/themes/default/html/views/template/remove.php | 4++--
modules/cms-ui/themes/default/html/views/template/src.php | 4++--
modules/cms-ui/themes/default/html/views/template/src.tpl.src.xml | 2+-
modules/cms-ui/themes/default/html/views/template/srcelement.php | 4++--
modules/cms-ui/themes/default/html/views/templatelist/add.php | 4++--
modules/cms-ui/themes/default/html/views/text/compress.php | 4++--
modules/cms-ui/themes/default/html/views/text/edit.php | 4++--
modules/cms-ui/themes/default/html/views/text/extract.php | 4++--
modules/cms-ui/themes/default/html/views/text/pub.php | 4++--
modules/cms-ui/themes/default/html/views/text/remove.php | 4++--
modules/cms-ui/themes/default/html/views/text/size.php | 4++--
modules/cms-ui/themes/default/html/views/text/uncompress.php | 4++--
modules/cms-ui/themes/default/html/views/text/value.php | 4++--
modules/cms-ui/themes/default/html/views/text/value.tpl.src.xml | 36++++++++++++++++++------------------
modules/cms-ui/themes/default/html/views/url/edit.php | 4++--
modules/cms-ui/themes/default/html/views/url/info.php | 4++--
modules/cms-ui/themes/default/html/views/url/remove.php | 4++--
modules/cms-ui/themes/default/html/views/user/add.php | 4++--
modules/cms-ui/themes/default/html/views/user/memberships.php | 4++--
modules/cms-ui/themes/default/html/views/user/prop.php | 4++--
modules/cms-ui/themes/default/html/views/user/pw.php | 4++--
modules/cms-ui/themes/default/html/views/user/remove.php | 4++--
modules/cms-ui/themes/default/html/views/userlist/add.php | 4++--
modules/cms-ui/themes/default/production/combined.min.js | 10+++++-----
modules/cms-ui/themes/default/script/openrat/form.js | 96++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
modules/cms-ui/themes/default/script/openrat/form.min.js | 6+++---
modules/cms-ui/themes/default/script/openrat/workbench.js | 7+++++++
modules/cms-ui/themes/default/script/openrat/workbench.min.js | 4++--
modules/cms-ui/themes/default/script/plugin/jquery-plugin-orLinkify.js | 4----
modules/cms-ui/themes/default/script/plugin/jquery-plugin-orLinkify.min.js | 4++--
modules/language/lang-cn.php | 3+++
modules/language/lang-de.php | 3+++
modules/language/lang-en.php | 3+++
modules/language/lang-es.php | 3+++
modules/language/lang-fr.php | 3+++
modules/language/lang-it.php | 3+++
modules/language/lang-ru.php | 3+++
modules/language/language.yml | 10++++++++++
modules/template-engine/components/html/form/Form.class.php | 8+++++++-
modules/template-engine/components/template.xsd | 1+
136 files changed, 358 insertions(+), 305 deletions(-)

diff --git a/modules/cms-ui/themes/default/html/views/alias/info.php b/modules/cms-ui/themes/default/html/views/alias/info.php @@ -60,4 +60,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/advanced.php b/modules/cms-ui/themes/default/html/views/element/advanced.php @@ -300,4 +300,4 @@ </div> <?php } ?> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/name.php b/modules/cms-ui/themes/default/html/views/element/name.php @@ -24,4 +24,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/prop.php b/modules/cms-ui/themes/default/html/views/element/prop.php @@ -37,4 +37,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/properties.php b/modules/cms-ui/themes/default/html/views/element/properties.php @@ -269,4 +269,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/element/remove.php b/modules/cms-ui/themes/default/html/views/element/remove.php @@ -51,4 +51,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/advanced.php b/modules/cms-ui/themes/default/html/views/file/advanced.php @@ -3,4 +3,4 @@ <label class="or-form-row"><span class="or-form-label"><?php echo lang('file_extension') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_extension" name="<?php if ('') echo ''.'_' ?>extension<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="extension" value="<?php echo Text::encodeHtml(@$extension) ?>" /><?php if (false) { ?><input type="hidden" name="extension" value="<?php $extension ?>"/><?php } ?></div></span></label> <label class="or-form-row"><span class="or-form-label">?type?</span><span class="or-form-input"><div class="inputholder"><select id="<?php echo REQUEST_ID ?>_type" name="type" title="" class=""<?php if (count($types)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($types,$type,0,0) ?><?php if (count($types)==0) { ?><input type="hidden" name="type" value="" /><?php } ?><?php if (count($types)==1) { ?><input type="hidden" name="type" value="<?php echo array_keys($types)[0] ?>" /><?php } ?> </select></div></span></label> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/compress.php b/modules/cms-ui/themes/default/html/views/file/compress.php @@ -22,4 +22,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/edit.php b/modules/cms-ui/themes/default/html/views/file/edit.php @@ -16,4 +16,4 @@ <div class="input"> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/extract.php b/modules/cms-ui/themes/default/html/views/file/extract.php @@ -8,4 +8,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/pub.php b/modules/cms-ui/themes/default/html/views/file/pub.php @@ -18,4 +18,4 @@ </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 + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('publish') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/remove.php b/modules/cms-ui/themes/default/html/views/file/remove.php @@ -14,4 +14,4 @@ ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } } ?>&nbsp;?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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/uncompress.php b/modules/cms-ui/themes/default/html/views/file/uncompress.php @@ -18,4 +18,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/value.php b/modules/cms-ui/themes/default/html/views/file/value.php @@ -16,4 +16,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/advanced.php b/modules/cms-ui/themes/default/html/views/folder/advanced.php @@ -130,4 +130,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createfile.php b/modules/cms-ui/themes/default/html/views/folder/createfile.php @@ -51,4 +51,4 @@ <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createfolder.php b/modules/cms-ui/themes/default/html/views/folder/createfolder.php @@ -17,4 +17,4 @@ <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></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="<?php echo lang('add') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('add') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createimage.php b/modules/cms-ui/themes/default/html/views/folder/createimage.php @@ -51,4 +51,4 @@ <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createlink.php b/modules/cms-ui/themes/default/html/views/folder/createlink.php @@ -22,4 +22,4 @@ <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createpage.php b/modules/cms-ui/themes/default/html/views/folder/createpage.php @@ -25,4 +25,4 @@ <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createtext.php b/modules/cms-ui/themes/default/html/views/folder/createtext.php @@ -50,4 +50,4 @@ <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/createurl.php b/modules/cms-ui/themes/default/html/views/folder/createurl.php @@ -30,4 +30,4 @@ <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>"><?php echo Text::encodeHtml('') ?></textarea></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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/info.php b/modules/cms-ui/themes/default/html/views/folder/info.php @@ -77,4 +77,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/inherit.php b/modules/cms-ui/themes/default/html/views/folder/inherit.php @@ -15,4 +15,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/order.php b/modules/cms-ui/themes/default/html/views/folder/order.php @@ -40,4 +40,4 @@ <?php } ?> </table></div></div> <input type="hidden" name="order" value=""/> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/pub.php b/modules/cms-ui/themes/default/html/views/folder/pub.php @@ -107,4 +107,4 @@ </div> <?php } ?> </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('publish') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('publish') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/remove.php b/modules/cms-ui/themes/default/html/views/folder/remove.php @@ -27,4 +27,4 @@ ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } } ?>&nbsp;?GLOBAL_DELETE_WITH_CHILDREN? </span></label> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/add.php b/modules/cms-ui/themes/default/html/views/group/add.php @@ -9,4 +9,4 @@ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/memberships.php b/modules/cms-ui/themes/default/html/views/group/memberships.php @@ -42,4 +42,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/prop.php b/modules/cms-ui/themes/default/html/views/group/prop.php @@ -10,4 +10,4 @@ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="100" class="name focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/group/remove.php b/modules/cms-ui/themes/default/html/views/group/remove.php @@ -32,4 +32,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/grouplist/add.php b/modules/cms-ui/themes/default/html/views/grouplist/add.php @@ -9,4 +9,4 @@ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/compress.php b/modules/cms-ui/themes/default/html/views/image/compress.php @@ -22,4 +22,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/edit.php b/modules/cms-ui/themes/default/html/views/image/edit.php @@ -16,4 +16,4 @@ <div class="input"> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/extract.php b/modules/cms-ui/themes/default/html/views/image/extract.php @@ -8,4 +8,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/info.php b/modules/cms-ui/themes/default/html/views/image/info.php @@ -143,4 +143,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/pub.php b/modules/cms-ui/themes/default/html/views/image/pub.php @@ -18,4 +18,4 @@ </div> </td> </tr> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('publish') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('publish') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/remove.php b/modules/cms-ui/themes/default/html/views/image/remove.php @@ -36,4 +36,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/size.php b/modules/cms-ui/themes/default/html/views/image/size.php @@ -91,4 +91,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/uncompress.php b/modules/cms-ui/themes/default/html/views/image/uncompress.php @@ -18,4 +18,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/value.php b/modules/cms-ui/themes/default/html/views/image/value.php @@ -16,4 +16,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/add.php b/modules/cms-ui/themes/default/html/views/language/add.php @@ -9,4 +9,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/prop.php b/modules/cms-ui/themes/default/html/views/language/prop.php @@ -37,4 +37,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/language/remove.php b/modules/cms-ui/themes/default/html/views/language/remove.php @@ -34,4 +34,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/languagelist/add.php b/modules/cms-ui/themes/default/html/views/languagelist/add.php @@ -9,4 +9,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/link/edit.php b/modules/cms-ui/themes/default/html/views/link/edit.php @@ -18,4 +18,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/link/info.php b/modules/cms-ui/themes/default/html/views/link/info.php @@ -60,4 +60,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/link/remove.php b/modules/cms-ui/themes/default/html/views/link/remove.php @@ -14,4 +14,4 @@ ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } } ?>&nbsp;?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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/login.php b/modules/cms-ui/themes/default/html/views/login/login.php @@ -131,4 +131,4 @@ <input type="hidden" name="modelid" value="<?php echo $modelid ?>"/> <input type="hidden" name="projectid" value="<?php echo $projectid ?>"/> <input type="hidden" name="languageid" value="<?php echo $languageid ?>"/> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('menu_login') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('menu_login') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/openid.php b/modules/cms-ui/themes/default/html/views/login/openid.php @@ -47,4 +47,4 @@ <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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/password.php b/modules/cms-ui/themes/default/html/views/login/password.php @@ -34,7 +34,7 @@ </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="<?php echo lang('BUTTON_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 or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> <?php } ?> <?php if(!$if2){?> <div class="message error"> diff --git a/modules/cms-ui/themes/default/html/views/login/passwordcode.php b/modules/cms-ui/themes/default/html/views/login/passwordcode.php @@ -36,4 +36,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/login/register.php b/modules/cms-ui/themes/default/html/views/login/register.php @@ -33,7 +33,7 @@ <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="<?php echo lang('BUTTON_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 or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> <?php } ?> <?php if(!$if2){?> <div class="message error"> diff --git a/modules/cms-ui/themes/default/html/views/login/registercode.php b/modules/cms-ui/themes/default/html/views/login/registercode.php @@ -49,4 +49,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/prop.php b/modules/cms-ui/themes/default/html/views/model/prop.php @@ -29,4 +29,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/model/remove.php b/modules/cms-ui/themes/default/html/views/model/remove.php @@ -34,4 +34,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/modellist/add.php b/modules/cms-ui/themes/default/html/views/modellist/add.php @@ -8,4 +8,4 @@ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/aclform.php b/modules/cms-ui/themes/default/html/views/object/aclform.php @@ -98,4 +98,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/copy.php b/modules/cms-ui/themes/default/html/views/object/copy.php @@ -24,4 +24,4 @@ <span><?php echo nl2br(encodeHtml(htmlentities(@$target[name]))); ?></span> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/inherit.php b/modules/cms-ui/themes/default/html/views/object/inherit.php @@ -27,4 +27,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/name.php b/modules/cms-ui/themes/default/html/views/object/name.php @@ -5,4 +5,4 @@ <label class="or-form-row"><span class="or-form-label"><?php echo lang('name') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" required="required" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div></span></label> <label class="or-form-row"><span class="or-form-label">?description?</span><span class="or-form-input"><div class="inputholder"><textarea class="description" name="<?php if ('') echo ''.'_' ?>description<?php if (false) echo '_disabled' ?>" maxlength="255"><?php echo Text::encodeHtml($description) ?></textarea></div></span></label> </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>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('global_save') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/prop.php b/modules/cms-ui/themes/default/html/views/object/prop.php @@ -6,4 +6,4 @@ <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>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('global_save') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/settings.php b/modules/cms-ui/themes/default/html/views/object/settings.php @@ -36,4 +36,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/changetemplate.php b/modules/cms-ui/themes/default/html/views/page/changetemplate.php @@ -22,4 +22,4 @@ </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="<?php echo lang('BUTTON_NEXT') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_NEXT') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/changetemplateselectelements.php b/modules/cms-ui/themes/default/html/views/page/changetemplateselectelements.php @@ -12,4 +12,4 @@ </div> </div> <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('MENU_CHANGETEMPLATE') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('MENU_CHANGETEMPLATE') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/form.php b/modules/cms-ui/themes/default/html/views/page/form.php @@ -107,4 +107,4 @@ title="?button_ok_DESC?" value="&nbsp;&nbsp;&nbsp;&nbsp;?button_ok?&nbsp;&nbsp;&nbsp;&nbsp;" /> </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/name.php b/modules/cms-ui/themes/default/html/views/page/name.php @@ -23,4 +23,4 @@ } } ?>&nbsp;?leave_link? </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>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('global_save') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/preview.php b/modules/cms-ui/themes/default/html/views/page/preview.php @@ -4,7 +4,7 @@ </select></div> <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_modelid" name="modelid" title="" class=""<?php if (count($models)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($models,$modelid,0,0) ?><?php if (count($models)==0) { ?><input type="hidden" name="modelid" value="" /><?php } ?><?php if (count($models)==1) { ?><input type="hidden" name="modelid" value="<?php echo array_keys($models)[0] ?>" /><?php } ?> </select></div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> + <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('PREVIEW') ?></legend><div class="closable"> <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="./#//"> diff --git a/modules/cms-ui/themes/default/html/views/page/pub.php b/modules/cms-ui/themes/default/html/views/page/pub.php @@ -29,4 +29,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/remove.php b/modules/cms-ui/themes/default/html/views/page/remove.php @@ -14,4 +14,4 @@ ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } } ?>&nbsp;?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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/src.php b/modules/cms-ui/themes/default/html/views/page/src.php @@ -4,7 +4,7 @@ </select></div> <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_modelid" name="modelid" title="" class=""<?php if (count($models)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($models,$modelid,0,0) ?><?php if (count($models)==0) { ?><input type="hidden" name="modelid" value="" /><?php } ?><?php if (count($models)==1) { ?><input type="hidden" name="modelid" value="<?php echo array_keys($models)[0] ?>" /><?php } ?> </select></div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> + <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('SOURCE') ?></legend><div class="closable"> <textarea name="<?php if ('') echo ''.'_' ?>src<?php if (true) echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="html" class="editor code-editor"><?php echo htmlentities(${'src'}) ?></textarea> </div></fieldset> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/export.php b/modules/cms-ui/themes/default/html/views/pageelement/export.php @@ -14,4 +14,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/history.php b/modules/cms-ui/themes/default/html/views/pageelement/history.php @@ -106,4 +106,4 @@ </tr> <?php } ?> </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 + <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('compare') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/import.php b/modules/cms-ui/themes/default/html/views/pageelement/import.php @@ -19,4 +19,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/link.php b/modules/cms-ui/themes/default/html/views/pageelement/link.php @@ -75,4 +75,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/prop.php b/modules/cms-ui/themes/default/html/views/pageelement/prop.php @@ -92,4 +92,4 @@ </td> </tr> </table></div></div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/pub.php b/modules/cms-ui/themes/default/html/views/pageelement/pub.php @@ -29,4 +29,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/value.php b/modules/cms-ui/themes/default/html/views/pageelement/value.php @@ -238,4 +238,4 @@ </div> <?php } ?> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('save') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="button" class="or-form-btn or-form-btn--primary or-form-btn--apply" value="<?php echo lang("APPLY") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('save') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/pageelement/value.tpl.src.xml b/modules/cms-ui/themes/default/html/views/pageelement/value.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <form method="post" label="message:save"> + <form method="post" label="message:save" apply="true"> <hidden name="languageid" /> <hidden name="elementid" /> <hidden name="value_time" /> diff --git a/modules/cms-ui/themes/default/html/views/profile/confirmmail.php b/modules/cms-ui/themes/default/html/views/profile/confirmmail.php @@ -25,4 +25,4 @@ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_code" name="<?php if ('') echo ''.'_' ?>code<?php if (false) echo '_disabled' ?>" required="required" autofocus="autofocus" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$code) ?>" /><?php if (false) { ?><input type="hidden" name="code" value="<?php $code ?>"/><?php } ?></div> </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/profile/edit.php b/modules/cms-ui/themes/default/html/views/profile/edit.php @@ -144,4 +144,4 @@ </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="<?php echo lang('global_save') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('global_save') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/profile/mail.php b/modules/cms-ui/themes/default/html/views/profile/mail.php @@ -33,4 +33,4 @@ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'mail_code'.'')))); ?></span> </a> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/profile/pw.php b/modules/cms-ui/themes/default/html/views/profile/pw.php @@ -57,4 +57,4 @@ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'pwchange_not_allowed'.'')))); ?></span> </div> <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/project/add.php b/modules/cms-ui/themes/default/html/views/project/add.php @@ -36,4 +36,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/project/export.php b/modules/cms-ui/themes/default/html/views/project/export.php @@ -9,4 +9,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/project/maintenance.php b/modules/cms-ui/themes/default/html/views/project/maintenance.php @@ -16,4 +16,4 @@ </label> </div> </div></fieldset> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/project/prop.php b/modules/cms-ui/themes/default/html/views/project/prop.php @@ -155,4 +155,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/project/remove.php b/modules/cms-ui/themes/default/html/views/project/remove.php @@ -34,4 +34,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/projectlist/add.php b/modules/cms-ui/themes/default/html/views/projectlist/add.php @@ -27,4 +27,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/search/edit.php b/modules/cms-ui/themes/default/html/views/search/edit.php @@ -105,4 +105,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/start/projectmenu.php b/modules/cms-ui/themes/default/html/views/start/projectmenu.php @@ -54,7 +54,7 @@ </td> </tr> </table></div></div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_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 or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> </div> </div> </td> diff --git a/modules/cms-ui/themes/default/html/views/template/addel.php b/modules/cms-ui/themes/default/html/views/template/addel.php @@ -42,4 +42,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/extension.php b/modules/cms-ui/themes/default/html/views/template/extension.php @@ -6,4 +6,4 @@ <label class="or-form-row"><span class="or-form-label"><?php echo lang('template_extension') ?></span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_<?php echo $name ?>" name="<?php if ('') echo ''.'_' ?><?php echo $name ?><?php if (false) echo '_disabled' ?>" required="required" type="text" maxlength="10" class="" value="<?php echo Text::encodeHtml(@$$name) ?>" /><?php if (false) { ?><input type="hidden" name="<?php echo $name ?>" value="<?php $$name ?>"/><?php } ?></div></span></label> </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/preview.php b/modules/cms-ui/themes/default/html/views/template/preview.php @@ -2,7 +2,7 @@ <form name="" target="_self" data-target="self" action="./" data-method="preview" data-action="template" data-id="<?php echo OR_ID ?>" method="GET" enctype="application/x-www-form-urlencoded" class="or-form template" data-async="false" data-autosave="true"><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="template" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="preview" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_modelid" name="modelid" title="" class=""<?php if (count($models)<=1) echo ' disabled="disabled"'; ?> size="1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($models,$modelid,0,0) ?><?php if (count($models)==0) { ?><input type="hidden" name="modelid" value="" /><?php } ?><?php if (count($models)==1) { ?><input type="hidden" name="modelid" value="<?php echo array_keys($models)[0] ?>" /><?php } ?> </select></div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> + <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form> <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('preview') ?></legend><div class="closable"> <iframe src="<?php echo $preview_url ?>"></iframe> <a class="action" target="_self" data-action="file" data-method="edit" data-id="<?php echo OR_ID ?>" data-extra="[]" href="./#/file/"> diff --git a/modules/cms-ui/themes/default/html/views/template/prop.php b/modules/cms-ui/themes/default/html/views/template/prop.php @@ -39,4 +39,4 @@ </a> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/pub.php b/modules/cms-ui/themes/default/html/views/template/pub.php @@ -29,4 +29,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/remove.php b/modules/cms-ui/themes/default/html/views/template/remove.php @@ -34,4 +34,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/src.php b/modules/cms-ui/themes/default/html/views/template/src.php @@ -4,4 +4,4 @@ <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('source') ?></legend><div class="closable"> <textarea name="<?php if ('') echo ''.'_' ?>source<?php if (false) echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"><?php echo htmlentities(${'source'}) ?></textarea> </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="button" class="or-form-btn or-form-btn--primary or-form-btn--apply" value="<?php echo lang("APPLY") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/template/src.tpl.src.xml b/modules/cms-ui/themes/default/html/views/template/src.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <form> + <form apply="true"> <hidden name="modelid" /> <group title="message:source"> <editor type="code" name="source" mode="htmlmixed" /> diff --git a/modules/cms-ui/themes/default/html/views/template/srcelement.php b/modules/cms-ui/themes/default/html/views/template/srcelement.php @@ -50,4 +50,4 @@ </div> </div> <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/templatelist/add.php b/modules/cms-ui/themes/default/html/views/templatelist/add.php @@ -44,4 +44,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/compress.php b/modules/cms-ui/themes/default/html/views/text/compress.php @@ -22,4 +22,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/edit.php b/modules/cms-ui/themes/default/html/views/text/edit.php @@ -16,4 +16,4 @@ <div class="input"> </div> </div> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/extract.php b/modules/cms-ui/themes/default/html/views/text/extract.php @@ -8,4 +8,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/pub.php b/modules/cms-ui/themes/default/html/views/text/pub.php @@ -18,4 +18,4 @@ </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 + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('publish') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/remove.php b/modules/cms-ui/themes/default/html/views/text/remove.php @@ -36,4 +36,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/size.php b/modules/cms-ui/themes/default/html/views/text/size.php @@ -91,4 +91,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/uncompress.php b/modules/cms-ui/themes/default/html/views/text/uncompress.php @@ -18,4 +18,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/value.php b/modules/cms-ui/themes/default/html/views/text/value.php @@ -16,4 +16,4 @@ </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('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="button" class="or-form-btn or-form-btn--primary or-form-btn--apply" value="<?php echo lang("APPLY") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/value.tpl.src.xml b/modules/cms-ui/themes/default/html/views/text/value.tpl.src.xml @@ -1,20 +1,20 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <form> - <row> - <column> - <text text="GLOBAL_VALUE"></text> - </column> - <column> - <editor name="value" type="code" extension="var:extension" mimetype="var:mimetype"></editor> - </column> - </row> - <row> - <column class="act" colspan="2"> - <button type="ok"></button> - </column> - </row> - </form> - <focus field="value"></focus> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> + <form apply="true"> + <row> + <column> + <text text="GLOBAL_VALUE"></text> + </column> + <column> + <editor name="value" type="code" extension="var:extension" mimetype="var:mimetype"></editor> + </column> + </row> + <row> + <column class="act" colspan="2"> + <button type="ok"></button> + </column> + </row> + </form> + <focus field="value"></focus> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/url/edit.php b/modules/cms-ui/themes/default/html/views/url/edit.php @@ -10,4 +10,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/url/info.php b/modules/cms-ui/themes/default/html/views/url/info.php @@ -60,4 +60,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/url/remove.php b/modules/cms-ui/themes/default/html/views/url/remove.php @@ -14,4 +14,4 @@ ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } } ?>&nbsp;?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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/add.php b/modules/cms-ui/themes/default/html/views/user/add.php @@ -9,4 +9,4 @@ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/memberships.php b/modules/cms-ui/themes/default/html/views/user/memberships.php @@ -32,4 +32,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/prop.php b/modules/cms-ui/themes/default/html/views/user/prop.php @@ -161,4 +161,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/pw.php b/modules/cms-ui/themes/default/html/views/user/pw.php @@ -99,4 +99,4 @@ </div> <?php } ?> <?php } ?> - <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/user/remove.php b/modules/cms-ui/themes/default/html/views/user/remove.php @@ -34,4 +34,4 @@ </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/userlist/add.php b/modules/cms-ui/themes/default/html/views/userlist/add.php @@ -9,4 +9,4 @@ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if (false) echo '_disabled' ?>" type="text" maxlength="128" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if (false) { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> </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="<?php echo lang('BUTTON_OK') ?>" /></div></form>- \ No newline at end of file + <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary or-form-btn--save" value="<?php echo lang('BUTTON_OK') ?>" /></div></form>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/production/combined.min.js b/modules/cms-ui/themes/default/production/combined.min.js @@ -116,7 +116,7 @@ else{return{top:0,left:0}}},_cacheMargins:function(){this.margins={left:(parseIn else{this.currentItem.show()};if(this.fromOutside&&!e){s.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))})};if((this.fromOutside||this.domPosition.prev!==this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!==this.currentItem.parent()[0])&&!e){s.push(function(t){this._trigger("update",t,this._uiHash())})};if(this!==this.currentContainer){if(!e){s.push(function(t){this._trigger("remove",t,this._uiHash())});s.push((function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}).call(this,this.currentContainer));s.push((function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}).call(this,this.currentContainer))}};function o(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}};for(i=this.containers.length-1;i>=0;i--){if(!e){s.push(o("deactivate",this,this.containers[i]))};if(this.containers[i].containerCache.over){s.push(o("out",this,this.containers[i]));this.containers[i].containerCache.over=0}};if(this.storedCursor){this.document.find("body").css("cursor",this.storedCursor);this.storedStylesheet.remove()};if(this._storedOpacity){this.helper.css("opacity",this._storedOpacity)};if(this._storedZIndex){this.helper.css("zIndex",this._storedZIndex==="auto"?"":this._storedZIndex)};this.dragging=!1;if(!e){this._trigger("beforeStop",t,this._uiHash())};this.placeholder[0].parentNode.removeChild(this.placeholder[0]);if(!this.cancelHelperRemoval){if(this.helper[0]!==this.currentItem[0]){this.helper.remove()};this.helper=null};if(!e){for(i=0;i<s.length;i++){s[i].call(this,t)};this._trigger("stop",t,this._uiHash())};this.fromOutside=!1;return!this.cancelHelperRemoval},_trigger:function(){if(t.Widget.prototype._trigger.apply(this,arguments)===!1){this.cancel()}},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}})})); /* ./modules/cms-ui/themes/default/script/plugin/jquery-plugin-orSearch.min.js */;jQuery.fn.orSearch=function(e){var t=$.extend({'dropdown':$(),'select':function(e){}},e);return $(this).on('input',function(){let searchArgument=$(this).val();let dropdownEl=$(t.dropdown);if(searchArgument.length>3){$(dropdownEl).empty();$.ajax({'type':'GET',url:'./api/?action=search&subaction=quicksearch&output=json&search='+searchArgument,data:null,success:function(e,n,r){for(id in e.output.result){let result=e.output.result[id];let div=$('<div class="entry or-search-result" title="'+result.desc+'"></div>');div.data('object',{'name':result.name,'action':result.type,'id':result.id});let link=$('<a />').attr('href',Openrat.Navigator.createShortUrl(result.type,result.id));link.click(function(e){e.preventDefault()});$(link).append('<i class="image-icon image-icon--action-'+result.type+'" />');$(link).append('<span>'+result.name+'</span>');$(div).append(link);$(dropdownEl).append(div)};$(dropdownEl).closest('.or-menu').addClass('open');$(dropdownEl).find('.or-search-result').click(function(e){t.select($(this).data('object'))})}})} else{$(dropdownEl).empty()}})}; -/* ./modules/cms-ui/themes/default/script/plugin/jquery-plugin-orLinkify.min.js */;var popupWindow;jQuery.fn.orLinkify=function(){$(this).find('a').click(function(t){t.preventDefault()});return $(this).click(function(){$(this).find('a').first().each(function(){let type=$(this).attr('data-type');if($(this).parent().hasClass('inactive'))return;switch(type){case'post':$form=$('<form />').attr('method','POST').addClass('invisible');$form.data('afterSuccess',$(this).data('afterSuccess'));let params=jQuery.parseJSON($(this).attr('data-data'));params.output='json';$.each(params,function(t,a){let $input=$('<input />').attr('type','hidden').attr('name',t).attr('value',a);$form.append($input)});let form=new Openrat.Form();form.initOnElement($form);form.submit();break;case'edit':case'dialog':startDialog($(this).attr('data-name'),$(this).attr('data-action'),$(this).attr('data-method'),$(this).attr('data-id'),$(this).attr('data-extra'));break;case'external':window.open($(this).attr('data-url'),' _blank');break;case'popup':popupWindow=window.open($(this).attr('data-url'),'Popup','location=no,menubar=no,scrollbars=yes,toolbar=no,resizable=yes');break;case'help':help(this,$(this).attr('data-url'),$(this).attr('data-suffix'));break;case'fullscreen':fullscreen(this);break;case'open':openNewAction($(this).attr('data-name'),$(this).attr('data-action'),$(this).attr('data-id'));break;default:throw'UI error: Unknown link type: '+type+' in link '+$(this).html()}})})};$(document).on('orDataChanged',function(t,a){if(typeof popupWindow!='undefined')popupWindow.location.reload()}); +/* ./modules/cms-ui/themes/default/script/plugin/jquery-plugin-orLinkify.min.js */;var popupWindow;jQuery.fn.orLinkify=function(){$(this).find('a').click(function(t){t.preventDefault()});return $(this).click(function(){$(this).find('a').first().each(function(){let type=$(this).attr('data-type');if($(this).parent().hasClass('inactive'))return;switch(type){case'post':$form=$('<form />').attr('method','POST').addClass('invisible');$form.data('afterSuccess',$(this).data('afterSuccess'));let params=jQuery.parseJSON($(this).attr('data-data'));params.output='json';$.each(params,function(t,a){let $input=$('<input />').attr('type','hidden').attr('name',t).attr('value',a);$form.append($input)});let form=new Openrat.Form();form.initOnElement($form);form.submit();break;case'edit':case'dialog':startDialog($(this).attr('data-name'),$(this).attr('data-action'),$(this).attr('data-method'),$(this).attr('data-id'),$(this).attr('data-extra'));break;case'external':window.open($(this).attr('data-url'),' _blank');break;case'popup':popupWindow=window.open($(this).attr('data-url'),'Popup','location=no,menubar=no,scrollbars=yes,toolbar=no,resizable=yes');break;case'help':help(this,$(this).attr('data-url'),$(this).attr('data-suffix'));break;case'fullscreen':fullscreen(this);break;case'open':openNewAction($(this).attr('data-name'),$(this).attr('data-action'),$(this).attr('data-id'));break;default:throw'UI error: Unknown link type: '+type+' in link '+$(this).html()}})})}; /* ./modules/cms-ui/themes/default/script/plugin/jquery-plugin-orTree.min.js */;jQuery.fn.orTree=function(){$(this).each(function(a,e){$(e).children('.or-navtree-node-control').click(function(){var a=$(this).parent('.or-navtree-node');if($(a).is('.or-navtree-node--is-open')){$(a).children('ul').slideUp('fast').remove();$(a).removeClass('or-navtree-node--is-open').addClass('or-navtree-node--is-closed').find('.tree-icon').removeClass('image-icon--node-open').addClass('image-icon--node-closed')} else{$(e).closest('div.view').addClass('loader');var i=$(a).data('type'),o=$(a).data('id'),t=$(a).data('extra'),n='./api/?action=tree&subaction=loadBranch&id='+o+'&type='+i+'&output=json';if(typeof t==='string'){jQuery.each(jQuery.parseJSON(t.replace(/'/g,'"')),function(e,a){n=n+'&'+e+'='+a})} else if(typeof t==='object'){jQuery.each(t,function(e,a){n=n+'&'+e+'='+a})} @@ -10825,13 +10825,13 @@ jQuery.trumbowyg={langs:{en:{viewHTML:"View HTML",undo:"Undo",redo:"Redo",format /* ./modules/cms-ui/themes/default/script/openrat/view.min.js */;Openrat.View=function(t,r,i,n){this.action=t;this.method=r;this.id=i;this.params=n;this.before=function(){};this.start=function(e){this.before();this.element=e;this.loadView()};this.afterLoad=function(){};this.close=function(){};function a(e){Openrat.Workbench.afterViewLoadedHandler.fire(e);let f=$(e).data('afterViewLoaded');if(f instanceof Function)f(e)};this.loadView=function(){let e=Openrat.View.createUrl(this.action,this.method,this.id,this.params);let element=this.element;let view=this;$(this.element).empty().fadeTo(1,0.7).addClass('loader').html('').load(e,function(t,i,r){$(element).fadeTo(350,1);$(element).removeClass('loader');$(element).find('form').each(function(){let form=new Openrat.Form();form.close=function(){view.close()};form.initOnElement(this)});if(i=='error'){$(element).html('');Openrat.Workbench.notify('','','error','Server Error',['Server Error while requesting url '+e,t]);return};a(element)})};Openrat.View.createUrl=function(t,subaction,i,extraid={}){var e='./';e+='?';if(t)e+='&action='+t;if(subaction)e+='&subaction='+subaction;if(i)e+='&id='+i;if(typeof extraid==='string'){extraid=extraid.replace(/'/g,'"');var o=jQuery.parseJSON(extraid);jQuery.each(o,function(t,i){e=e+'&'+t+'='+i})} else if(typeof extraid==='object'){jQuery.each(extraid,function(t,i){e=e+'&'+t+'='+i})} else{};return e}}; -/* ./modules/cms-ui/themes/default/script/openrat/form.min.js */;Openrat.Form=function(){this.setLoadStatus=function(e){$(this.element).closest('div.content').toggleClass('loader',e)};this.initOnElement=function(e){this.element=e;let form=this;if($(this.element).data('autosave')){$(this.element).find('input[type="checkbox"]').click(function(){form.submit()});$(this.element).find('select').change(function(){form.submit()})};$(e).find('.or-form-btn--cancel').click(function(){form.cancel()});$(e).find('.or-form-btn--reset').click(function(){form.rollback()});$(e).submit(function(e){if($(this).data('target')=='view'){form.submit();e.preventDefault()}})};this.cancel=function(){this.close()};this.rollback=function(){this.element.trigger('reset')};this.close=function(){};this.forwardTo=function(e,t,r,s){let view=new Openrat.View(e,t,r,s);view.start($(this.element).closest('.view'))};this.submit=function(){let status=$('<div class="notice info"><div class="text loader"></div></div>');$('#noticebar').prepend(status);$(status).show();$(this.element).find('.error').removeClass('error');var t=$(this.element).serializeArray(),e={};$(t).each(function(t,r){e[r.name]=r.value});if(!e.id)e.id=Openrat.Workbench.state.id;if(!e.action)e.action=Openrat.Workbench.state.action;let formMethod=$(this.element).attr('method').toUpperCase();if(formMethod=='GET'){this.forwardTo(e.action,e.subaction,e.id,e);$(status).remove()} -else{let url='./api/';this.setLoadStatus(!0);url+='';e.output='json';if($(this.element).data('async')){this.close()};let form=this;$.ajax({'type':'POST',url:url,data:e,success:function(e,t,r){form.setLoadStatus(!1);$(status).remove();form.doResponse(e,t,form.element)},error:function(e,t,r){form.setLoadStatus(!1);$(status).remove();try{let error=jQuery.parseJSON(e.responseText);Openrat.Workbench.notify('','','error',error.error,[error.description])}catch(s){let msg=e.responseText;Openrat.Workbench.notify('','','error','Server Error',[msg])}}});$(form.element).fadeIn()}};this.doResponse=function(e,t,r){if(t!='success'){alert('Server error: '+t);return};let form=this;$.each(e['notices'],function(t,e){let notifyBrowser=$(r).data('async');Openrat.Workbench.notify(e.type,e.name,e.status,e.text,e.log,notifyBrowser);if(e.status=='ok'){if(!$(r).data('async')){form.close();$(r).closest('div.panel').find('div.header ul.views li.action.active').removeClass('dirty')};let afterSuccess=$(r).data('afterSuccess');let async=$(r).data('async');if(afterSuccess){if(afterSuccess=='reloadAll'){Openrat.Workbench.reloadAll()}} -else{if(async);else Openrat.Workbench.reloadViews()};$(document).trigger('orDataChanged')} +/* ./modules/cms-ui/themes/default/script/openrat/form.min.js */;Openrat.Form=function(){const modes={showBrowserNotice:1,keepOpen:2,closeAfterSubmit:4,closeAfterSuccess:8,};this.setLoadStatus=function(e){$(this.element).closest('div.content').toggleClass('loader',e)};this.initOnElement=function(e){this.element=e;let form=this;if($(this.element).data('autosave')){$(this.element).find('input[type="checkbox"]').click(function(){form.submit(modes.keepOpen)});$(this.element).find('select').change(function(){form.submit(modes.keepOpen)})};$(e).find('.or-form-btn--cancel').click(function(){form.cancel()});$(e).find('.or-form-btn--reset').click(function(){form.rollback()});$(e).find('.or-form-btn--apply').click(function(){form.submit(modes.keepOpen)});$(e).submit(function(e){if($(this).data('target')=='view'){form.submit();e.preventDefault()}})};this.cancel=function(){this.close()};this.rollback=function(){this.element.trigger('reset')};this.close=function(){};this.forwardTo=function(e,t,s,o){let view=new Openrat.View(e,t,s,o);view.start($(this.element).closest('.view'))};this.submit=function(e){if(e===undefined)if($(this.element).data('async'))e=modes.closeAfterSubmit;else e=modes.closeAfterSuccess;let status=$('<div class="notice info"><div class="text loader"></div></div>');$('#noticebar').prepend(status);$(status).show();$(this.element).find('.error').removeClass('error');let params=$(this.element).serializeArray();let data={};$(params).each(function(e,t){data[t.name]=t.value});if(!data.id)data.id=Openrat.Workbench.state.id;if(!data.action)data.action=Openrat.Workbench.state.action;let formMethod=$(this.element).attr('method').toUpperCase();if(formMethod=='GET'){this.forwardTo(data.action,data.subaction,data.id,data);$(status).remove()} +else{let url='./api/';this.setLoadStatus(!0);url+='';data.output='json';if(e==modes.closeAfterSubmit)this.close();let form=this;$.ajax({'type':'POST',url:url,data:data,success:function(t,s,o){form.setLoadStatus(!1);$(status).remove();form.doResponse(t,s,form.element,function(){if(e==modes.closeAfterSuccess){form.close();$(form.element).closest('div.panel').find('div.header ul.views li.action.active').removeClass('dirty')};let afterSuccess=$(form.element).data('afterSuccess');let async=$(form.element).data('async');if(afterSuccess){if(afterSuccess=='reloadAll'){Openrat.Workbench.reloadAll()}} +else{if(async);else Openrat.Workbench.reloadViews()}})},error:function(e,t,s){form.setLoadStatus(!1);$(status).remove();try{let error=jQuery.parseJSON(e.responseText);Openrat.Workbench.notify('','','error',error.error,[error.description])}catch(o){let msg=e.responseText;Openrat.Workbench.notify('','','error','Server Error',[msg])}}});$(form.element).fadeIn()}};this.doResponse=function(e,t,s,onSuccess=$.noop){if(t!='success'){alert('Server error: '+t);return};let form=this;$.each(e['notices'],function(t,e){let notifyBrowser=$(s).data('async');Openrat.Workbench.notify(e.type,e.name,e.status,e.text,e.log,notifyBrowser);if(e.status=='ok'){onSuccess();Openrat.Workbench.dataChangedHandler.fire()} else{}});$.each(e['errors'],function(e,t){$('input[name='+t+']').addClass('error').parent().addClass('error').parents('fieldset').addClass('show').addClass('open')});if(e.control.redirect)window.location.href=e.control.redirect}}; /* ./modules/cms-ui/themes/default/script/openrat/workbench.min.js */;Openrat.Workbench=new function(){'use strict';this.state={};this.initialize=function(){this.initializePingTimer();this.initializeState();this.openModalDialog()};this.openModalDialog=function(){if($('#dialog').data('action')){startDialog('',$('#dialog').data('action'),$('#dialog').data('action'),0,{})}};this.initializeState=function(){let parts=window.location.hash.split('/');let state={action:'index',id:0};if(parts.length>=2)state.action=parts[1].toLowerCase();if(parts.length>=3)state.id=parts[2].replace(/[^0-9_]/gim,'');Openrat.Workbench.state=state;$('#editor').attr('data-action',state.action);$('#editor').attr('data-id',state.id);$('#editor').attr('data-extra','{}');Openrat.Navigator.toActualHistory(state)};this.initializePingTimer=function(){var t=function(){$.ajax(Openrat.View.createUrl('title','ping',0))},i=5;window.setInterval(t,i*60*1000)};this.loadNewActionState=function(t){Openrat.Workbench.state=t;Openrat.Workbench.loadNewAction(t.action,t.id,t.data);this.afterNewActionHandler.fire()};this.afterNewActionHandler=$.Callbacks();this.loadNewAction=function(t,i,e){$('#editor').attr('data-action',t);$('#editor').attr('data-id',i);$('#editor').attr('data-extra',JSON.stringify(e));this.reloadViews()};this.reloadViews=function(){$('#workbench section.closed .view-loader').empty();Openrat.Workbench.loadViews($('#workbench section.open .view-loader'))};this.reloadAll=function(){$('#workbench .view').empty();Openrat.Workbench.loadViews($('#workbench .view.view-loader, #workbench .view.view-static'));this.loadUserStyle()};this.loadUserStyle=function(){let url=Openrat.View.createUrl('index','userinfo',0);$.getJSON(url,function(t){let style=t['style'];Openrat.Workbench.setUserStyle(style);let color=t['theme-color'];Openrat.Workbench.setThemeColor(color)})};this.loadViews=function(t){t.each(function(t){let $targetDOMElement=$(this);Openrat.Workbench.loadNewActionIntoElement($targetDOMElement)})};this.loadNewActionIntoElement=function(t){let action;if(t.is('.view-static'))action=t.attr('data-action');else action=$('#editor').attr('data-action');let id=$('#editor').attr('data-id');let params=$('#editor').attr('data-extra');let method=t.data('method');let view=new Openrat.View(action,method,id,params);view.start(t)};this.setUserStyle=function(t){var i=$('html'),e=i.attr('class').split(/\s+/);$.each(e,function(t,e){if(e.startsWith('theme-')){i.removeClass(e)}});i.addClass('theme-'+t.toLowerCase())};this.setThemeColor=function(t){$('#theme-color').attr('content',t)};let notifyBrowser=function(t){if(!('Notification' in window)){return} else if(Notification.permission==='granted'){let notification=new Notification(t)} -else if(Notification.permission!=='denied'){Notification.requestPermission(function(i){if(i==='granted'){let notification=new Notification(t)}})}};this.notify=function(t,e,i,o,log=[],notifyTheBrowser=!1){if(notifyTheBrowser)notifyBrowser(o);let notice=$('<div class="notice '+i+'"></div>');let toolbar=$('<div class="or-notice-toolbar"></div>');if(log.length)$(toolbar).append('<i class="or-action-full image-icon image-icon--menu-fullscreen"></i>');$(toolbar).append('<i class="or-action-close image-icon image-icon--menu-close"></i>');$(notice).append(toolbar);let id=0;if(e)$(notice).append('<div class="name clickable"><a href="" data-type="open" data-action="'+t+'" data-id="'+id+'"><i class="or-action-full image-icon image-icon--action-'+t+'"></i> '+e+'</a></div>');$(notice).append('<div class="text">'+htmlEntities(o)+'</div>');if(log.length){let logLi=log.reduce((result,item)=>{result+='<li><pre>'+htmlEntities(item)+'</pre></li>';return result},'');$(notice).append('<div class="log"><ul>'+logLi+'</ul></div>')};$('#noticebar').prepend(notice);$(notice).orLinkify();$(notice).find('.or-action-full').click(function(){$(notice).toggleClass('full')});$(notice).find('.or-action-close').click(function(){$(notice).fadeOut('fast',function(){$(notice).remove()})});let timeout=1;if(i=='ok')timeout=20;if(i=='info')timeout=60;if(i=='warning')timeout=120;if(i=='error')timeout=120;if(timeout>0)setTimeout(function(){$(notice).fadeOut('slow',function(){$(this).remove()})},timeout*1000)};this.afterViewLoadedHandler=$.Callbacks();let afterViewFunctions=[];this.registerAfterViewLoaded=function(t){afterViewFunctions.push(t)};this.afterViewLoaded=function(t){afterViewFunctions.forEach(function(i){i(t)})}}; +else if(Notification.permission!=='denied'){Notification.requestPermission(function(i){if(i==='granted'){let notification=new Notification(t)}})}};this.notify=function(t,e,i,o,log=[],notifyTheBrowser=!1){if(notifyTheBrowser)notifyBrowser(o);let notice=$('<div class="notice '+i+'"></div>');let toolbar=$('<div class="or-notice-toolbar"></div>');if(log.length)$(toolbar).append('<i class="or-action-full image-icon image-icon--menu-fullscreen"></i>');$(toolbar).append('<i class="or-action-close image-icon image-icon--menu-close"></i>');$(notice).append(toolbar);let id=0;if(e)$(notice).append('<div class="name clickable"><a href="" data-type="open" data-action="'+t+'" data-id="'+id+'"><i class="or-action-full image-icon image-icon--action-'+t+'"></i> '+e+'</a></div>');$(notice).append('<div class="text">'+htmlEntities(o)+'</div>');if(log.length){let logLi=log.reduce((result,item)=>{result+='<li><pre>'+htmlEntities(item)+'</pre></li>';return result},'');$(notice).append('<div class="log"><ul>'+logLi+'</ul></div>')};$('#noticebar').prepend(notice);$(notice).orLinkify();$(notice).find('.or-action-full').click(function(){$(notice).toggleClass('full')});$(notice).find('.or-action-close').click(function(){$(notice).fadeOut('fast',function(){$(notice).remove()})});let timeout=1;if(i=='ok')timeout=20;if(i=='info')timeout=60;if(i=='warning')timeout=120;if(i=='error')timeout=120;if(timeout>0)setTimeout(function(){$(notice).fadeOut('slow',function(){$(this).remove()})},timeout*1000)};this.dataChangedHandler=$.Callbacks();this.dataChangedHandler.add(function(){if(popupWindow!==undefined)popupWindow.location.reload()});this.afterViewLoadedHandler=$.Callbacks();let afterViewFunctions=[];this.registerAfterViewLoaded=function(t){afterViewFunctions.push(t)};this.afterViewLoaded=function(t){afterViewFunctions.forEach(function(i){i(t)})}}; /* ./modules/cms-ui/themes/default/script/openrat/navigator.min.js */;Openrat.Navigator=new function(){'use strict';this.navigateTo=function(t){Openrat.Workbench.loadNewActionState(t)};this.navigateToNew=function(t){this.navigateTo(t);window.history.pushState(t,t.name,this.createShortUrl(t.action,t.id))};this.toActualHistory=function(t){window.history.replaceState(t,t.name,this.createShortUrl(t.action,t.id))};this.createShortUrl=function(t,i){return'./#/'+t+(i?'/'+i:'')}}; /* ./modules/cms-ui/themes/default/script/openrat/common.min.js */;var OR_THEMES_EXT_DIR='modules/cms-ui/themes/';$(function(){$('html').removeClass('nojs');$('.initial-hidden').removeClass('initial-hidden');function e(){function e(e){$(e).closest('div.panel').fadeOut('fast',function(){$(this).toggleClass('fullscreen').fadeIn('fast')})};$('div.header').dblclick(function(){e(this)})};e();window.onpopstate=function(e){Openrat.Navigator.navigateTo(e.state)};Openrat.Workbench.initialize();Openrat.Workbench.reloadAll();let registerWorkbenchGlobalEvents=function(){$('.keystroke').each(function(){let keystrokeElement=$(this);let keystroke=keystrokeElement.text();if(keystroke.length==0)return;let keyaction=function(){keystrokeElement.click()};$(document).bind('keydown',keystroke,keyaction)});$('section.toggle-open-close .on-click-open-close').click(function(){var t=$(this).closest('section');if(t.hasClass('disabled'))return;var e=t.find('div.view-loader');if(e.children().length==0)Openrat.Workbench.loadNewActionIntoElement(e)})};$('.or-initial-notice').each(function(){Openrat.Workbench.notify('','','info',$(this).text());$(this).remove()});registerWorkbenchGlobalEvents();let closeMenu=function(){$('body').click(function(){$('.toolbar-icon.menu').parents('.or-menu').removeClass('open')})};closeMenu();Openrat.Workbench.afterNewActionHandler.add(function(){let url='./api/?action=tree&subaction=path&id='+Openrat.Workbench.state.id+'&type='+Openrat.Workbench.state.action+'&output=json';$.getJSON(url,function(e){$('nav .or-navtree-node').removeClass('or-navtree-node--selected');let output=e['output'];$.each(output.path,function(e, t){$nav=$('nav .or-navtree-node[data-type='+t.type+'][data-id='+t.id+'].or-navtree-node--is-closed .or-navtree-node-control');$nav.click()});if(output.actual)$('nav .or-navtree-node[data-type='+output.actual.type+'][data-id='+output.actual.id+']').addClass('or-navtree-node--selected');let $breadcrumb=$('.or-breadcrumb').empty();let items=[];$.each(output.path.concat(output.actual),function(e,t){items.push('<li class="or-breadcrumb-item clickable" tabindex="0"><a href="'+Openrat.Navigator.createShortUrl(t.action,t.id)+'" data-type="open" data-action="'+t.action+'" data-id="'+t.id+'"><i class="image-icon image-icon--action-'+t.action+'" />'+t.name+'</a></li>')});$breadcrumb.append(items.join('<li><i class="tree-icon image-icon image-icon--node-closed"></i></li>'));$('.or-breadcrumb .clickable').orLinkify()}).fail(function(e){console.warn(e);console.warn('failed to load path from '+url)}).always(function(){})})});let filterMenus=function(){let action=Openrat.Workbench.state.action;let id=Openrat.Workbench.state.id;$('div.clickable').addClass('active');$('div.clickable.filtered').removeClass('active').addClass('inactive');$('div.clickable.filtered.on-action-'+action).addClass('active').removeClass('inactive');$('div.clickable.filtered a').attr('data-id',id)};$('#title.view').data('afterViewLoaded',function(){filterMenus()});Openrat.Workbench.afterNewActionHandler.add(function(){filterMenus()});Openrat.Workbench.afterViewLoadedHandler.add(function(e){if(typeof popupWindow!='undefined')$(e).find('a[data-type=\'popup\']').each(function(){popupWindow.location.href=$(this).attr('data-url')})});Openrat.Workbench.afterViewLoadedHandler.add(function(e){var n=$(e).closest('section');n.toggleClass('is-empty',$(e).is(':empty'));$(e).closest('div.panel').find('div.header div.dropdown div.entry.perview').remove();$(e).find('.toggle-nav-open-close').click(function(){$('nav').toggleClass('open')});$(e).find('.toggle-nav-small').click(function(){$('nav').toggleClass('small')});$(e).find('div.headermenu > a').each(function(e, t){});$(e).find('div.header > a.back').each(function(t, n){$(n).removeClass('button').wrap('<div class="entry perview" />').parent().appendTo($(e).closest('div.panel').find('div.header div.dropdown').first())});$(e).find('div.selector.tree').each(function(){var e=this;$(this).orTree({type:'project',selectable:$(e).attr('data-types').split(','),id:$(e).attr('data-init-folderid'),onSelect:function(t,n,a){var i=$(e).parent();$(i).find('input[type=text]').attr('value',t);$(i).find('input[type=hidden]').attr('value',a)}})});t(e);$(e).find('input').change(function(){$(this).parent('div.view').addClass('dirty')});$(e).find('.or-theme-chooser').change(function(){Openrat.Workbench.setUserStyle(this.value)});function a(e){$(e).find('.toolbar-icon.menu').click(function(e){e.stopPropagation();$(this).parents('.or-menu').toggleClass('open')});$(e).find('.toolbar-icon.menu').mouseover(function(){$(this).parents('.or-menu').find('.toolbar-icon.menu').removeClass('open');$(this).addClass('open')})};function i(e){$(e).find('.search input').orSearch({dropdown:'#title div.search div.dropdown',select:function(e){openNewAction(e.name,e.action,e.id)}})};function o(e){$(e).find('.selector input').orSearch({dropdown:'.dropdown',select:function(t){$(e).find('.or-selector-link-value').val(t.id);$(e).find('.or-selector-link-name').val(t.name).attr('placeholder',t.name)}})};function l(e){$(e).find('.or-navtree-node').orTree()};a(e);i(e);o(e);l(e);function t(e){registerDraggable(e);registerDroppable(e)};t(e)});function registerDraggable(e){$(e).find('.or-draggable').draggable({helper:'clone',opacity:0.7,zIndex:2,distance:10,cursor:'move',revert:'false'})};function registerTreeBranchEvents(e){registerDraggable(e)};function registerDroppable(e){$(e).find('.or-droppable').droppable({accept:'.or-draggable',hoverClass:'or-droppable--hover',activeClass:'or-droppable--active',drop:function(e,t){let dropped=t.draggable;let id=dropped.data('id');let name=dropped.data('name');if(!name)name=id;$(this).find('.or-selector-link-value').val(id);$(this).find('.or-selector-link-name').val(name).attr('placeholder',name)}})};function startDialog(e,t,n,a,i){if(!t)t=$('#editor').attr('data-action');if(!a)a=$('#editor').attr('data-id');let view=new Openrat.View(t,n,a,i);view.before=function(){$('#dialog > .view').html('<div class="header"><img class="icon" title="" src="./themes/default/images/icon/'+n+'.png" />'+e+'</div>');$('#dialog > .view').data('id',a);$('#dialog').removeClass('is-closed').addClass('is-open');let view=this;this.escapeKeyClosingHandler=function(e){if(e.keyCode==27){view.close();$(document).off('keyup')}};$(document).keyup(this.escapeKeyClosingHandler);$('#dialog .filler').click(function(){view.close()})};view.close=function(){if($('div#dialog').hasClass('modal'))return;$('#dialog .view').fadeOut('fast').html('');$('#dialog').removeClass('is-open').addClass('is-closed');$(document).unbind('keyup',this.escapeKeyClosingHandler)};view.start($('div#dialog > .view'))};function setTitle(e){if(e)$('head > title').text(e+' - '+$('head > title').data('default'));else $('head > title').text($('head > title').data('default'))};function openNewAction(e,t,n){$('nav').removeClass('open');setTitle(e);Openrat.Navigator.navigateToNew({'action':t,'id':n})};function insert(e,t,a){var n=document.forms[0].elements[e];n.focus();if(typeof document.selection!='undefined'){var l=document.selection.createRange(),i=l.text;l.text=t+i+a;l=document.selection.createRange();if(i.length==0){l.move('character',-a.length)} else{l.moveStart('character',t.length+i.length+a.length)};l.select()} diff --git a/modules/cms-ui/themes/default/script/openrat/form.js b/modules/cms-ui/themes/default/script/openrat/form.js @@ -6,6 +6,13 @@ */ Openrat.Form = function() { + const modes = { + showBrowserNotice : 1, + keepOpen : 2, + closeAfterSubmit : 4, + closeAfterSuccess : 8, + }; + this.setLoadStatus = function( isLoading ) { $(this.element).closest('div.content').toggleClass('loader',isLoading); } @@ -20,10 +27,10 @@ Openrat.Form = function() { if ( $(this.element).data('autosave') ) { $(this.element).find('input[type="checkbox"]').click( function() { - form.submit(); + form.submit(modes.keepOpen); }); $(this.element).find('select').change( function() { - form.submit(); + form.submit(modes.keepOpen); }); } @@ -43,6 +50,9 @@ Openrat.Form = function() { form.rollback(); }); + $(element).find('.or-form-btn--apply').click( function() { + form.submit(modes.keepOpen); + }); // Submithandler for the whole form. $(element).submit( function( event ) { @@ -77,10 +87,16 @@ Openrat.Form = function() { view.start( $(this.element).closest('.view') ); } - this.submit = function() { + this.submit = function( mode ) { + if ( mode === undefined ) + if ( $(this.element).data('async') ) + mode = modes.closeAfterSubmit; + else + mode = modes.closeAfterSuccess; - // Show progress + + // Show progress let status = $('<div class="notice info"><div class="text loader"></div></div>'); $('#noticebar').prepend(status); // Notice anhängen. $(status).show(); @@ -89,8 +105,8 @@ Openrat.Form = function() { // Falls wieder ein Fehler auftritt, werden diese erneut gesetzt. $(this.element).find('.error').removeClass('error'); - var params = $(this.element).serializeArray(); - var data = {}; + let params = $(this.element).serializeArray(); + let data = {}; $(params).each(function(index, obj){ data[obj.name] = obj.value; }); @@ -121,13 +137,9 @@ Openrat.Form = function() { //params['output'] = 'json';// Irgendwie geht das nicht. data.output = 'json'; - if ( $(this.element).data('async') ) - { - // Verarbeitung erfolgt asynchron, das heißt, dass der evtl. geöffnete Dialog - // beendet wird. + if ( mode == modes.closeAfterSubmit ) this.close(); // Async: Window is closed, but the action will be startet now. - } let form = this; $.ajax( { 'type':'POST',url:url, data:data, success:function(data, textStatus, jqXHR) @@ -135,7 +147,34 @@ Openrat.Form = function() { form.setLoadStatus(false); $(status).remove(); - form.doResponse(data,textStatus,form.element); + form.doResponse(data,textStatus,form.element, function() { + + // The data was successful saved. + // Now we can close the form. + if ( mode == modes.closeAfterSuccess ) + { + form.close(); + + // clear the dirty flag. + $(form.element).closest('div.panel').find('div.header ul.views li.action.active').removeClass('dirty'); + } + + let afterSuccess = $(form.element).data('afterSuccess'); + let async = $(form.element).data('async' ); + if ( afterSuccess ) + { + if ( afterSuccess == 'reloadAll' ) + { + Openrat.Workbench.reloadAll(); + } + } else { + if ( async ) + ; // do not reload + else + Openrat.Workbench.reloadViews(); + } + + }); }, error:function(jqXHR, textStatus, errorThrown) { form.setLoadStatus(false); @@ -170,7 +209,7 @@ Openrat.Form = function() { * @param status Status * @param element */ - this.doResponse = function(data,status,element) + this.doResponse = function(data,status,element, onSuccess = $.noop ) { if ( status != 'success' ) { @@ -191,35 +230,8 @@ Openrat.Form = function() { if ( value.status == 'ok' ) // Kein Fehler? { - // Kein Fehler - // Nur bei synchronen Prozessen soll nach Verarbeitung der Dialog - // geschlossen werden. - if ( ! $(element).data('async') ) - { - // Verarbeitung erfolgt synchron, das heißt, dass jetzt der evtl. geöffnete Dialog - // beendet wird. - form.close(); - - // Da gespeichert wurde, jetzt das 'dirty'-flag zurücksetzen. - $(element).closest('div.panel').find('div.header ul.views li.action.active').removeClass('dirty'); - } - - let afterSuccess = $(element).data('afterSuccess'); - let async = $(element).data('async' ); - if ( afterSuccess ) - { - if ( afterSuccess == 'reloadAll' ) - { - Openrat.Workbench.reloadAll(); - } - } else { - if ( async ) - ; // do not reload - else - Openrat.Workbench.reloadViews(); - } - - $(document).trigger('orDataChanged'); + onSuccess(); + Openrat.Workbench.dataChangedHandler.fire(); } else // Server liefert Fehler zurück. diff --git a/modules/cms-ui/themes/default/script/openrat/form.min.js b/modules/cms-ui/themes/default/script/openrat/form.min.js @@ -1,4 +1,4 @@ -;Openrat.Form=function(){this.setLoadStatus=function(e){$(this.element).closest('div.content').toggleClass('loader',e)};this.initOnElement=function(e){this.element=e;let form=this;if($(this.element).data('autosave')){$(this.element).find('input[type="checkbox"]').click(function(){form.submit()});$(this.element).find('select').change(function(){form.submit()})};$(e).find('.or-form-btn--cancel').click(function(){form.cancel()});$(e).find('.or-form-btn--reset').click(function(){form.rollback()});$(e).submit(function(e){if($(this).data('target')=='view'){form.submit();e.preventDefault()}})};this.cancel=function(){this.close()};this.rollback=function(){this.element.trigger('reset')};this.close=function(){};this.forwardTo=function(e,t,r,s){let view=new Openrat.View(e,t,r,s);view.start($(this.element).closest('.view'))};this.submit=function(){let status=$('<div class="notice info"><div class="text loader"></div></div>');$('#noticebar').prepend(status);$(status).show();$(this.element).find('.error').removeClass('error');var t=$(this.element).serializeArray(),e={};$(t).each(function(t,r){e[r.name]=r.value});if(!e.id)e.id=Openrat.Workbench.state.id;if(!e.action)e.action=Openrat.Workbench.state.action;let formMethod=$(this.element).attr('method').toUpperCase();if(formMethod=='GET'){this.forwardTo(e.action,e.subaction,e.id,e);$(status).remove()} -else{let url='./api/';this.setLoadStatus(!0);url+='';e.output='json';if($(this.element).data('async')){this.close()};let form=this;$.ajax({'type':'POST',url:url,data:e,success:function(e,t,r){form.setLoadStatus(!1);$(status).remove();form.doResponse(e,t,form.element)},error:function(e,t,r){form.setLoadStatus(!1);$(status).remove();try{let error=jQuery.parseJSON(e.responseText);Openrat.Workbench.notify('','','error',error.error,[error.description])}catch(s){let msg=e.responseText;Openrat.Workbench.notify('','','error','Server Error',[msg])}}});$(form.element).fadeIn()}};this.doResponse=function(e,t,r){if(t!='success'){alert('Server error: '+t);return};let form=this;$.each(e['notices'],function(t,e){let notifyBrowser=$(r).data('async');Openrat.Workbench.notify(e.type,e.name,e.status,e.text,e.log,notifyBrowser);if(e.status=='ok'){if(!$(r).data('async')){form.close();$(r).closest('div.panel').find('div.header ul.views li.action.active').removeClass('dirty')};let afterSuccess=$(r).data('afterSuccess');let async=$(r).data('async');if(afterSuccess){if(afterSuccess=='reloadAll'){Openrat.Workbench.reloadAll()}} -else{if(async);else Openrat.Workbench.reloadViews()};$(document).trigger('orDataChanged')} +;Openrat.Form=function(){const modes={showBrowserNotice:1,keepOpen:2,closeAfterSubmit:4,closeAfterSuccess:8,};this.setLoadStatus=function(e){$(this.element).closest('div.content').toggleClass('loader',e)};this.initOnElement=function(e){this.element=e;let form=this;if($(this.element).data('autosave')){$(this.element).find('input[type="checkbox"]').click(function(){form.submit(modes.keepOpen)});$(this.element).find('select').change(function(){form.submit(modes.keepOpen)})};$(e).find('.or-form-btn--cancel').click(function(){form.cancel()});$(e).find('.or-form-btn--reset').click(function(){form.rollback()});$(e).find('.or-form-btn--apply').click(function(){form.submit(modes.keepOpen)});$(e).submit(function(e){if($(this).data('target')=='view'){form.submit();e.preventDefault()}})};this.cancel=function(){this.close()};this.rollback=function(){this.element.trigger('reset')};this.close=function(){};this.forwardTo=function(e,t,s,o){let view=new Openrat.View(e,t,s,o);view.start($(this.element).closest('.view'))};this.submit=function(e){if(e===undefined)if($(this.element).data('async'))e=modes.closeAfterSubmit;else e=modes.closeAfterSuccess;let status=$('<div class="notice info"><div class="text loader"></div></div>');$('#noticebar').prepend(status);$(status).show();$(this.element).find('.error').removeClass('error');let params=$(this.element).serializeArray();let data={};$(params).each(function(e,t){data[t.name]=t.value});if(!data.id)data.id=Openrat.Workbench.state.id;if(!data.action)data.action=Openrat.Workbench.state.action;let formMethod=$(this.element).attr('method').toUpperCase();if(formMethod=='GET'){this.forwardTo(data.action,data.subaction,data.id,data);$(status).remove()} +else{let url='./api/';this.setLoadStatus(!0);url+='';data.output='json';if(e==modes.closeAfterSubmit)this.close();let form=this;$.ajax({'type':'POST',url:url,data:data,success:function(t,s,o){form.setLoadStatus(!1);$(status).remove();form.doResponse(t,s,form.element,function(){if(e==modes.closeAfterSuccess){form.close();$(form.element).closest('div.panel').find('div.header ul.views li.action.active').removeClass('dirty')};let afterSuccess=$(form.element).data('afterSuccess');let async=$(form.element).data('async');if(afterSuccess){if(afterSuccess=='reloadAll'){Openrat.Workbench.reloadAll()}} +else{if(async);else Openrat.Workbench.reloadViews()}})},error:function(e,t,s){form.setLoadStatus(!1);$(status).remove();try{let error=jQuery.parseJSON(e.responseText);Openrat.Workbench.notify('','','error',error.error,[error.description])}catch(o){let msg=e.responseText;Openrat.Workbench.notify('','','error','Server Error',[msg])}}});$(form.element).fadeIn()}};this.doResponse=function(e,t,s,onSuccess=$.noop){if(t!='success'){alert('Server error: '+t);return};let form=this;$.each(e['notices'],function(t,e){let notifyBrowser=$(s).data('async');Openrat.Workbench.notify(e.type,e.name,e.status,e.text,e.log,notifyBrowser);if(e.status=='ok'){onSuccess();Openrat.Workbench.dataChangedHandler.fire()} else{}});$.each(e['errors'],function(e,t){$('input[name='+t+']').addClass('error').parent().addClass('error').parents('fieldset').addClass('show').addClass('open')});if(e.control.redirect)window.location.href=e.control.redirect}}; \ No newline at end of file diff --git a/modules/cms-ui/themes/default/script/openrat/workbench.js b/modules/cms-ui/themes/default/script/openrat/workbench.js @@ -315,6 +315,13 @@ Openrat.Workbench = new function() + this.dataChangedHandler = $.Callbacks(); + + this.dataChangedHandler.add( function() { + if ( popupWindow !== undefined ) + popupWindow.location.reload(); + } ); + this.afterViewLoadedHandler = $.Callbacks(); let afterViewFunctions = []; diff --git a/modules/cms-ui/themes/default/script/openrat/workbench.min.js b/modules/cms-ui/themes/default/script/openrat/workbench.min.js @@ -1,3 +1,3 @@ ;Openrat.Workbench=new function(){'use strict';this.state={};this.initialize=function(){this.initializePingTimer();this.initializeState();this.openModalDialog()};this.openModalDialog=function(){if($('#dialog').data('action')){startDialog('',$('#dialog').data('action'),$('#dialog').data('action'),0,{})}};this.initializeState=function(){let parts=window.location.hash.split('/');let state={action:'index',id:0};if(parts.length>=2)state.action=parts[1].toLowerCase();if(parts.length>=3)state.id=parts[2].replace(/[^0-9_]/gim,'');Openrat.Workbench.state=state;$('#editor').attr('data-action',state.action);$('#editor').attr('data-id',state.id);$('#editor').attr('data-extra','{}');Openrat.Navigator.toActualHistory(state)};this.initializePingTimer=function(){var t=function(){$.ajax(Openrat.View.createUrl('title','ping',0))},i=5;window.setInterval(t,i*60*1000)};this.loadNewActionState=function(t){Openrat.Workbench.state=t;Openrat.Workbench.loadNewAction(t.action,t.id,t.data);this.afterNewActionHandler.fire()};this.afterNewActionHandler=$.Callbacks();this.loadNewAction=function(t,i,e){$('#editor').attr('data-action',t);$('#editor').attr('data-id',i);$('#editor').attr('data-extra',JSON.stringify(e));this.reloadViews()};this.reloadViews=function(){$('#workbench section.closed .view-loader').empty();Openrat.Workbench.loadViews($('#workbench section.open .view-loader'))};this.reloadAll=function(){$('#workbench .view').empty();Openrat.Workbench.loadViews($('#workbench .view.view-loader, #workbench .view.view-static'));this.loadUserStyle()};this.loadUserStyle=function(){let url=Openrat.View.createUrl('index','userinfo',0);$.getJSON(url,function(t){let style=t['style'];Openrat.Workbench.setUserStyle(style);let color=t['theme-color'];Openrat.Workbench.setThemeColor(color)})};this.loadViews=function(t){t.each(function(t){let $targetDOMElement=$(this);Openrat.Workbench.loadNewActionIntoElement($targetDOMElement)})};this.loadNewActionIntoElement=function(t){let action;if(t.is('.view-static'))action=t.attr('data-action');else action=$('#editor').attr('data-action');let id=$('#editor').attr('data-id');let params=$('#editor').attr('data-extra');let method=t.data('method');let view=new Openrat.View(action,method,id,params);view.start(t)};this.setUserStyle=function(t){var i=$('html'),e=i.attr('class').split(/\s+/);$.each(e,function(t,e){if(e.startsWith('theme-')){i.removeClass(e)}});i.addClass('theme-'+t.toLowerCase())};this.setThemeColor=function(t){$('#theme-color').attr('content',t)};let notifyBrowser=function(t){if(!('Notification' in window)){return} else if(Notification.permission==='granted'){let notification=new Notification(t)} -else if(Notification.permission!=='denied'){Notification.requestPermission(function(i){if(i==='granted'){let notification=new Notification(t)}})}};this.notify=function(t,e,i,o,log=[],notifyTheBrowser=!1){if(notifyTheBrowser)notifyBrowser(o);let notice=$('<div class="notice '+i+'"></div>');let toolbar=$('<div class="or-notice-toolbar"></div>');if(log.length)$(toolbar).append('<i class="or-action-full image-icon image-icon--menu-fullscreen"></i>');$(toolbar).append('<i class="or-action-close image-icon image-icon--menu-close"></i>');$(notice).append(toolbar);let id=0;if(e)$(notice).append('<div class="name clickable"><a href="" data-type="open" data-action="'+t+'" data-id="'+id+'"><i class="or-action-full image-icon image-icon--action-'+t+'"></i> '+e+'</a></div>');$(notice).append('<div class="text">'+htmlEntities(o)+'</div>');if(log.length){let logLi=log.reduce((result,item)=>{result+='<li><pre>'+htmlEntities(item)+'</pre></li>';return result},'');$(notice).append('<div class="log"><ul>'+logLi+'</ul></div>')};$('#noticebar').prepend(notice);$(notice).orLinkify();$(notice).find('.or-action-full').click(function(){$(notice).toggleClass('full')});$(notice).find('.or-action-close').click(function(){$(notice).fadeOut('fast',function(){$(notice).remove()})});let timeout=1;if(i=='ok')timeout=20;if(i=='info')timeout=60;if(i=='warning')timeout=120;if(i=='error')timeout=120;if(timeout>0)setTimeout(function(){$(notice).fadeOut('slow',function(){$(this).remove()})},timeout*1000)};this.afterViewLoadedHandler=$.Callbacks();let afterViewFunctions=[];this.registerAfterViewLoaded=function(t){afterViewFunctions.push(t)};this.afterViewLoaded=function(t){afterViewFunctions.forEach(function(i){i(t)})}};- \ No newline at end of file +else if(Notification.permission!=='denied'){Notification.requestPermission(function(i){if(i==='granted'){let notification=new Notification(t)}})}};this.notify=function(t,e,i,o,log=[],notifyTheBrowser=!1){if(notifyTheBrowser)notifyBrowser(o);let notice=$('<div class="notice '+i+'"></div>');let toolbar=$('<div class="or-notice-toolbar"></div>');if(log.length)$(toolbar).append('<i class="or-action-full image-icon image-icon--menu-fullscreen"></i>');$(toolbar).append('<i class="or-action-close image-icon image-icon--menu-close"></i>');$(notice).append(toolbar);let id=0;if(e)$(notice).append('<div class="name clickable"><a href="" data-type="open" data-action="'+t+'" data-id="'+id+'"><i class="or-action-full image-icon image-icon--action-'+t+'"></i> '+e+'</a></div>');$(notice).append('<div class="text">'+htmlEntities(o)+'</div>');if(log.length){let logLi=log.reduce((result,item)=>{result+='<li><pre>'+htmlEntities(item)+'</pre></li>';return result},'');$(notice).append('<div class="log"><ul>'+logLi+'</ul></div>')};$('#noticebar').prepend(notice);$(notice).orLinkify();$(notice).find('.or-action-full').click(function(){$(notice).toggleClass('full')});$(notice).find('.or-action-close').click(function(){$(notice).fadeOut('fast',function(){$(notice).remove()})});let timeout=1;if(i=='ok')timeout=20;if(i=='info')timeout=60;if(i=='warning')timeout=120;if(i=='error')timeout=120;if(timeout>0)setTimeout(function(){$(notice).fadeOut('slow',function(){$(this).remove()})},timeout*1000)};this.dataChangedHandler=$.Callbacks();this.dataChangedHandler.add(function(){if(popupWindow!==undefined)popupWindow.location.reload()});this.afterViewLoadedHandler=$.Callbacks();let afterViewFunctions=[];this.registerAfterViewLoaded=function(t){afterViewFunctions.push(t)};this.afterViewLoaded=function(t){afterViewFunctions.forEach(function(i){i(t)})}};+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/script/plugin/jquery-plugin-orLinkify.js b/modules/cms-ui/themes/default/script/plugin/jquery-plugin-orLinkify.js @@ -80,8 +80,4 @@ jQuery.fn.orLinkify = function() }; -$(document).on('orDataChanged',function(event, data) { - if ( typeof popupWindow != "undefined" ) - popupWindow.location.reload(); -} ); diff --git a/modules/cms-ui/themes/default/script/plugin/jquery-plugin-orLinkify.min.js b/modules/cms-ui/themes/default/script/plugin/jquery-plugin-orLinkify.min.js @@ -1 +1 @@ -;var popupWindow;jQuery.fn.orLinkify=function(){$(this).find('a').click(function(t){t.preventDefault()});return $(this).click(function(){$(this).find('a').first().each(function(){let type=$(this).attr('data-type');if($(this).parent().hasClass('inactive'))return;switch(type){case'post':$form=$('<form />').attr('method','POST').addClass('invisible');$form.data('afterSuccess',$(this).data('afterSuccess'));let params=jQuery.parseJSON($(this).attr('data-data'));params.output='json';$.each(params,function(t,a){let $input=$('<input />').attr('type','hidden').attr('name',t).attr('value',a);$form.append($input)});let form=new Openrat.Form();form.initOnElement($form);form.submit();break;case'edit':case'dialog':startDialog($(this).attr('data-name'),$(this).attr('data-action'),$(this).attr('data-method'),$(this).attr('data-id'),$(this).attr('data-extra'));break;case'external':window.open($(this).attr('data-url'),' _blank');break;case'popup':popupWindow=window.open($(this).attr('data-url'),'Popup','location=no,menubar=no,scrollbars=yes,toolbar=no,resizable=yes');break;case'help':help(this,$(this).attr('data-url'),$(this).attr('data-suffix'));break;case'fullscreen':fullscreen(this);break;case'open':openNewAction($(this).attr('data-name'),$(this).attr('data-action'),$(this).attr('data-id'));break;default:throw'UI error: Unknown link type: '+type+' in link '+$(this).html()}})})};$(document).on('orDataChanged',function(t,a){if(typeof popupWindow!='undefined')popupWindow.location.reload()});- \ No newline at end of file +;var popupWindow;jQuery.fn.orLinkify=function(){$(this).find('a').click(function(t){t.preventDefault()});return $(this).click(function(){$(this).find('a').first().each(function(){let type=$(this).attr('data-type');if($(this).parent().hasClass('inactive'))return;switch(type){case'post':$form=$('<form />').attr('method','POST').addClass('invisible');$form.data('afterSuccess',$(this).data('afterSuccess'));let params=jQuery.parseJSON($(this).attr('data-data'));params.output='json';$.each(params,function(t,a){let $input=$('<input />').attr('type','hidden').attr('name',t).attr('value',a);$form.append($input)});let form=new Openrat.Form();form.initOnElement($form);form.submit();break;case'edit':case'dialog':startDialog($(this).attr('data-name'),$(this).attr('data-action'),$(this).attr('data-method'),$(this).attr('data-id'),$(this).attr('data-extra'));break;case'external':window.open($(this).attr('data-url'),' _blank');break;case'popup':popupWindow=window.open($(this).attr('data-url'),'Popup','location=no,menubar=no,scrollbars=yes,toolbar=no,resizable=yes');break;case'help':help(this,$(this).attr('data-url'),$(this).attr('data-suffix'));break;case'fullscreen':fullscreen(this);break;case'open':openNewAction($(this).attr('data-name'),$(this).attr('data-action'),$(this).attr('data-id'));break;default:throw'UI error: Unknown link type: '+type+' in link '+$(this).html()}})})};+ \ No newline at end of file diff --git a/modules/language/lang-cn.php b/modules/language/lang-cn.php @@ -1294,4 +1294,7 @@ function language() { return array( 'LINKS_RELATIVE'=>"Relative links", 'LINKS_ABSOLUTE'=>"Absolute links", 'PREVIEW'=>"Preview", +'ALIAS'=>"Alias", +'TEXT'=>"Text", +'APPLY'=>"Apply", );} \ No newline at end of file diff --git a/modules/language/lang-de.php b/modules/language/lang-de.php @@ -1294,4 +1294,7 @@ function language() { return array( 'LINKS_RELATIVE'=>"Relative Links", 'LINKS_ABSOLUTE'=>"Absolute Links", 'PREVIEW'=>"Vorschau", +'ALIAS'=>"Alias", +'TEXT'=>"Text", +'APPLY'=>"Übernehmen", );} \ No newline at end of file diff --git a/modules/language/lang-en.php b/modules/language/lang-en.php @@ -1294,4 +1294,7 @@ function language() { return array( 'LINKS_RELATIVE'=>"Relative links", 'LINKS_ABSOLUTE'=>"Absolute links", 'PREVIEW'=>"Preview", +'ALIAS'=>"Alias", +'TEXT'=>"Text", +'APPLY'=>"Apply", );} \ No newline at end of file diff --git a/modules/language/lang-es.php b/modules/language/lang-es.php @@ -1318,4 +1318,7 @@ MENU_INDEX_ADMINISTRATION_DESC =", 'LINKS_RELATIVE'=>"Relative links", 'LINKS_ABSOLUTE'=>"Absolute links", 'PREVIEW'=>"Preview", +'ALIAS'=>"Alias", +'TEXT'=>"Text", +'APPLY'=>"Apply", );} \ No newline at end of file diff --git a/modules/language/lang-fr.php b/modules/language/lang-fr.php @@ -1294,4 +1294,7 @@ function language() { return array( 'LINKS_RELATIVE'=>"Relative links", 'LINKS_ABSOLUTE'=>"Absolute links", 'PREVIEW'=>"Prévision", +'ALIAS'=>"Alias", +'TEXT'=>"Text", +'APPLY'=>"Apply", );} \ No newline at end of file diff --git a/modules/language/lang-it.php b/modules/language/lang-it.php @@ -1294,4 +1294,7 @@ function language() { return array( 'LINKS_RELATIVE'=>"Relative links", 'LINKS_ABSOLUTE'=>"Absolute links", 'PREVIEW'=>"Preview", +'ALIAS'=>"Alias", +'TEXT'=>"Text", +'APPLY'=>"Apply", );} \ No newline at end of file diff --git a/modules/language/lang-ru.php b/modules/language/lang-ru.php @@ -1294,4 +1294,7 @@ function language() { return array( 'LINKS_RELATIVE'=>"Relative links", 'LINKS_ABSOLUTE'=>"Absolute links", 'PREVIEW'=>"элементов предварительного просмотра", +'ALIAS'=>"Alias", +'TEXT'=>"Text", +'APPLY'=>"Apply", );} \ No newline at end of file diff --git a/modules/language/language.yml b/modules/language/language.yml @@ -6167,3 +6167,12 @@ PREVIEW: en: Preview fr: Prévision ru: элементов предварительного просмотра +ALIAS: + de: Alias + en: Alias +TEXT: + de: Text + en: Text +APPLY: + en: Apply + de: Übernehmen+ \ No newline at end of file diff --git a/modules/template-engine/components/html/form/Form.class.php b/modules/template-engine/components/html/form/Form.class.php @@ -20,6 +20,7 @@ class FormComponent extends Component public $label; + public $apply = false; public $cancel = true; public $readonly = false; @@ -100,8 +101,13 @@ class FormComponent extends Component echo '<input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" />'; } + if ($this->apply && !$this->readonly) + { + echo '<input type="button" class="or-form-btn or-form-btn--primary or-form-btn--apply" value="<?php echo lang("APPLY") ?>" />'; + } + if ( !$this->readonly ) - echo "<input type=\"submit\" class=\"or-form-btn or-form-btn--primary\" value=\"{$label}\" />"; + echo "<input type=\"submit\" class=\"or-form-btn or-form-btn--primary or-form-btn--save\" value=\"{$label}\" />"; //echo '</div>'; echo '</div>'; diff --git a/modules/template-engine/components/template.xsd b/modules/template-engine/components/template.xsd @@ -1821,6 +1821,7 @@ <xsd:attribute name="languageid" type="xsd:string"/> <xsd:attribute name="modelid" type="xsd:string"/> <xsd:attribute name="label" type="xsd:string"/> + <xsd:attribute name="apply" type="xsd:boolean"/> <xsd:attribute name="cancel" type="xsd:boolean"/> <xsd:attribute name="readonly" type="xsd:boolean"/> <xsd:attribute name="target" type="xsd:string"/>