openrat-cms

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

commit 0cd0993dc1eed068d7eb54d591a6b204dbfcf4ba
parent 6216a111a5245322a7889bcee87741f6d86423d3
Author: Jan Dankert <develop@jandankert.de>
Date:   Mon,  5 Oct 2020 23:32:06 +0200

UI: Nicer buttons

Diffstat:
Mmodules/cms/base/Startup.class.php | 4++--
Mmodules/cms/ui/themes/default/html/views/element/advanced.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/element/name.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/element/prop.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/element/properties.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/element/remove.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/file/advanced.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/file/compress.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/file/edit.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/file/extract.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/file/info.php | 7++++++-
Mmodules/cms/ui/themes/default/html/views/file/pub.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/file/remove.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/file/uncompress.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/file/value.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/folder/advanced.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/folder/createfile.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/folder/createfolder.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/folder/createimage.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/folder/createlink.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/folder/createpage.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/folder/createtext.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/folder/createurl.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/folder/edit.php | 2+-
Mmodules/cms/ui/themes/default/html/views/folder/edit.tpl.src.xml | 2+-
Mmodules/cms/ui/themes/default/html/views/folder/inherit.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/folder/order.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/folder/pub.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/folder/remove.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/folder/show.php | 2+-
Mmodules/cms/ui/themes/default/html/views/folder/show.tpl.src.xml | 2+-
Mmodules/cms/ui/themes/default/html/views/group/add.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/group/info.php | 4++--
Mmodules/cms/ui/themes/default/html/views/group/info.tpl.src.xml | 4++--
Mmodules/cms/ui/themes/default/html/views/group/memberships.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/group/prop.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/group/remove.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/grouplist/add.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/image/compress.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/image/edit.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/image/extract.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/image/pub.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/image/size.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/image/uncompress.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/image/value.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/language/add.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/language/info.php | 2+-
Mmodules/cms/ui/themes/default/html/views/language/info.tpl.src.xml | 2+-
Mmodules/cms/ui/themes/default/html/views/language/prop.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/language/remove.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/languagelist/add.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/link/edit.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/link/remove.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/login/login.php | 7++++++-
Mmodules/cms/ui/themes/default/html/views/login/openid.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/login/password.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/login/passwordcode.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/login/register.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/login/registercode.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/model/info.php | 2+-
Mmodules/cms/ui/themes/default/html/views/model/info.tpl.src.xml | 2+-
Mmodules/cms/ui/themes/default/html/views/model/prop.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/model/remove.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/modellist/add.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/object/aclform.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/object/copy.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/object/info.php | 7++++++-
Mmodules/cms/ui/themes/default/html/views/object/inherit.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/object/name.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/object/prop.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/object/settings.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/page/changetemplate.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/page/changetemplateselectelements.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/page/form.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/page/info.php | 4++--
Mmodules/cms/ui/themes/default/html/views/page/info.tpl.src.xml | 4++--
Mmodules/cms/ui/themes/default/html/views/page/name.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/page/preview.php | 7++++++-
Mmodules/cms/ui/themes/default/html/views/page/pub.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/page/remove.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/page/src.php | 7++++++-
Mmodules/cms/ui/themes/default/html/views/pageelement/export.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/pageelement/history.php | 7++++++-
Mmodules/cms/ui/themes/default/html/views/pageelement/import.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/pageelement/link.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/pageelement/prop.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/pageelement/pub.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/pageelement/value.php | 21++++++++++++++++++---
Mmodules/cms/ui/themes/default/html/views/profile/confirmmail.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/profile/edit.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/profile/mail.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/profile/pw.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/project/add.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/project/export.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/project/info.php | 7++++++-
Mmodules/cms/ui/themes/default/html/views/project/maintenance.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/project/prop.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/project/remove.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/projectlist/add.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/search/edit.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/start/projectmenu.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/template/addel.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/template/extension.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/template/preview.php | 7++++++-
Mmodules/cms/ui/themes/default/html/views/template/prop.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/template/pub.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/template/remove.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/template/src.php | 21++++++++++++++++++---
Mmodules/cms/ui/themes/default/html/views/template/srcelement.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/templatelist/add.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/text/compress.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/text/edit.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/text/extract.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/text/pub.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/text/size.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/text/uncompress.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/text/value.php | 21++++++++++++++++++---
Mmodules/cms/ui/themes/default/html/views/tree/show.php | 4++--
Mmodules/cms/ui/themes/default/html/views/tree/show.tpl.src.xml | 4++--
Mmodules/cms/ui/themes/default/html/views/url/edit.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/url/remove.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/user/add.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/user/info.php | 4++--
Mmodules/cms/ui/themes/default/html/views/user/info.tpl.src.xml | 4++--
Mmodules/cms/ui/themes/default/html/views/user/memberships.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/user/prop.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/user/pw.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/user/remove.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/html/views/userlist/add.php | 14++++++++++++--
Mmodules/cms/ui/themes/default/script/openrat.js | 9++++++---
Mmodules/cms/ui/themes/default/script/openrat.min.js | 2+-
Mmodules/cms/ui/themes/default/script/openrat/form.js | 9++++++---
Mmodules/cms/ui/themes/default/style/openrat-form.less | 63+++++++++++++++++++++++++++++++++++----------------------------
Mmodules/cms/ui/themes/default/style/openrat-ui.less | 12+-----------
Mmodules/cms/ui/themes/default/style/openrat.css | 60+++++++++++++++++++++++++++++-------------------------------
Mmodules/cms/ui/themes/default/style/openrat.min.css | 4++--
Mmodules/cms/ui/themes/default/style/theme/openrat-theme.less | 6+++++-
Mmodules/template_engine/components/html/form/Form.class.php | 51++++++++++++++++++++++++++++++---------------------
Mmodules/template_engine/element/Element.class.php | 6++++++
Mmodules/template_engine/element/Value.class.php | 6++++++
140 files changed, 1467 insertions(+), 346 deletions(-)

diff --git a/modules/cms/base/Startup.class.php b/modules/cms/base/Startup.class.php @@ -132,7 +132,7 @@ class Startup { // MAGIC_QUOTES // This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0. // always returns FALSE as of PHP 5.4.0. - if (get_magic_quotes_gpc() == 1) + if (@get_magic_quotes_gpc() == 1) // function is deprecated since PHP 7.4 Logger::warn("MAGIC_QUOTES is active. For security reasons: DO NOT USE THIS!"); } @@ -146,7 +146,7 @@ class Startup { public static function readonly() { // Gesamtes CMS ist readonly. - if (\cms\base\Configuration::config('security', 'readonly')) + if (Configuration::config('security', 'readonly')) return true; // Aktuelle Datenbankverbindung ist readonly. diff --git a/modules/cms/ui/themes/default/html/views/element/advanced.php b/modules/cms/ui/themes/default/html/views/element/advanced.php @@ -329,7 +329,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -33,7 +33,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -59,7 +59,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -303,7 +303,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -66,7 +66,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -24,7 +24,17 @@ </label> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -49,7 +49,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -26,7 +26,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -14,7 +14,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/info.php b/modules/cms/ui/themes/default/html/views/file/info.php @@ -231,6 +231,11 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> </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 @@ -25,7 +25,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('publish').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('publish').'') ?> + </span> + </div> </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 @@ -20,7 +20,17 @@ </label> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -39,7 +39,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -24,7 +24,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -128,7 +128,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -76,7 +76,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -29,7 +29,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('add').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('add').'') ?> + </span> + </div> </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 @@ -76,7 +76,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -34,7 +34,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -42,7 +42,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -75,7 +75,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -43,7 +43,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/edit.php b/modules/cms/ui/themes/default/html/views/folder/edit.php @@ -67,7 +67,7 @@ </div> </div> <div class="<?php echo O::escapeHtml('clickable') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('folder') ?>" data-method="<?php echo O::escapeHtml('create') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('folder') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('create') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':\'folder\',\'dialogMethod\':\'create\'}') ?>" href="<?php echo O::escapeHtml('/#/folder/') ?>" class="<?php echo O::escapeHtml('or-link-btn') ?>"><?php echo O::escapeHtml('') ?> + <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('folder') ?>" data-method="<?php echo O::escapeHtml('create') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('folder') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('create') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':\'folder\',\'dialogMethod\':\'create\'}') ?>" href="<?php echo O::escapeHtml('/#/folder/') ?>" class="<?php echo O::escapeHtml('or-btn') ?>"><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('image-icon image-icon--action-new') ?>"><?php echo O::escapeHtml('') ?> </i> <span><?php echo O::escapeHtml(''.@O::lang('new').'') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/edit.tpl.src.xml @@ -52,7 +52,7 @@ <part class="clickable"> - <link type="dialog" action="folder" subaction="create" class="or-link-btn"> + <link type="dialog" action="folder" subaction="create" class="or-btn"> <image action="new" /> <text value="${message:new}"></text> </link> diff --git a/modules/cms/ui/themes/default/html/views/folder/inherit.php b/modules/cms/ui/themes/default/html/views/folder/inherit.php @@ -35,7 +35,17 @@ <?php } ?> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -67,7 +67,17 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('order') ?>" value="<?php echo O::escapeHtml(''.@$order.'') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -86,7 +86,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('publish').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('publish').'') ?> + </span> + </div> </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 @@ -25,7 +25,17 @@ </label> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/show.php b/modules/cms/ui/themes/default/html/views/folder/show.php @@ -62,7 +62,7 @@ </div> </div> <div class="<?php echo O::escapeHtml('clickable') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('view') ?>" data-action="<?php echo O::escapeHtml('folder') ?>" data-method="<?php echo O::escapeHtml('create') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('/#/folder/') ?>" class="<?php echo O::escapeHtml('or-link-btn') ?>"><?php echo O::escapeHtml('') ?> + <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('view') ?>" data-action="<?php echo O::escapeHtml('folder') ?>" data-method="<?php echo O::escapeHtml('create') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('/#/folder/') ?>" class="<?php echo O::escapeHtml('or-btn') ?>"><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('image-icon image-icon--action-new') ?>"><?php echo O::escapeHtml('') ?> </i> <span><?php echo O::escapeHtml(''.@O::lang('new').'') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/show.tpl.src.xml @@ -48,7 +48,7 @@ <part class="clickable"> - <link type="view" action="folder" subaction="create" class="or-link-btn"> + <link type="view" action="folder" subaction="create" class="or-btn"> <image action="new" /> <text value="${message:new}"></text> </link> diff --git a/modules/cms/ui/themes/default/html/views/group/add.php b/modules/cms/ui/themes/default/html/views/group/add.php @@ -18,7 +18,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/group/info.php b/modules/cms/ui/themes/default/html/views/group/info.php @@ -17,7 +17,7 @@ <div class="<?php echo O::escapeHtml('input clickable') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@$name.'') ?> </span> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('edit') ?>" data-action="<?php echo O::escapeHtml('group') ?>" data-method="<?php echo O::escapeHtml('prop') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('/#/group/') ?>" class="<?php echo O::escapeHtml('or-link-btn') ?>"><?php echo O::escapeHtml('') ?> + <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('edit') ?>" data-action="<?php echo O::escapeHtml('group') ?>" data-method="<?php echo O::escapeHtml('prop') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('/#/group/') ?>" class="<?php echo O::escapeHtml('or-btn') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('edit').'') ?> </span> </a> @@ -44,7 +44,7 @@ <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('input clickable') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('edit') ?>" data-action="<?php echo O::escapeHtml('group') ?>" data-method="<?php echo O::escapeHtml('memberships') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('/#/group/') ?>" class="<?php echo O::escapeHtml('or-link-btn') ?>"><?php echo O::escapeHtml('') ?> + <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('edit') ?>" data-action="<?php echo O::escapeHtml('group') ?>" data-method="<?php echo O::escapeHtml('memberships') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('/#/group/') ?>" class="<?php echo O::escapeHtml('or-btn') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('edit').'') ?> </span> </a> diff --git a/modules/cms/ui/themes/default/html/views/group/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/group/info.tpl.src.xml @@ -10,7 +10,7 @@ </part> <part class="input clickable"> <text value="${name}"/> - <link class="or-link-btn" action="group" subaction="prop" type="edit"> + <link class="or-btn" action="group" subaction="prop" type="edit"> <text value="${message:edit}"/> </link> </part> @@ -38,7 +38,7 @@ </part> <part class="input clickable"> - <link class="or-link-btn" action="group" subaction="memberships" type="edit"> + <link class="or-btn" action="group" subaction="memberships" type="edit"> <text value="${message:edit}"/> </link> </part> diff --git a/modules/cms/ui/themes/default/html/views/group/memberships.php b/modules/cms/ui/themes/default/html/views/group/memberships.php @@ -46,7 +46,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -20,7 +20,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -39,7 +39,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -18,7 +18,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -49,7 +49,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -25,7 +25,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -14,7 +14,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -25,7 +25,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('publish').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('publish').'') ?> + </span> + </div> </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 @@ -130,7 +130,17 @@ <?php } ?> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -39,7 +39,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -24,7 +24,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -23,7 +23,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/language/info.php b/modules/cms/ui/themes/default/html/views/language/info.php @@ -33,7 +33,7 @@ <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('input clickable') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('edit') ?>" data-action="<?php echo O::escapeHtml('language') ?>" data-method="<?php echo O::escapeHtml('prop') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('/#/language/') ?>" class="<?php echo O::escapeHtml('or-link-btn') ?>"><?php echo O::escapeHtml('') ?> + <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('edit') ?>" data-action="<?php echo O::escapeHtml('language') ?>" data-method="<?php echo O::escapeHtml('prop') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('/#/language/') ?>" class="<?php echo O::escapeHtml('or-btn') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('edit').'') ?> </span> </a> diff --git a/modules/cms/ui/themes/default/html/views/language/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/language/info.tpl.src.xml @@ -27,7 +27,7 @@ <part class="label"> </part> <part class="input clickable"> - <link class="or-link-btn" action="language" subaction="prop" type="edit"> + <link class="or-btn" action="language" subaction="prop" type="edit"> <text value="${message:edit}"/> </link> </part> diff --git a/modules/cms/ui/themes/default/html/views/language/prop.php b/modules/cms/ui/themes/default/html/views/language/prop.php @@ -36,7 +36,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -45,7 +45,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -23,7 +23,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -22,7 +22,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -20,7 +20,17 @@ </label> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -170,6 +170,11 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('languageid') ?>" value="<?php echo O::escapeHtml(''.@$languageid.'') ?>" /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('menu_login').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('menu_login').'') ?> + </span> + </div> </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 @@ -88,7 +88,17 @@ <?php } ?> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -44,8 +44,18 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> <?php } ?> diff --git a/modules/cms/ui/themes/default/html/views/login/passwordcode.php b/modules/cms/ui/themes/default/html/views/login/passwordcode.php @@ -38,7 +38,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -38,8 +38,18 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> <?php } ?> diff --git a/modules/cms/ui/themes/default/html/views/login/registercode.php b/modules/cms/ui/themes/default/html/views/login/registercode.php @@ -61,7 +61,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/model/info.php b/modules/cms/ui/themes/default/html/views/model/info.php @@ -17,7 +17,7 @@ <div class="<?php echo O::escapeHtml('input clickable') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@$name.'') ?> </span> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('edit') ?>" data-action="<?php echo O::escapeHtml('model') ?>" data-method="<?php echo O::escapeHtml('prop') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('/#/model/') ?>" class="<?php echo O::escapeHtml('or-link-btn') ?>"><?php echo O::escapeHtml('') ?> + <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('edit') ?>" data-action="<?php echo O::escapeHtml('model') ?>" data-method="<?php echo O::escapeHtml('prop') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('/#/model/') ?>" class="<?php echo O::escapeHtml('or-btn') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('edit').'') ?> </span> </a> diff --git a/modules/cms/ui/themes/default/html/views/model/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/model/info.tpl.src.xml @@ -10,7 +10,7 @@ </part> <part class="input clickable"> <text value="${name}"/> - <link class="or-link-btn" action="model" subaction="prop" type="edit"> + <link class="or-btn" action="model" subaction="prop" type="edit"> <text value="${message:edit}"/> </link> </part> diff --git a/modules/cms/ui/themes/default/html/views/model/prop.php b/modules/cms/ui/themes/default/html/views/model/prop.php @@ -27,7 +27,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -45,7 +45,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -18,7 +18,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -133,7 +133,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -39,7 +39,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/object/info.php b/modules/cms/ui/themes/default/html/views/object/info.php @@ -321,6 +321,11 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> </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 @@ -35,7 +35,17 @@ <?php } ?> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -32,7 +32,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('save').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('save').'') ?> + </span> + </div> </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 @@ -40,7 +40,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('save').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('save').'') ?> + </span> + </div> </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 @@ -67,7 +67,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -38,7 +38,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('BUTTON_NEXT').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('BUTTON_NEXT').'') ?> + </span> + </div> </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 @@ -26,7 +26,17 @@ <?php } ?> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('MENU_CHANGETEMPLATE').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('MENU_CHANGETEMPLATE').'') ?> + </span> + </div> </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 @@ -108,7 +108,17 @@ </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/page/info.php b/modules/cms/ui/themes/default/html/views/page/info.php @@ -45,7 +45,7 @@ <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('input clickable') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('prop') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('prop') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'prop\'}') ?>" href="<?php echo O::escapeHtml('/#//') ?>" class="<?php echo O::escapeHtml('or-link-btn') ?>"><?php echo O::escapeHtml('') ?> + <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('prop') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('prop') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'prop\'}') ?>" href="<?php echo O::escapeHtml('/#//') ?>" class="<?php echo O::escapeHtml('or-btn') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('edit').'') ?> </span> </a> @@ -82,7 +82,7 @@ </span> </label> <div class="<?php echo O::escapeHtml('clickable') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('edit') ?>" data-action="<?php echo O::escapeHtml('page') ?>" data-method="<?php echo O::escapeHtml('name') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-languageid="<?php echo O::escapeHtml(''.@$languageid.'') ?>" data-extra="<?php echo O::escapeHtml('{\'languageid\':\''.@$languageid.'\'}') ?>" href="<?php echo O::escapeHtml('/#/page/') ?>" class="<?php echo O::escapeHtml('or-link-btn') ?>"><?php echo O::escapeHtml('') ?> + <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('edit') ?>" data-action="<?php echo O::escapeHtml('page') ?>" data-method="<?php echo O::escapeHtml('name') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-languageid="<?php echo O::escapeHtml(''.@$languageid.'') ?>" data-extra="<?php echo O::escapeHtml('{\'languageid\':\''.@$languageid.'\'}') ?>" href="<?php echo O::escapeHtml('/#/page/') ?>" class="<?php echo O::escapeHtml('or-btn') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('edit').'') ?> </span> </a> diff --git a/modules/cms/ui/themes/default/html/views/page/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/page/info.tpl.src.xml @@ -33,7 +33,7 @@ <part class="label"> </part> <part class="input clickable"> - <link subaction="prop" class="or-link-btn" type="dialog"> + <link subaction="prop" class="or-btn" type="dialog"> <text value="${message:edit}" /> </link> </part> @@ -51,7 +51,7 @@ <text label="alias" value="${alias}" /> <part class="clickable"> - <link class="or-link-btn" type="edit" action="page" subaction="name" var1="languageid" value1="${languageid}"> + <link class="or-btn" type="edit" action="page" subaction="name" var1="languageid" value1="${languageid}"> <text value="${message:edit}" /> </link> </part> diff --git a/modules/cms/ui/themes/default/html/views/page/name.php b/modules/cms/ui/themes/default/html/views/page/name.php @@ -63,7 +63,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('save').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('save').'') ?> + </span> + </div> </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 @@ -21,7 +21,12 @@ </select> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/page/pub.php b/modules/cms/ui/themes/default/html/views/page/pub.php @@ -37,7 +37,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -20,7 +20,17 @@ </label> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -21,7 +21,12 @@ </select> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/export.php b/modules/cms/ui/themes/default/html/views/pageelement/export.php @@ -24,7 +24,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -142,6 +142,11 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('compare').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('compare').'') ?> + </span> + </div> </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 @@ -29,7 +29,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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,7 +75,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -150,7 +150,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -37,7 +37,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -344,8 +344,23 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('APPLY').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--apply') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('save').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-apply') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-apply') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('APPLY').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('save').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/profile/confirmmail.php b/modules/cms/ui/themes/default/html/views/profile/confirmmail.php @@ -29,7 +29,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -190,7 +190,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('save').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('save').'') ?> + </span> + </div> </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 @@ -48,7 +48,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -83,7 +83,17 @@ <?php } ?> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -58,7 +58,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -23,7 +23,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/project/info.php b/modules/cms/ui/themes/default/html/views/project/info.php @@ -17,6 +17,11 @@ <?php } ?> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> </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 @@ -38,7 +38,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -152,7 +152,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -43,7 +43,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -52,7 +52,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -61,7 +61,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -84,8 +84,18 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> </div> diff --git a/modules/cms/ui/themes/default/html/views/template/addel.php b/modules/cms/ui/themes/default/html/views/template/addel.php @@ -56,7 +56,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -29,7 +29,17 @@ <?php } ?> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -15,7 +15,12 @@ </select> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/template/prop.php b/modules/cms/ui/themes/default/html/views/template/prop.php @@ -56,7 +56,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -37,7 +37,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -45,7 +45,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -23,8 +23,23 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('APPLY').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--apply') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-apply') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-apply') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('APPLY').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/template/srcelement.php b/modules/cms/ui/themes/default/html/views/template/srcelement.php @@ -73,7 +73,17 @@ <?php } ?> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -74,7 +74,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -49,7 +49,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -25,7 +25,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -14,7 +14,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -25,7 +25,17 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('publish').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('publish').'') ?> + </span> + </div> </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 @@ -130,7 +130,17 @@ <?php } ?> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -39,7 +39,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -24,8 +24,23 @@ </tr> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('APPLY').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--apply') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-apply') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-apply') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('APPLY').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/tree/show.php b/modules/cms/ui/themes/default/html/views/tree/show.php @@ -1,7 +1,7 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-navtree') ?>"><?php echo O::escapeHtml('') ?> </div> - <i class="<?php echo O::escapeHtml('image-icon image-icon--arrow-left or-act-nav-small or-link-btn or-view-flying-button') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--arrow-left or-act-nav-small or-btn or-view-flying-button') ?>"><?php echo O::escapeHtml('') ?> </i> - <i class="<?php echo O::escapeHtml('image-icon image-icon--arrow-right or-act-nav-wide or-link-btn or-view-flying-button') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--arrow-right or-act-nav-wide or-btn or-view-flying-button') ?>"><?php echo O::escapeHtml('') ?> </i> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/tree/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/tree/show.tpl.src.xml @@ -4,6 +4,6 @@ <!-- The tree is displayed by javascript calls --> <part class="or-navtree" /> - <image class="or-act-nav-small, or-link-btn, or-view-flying-button" symbol="arrow-left" /> - <image class="or-act-nav-wide , or-link-btn, or-view-flying-button" symbol="arrow-right" /> + <image class="or-act-nav-small, or-btn, or-view-flying-button" symbol="arrow-left" /> + <image class="or-act-nav-wide , or-btn, or-view-flying-button" symbol="arrow-right" /> </output> diff --git a/modules/cms/ui/themes/default/html/views/url/edit.php b/modules/cms/ui/themes/default/html/views/url/edit.php @@ -22,7 +22,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -20,7 +20,17 @@ </label> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -18,7 +18,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/user/info.php b/modules/cms/ui/themes/default/html/views/user/info.php @@ -109,7 +109,7 @@ <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('input clickable') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('prop') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('prop') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'prop\'}') ?>" href="<?php echo O::escapeHtml('/#//') ?>" class="<?php echo O::escapeHtml('or-link-btn') ?>"><?php echo O::escapeHtml('') ?> + <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('prop') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('prop') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'prop\'}') ?>" href="<?php echo O::escapeHtml('/#//') ?>" class="<?php echo O::escapeHtml('or-btn') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('edit').'') ?> </span> </a> @@ -180,7 +180,7 @@ <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('input clickable') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('user') ?>" data-method="<?php echo O::escapeHtml('pw') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('user') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('pw') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':\'user\',\'dialogMethod\':\'pw\'}') ?>" href="<?php echo O::escapeHtml('/#/user/') ?>" class="<?php echo O::escapeHtml('or-link-btn') ?>"><?php echo O::escapeHtml('') ?> + <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('dialog') ?>" data-action="<?php echo O::escapeHtml('user') ?>" data-method="<?php echo O::escapeHtml('pw') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-dialogAction="<?php echo O::escapeHtml('user') ?>" data-extra-dialogMethod="<?php echo O::escapeHtml('pw') ?>" data-extra="<?php echo O::escapeHtml('{\'dialogAction\':\'user\',\'dialogMethod\':\'pw\'}') ?>" href="<?php echo O::escapeHtml('/#/user/') ?>" class="<?php echo O::escapeHtml('or-btn') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('edit_password').'') ?> </span> </a> diff --git a/modules/cms/ui/themes/default/html/views/user/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/user/info.tpl.src.xml @@ -84,7 +84,7 @@ <part class="label"> </part> <part class="input clickable"> - <link type="dialog" subaction="prop" class="or-link-btn"> + <link type="dialog" subaction="prop" class="or-btn"> <text value="${message:edit}"/> </link> </part> @@ -133,7 +133,7 @@ <part class="label"> </part> <part class="input clickable"> - <link type="dialog" subaction="pw" action="user" class="or-link-btn"> + <link type="dialog" subaction="pw" action="user" class="or-btn"> <text value="${message:edit_password}"/> </link> </part> diff --git a/modules/cms/ui/themes/default/html/views/user/memberships.php b/modules/cms/ui/themes/default/html/views/user/memberships.php @@ -39,7 +39,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -183,7 +183,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -96,7 +96,17 @@ <?php } ?> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -50,7 +50,17 @@ </fieldset> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </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 @@ -18,7 +18,17 @@ </div> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('button') ?>" value="<?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('submit') ?>" value="<?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?>" class="<?php echo O::escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?> + </span> + </div> + <div class="<?php echo O::escapeHtml('or-btn or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('image-icon image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> + </span> + </div> </div> </form> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/script/openrat.js b/modules/cms/ui/themes/default/script/openrat.js @@ -1748,17 +1748,20 @@ Openrat.Form = function() { }); */ - $(element).find('.or-form-btn--cancel').click( function() { + $(element).find('.or-act-form-cancel').click( function() { form.cancel(); }); - $(element).find('.or-form-btn--reset').click( function() { + $(element).find('.or-act-form-reset').click( function() { form.rollback(); }); - $(element).find('.or-form-btn--apply').click( function() { + $(element).find('.or-act-form-apply').click( function() { form.submit(modes.keepOpen); }); + $(element).find('.or-act-form-save').click( function() { + form.submit(); + }); // Submithandler for the whole form. $(element).submit( function( event ) { diff --git a/modules/cms/ui/themes/default/script/openrat.min.js b/modules/cms/ui/themes/default/script/openrat.min.js @@ -1173,7 +1173,7 @@ jQuery.trumbowyg={langs:{en:{viewHTML:"View HTML",undo:"Undo",redo:"Redo",format ;Openrat.View=function(e,t,i,r){this.action=e;this.method=t;this.id=i;this.params=r;this.before=function(){};this.start=function(e){this.before();this.element=e;this.loadView()};this.afterLoad=function(){};this.close=function(){};function n(e){Openrat.Workbench.afterViewLoadedHandler.fire(e)};this.loadView=function(){let url=Openrat.View.createUrl(this.action,this.method,this.id,this.params,!1);let element=this.element;let view=this;let loadViewHtmlPromise=$.ajax(url);$(this.element).addClass('loader');loadViewHtmlPromise.done(function(e,t){if(!e)e='';$(element).html(e).removeClass('loader');$(element).find('form').each(function(){let form=new Openrat.Form();form.close=function(){view.close()};form.initOnElement(this)});n(element)});loadViewHtmlPromise.fail(function(e,t,i){$(element).html('');Openrat.Workbench.notify('',0,'','error','Server Error',['Server Error while requesting url '+url,t])});let apiUrl=Openrat.View.createUrl(this.action,this.method,this.id,this.params,!0);loadViewHtmlPromise.done(function(){})};Openrat.View.createUrl=function(e,subaction,i,extraid={},api=!1){let url='./';if(api)url+='api/';url+='?';if(e)url+='&action='+e;if(subaction)url+='&subaction='+subaction;if(i)url+='&id='+i;if(typeof extraid==='string'){extraid=extraid.replace(/'/g,'"');let extraObject=jQuery.parseJSON(extraid);jQuery.each(extraObject,function(e,t){url=url+'&'+e+'='+t})} else if(typeof extraid==='object'){jQuery.each(extraid,function(e,t){url=url+'&'+e+'='+t})} else{};return url}}; -;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('.or-input.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()} +;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-act-form-cancel').click(function(){form.cancel()});$(e).find('.or-act-form-reset').click(function(){form.rollback()});$(e).find('.or-act-form-apply').click(function(){form.submit(modes.keepOpen)});$(e).find('.or-act-form-save').click(function(){form.submit()});$(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('.or-input.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('',0,'','error',error.error,[error.description])}catch(o){let msg=e.responseText;Openrat.Workbench.notify('',0,'','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.id,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){$('.or-input[name='+t+']').addClass('error').parent().addClass('error').parents('fieldset').removeClass('closed').addClass('show').addClass('open')})}}; diff --git a/modules/cms/ui/themes/default/script/openrat/form.js b/modules/cms/ui/themes/default/script/openrat/form.js @@ -42,17 +42,20 @@ Openrat.Form = function() { }); */ - $(element).find('.or-form-btn--cancel').click( function() { + $(element).find('.or-act-form-cancel').click( function() { form.cancel(); }); - $(element).find('.or-form-btn--reset').click( function() { + $(element).find('.or-act-form-reset').click( function() { form.rollback(); }); - $(element).find('.or-form-btn--apply').click( function() { + $(element).find('.or-act-form-apply').click( function() { form.submit(modes.keepOpen); }); + $(element).find('.or-act-form-save').click( function() { + form.submit(); + }); // Submithandler for the whole form. $(element).submit( function( event ) { diff --git a/modules/cms/ui/themes/default/style/openrat-form.less b/modules/cms/ui/themes/default/style/openrat-form.less @@ -1,3 +1,4 @@ +@color-overridden-by-theme: black; .border-radius (@radius) { border-radius: @radius; @@ -11,6 +12,7 @@ box-shadow: @x @y @radius @color; } +@small: ~"only screen and (max-width: 65rem)"; /* R e s p o n s i v e f o r m s */ .or-form { @@ -26,9 +28,6 @@ overflow-y: auto; } - .or-form-actionbar { - height:3em; - } input[type=checkbox] + label, input[type=radio] + label { @@ -121,11 +120,10 @@ } } - //padding-bottom: 4em; - //position: relative; .or-form-actionbar { + height:3em; position: sticky; bottom: 0; left: 0; @@ -136,28 +134,18 @@ padding: 1em; height: auto; - - .or-form-btn { - padding: 1em 2em; - margin-left: 1.5em; - min-width: 14em; - border: 0; - - .border-radius(0.5em); - cursor: pointer; - - &--primary { - font-weight: bold; /* Primäre Aktion in Fettdruck */ - } - - } + .or-btn { + padding: 1em 2em; + margin-left: 1.5em; + min-width: 14em; + } } - /* Responsive layout - when the screen is less than 600px wide, make the two columns stack on top of each other instead of next to each other */ - @media screen and (max-width: 65rem) { + /* Responsive layout - when the screen is less than 600px wide, make the two columns stack on top of each other instead of next to each other */ + @media @small { div.label, div.input { width: 100%; @@ -174,16 +162,34 @@ .or-form-actionbar { - align-items: center; - display: block; - - .or-form-btn { - width:90%; + .or-btn { + padding: 1em 1em; + min-width: 5em; } + .or-act-form-apply { + display: none; + } + .or-btn--secondary { + min-width: 0; + .or-form-btn-label { + //display: none; + } + } } - } } +/* Buttons */ +.or-btn { + padding: 0.5em 0.5em; + border: 1px solid @color-overridden-by-theme; + + .border-radius(0.5em); + cursor: pointer; + + &--primary { + font-weight: bold; + } +}+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/style/openrat-ui.less b/modules/cms/ui/themes/default/style/openrat-ui.less @@ -117,6 +117,7 @@ &--arrow-right:after { content: "chevron_right"; } &--form-ok:after { content: "done"; } + &--form-apply:after { content: "done"; } &--form-cancel:after { content: "clear"; } &--editor-bold:after { content: "format_bold"; } @@ -505,17 +506,6 @@ main .or-form .or-form-actionbar { } -.or-link-btn { - padding: 0.5em 1.0em; - //min-width: 5em; - border: 0; - - .border-radius(0.3em); - cursor: pointer; -} - - - div.search > .or-input { padding-top: 1px; } diff --git a/modules/cms/ui/themes/default/style/openrat.css b/modules/cms/ui/themes/default/style/openrat.css @@ -435,6 +435,9 @@ legend { .image-icon--form-ok:after { content: "done"; } +.image-icon--form-apply:after { + content: "done"; +} .image-icon--form-cancel:after { content: "clear"; } @@ -751,15 +754,6 @@ div.content > form { main .or-form .or-form-actionbar { display: none; } -.or-link-btn { - padding: 0.5em 1.0em; - border: 0; - border-radius: 0.3em; - -moz-border-radius: 0.3em; - -webkit-border-radius: 0.3em; - -khtml-border-radius: 0.3em; - cursor: pointer; -} div.search > .or-input { padding-top: 1px; } @@ -840,7 +834,7 @@ img.image-icon { right: 1em; position: absolute; } -/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22mnt%5C%2Fdata%5C%2Fdankert%5C%2FEntwicklung%5C%2FProjekte%5C%2Fopenrat-cms%5C%2Fmodules%5C%2Fcms%5C%2Fui%5C%2Fthemes%5C%2Fdefault%5C%2Fstyle%5C%2Fopenrat-ui.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3B%3BAAIA%3BCACE%3BCACA%3BCACA%3BCACA%2CKAAK%2CMAAM%2CmBAAmB%2CMAAM%2CuBAChC%2CwCAAwC%2COAAO%2CuDAC%5C%2FC%2CwCAAwC%2COAAO%2COAFnD%3B%3B%3B%3B%3BAAMF%3BCACE%2CaAAa%2CiBAAb%3BCACA%3BCACA%3BCACA%2CKAAK%2CMAAM%2CoBAAoB%2CMAAM%2C8BACjC%2CkDAAkD%2COAAO%2CuDACzD%2CiDAAiD%2COAAO%2COAF5D%3B%3B%3B%3BAAKF%3BCACE%2CaAAa%2CgBAAb%3BCACA%3BCACA%3BCACA%2CKAAK%2CMAAM%2CmBACX%2CMAAM%2C8BACF%2CuCAAuC%2COAAO%2CcAC9C%2CsCAAsC%2COAAO%2COAHjD%3B%3BAAMF%3BCACE%2CaAAa%2CgBAAb%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BCAGA%3B%3BAAGA%2CWAAC%2CgBAAgB%3BCAAS%3B%3BAAC1B%2CWAAC%2CoBAAoB%3BCAAS%2CSAAS%2CeAAT%3B%3BAAC9B%2CWAAC%2CkBAAkB%3BCAAS%3B%3BAAC5B%2CWAAC%2CkBAAkB%3BCAAS%2CSAAS%2CWAAT%3B%3BAAC5B%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CWAAT%3B%3BAAC1B%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CYAAT%3B%3BAAC1B%2CWAAC%2CkBAAkB%3BCAAS%2CSAAS%2CiBAAT%3B%3BAAC5B%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CcAAT%3B%3BAAC1B%2CWAAC%2CoBAAoB%3BCAAS%3B%3BAAC9B%2CWAAC%2CoBAAoB%3BCAAS%3B%3BAAC9B%2CWAAC%2CgBAAgB%3BCAAS%3B%3BAAC1B%2CWAAC%2CmBAAmB%3BCAAS%2CSAAS%2CqBAAT%3B%3BAAC7B%2CWAAC%2CgBAAgB%3BCAAS%3B%3BAAC1B%2CWAAC%2CoBAAoB%3BCAAS%3B%3BAAC9B%2CWAAC%2CoBAAoB%3BCAAS%2CSAAS%2CWAAT%3B%3BAAE9B%2CWAAC%2CcAAc%3BCAAS%3B%3BAACxB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CWAAT%3B%3BAACvB%2CWAAC%2CYAAY%3BCAAS%3B%3BAACtB%2CWAAC%2CcAAc%3BCAAS%2CSAAS%2CiBAAT%3B%3BAACxB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CaAAT%3B%3BAACvB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CmBAAT%3B%3BAACvB%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CkBAAkB%3BCAAS%2CSAAS%2CYAAT%3B%3BAAC5B%2CWAAC%2CcAAc%3BCAAS%2CSAAS%2CYAAT%3B%3BAACxB%2CWAAC%2CeAAe%3BCAAS%2CSAAS%2CaAAT%3B%3BAACzB%2CWAAC%2CqBAAqB%3BCAAS%3B%3BAAC%5C%2FB%2CWAAC%2CiBAAiB%3BCAAS%3B%3BAAC3B%2CWAAC%2CiBAAiB%3BCAAS%3B%3BAAC3B%2CWAAC%2CqBAAqB%3BCAAS%3B%3BAAC%5C%2FB%2CWAAC%2CmBAAmB%3BCAAS%3B%3BAAC7B%2CWAAC%2CcAAc%3BCAAS%3B%3BAACxB%2CWAAC%2CiBAAiB%3BCAAS%3B%3BAAC3B%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CYAAT%3B%3BAAC1B%2CWAAC%2CiBAAiB%3BCAAS%3B%3BAAC3B%2CWAAC%2CsBAAsB%3BCAAS%3B%3BAAChC%2CWAAC%2CoBAAoB%3BCAAS%3B%3BAAC9B%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CiBAAT%3B%3BAAE1B%2CWAAC%2CcAAc%3BCAAS%2CSAAS%2CYAAT%3B%3BAAExB%2CWAAC%3BCAAsB%2CSAAS%2CiBAAT%3B%3BAACvB%2CWAAC%2CiBAAiB%3BCAAS%3B%3BAAC3B%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CcAAT%3B%3BAAC1B%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CYAAY%3BCAAS%3B%3BAACtB%2CWAAC%2CYAAY%3BCAAS%3B%3BAACtB%2CWAAC%2CeAAe%3BCAAS%3B%3BAACzB%2CWAAC%2CgBAAgB%3BCAAS%3B%3BAAC1B%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CeAAe%3BCAAS%3B%3BAACzB%2CWAAC%2CYAAY%3BCAAS%2CSAAS%2CSAAT%3B%3BAACtB%2CWAAC%2CYAAY%3BCAAS%3B%3BAACtB%2CWAAC%2CiBAAiB%3BCAAS%3B%3BAAC3B%2CWAAC%2CWAAW%3BCAAS%3B%3BAACrB%2CWAAC%2CYAAY%3BCAAS%3B%3BAAEtB%2CWAAC%2CWAAW%3BCAAS%3B%3BAACrB%2CWAAC%2CeAAe%3BCAAS%2CSAAS%2CgBAAT%3B%3BAACzB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CeAAT%3B%3BAAEvB%2CWAAC%2CWAAW%3BCAAS%2CSAAS%2CaAAT%3B%3BAACrB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CeAAT%3B%3BAACvB%2CWAAC%2CUAAU%3BCAAS%2CSAAS%2CiBAAT%3B%3BAACpB%2CWAAC%2CUAAU%3BCAAS%3B%3BAAEpB%2CWAAC%2CYAAY%3BCAAS%2CSAAS%2CcAAT%3B%3BAACtB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CeAAT%3B%3BAAEvB%2CWAAC%2CSAAS%3BCAAS%3B%3BAACnB%2CWAAC%2CaAAa%3BCAAS%3B%3BAAEvB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CaAAT%3B%3BAACvB%2CWAAC%2CeAAe%3BCAAS%2CSAAS%2CeAAT%3B%3BAACzB%2CWAAC%2CiBAAiB%3BCAAS%2CSAAS%2CaAAT%3B%3BAAC3B%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CcAAT%3B%3BAACvB%2CWAAC%2CmBAAmB%3BCAAS%3B%3BAAC7B%2CWAAC%2CcAAc%3BCAAS%2CSAAS%2CcAAT%3B%3BAACxB%2CWAAC%2CuBAAuB%3BCAAS%2CSAAS%2CsBAAT%3B%3BAACjC%2CWAAC%2CqBAAqB%3BCAAS%2CSAAS%2CsBAAT%3B%3BAAC%5C%2FB%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CiBAAT%3B%3BAAC1B%2CWAAC%2CmBAAmB%3BCAAS%3B%3BAAC7B%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CcAAc%3BCAAS%3B%3BAACxB%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CuBAAuB%3BCAAS%3B%3BAACjC%2CWAAC%2CcAAc%3BCAAS%2CSAAS%2CYAAT%3B%3BAAG1B%3BCACE%3B%3BAAgBF%3BCACE%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%3BAACH%2CGAAG%2CWAAY%3BAACf%2CGAAG%2CMAAS%2CMAAG%3BCACb%3B%3BAAGF%2CGAAG%3BCAED%3BCACA%3BCACA%3B%3BCAEA%3BCACA%3BCACA%3B%3BAARF%2CGAAG%2CUAWD%2CIAAG%3BCACD%2CyBAAA%3BCACA%3BCACA%3BCACA%3BCAvCF%2CkBAAA%3BCACA%2CuBAAA%3BCACA%2C0BAAA%3BCACA%2CyBAAA%3BCAGA%2CuCAAA%3BCACA%2CoCAAA%3BCACA%2C%2BBAAA%3B%3BAAgBF%2CGAAG%2CUAWD%2CIAAG%2COASD%3BCACE%3BCACA%2CeAAA%3BCACA%3BCACA%3BCACA%3B%3BAAGF%2CGA5BD%2CUAWD%2CIAAG%2COAiBA%2CMACC%3BCACE%3B%3BAAIJ%2CGAlCD%2CUAWD%2CIAAG%2COAuBA%3BCACC%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAIF%2CGA9CD%2CUAWD%2CIAAG%2COAmCA%2CMAEC%2CIAAG%3BCACD%3B%3BAAjDR%2CGAAG%2CUAWD%2CIAAG%2COA0CD%2CIAAG%3BCACD%3B%3BAAGF%2CGAzDD%2CUAWD%2CIAAG%2COA8CA%3BCACC%2CSAAS%2CEAAT%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%2C6BAAA%3BCACA%3BCACA%3BCACA%3B%3BAAnEN%2CGAAG%2CUAWD%2CIAAG%2COA2DD%2CIAAG%3BCACD%3BCACA%3BCACA%3BCACA%3BCACA%2CaAAa%2CiDAAb%3B%3BAAGF%2CGA9ED%2CUAWD%2CIAAG%2COAmEA%2CKACC%2CIAAG%3BCACD%3B%3BAAmBR%2CGAAG%3BCACD%3BCACA%3B%3B%3B%3BAAQF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3BAAGF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3B%3BAAIF%2CGAAG%3BAACH%2CGAAG%3BCACD%3BCACA%3B%3B%3B%3BAAaF%2CGAAG%2CKAAM%3BCACP%3BCACA%3B%3BAAGF%2CGAAG%2CKAAM%3BCACP%3B%3BAAGF%3BAACA%3BCACE%3B%3B%3BAAQA%2CaAAC%3BCAEC%3BCACA%3B%3BAAGF%2CaAAC%3BCACC%3BCACA%3B%3B%3BAAOJ%2CGAAG%3BCACD%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%2CMAAO%2CGAAE%2CMAAO%3BCACjB%3BCACA%3BCAEA%3BCAEA%2C%2BBAAA%3BCAEA%3B%3BCACA%3B%3BCACA%3B%3BCAEA%3B%3BCACA%3B%3BCACA%3B%3BCACA%3BCAEA%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%3BCACD%3BCACA%3B%3B%3BAAOF%2CGAAG%2CMAAO%2CIAAG%3BCACX%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CqDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CuDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CkDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CoDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%3BAACrB%2CGAAG%3BCACD%2CyBAAA%3BCACA%2CyBAAA%3BCACA%2C2BAAA%3BCAEA%3BCACA%3BCACA%3BCACA%3B%3BAAIF%2CUACE%2CIAAG%2CMAAM%3BCACP%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%2CyBAAA%3BCACA%3BCACA%3BCACA%3B%3BAAVJ%2CUAaE%2CIAAG%2CMAAM%2CWAAc%2CMAAG%3BCACxB%3BCACA%3B%3BAAfJ%2CUAkBE%2CIAAG%3BCACD%2CyBAAA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAzBJ%2CUA4BE%2CIAAG%3BAA5BL%2CUA4BiB%2CIAAG%3BAA5BpB%2CUA4B4B%2CIAAG%3BCAC3B%3BCACA%3BCACA%3B%3BAA%5C%2FBJ%2CUAkCE%2CIAAG%2CMAAS%2CMAAG%3BCACb%3B%3BAAIJ%3BCACE%3B%3BAAGF%3BCACE%3B%3B%3B%3B%3BAAMF%2CGAAG%3BCACD%3B%3BAAGF%2CGAAG%2CQAAS%2CIAAG%3BCACb%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%2CQAAS%2CIAAG%2COAAU%2CMAAG%3BCAC1B%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%2CQAAS%2CKAAI%2CsBAAuB%2CIAAG%3BCACxC%3B%3BAAGF%2CGAAG%2CQAAW%3BCACZ%3B%3BAAQF%2CIAAK%2CSAAS%3BCACZ%3B%3BAAIF%3BCACE%2CoBAAA%3BCAEA%3BCA7WA%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3BCA6WA%3B%3BAAKF%2CGAAG%2COAAU%3BCACX%3B%3BAAGF%3BCACE%3BCACA%3B%3B%3BAAIF%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CKAAI%3BCACjB%3B%3B%3BAAIF%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CKAAI%3BAACnB%2CQAAW%2CMAAI%2CKAAI%3BAACnB%2CQAAW%2CMAAI%2CKAAI%3BCACjB%2CaAAa%2CiDAAb%3B%3BAAGF%2CEAAE%3BCACA%3B%3BAAIF%2CGAAG%2CQAAS%3BAACZ%2CGAAG%3BCACD%3BCACA%3B%3BAAGF%2CGAAG%3BCACD%3B%3B%3BAAIF%3BCACE%3B%3BAAGF%3BCACE%3BCACA%3BCACA%2CgBAAA%3B%3BAAHF%2CYAKI%3BCACA%2CiBAAA%3BCACA%3BCACA%3BCA1aF%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3B%3BAA6aF%3BCAEE%3B%3BAAEA%2CQAAC%2CMACC%3BCACE%3B%3BAANN%2CQAUE%3BCACE%3BCACA%3BCACA%3BCACA%3BCACA%3BCAEA%3BCACA%3BCAlcF%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3BCAicE%3BCAEA%3B%3BAAtBJ%2CQAUE%2CeAcI%3BCACA%3B%3BAAMN%3BCACI%3BCACA%3BCACA%3BCACA%22%7D */ +/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22mnt%5C%2Fdata%5C%2Fdankert%5C%2FEntwicklung%5C%2FProjekte%5C%2Fopenrat-cms%5C%2Fmodules%5C%2Fcms%5C%2Fui%5C%2Fthemes%5C%2Fdefault%5C%2Fstyle%5C%2Fopenrat-ui.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3B%3BAAIA%3BCACE%3BCACA%3BCACA%3BCACA%2CKAAK%2CMAAM%2CmBAAmB%2CMAAM%2CuBAChC%2CwCAAwC%2COAAO%2CuDAC%5C%2FC%2CwCAAwC%2COAAO%2COAFnD%3B%3B%3B%3B%3BAAMF%3BCACE%2CaAAa%2CiBAAb%3BCACA%3BCACA%3BCACA%2CKAAK%2CMAAM%2CoBAAoB%2CMAAM%2C8BACjC%2CkDAAkD%2COAAO%2CuDACzD%2CiDAAiD%2COAAO%2COAF5D%3B%3B%3B%3BAAKF%3BCACE%2CaAAa%2CgBAAb%3BCACA%3BCACA%3BCACA%2CKAAK%2CMAAM%2CmBACX%2CMAAM%2C8BACF%2CuCAAuC%2COAAO%2CcAC9C%2CsCAAsC%2COAAO%2COAHjD%3B%3BAAMF%3BCACE%2CaAAa%2CgBAAb%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BCAGA%3B%3BAAGA%2CWAAC%2CgBAAgB%3BCAAS%3B%3BAAC1B%2CWAAC%2CoBAAoB%3BCAAS%2CSAAS%2CeAAT%3B%3BAAC9B%2CWAAC%2CkBAAkB%3BCAAS%3B%3BAAC5B%2CWAAC%2CkBAAkB%3BCAAS%2CSAAS%2CWAAT%3B%3BAAC5B%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CWAAT%3B%3BAAC1B%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CYAAT%3B%3BAAC1B%2CWAAC%2CkBAAkB%3BCAAS%2CSAAS%2CiBAAT%3B%3BAAC5B%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CcAAT%3B%3BAAC1B%2CWAAC%2CoBAAoB%3BCAAS%3B%3BAAC9B%2CWAAC%2CoBAAoB%3BCAAS%3B%3BAAC9B%2CWAAC%2CgBAAgB%3BCAAS%3B%3BAAC1B%2CWAAC%2CmBAAmB%3BCAAS%2CSAAS%2CqBAAT%3B%3BAAC7B%2CWAAC%2CgBAAgB%3BCAAS%3B%3BAAC1B%2CWAAC%2CoBAAoB%3BCAAS%3B%3BAAC9B%2CWAAC%2CoBAAoB%3BCAAS%2CSAAS%2CWAAT%3B%3BAAE9B%2CWAAC%2CcAAc%3BCAAS%3B%3BAACxB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CWAAT%3B%3BAACvB%2CWAAC%2CYAAY%3BCAAS%3B%3BAACtB%2CWAAC%2CcAAc%3BCAAS%2CSAAS%2CiBAAT%3B%3BAACxB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CaAAT%3B%3BAACvB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CmBAAT%3B%3BAACvB%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CkBAAkB%3BCAAS%2CSAAS%2CYAAT%3B%3BAAC5B%2CWAAC%2CcAAc%3BCAAS%2CSAAS%2CYAAT%3B%3BAACxB%2CWAAC%2CeAAe%3BCAAS%2CSAAS%2CaAAT%3B%3BAACzB%2CWAAC%2CqBAAqB%3BCAAS%3B%3BAAC%5C%2FB%2CWAAC%2CiBAAiB%3BCAAS%3B%3BAAC3B%2CWAAC%2CiBAAiB%3BCAAS%3B%3BAAC3B%2CWAAC%2CqBAAqB%3BCAAS%3B%3BAAC%5C%2FB%2CWAAC%2CmBAAmB%3BCAAS%3B%3BAAC7B%2CWAAC%2CcAAc%3BCAAS%3B%3BAACxB%2CWAAC%2CiBAAiB%3BCAAS%3B%3BAAC3B%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CYAAT%3B%3BAAC1B%2CWAAC%2CiBAAiB%3BCAAS%3B%3BAAC3B%2CWAAC%2CsBAAsB%3BCAAS%3B%3BAAChC%2CWAAC%2CoBAAoB%3BCAAS%3B%3BAAC9B%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CiBAAT%3B%3BAAE1B%2CWAAC%2CcAAc%3BCAAS%2CSAAS%2CYAAT%3B%3BAAExB%2CWAAC%3BCAAsB%2CSAAS%2CiBAAT%3B%3BAACvB%2CWAAC%2CiBAAiB%3BCAAS%3B%3BAAC3B%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CcAAT%3B%3BAAC1B%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CYAAY%3BCAAS%3B%3BAACtB%2CWAAC%2CYAAY%3BCAAS%3B%3BAACtB%2CWAAC%2CeAAe%3BCAAS%3B%3BAACzB%2CWAAC%2CgBAAgB%3BCAAS%3B%3BAAC1B%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CeAAe%3BCAAS%3B%3BAACzB%2CWAAC%2CYAAY%3BCAAS%2CSAAS%2CSAAT%3B%3BAACtB%2CWAAC%2CYAAY%3BCAAS%3B%3BAACtB%2CWAAC%2CiBAAiB%3BCAAS%3B%3BAAC3B%2CWAAC%2CWAAW%3BCAAS%3B%3BAACrB%2CWAAC%2CYAAY%3BCAAS%3B%3BAAEtB%2CWAAC%2CWAAW%3BCAAS%3B%3BAACrB%2CWAAC%2CeAAe%3BCAAS%2CSAAS%2CgBAAT%3B%3BAACzB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CeAAT%3B%3BAAEvB%2CWAAC%2CWAAW%3BCAAS%2CSAAS%2CaAAT%3B%3BAACrB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CeAAT%3B%3BAACvB%2CWAAC%2CUAAU%3BCAAS%2CSAAS%2CiBAAT%3B%3BAACpB%2CWAAC%2CUAAU%3BCAAS%3B%3BAAEpB%2CWAAC%2CYAAY%3BCAAS%2CSAAS%2CcAAT%3B%3BAACtB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CeAAT%3B%3BAAEvB%2CWAAC%2CSAAS%3BCAAS%3B%3BAACnB%2CWAAC%2CYAAY%3BCAAS%3B%3BAACtB%2CWAAC%2CaAAa%3BCAAS%3B%3BAAEvB%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CaAAT%3B%3BAACvB%2CWAAC%2CeAAe%3BCAAS%2CSAAS%2CeAAT%3B%3BAACzB%2CWAAC%2CiBAAiB%3BCAAS%2CSAAS%2CaAAT%3B%3BAAC3B%2CWAAC%2CaAAa%3BCAAS%2CSAAS%2CcAAT%3B%3BAACvB%2CWAAC%2CmBAAmB%3BCAAS%3B%3BAAC7B%2CWAAC%2CcAAc%3BCAAS%2CSAAS%2CcAAT%3B%3BAACxB%2CWAAC%2CuBAAuB%3BCAAS%2CSAAS%2CsBAAT%3B%3BAACjC%2CWAAC%2CqBAAqB%3BCAAS%2CSAAS%2CsBAAT%3B%3BAAC%5C%2FB%2CWAAC%2CgBAAgB%3BCAAS%2CSAAS%2CiBAAT%3B%3BAAC1B%2CWAAC%2CmBAAmB%3BCAAS%3B%3BAAC7B%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CcAAc%3BCAAS%3B%3BAACxB%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CaAAa%3BCAAS%3B%3BAACvB%2CWAAC%2CuBAAuB%3BCAAS%3B%3BAACjC%2CWAAC%2CcAAc%3BCAAS%2CSAAS%2CYAAT%3B%3BAAG1B%3BCACE%3B%3BAAgBF%3BCACE%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%3BAACH%2CGAAG%2CWAAY%3BAACf%2CGAAG%2CMAAS%2CMAAG%3BCACb%3B%3BAAGF%2CGAAG%3BCAED%3BCACA%3BCACA%3B%3BCAEA%3BCACA%3BCACA%3B%3BAARF%2CGAAG%2CUAWD%2CIAAG%3BCACD%2CyBAAA%3BCACA%3BCACA%3BCACA%3BCAvCF%2CkBAAA%3BCACA%2CuBAAA%3BCACA%2C0BAAA%3BCACA%2CyBAAA%3BCAGA%2CuCAAA%3BCACA%2CoCAAA%3BCACA%2C%2BBAAA%3B%3BAAgBF%2CGAAG%2CUAWD%2CIAAG%2COASD%3BCACE%3BCACA%2CeAAA%3BCACA%3BCACA%3BCACA%3B%3BAAGF%2CGA5BD%2CUAWD%2CIAAG%2COAiBA%2CMACC%3BCACE%3B%3BAAIJ%2CGAlCD%2CUAWD%2CIAAG%2COAuBA%3BCACC%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAIF%2CGA9CD%2CUAWD%2CIAAG%2COAmCA%2CMAEC%2CIAAG%3BCACD%3B%3BAAjDR%2CGAAG%2CUAWD%2CIAAG%2COA0CD%2CIAAG%3BCACD%3B%3BAAGF%2CGAzDD%2CUAWD%2CIAAG%2COA8CA%3BCACC%2CSAAS%2CEAAT%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%2C6BAAA%3BCACA%3BCACA%3BCACA%3B%3BAAnEN%2CGAAG%2CUAWD%2CIAAG%2COA2DD%2CIAAG%3BCACD%3BCACA%3BCACA%3BCACA%3BCACA%2CaAAa%2CiDAAb%3B%3BAAGF%2CGA9ED%2CUAWD%2CIAAG%2COAmEA%2CKACC%2CIAAG%3BCACD%3B%3BAAmBR%2CGAAG%3BCACD%3BCACA%3B%3B%3B%3BAAQF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3BAAGF%2CCAAC%3BAACD%2CCAAC%3BCACC%3BCACA%3B%3B%3BAAIF%2CGAAG%3BAACH%2CGAAG%3BCACD%3BCACA%3B%3B%3B%3BAAaF%2CGAAG%2CKAAM%3BCACP%3BCACA%3B%3BAAGF%2CGAAG%2CKAAM%3BCACP%3B%3BAAGF%3BAACA%3BCACE%3B%3B%3BAAQA%2CaAAC%3BCAEC%3BCACA%3B%3BAAGF%2CaAAC%3BCACC%3BCACA%3B%3B%3BAAOJ%2CGAAG%3BCACD%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%2CMAAO%2CGAAE%2CMAAO%3BCACjB%3BCACA%3BCAEA%3BCAEA%2C%2BBAAA%3BCAEA%3B%3BCACA%3B%3BCACA%3B%3BCAEA%3B%3BCACA%3B%3BCACA%3B%3BCACA%3BCAEA%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%3BCACD%3BCACA%3B%3B%3BAAOF%2CGAAG%2CMAAO%2CIAAG%3BCACX%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CqDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CuDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CkDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%2CIAAG%3BAACxB%2CGAAG%2CQAAQ%3BCACT%2CoDAAA%3BCACA%2C4BAAA%3B%3BAAGF%2CGAAG%2CMAAO%2CIAAG%2COAAQ%3BAACrB%2CGAAG%3BCACD%2CyBAAA%3BCACA%2CyBAAA%3BCACA%2C2BAAA%3BCAEA%3BCACA%3BCACA%3BCACA%3B%3BAAIF%2CUACE%2CIAAG%2CMAAM%3BCACP%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%2CyBAAA%3BCACA%3BCACA%3BCACA%3B%3BAAVJ%2CUAaE%2CIAAG%2CMAAM%2CWAAc%2CMAAG%3BCACxB%3BCACA%3B%3BAAfJ%2CUAkBE%2CIAAG%3BCACD%2CyBAAA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAzBJ%2CUA4BE%2CIAAG%3BAA5BL%2CUA4BiB%2CIAAG%3BAA5BpB%2CUA4B4B%2CIAAG%3BCAC3B%3BCACA%3BCACA%3B%3BAA%5C%2FBJ%2CUAkCE%2CIAAG%2CMAAS%2CMAAG%3BCACb%3B%3BAAIJ%3BCACE%3B%3BAAGF%3BCACE%3B%3B%3B%3B%3BAAMF%2CGAAG%3BCACD%3B%3BAAGF%2CGAAG%2CQAAS%2CIAAG%3BCACb%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%2CQAAS%2CIAAG%2COAAU%2CMAAG%3BCAC1B%3BCACA%3BCACA%3B%3BAAGF%2CGAAG%2CQAAS%2CKAAI%2CsBAAuB%2CIAAG%3BCACxC%3B%3BAAGF%2CGAAG%2CQAAW%3BCACZ%3B%3BAAQF%2CIAAK%2CSAAS%3BCACZ%3B%3BAAIF%2CGAAG%2COAAU%3BCACX%3B%3BAAGF%3BCACE%3BCACA%3B%3B%3BAAIF%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CKAAI%3BCACjB%3B%3B%3BAAIF%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CMAAK%3BAACpB%2CQAAW%2CMAAI%2CKAAI%3BAACnB%2CQAAW%2CMAAI%2CKAAI%3BAACnB%2CQAAW%2CMAAI%2CKAAI%3BCACjB%2CaAAa%2CiDAAb%3B%3BAAGF%2CEAAE%3BCACA%3B%3BAAIF%2CGAAG%2CQAAS%3BAACZ%2CGAAG%3BCACD%3BCACA%3B%3BAAGF%2CGAAG%3BCACD%3B%3B%3BAAIF%3BCACE%3B%3BAAGF%3BCACE%3BCACA%3BCACA%2CgBAAA%3B%3BAAHF%2CYAKI%3BCACA%2CiBAAA%3BCACA%3BCACA%3BCA%5C%2FZF%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3B%3BAAkaF%3BCAEE%3B%3BAAEA%2CQAAC%2CMACC%3BCACE%3B%3BAANN%2CQAUE%3BCACE%3BCACA%3BCACA%3BCACA%3BCACA%3BCAEA%3BCACA%3BCAvbF%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3BCAsbE%3BCAEA%3B%3BAAtBJ%2CQAUE%2CeAcI%3BCACA%3B%3BAAMN%3BCACI%3BCACA%3BCACA%3BCACA%22%7D */ /* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/default/style/openrat-header */ /* H e a d e r */ #title { @@ -959,9 +953,6 @@ img.image-icon { flex-grow: 1; overflow-y: auto; } -.or-form .or-form-actionbar { - height: 3em; -} .or-form input[type=checkbox] + label, .or-form input[type=radio] + label { width: 80%; @@ -1033,6 +1024,7 @@ img.image-icon { width: 75%; } .or-form .or-form-actionbar { + height: 3em; position: sticky; bottom: 0; left: 0; @@ -1042,22 +1034,12 @@ img.image-icon { padding: 1em; height: auto; } -.or-form .or-form-actionbar .or-form-btn { +.or-form .or-form-actionbar .or-btn { padding: 1em 2em; margin-left: 1.5em; min-width: 14em; - border: 0; - border-radius: 0.5em; - -moz-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - -khtml-border-radius: 0.5em; - cursor: pointer; -} -.or-form .or-form-actionbar .or-form-btn--primary { - font-weight: bold; - /* Primäre Aktion in Fettdruck */ } -@media screen and (max-width: 65rem) { +@media only screen and (max-width: 65rem) { .or-form div.label, .or-form div.input { width: 100%; @@ -1070,15 +1052,31 @@ img.image-icon { .or-form .or-form-row .or-form-input { width: 100%; } - .or-form .or-form-actionbar { - align-items: center; - display: block; + .or-form .or-form-actionbar .or-btn { + padding: 1em 1em; + min-width: 5em; + } + .or-form .or-form-actionbar .or-act-form-apply { + display: none; } - .or-form .or-form-actionbar .or-form-btn { - width: 90%; + .or-form .or-form-actionbar .or-btn--secondary { + min-width: 0; } } -/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22mnt%5C%2Fdata%5C%2Fdankert%5C%2FEntwicklung%5C%2FProjekte%5C%2Fopenrat-cms%5C%2Fmodules%5C%2Fcms%5C%2Fui%5C%2Fthemes%5C%2Fdefault%5C%2Fstyle%5C%2Fopenrat-form.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3BAAeA%3BCACI%3BCACA%3BCACA%3BCA4CF%3B%3B%3B%3B%3B%3B%3B%3B%3BAA%5C%2FCF%2CQAKI%3BCACI%3B%3BAANR%2CQAQI%3BCACI%3BCACA%3B%3BAAVR%2CQAaI%3BCACI%3B%3BAAdR%2CQAiBE%2CMAAK%2CeAAkB%3BAAjBzB%2CQAkBE%2CMAAK%2CYAAe%3BCAClB%3B%3BAAnBJ%2CQAsBE%3BCACE%3B%3BAAvBJ%2CQA8BE%2CIAAG%2CYAAe%2CMAAG%3BCACnB%3B%3BAA%5C%2FBJ%2CQAkCE%2CMAAK%3BCACH%3BCACA%3BCACA%3B%3BCACA%3B%3BCACA%3B%3BCACA%3BCACA%3BCACA%3B%3BAA1CJ%2CQAkDE%2CMAAK%3BAAlDP%2CQAkDoB%3BAAlDpB%2CQAkD4B%3BCACxB%3BCACA%3BCACA%2CsBAAA%3BCACA%3BCACA%3BCACA%3B%3BAAxDJ%2CQA4DE%3BCACE%2CyBAAA%3BCACA%3B%3BAA9DJ%2CQAkEE%2CMAAK%3BCACH%3BCACA%2CkBAAA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAAxEJ%2CQA4EE%2CIAAG%3BCACD%3BCACA%3BCACA%3B%3BAA%5C%2FEJ%2CQAmFE%2CIAAG%3BCACD%3BCACA%3BCACA%3B%3BAAtFJ%2CQA0FE%2CMAAK%3BCACH%2CSAAS%2CEAAT%3BCACA%3BCACA%3B%3BAA7FJ%2CQAgGE%3BCACE%3BCACA%3B%3BAAlGJ%2CQAgGE%2CaAIE%3BCACE%3B%3BAArGN%2CQAgGE%2CaAOE%3BCACE%3B%3BAAxGN%2CQA%2BGE%3BCAEE%3BCACA%3BCACA%3BCACA%3BCAEA%3BCACA%3BCACA%3BCACA%3B%3BAAzHJ%2CQA%2BGE%2CmBAaC%3BCACE%2CgBAAA%3BCACA%3BCACA%3BCACA%3BCA7ID%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3BCA6IC%3B%3BAAEA%2CQAtBH%2CmBAaC%2CaASG%3BCACC%3B%3B%3BAAoCP%2CmBA1BuC%3BCA0BvC%2CQAxBI%2CIAAG%3BCAwBP%2CQAxBe%2CIAAG%3BEACZ%3BEACA%3B%3BCAsBN%2CQAnBI%3BEACC%3B%3BCAkBL%2CQAnBI%2CaAEE%3BCAiBN%2CQAnBI%2CaAGE%3BEACE%3B%3BCAeR%2CQAXI%3BEAEE%3BEACA%3B%3BCAQN%2CQAXI%2CmBAKE%3BEACE%22%7D */ +/* Buttons */ +.or-btn { + padding: 0.5em 0.5em; + border: 1px solid #000000; + border-radius: 0.5em; + -moz-border-radius: 0.5em; + -webkit-border-radius: 0.5em; + -khtml-border-radius: 0.5em; + cursor: pointer; +} +.or-btn--primary { + font-weight: bold; +} +/*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%22mnt%5C%2Fdata%5C%2Fdankert%5C%2FEntwicklung%5C%2FProjekte%5C%2Fopenrat-cms%5C%2Fmodules%5C%2Fcms%5C%2Fui%5C%2Fthemes%5C%2Fdefault%5C%2Fstyle%5C%2Fopenrat-form.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%3BAAiBA%3BCACI%3BCACA%3BCACA%3BCAyCF%3B%3B%3B%3B%3B%3B%3B%3B%3BAA5CF%2CQAKI%3BCACI%3B%3BAANR%2CQAQI%3BCACI%3BCACA%3B%3BAAVR%2CQAcE%2CMAAK%2CeAAkB%3BAAdzB%2CQAeE%2CMAAK%2CYAAe%3BCAClB%3B%3BAAhBJ%2CQAmBE%3BCACE%3B%3BAApBJ%2CQA2BE%2CIAAG%2CYAAe%2CMAAG%3BCACnB%3B%3BAA5BJ%2CQA%2BBE%2CMAAK%3BCACH%3BCACA%3BCACA%3B%3BCACA%3B%3BCACA%3B%3BCACA%3BCACA%3BCACA%3B%3BAAvCJ%2CQA%2BCE%2CMAAK%3BAA%5C%2FCP%2CQA%2BCoB%3BAA%5C%2FCpB%2CQA%2BC4B%3BCACxB%3BCACA%3BCACA%2CsBAAA%3BCACA%3BCACA%3BCACA%3B%3BAArDJ%2CQAyDE%3BCACE%2CyBAAA%3BCACA%3B%3BAA3DJ%2CQA%2BDE%2CMAAK%3BCACH%3BCACA%2CkBAAA%3BCACA%3BCACA%3BCACA%3BCACA%3B%3BAArEJ%2CQAyEE%2CIAAG%3BCACD%3BCACA%3BCACA%3B%3BAA5EJ%2CQAgFE%2CIAAG%3BCACD%3BCACA%3BCACA%3B%3BAAnFJ%2CQAuFE%2CMAAK%3BCACH%2CSAAS%2CEAAT%3BCACA%3BCACA%3B%3BAA1FJ%2CQA6FE%3BCACE%3BCACA%3B%3BAA%5C%2FFJ%2CQA6FE%2CaAIE%3BCACE%3B%3BAAlGN%2CQA6FE%2CaAOE%3BCACE%3B%3BAArGN%2CQA0GE%3BCAEE%3BCACA%3BCACA%3BCACA%3BCACA%3BCAEA%3BCACA%3BCACA%3BCACA%3B%3BAArHJ%2CQA0GE%2CmBAaI%3BCACI%2CgBAAA%3BCACA%3BCACA%3B%3BAAwCV%3BCAAA%2CQA9BI%2CIAAG%3BCA8BP%2CQA9Be%2CIAAG%3BEACZ%3BEACA%3B%3BCA4BN%2CQAzBI%3BEACC%3B%3BCAwBL%2CQAzBI%2CaAEE%3BCAuBN%2CQAzBI%2CaAGE%3BEACE%3B%3BCAqBR%2CQAjBI%2CmBAEE%3BEACI%2CgBAAA%3BEACA%3B%3BCAaV%2CQAjBI%2CmBAMI%3BEACI%3B%3BCAUZ%2CQAjBI%2CmBASI%3BEACI%3B%3B%3B%3BAAYZ%3BCACI%2CoBAAA%3BCACA%2CyBAAA%3BCAvLA%2CoBAAA%3BCACA%2CyBAAA%3BCACA%2C4BAAA%3BCACA%2C2BAAA%3BCAuLA%3B%3BAAEA%2COAAC%3BCACG%22%7D */ /* Include style: /mnt/data/dankert/Entwicklung/Projekte/openrat-cms/modules/cms/ui/themes/default/style/openrat-navigation */ /* N a v i g a t i o n */ .or-navtree ul.or-navtree-list { diff --git a/modules/cms/ui/themes/default/style/openrat.min.css b/modules/cms/ui/themes/default/style/openrat.min.css @@ -1,7 +1,7 @@ /*! normalize.css v3.0.1 | MIT License | git.io/normalize */html{font-family: 'Oxygen', 'Roboto', -apple-system, BlinkMacSystemFont, "Segoe UI", "Open Sans", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;font-size: 0.9em;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%}body{margin: 0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display: block}audio,canvas,progress,video{display: inline-block;vertical-align: baseline}audio:not([controls]){display: none;height: 0}[hidden],template{display: none}a{background: transparent}a:active,a:hover{outline: 0}abbr[title]{border-bottom: 1px dotted}b,strong{font-weight: bold}dfn{font-style: italic}h1{font-size: 1.2em;margin: .67em 0}mark{background: #ff0;color: #000}small{font-size: 80%}sub,sup{font-size: 75%;line-height: 0;position: relative;vertical-align: baseline}sup{top: -0.5em}sub{bottom: -0.25em}img{border: 0}svg:not(:root){overflow: hidden}figure{margin: 1em 40px}hr{-moz-box-sizing: content-box;box-sizing: content-box;height: 0}pre{overflow: auto}code,kbd,pre,samp{font-family: 'Source Code Pro', monospace, monospace;font-size: 1em}button,input,optgroup,select,textarea{color: inherit;background-color: inherit;font: inherit;margin: 0}button{overflow: visible}button,select{text-transform: none}button,html input[type="button"]{-webkit-appearance: button;cursor: pointer}button[disabled],html input[disabled]{cursor: default}button input::-moz-focus-inner{border: 0;padding: 0}input{line-height: normal}input[type="reset"],input[type="submit"]{-webkit-appearance: button;cursor: pointer}input[type="checkbox"],input[type="radio"]{box-sizing: border-box;padding: 0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height: auto}input[type="search"]{-webkit-appearance: textfield;-moz-box-sizing: content-box;-webkit-box-sizing: content-box;box-sizing: content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance: none}fieldset{border: 1px solid #c0c0c0;margin: 0 2px;padding: .35em .625em .75em}legend{border: 0;padding: 0}textarea{overflow: auto}optgroup{font-weight: bold}table{border-collapse: collapse;border-spacing: 0}td,th{padding: 0;text-align: left}*,::before,::after{box-sizing: border-box}.initial-hidden{display: none}.sort-value{display: none}legend{font-size: 1.1em;font-weight: bold;padding: 0 .5em} -@font-face{font-family: 'Oxygen';font-style: normal;font-weight: 400;src: local('Oxygen Regular'), local('Oxygen-Regular'), url('../font/oxygen-v7-latin-regular.woff') format('woff2'), url('../font/oxygen-v7-latin-regular.woff') format('woff')}@font-face{font-family: 'Source Code Pro';font-style: normal;font-weight: 400;src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('../font/source-code-pro-v8-latin-regular.woff2') format('woff2'), url('../font/source-code-pro-v8-latin-regular.woff') format('woff')}@font-face{font-family: 'Material Icons';font-style: normal;font-weight: 400;src: local('Material Icons'), local('MaterialIcons-Regular'), url('../font/MaterialIcons-Regular.woff2') format('woff2'), url('../font/MaterialIcons-Regular.woff') format('woff')}.image-icon{font-family: 'Material Icons';font-weight: normal;font-style: normal;display: inline-block;text-transform: none;letter-spacing: normal;word-wrap: normal;white-space: nowrap;direction: ltr;font-feature-settings: 'liga'}.image-icon--action-el_text:after{content: "spellcheck"}.image-icon--action-el_longtext:after{content: "view_headline"}.image-icon--action-el_select:after{content: "list"}.image-icon--action-el_number:after{content: "looks_one"}.image-icon--action-el_link:after{content: "call_made"}.image-icon--action-el_date:after{content: "date_range"}.image-icon--action-el_insert:after{content: "keyboard_return"}.image-icon--action-el_copy:after{content: "flip_to_back"}.image-icon--action-el_linkinfo:after{content: "info"}.image-icon--action-el_linkdate:after{content: "info"}.image-icon--action-el_code:after{content: "code"}.image-icon--action-el_dynamic:after{content: "play_circle_outline"}.image-icon--action-el_info:after{content: "info"}.image-icon--action-el_infodate:after{content: "info"}.image-icon--action-el_checkbox:after{content: "check_box"}.image-icon--action-image:after{content: "image"}.image-icon--action-link:after{content: "call_made"}.image-icon--action-url:after{content: "link"}.image-icon--action-alias:after{content: "bookmark_border"}.image-icon--action-text:after{content: "text_format"}.image-icon--action-page:after{content: "insert_drive_file"}.image-icon--action-file:after{content: "save"}.image-icon--action-modellist:after{content: "device_hub"}.image-icon--action-model:after{content: "device_hub"}.image-icon--action-folder:after{content: "folder_open"}.image-icon--action-languagelist:after{content: "language"}.image-icon--action-language:after{content: "language"}.image-icon--action-template:after{content: "receipt"}.image-icon--action-templatelist:after{content: "receipt"}.image-icon--action-groupllist:after{content: "group"}.image-icon--action-group:after{content: "group"}.image-icon--action-userlist:after{content: "person"}.image-icon--action-user:after{content: "person"}.image-icon--action-profile:after{content: "person_pin"}.image-icon--method-settings:after{content: "settings"}.image-icon--action-configuration:after{content: "settings"}.image-icon--action-projectlist:after{content: "list"}.image-icon--action-project:after{content: "account_balance"}.image-icon--action-macro:after{content: "data_usage"}.image-icon--action-membership{content: "card_membership"}.image-icon--method-password:after{content: "lock"}.image-icon--method-publish:after{content: "cloud_upload"}.image-icon--method-show:after{content: "slideshow"}.image-icon--method-src:after{content: "code"}.image-icon--method-acl:after{content: "https"}.image-icon--method-rights:after{content: "https"}.image-icon--method-archive:after{content: "schedule"}.image-icon--method-mail:after{content: "mail"}.image-icon--method-search:after{content: "search"}.image-icon--method-add:after{content: "add_box"}.image-icon--menu-close:after{content: "close"}.image-icon--menu-fullscreen:after{content: "fullscreen"}.image-icon--menu-edit:after{content: "description"}.image-icon--menu-extra:after{content: "build"}.image-icon--menu-menu:after{content: "menu"}.image-icon--menu-minimize:after{content: "compare_arrows"}.image-icon--menu-qrcode:after{content: "phone_android"}.image-icon--node-open:after{content: "expand_more"}.image-icon--node-closed:after{content: "chevron_right"}.image-icon--dropdown:after{content: "arrow_drop_down"}.image-icon--database:after{content: "storage"}.image-icon--arrow-left:after{content: "chevron_left"}.image-icon--arrow-right:after{content: "chevron_right"}.image-icon--form-ok:after{content: "done"}.image-icon--form-cancel:after{content: "clear"}.image-icon--editor-bold:after{content: "format_bold"}.image-icon--editor-italic:after{content: "format_italic"}.image-icon--editor-headline:after{content: "format_size"}.image-icon--editor-help:after{content: "help_outline"}.image-icon--editor-fullscreen:after{content: "fullscreen"}.image-icon--editor-quote:after{content: "format_quote"}.image-icon--editor-unnumberedlist:after{content: "format_list_bulleted"}.image-icon--editor-numberedlist:after{content: "format_list_numbered"}.image-icon--editor-preview:after{content: "desktop_windows"}.image-icon--editor-sidebyside:after{content: "flip"}.image-icon--editor-link:after{content: "link"}.image-icon--editor-image:after{content: "image"}.image-icon--editor-undo:after{content: "undo"}.image-icon--editor-redo:after{content: "redo"}.image-icon--editor-code:after{content: "code"}.image-icon--editor-horizontalrule:after{content: "remove"}.image-icon--editor-table:after{content: "view_comfy"}.editor-toolbar{font-size: 1.5em}iframe{width: 100%;height: 500px;display: block}div.breadcrumb,div.breadcrumb a,div.panel > div.title{font-weight: bold}div#noticebar{display: block;position: fixed;bottom: 40px;right: 40px;width: 25em;z-index: 113}div#noticebar div.notice{border: 2px solid #000;padding: 1.1em;margin: 5px;position: relative;border-radius: 5px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px;-webkit-box-shadow: 3px 2px 5px #000;-moz-box-shadow: 3px 2px 5px #000;box-shadow: 3px 2px 5px #000}div#noticebar div.notice .or-notice-toolbar{float: right;margin: 0 .2em;font-size: 2em;color: gray;cursor: pointer}div#noticebar div.notice:hover .or-notice-toolbar{color: black}div#noticebar div.notice.full{display: block;position: fixed;bottom: 10%;top: 10%;right: 10%;left: 10%;width: 80%;z-index: 114}div#noticebar div.notice.error div.text{font-weight: bold}div#noticebar div.notice div.text{font-size: 1.1em}div#noticebar div.notice:after{content: '';position: absolute;right: 0;top: 50%;width: 0;height: 0;border: 1em solid transparent;border-right: 0;margin-top: -1em;margin-right: -1em}div#noticebar div.notice div.log{display: none;position: relative;max-height: 90%;overflow: auto;font-family: 'Source Code Pro', Monospace, Monospaced, Courier}div#noticebar div.notice.full div.log{display: block}div.onrowvisible{visibility: hidden;display: inline}a:link,a:visited{font-weight: normal;text-decoration: none}a:active,a:hover{font-weight: normal;text-decoration: none}img[align=left],img[align=right]{padding-right: 1px;padding-left: 1px}div.logo h2{font-weight: normal;font-size: 24px}div.logo p{font-size: 13px}label,.clickable{cursor: pointer}.or-droppable--active{background-color: #2E8B57 !important;cursor: move}.or-droppable--hover{background-color: #00d95a !important;cursor: move}img.icon{padding: 4px;width: 16px;height: 16px}div.panel ul.views li{vertical-align: middle;padding: 0px;cursor: pointer;border-right: 1px solid #000;-moz-border-radius-topleft: 5px;-webkit-border-radius-topleft: 5px;-khtml-border-top-radius-topleft: 5px;-moz-border-radius-topright: 5px;-webkit-border-radius-topright: 5px;-khtml-border-top-radius-topright: 5px;border-top-right-radius: 5px;display: inline;white-space: nowrap;float: left}div.panel{margin: 0px;padding: 0px}div.panel div.status{padding: 10px}div.panel div.status div.error,div.message.error{background: url(../images/notice_error.png) no-repeat;background-position: 5px 7px}div.panel div.status div.warn,div.message.warn{background: url(../images/notice_warning.png) no-repeat;background-position: 5px 7px}div.panel div.status div.ok,div.message.ok{background: url(../images/notice_ok.png) no-repeat;background-position: 5px 7px}div.panel div.status div.info,div.message.info{background: url(../images/notice_info.png) no-repeat;background-position: 5px 7px}div.panel div.status div,div.message{border: 1px solid #000;padding: 5px 0px 5px 25px;margin: 10px 10px 20px 10px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px;border-radius: 5px}#workbench div.panel.fullscreen{display: block;z-index: 109;position: fixed;top: 0;left: 0;background-color: #000;margin: 0px;width: 100% !important;height: 100% !important}#workbench div.panel.fullscreen > div.content{width: 100% !important;height: 100% !important}#workbench div.panel{border: 1px solid #000;margin: 0px;padding: 0px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px;border-radius: 5px}#workbench div.container,#workbench div.panel,#workbench div.divider{display: inline;float: left;margin: 0px}#workbench div.panel > div.content{overflow: auto}.invisible{visibility: hidden}.visible{visibility: visible}div.panel{position: relative}div.content div.bottom{height: 55px;width: 100%;position: absolute;padding-right: 40px;bottom: 0px;right: 0px;xvisibility: hidden}div.content div.bottom > div.command{xvisibility: visible;float: right;z-index: 20}div.content form[data-autosave='true'] div.command{display: none}div.content > form{padding-bottom: 45px}main .or-form .or-form-actionbar{display: none}.or-link-btn{padding: .5em 1em;border: 0;border-radius: .3em;-moz-border-radius: .3em;-webkit-border-radius: .3em;-khtml-border-radius: .3em;cursor: pointer}div.search > .or-input{padding-top: 1px}.or-input{padding: 2px;margin: 0px}fieldset > div input.name,fieldset > div span.name{font-weight: bold}fieldset > div input.filename,fieldset > div input.extension,fieldset > div input.ansidate,fieldset > div span.filename,fieldset > div span.extension,fieldset > div span.ansidate{font-family: 'Source Code Pro', Monospace, Monospaced, Courier}dl.notice{padding: 15px}div.content pre,div.dropdown{min-width: 150px;max-width: 450px}img.image-icon{visibility: hidden}.CodeMirror{height: auto}.or-linklist{display: flex;flex-direction: column;padding: 10% 20%}.or-linklist > .or-linklist-line{border: 1px solid;margin-top: 1em;padding: 1em;border-radius: .5em;-moz-border-radius: .5em;-webkit-border-radius: .5em;-khtml-border-radius: .5em}.or-info{position: relative}.or-info:hover .or-info-popup{display: block}.or-info .or-info-popup{display: none;position: absolute;top: 0px;left: 0px;overflow: visible;border: 0.5em;font-size: 2em;border-radius: .3em;-moz-border-radius: .3em;-webkit-border-radius: .3em;-khtml-border-radius: .3em;padding: 1.0em;z-index: 105}.or-info .or-info-popup > div{display: inline-block}.or-view-flying-button{display: block;bottom: 1em;right: 1em;position: absolute} +@font-face{font-family: 'Oxygen';font-style: normal;font-weight: 400;src: local('Oxygen Regular'), local('Oxygen-Regular'), url('../font/oxygen-v7-latin-regular.woff') format('woff2'), url('../font/oxygen-v7-latin-regular.woff') format('woff')}@font-face{font-family: 'Source Code Pro';font-style: normal;font-weight: 400;src: local('Source Code Pro'), local('SourceCodePro-Regular'), url('../font/source-code-pro-v8-latin-regular.woff2') format('woff2'), url('../font/source-code-pro-v8-latin-regular.woff') format('woff')}@font-face{font-family: 'Material Icons';font-style: normal;font-weight: 400;src: local('Material Icons'), local('MaterialIcons-Regular'), url('../font/MaterialIcons-Regular.woff2') format('woff2'), url('../font/MaterialIcons-Regular.woff') format('woff')}.image-icon{font-family: 'Material Icons';font-weight: normal;font-style: normal;display: inline-block;text-transform: none;letter-spacing: normal;word-wrap: normal;white-space: nowrap;direction: ltr;font-feature-settings: 'liga'}.image-icon--action-el_text:after{content: "spellcheck"}.image-icon--action-el_longtext:after{content: "view_headline"}.image-icon--action-el_select:after{content: "list"}.image-icon--action-el_number:after{content: "looks_one"}.image-icon--action-el_link:after{content: "call_made"}.image-icon--action-el_date:after{content: "date_range"}.image-icon--action-el_insert:after{content: "keyboard_return"}.image-icon--action-el_copy:after{content: "flip_to_back"}.image-icon--action-el_linkinfo:after{content: "info"}.image-icon--action-el_linkdate:after{content: "info"}.image-icon--action-el_code:after{content: "code"}.image-icon--action-el_dynamic:after{content: "play_circle_outline"}.image-icon--action-el_info:after{content: "info"}.image-icon--action-el_infodate:after{content: "info"}.image-icon--action-el_checkbox:after{content: "check_box"}.image-icon--action-image:after{content: "image"}.image-icon--action-link:after{content: "call_made"}.image-icon--action-url:after{content: "link"}.image-icon--action-alias:after{content: "bookmark_border"}.image-icon--action-text:after{content: "text_format"}.image-icon--action-page:after{content: "insert_drive_file"}.image-icon--action-file:after{content: "save"}.image-icon--action-modellist:after{content: "device_hub"}.image-icon--action-model:after{content: "device_hub"}.image-icon--action-folder:after{content: "folder_open"}.image-icon--action-languagelist:after{content: "language"}.image-icon--action-language:after{content: "language"}.image-icon--action-template:after{content: "receipt"}.image-icon--action-templatelist:after{content: "receipt"}.image-icon--action-groupllist:after{content: "group"}.image-icon--action-group:after{content: "group"}.image-icon--action-userlist:after{content: "person"}.image-icon--action-user:after{content: "person"}.image-icon--action-profile:after{content: "person_pin"}.image-icon--method-settings:after{content: "settings"}.image-icon--action-configuration:after{content: "settings"}.image-icon--action-projectlist:after{content: "list"}.image-icon--action-project:after{content: "account_balance"}.image-icon--action-macro:after{content: "data_usage"}.image-icon--action-membership{content: "card_membership"}.image-icon--method-password:after{content: "lock"}.image-icon--method-publish:after{content: "cloud_upload"}.image-icon--method-show:after{content: "slideshow"}.image-icon--method-src:after{content: "code"}.image-icon--method-acl:after{content: "https"}.image-icon--method-rights:after{content: "https"}.image-icon--method-archive:after{content: "schedule"}.image-icon--method-mail:after{content: "mail"}.image-icon--method-search:after{content: "search"}.image-icon--method-add:after{content: "add_box"}.image-icon--menu-close:after{content: "close"}.image-icon--menu-fullscreen:after{content: "fullscreen"}.image-icon--menu-edit:after{content: "description"}.image-icon--menu-extra:after{content: "build"}.image-icon--menu-menu:after{content: "menu"}.image-icon--menu-minimize:after{content: "compare_arrows"}.image-icon--menu-qrcode:after{content: "phone_android"}.image-icon--node-open:after{content: "expand_more"}.image-icon--node-closed:after{content: "chevron_right"}.image-icon--dropdown:after{content: "arrow_drop_down"}.image-icon--database:after{content: "storage"}.image-icon--arrow-left:after{content: "chevron_left"}.image-icon--arrow-right:after{content: "chevron_right"}.image-icon--form-ok:after{content: "done"}.image-icon--form-apply:after{content: "done"}.image-icon--form-cancel:after{content: "clear"}.image-icon--editor-bold:after{content: "format_bold"}.image-icon--editor-italic:after{content: "format_italic"}.image-icon--editor-headline:after{content: "format_size"}.image-icon--editor-help:after{content: "help_outline"}.image-icon--editor-fullscreen:after{content: "fullscreen"}.image-icon--editor-quote:after{content: "format_quote"}.image-icon--editor-unnumberedlist:after{content: "format_list_bulleted"}.image-icon--editor-numberedlist:after{content: "format_list_numbered"}.image-icon--editor-preview:after{content: "desktop_windows"}.image-icon--editor-sidebyside:after{content: "flip"}.image-icon--editor-link:after{content: "link"}.image-icon--editor-image:after{content: "image"}.image-icon--editor-undo:after{content: "undo"}.image-icon--editor-redo:after{content: "redo"}.image-icon--editor-code:after{content: "code"}.image-icon--editor-horizontalrule:after{content: "remove"}.image-icon--editor-table:after{content: "view_comfy"}.editor-toolbar{font-size: 1.5em}iframe{width: 100%;height: 500px;display: block}div.breadcrumb,div.breadcrumb a,div.panel > div.title{font-weight: bold}div#noticebar{display: block;position: fixed;bottom: 40px;right: 40px;width: 25em;z-index: 113}div#noticebar div.notice{border: 2px solid #000;padding: 1.1em;margin: 5px;position: relative;border-radius: 5px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px;-webkit-box-shadow: 3px 2px 5px #000;-moz-box-shadow: 3px 2px 5px #000;box-shadow: 3px 2px 5px #000}div#noticebar div.notice .or-notice-toolbar{float: right;margin: 0 .2em;font-size: 2em;color: gray;cursor: pointer}div#noticebar div.notice:hover .or-notice-toolbar{color: black}div#noticebar div.notice.full{display: block;position: fixed;bottom: 10%;top: 10%;right: 10%;left: 10%;width: 80%;z-index: 114}div#noticebar div.notice.error div.text{font-weight: bold}div#noticebar div.notice div.text{font-size: 1.1em}div#noticebar div.notice:after{content: '';position: absolute;right: 0;top: 50%;width: 0;height: 0;border: 1em solid transparent;border-right: 0;margin-top: -1em;margin-right: -1em}div#noticebar div.notice div.log{display: none;position: relative;max-height: 90%;overflow: auto;font-family: 'Source Code Pro', Monospace, Monospaced, Courier}div#noticebar div.notice.full div.log{display: block}div.onrowvisible{visibility: hidden;display: inline}a:link,a:visited{font-weight: normal;text-decoration: none}a:active,a:hover{font-weight: normal;text-decoration: none}img[align=left],img[align=right]{padding-right: 1px;padding-left: 1px}div.logo h2{font-weight: normal;font-size: 24px}div.logo p{font-size: 13px}label,.clickable{cursor: pointer}.or-droppable--active{background-color: #2E8B57 !important;cursor: move}.or-droppable--hover{background-color: #00d95a !important;cursor: move}img.icon{padding: 4px;width: 16px;height: 16px}div.panel ul.views li{vertical-align: middle;padding: 0px;cursor: pointer;border-right: 1px solid #000;-moz-border-radius-topleft: 5px;-webkit-border-radius-topleft: 5px;-khtml-border-top-radius-topleft: 5px;-moz-border-radius-topright: 5px;-webkit-border-radius-topright: 5px;-khtml-border-top-radius-topright: 5px;border-top-right-radius: 5px;display: inline;white-space: nowrap;float: left}div.panel{margin: 0px;padding: 0px}div.panel div.status{padding: 10px}div.panel div.status div.error,div.message.error{background: url(../images/notice_error.png) no-repeat;background-position: 5px 7px}div.panel div.status div.warn,div.message.warn{background: url(../images/notice_warning.png) no-repeat;background-position: 5px 7px}div.panel div.status div.ok,div.message.ok{background: url(../images/notice_ok.png) no-repeat;background-position: 5px 7px}div.panel div.status div.info,div.message.info{background: url(../images/notice_info.png) no-repeat;background-position: 5px 7px}div.panel div.status div,div.message{border: 1px solid #000;padding: 5px 0px 5px 25px;margin: 10px 10px 20px 10px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px;border-radius: 5px}#workbench div.panel.fullscreen{display: block;z-index: 109;position: fixed;top: 0;left: 0;background-color: #000;margin: 0px;width: 100% !important;height: 100% !important}#workbench div.panel.fullscreen > div.content{width: 100% !important;height: 100% !important}#workbench div.panel{border: 1px solid #000;margin: 0px;padding: 0px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px;border-radius: 5px}#workbench div.container,#workbench div.panel,#workbench div.divider{display: inline;float: left;margin: 0px}#workbench div.panel > div.content{overflow: auto}.invisible{visibility: hidden}.visible{visibility: visible}div.panel{position: relative}div.content div.bottom{height: 55px;width: 100%;position: absolute;padding-right: 40px;bottom: 0px;right: 0px;xvisibility: hidden}div.content div.bottom > div.command{xvisibility: visible;float: right;z-index: 20}div.content form[data-autosave='true'] div.command{display: none}div.content > form{padding-bottom: 45px}main .or-form .or-form-actionbar{display: none}div.search > .or-input{padding-top: 1px}.or-input{padding: 2px;margin: 0px}fieldset > div input.name,fieldset > div span.name{font-weight: bold}fieldset > div input.filename,fieldset > div input.extension,fieldset > div input.ansidate,fieldset > div span.filename,fieldset > div span.extension,fieldset > div span.ansidate{font-family: 'Source Code Pro', Monospace, Monospaced, Courier}dl.notice{padding: 15px}div.content pre,div.dropdown{min-width: 150px;max-width: 450px}img.image-icon{visibility: hidden}.CodeMirror{height: auto}.or-linklist{display: flex;flex-direction: column;padding: 10% 20%}.or-linklist > .or-linklist-line{border: 1px solid;margin-top: 1em;padding: 1em;border-radius: .5em;-moz-border-radius: .5em;-webkit-border-radius: .5em;-khtml-border-radius: .5em}.or-info{position: relative}.or-info:hover .or-info-popup{display: block}.or-info .or-info-popup{display: none;position: absolute;top: 0px;left: 0px;overflow: visible;border: 0.5em;font-size: 2em;border-radius: .3em;-moz-border-radius: .3em;-webkit-border-radius: .3em;-khtml-border-radius: .3em;padding: 1.0em;z-index: 105}.or-info .or-info-popup > div{display: inline-block}.or-view-flying-button{display: block;bottom: 1em;right: 1em;position: absolute} #title{overflow: hidden;padding: 5px}.or-menu{display: flex;justify-content: space-between}.or-menu .or-menu-group{display: flex}.or-menu .or-menu-group:nth-last-child(1) div.dropdown{right: 10px}.or-menu .or-menu-group i.image-icon{width: 1.1em}.or-menu .or-menu-group div > div.arrow-down{width: 0;height: 0;margin: 6px;padding: 0px;margin-top: 10px}.or-menu .or-menu-group div.toolbar-icon{padding: 2px;margin-left: 10px;float: left}.or-menu .or-menu-group div.toolbar-icon.user,.or-menu .or-menu-group div.toolbar-icon.search,.or-menu .or-menu-group div.toolbar-icon.history{float: right;margin-right: 10px;margin-left: 10px}.or-menu .or-menu-group div.toolbar-icon.menu{cursor: default}.or-menu .or-menu-group div.toolbar-icon.search input{border: 0;margin: 0;padding: 0;width: 3em;display: inline;transition: width .3s ease-in-out}.or-menu .or-menu-group div.toolbar-icon.search input:focus{width: 8em}.or-menu .or-menu-group div.toolbar-icon div.dropdown{z-index: 120;min-width: 250px;display: none;position: absolute;padding: 5px 0px;font-style: normal;font-weight: normal;text-decoration: none}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry{padding: 0}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry > a{display: flex;align-items: center;padding: 0 .5em}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry > a *{margin: 0.25em}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry > a span:first-of-type{flex: 1}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.entry > .text{display: block;margin: 10px}.or-menu .or-menu-group div.toolbar-icon div.dropdown div.divide{height: 1px;width: 100%;margin-top: 5px;margin-bottom: 5px}.or-menu.open .toolbar-icon.open > div.dropdown{display: block} -.or-form{display: flex;height: 100%;flex-direction: column;padding: 1em}.or-form .or-form-headline{height: 2em}.or-form .or-form-content{flex-grow: 1;overflow-y: auto}.or-form .or-form-actionbar{height: 3em}.or-form input[type=checkbox] + label,.or-form input[type=radio] + label{width: 80%}.or-form .headline{font-size: 1.8em}.or-form div.inputholder > div.dropdown{width: 70%}.or-form input.submit{padding: 7px;border: 0px;-moz-border-radius: 7px;-webkit-border-radius: 7px;-khtml-border-radius: 7px;border-radius: 7px;margin-left: 20px;cursor: pointer}.or-form input[type=text],.or-form select,.or-form textarea{width: 100%;padding: 12px;border: 1px solid #ccc;border-radius: 4px;box-sizing: border-box;resize: vertical}.or-form label{padding: 12px 12px 12px 0;display: inline-block}.or-form input[type=submit]{color: white;padding: 12px 20px;border: none;border-radius: 4px;cursor: pointer;float: right}.or-form div.label{float: left;width: 25%;margin-top: 6px}.or-form div.input{float: left;width: 75%;margin-top: 6px}.or-form .line:after{content: "";display: table;clear: both}.or-form .or-form-row{display: flex;align-items: center}.or-form .or-form-row .or-form-label{width: 25%}.or-form .or-form-row .or-form-input{width: 75%}.or-form .or-form-actionbar{position: sticky;bottom: 0;left: 0;right: 0;display: flex;justify-content: end;padding: 1em;height: auto}.or-form .or-form-actionbar .or-form-btn{padding: 1em 2em;margin-left: 1.5em;min-width: 14em;border: 0;border-radius: .5em;-moz-border-radius: .5em;-webkit-border-radius: .5em;-khtml-border-radius: .5em;cursor: pointer}.or-form .or-form-actionbar .or-form-btn--primary{font-weight: bold}@media screen and (max-width: 65rem){.or-form div.label,.or-form div.input{width: 100%;margin-top: 0}.or-form .or-form-row{flex-direction: column}.or-form .or-form-row .or-form-label,.or-form .or-form-row .or-form-input{width: 100%}.or-form .or-form-actionbar{align-items: center;display: block}.or-form .or-form-actionbar .or-form-btn{width: 90%}} +.or-form{display: flex;height: 100%;flex-direction: column;padding: 1em}.or-form .or-form-headline{height: 2em}.or-form .or-form-content{flex-grow: 1;overflow-y: auto}.or-form input[type=checkbox] + label,.or-form input[type=radio] + label{width: 80%}.or-form .headline{font-size: 1.8em}.or-form div.inputholder > div.dropdown{width: 70%}.or-form input.submit{padding: 7px;border: 0px;-moz-border-radius: 7px;-webkit-border-radius: 7px;-khtml-border-radius: 7px;border-radius: 7px;margin-left: 20px;cursor: pointer}.or-form input[type=text],.or-form select,.or-form textarea{width: 100%;padding: 12px;border: 1px solid #ccc;border-radius: 4px;box-sizing: border-box;resize: vertical}.or-form label{padding: 12px 12px 12px 0;display: inline-block}.or-form input[type=submit]{color: white;padding: 12px 20px;border: none;border-radius: 4px;cursor: pointer;float: right}.or-form div.label{float: left;width: 25%;margin-top: 6px}.or-form div.input{float: left;width: 75%;margin-top: 6px}.or-form .line:after{content: "";display: table;clear: both}.or-form .or-form-row{display: flex;align-items: center}.or-form .or-form-row .or-form-label{width: 25%}.or-form .or-form-row .or-form-input{width: 75%}.or-form .or-form-actionbar{height: 3em;position: sticky;bottom: 0;left: 0;right: 0;display: flex;justify-content: end;padding: 1em;height: auto}.or-form .or-form-actionbar .or-btn{padding: 1em 2em;margin-left: 1.5em;min-width: 14em}@media only screen and (max-width: 65rem){.or-form div.label,.or-form div.input{width: 100%;margin-top: 0}.or-form .or-form-row{flex-direction: column}.or-form .or-form-row .or-form-label,.or-form .or-form-row .or-form-input{width: 100%}.or-form .or-form-actionbar .or-btn{padding: 1em 1em;min-width: 5em}.or-form .or-form-actionbar .or-act-form-apply{display: none}.or-form .or-form-actionbar .or-btn--secondary{min-width: 0}}.or-btn{padding: .5em .5em;border: 1px solid #000;border-radius: .5em;-moz-border-radius: .5em;-webkit-border-radius: .5em;-khtml-border-radius: .5em;cursor: pointer}.or-btn--primary{font-weight: bold} .or-navtree ul.or-navtree-list{list-style-type: none;margin: 0;padding: 0}.or-navtree ul.or-navtree-list ul{margin-left: 18px}.or-navtree ul.or-navtree-list .or-navtree-node-control{width: 18px;min-width: 18px;height: 18px;float: left;cursor: pointer}.or-navtree ul.or-navtree-list .or-navtree-node{margin: 0;padding: 0;line-height: 18px;font-weight: normal;white-space: nowrap}.or-navtree ul.or-navtree-list .or-navtree-node.or-navtree-node--selected{font-weight: bold}.or-navtree ul.or-navtree-list .or-navtree-node.or-navtree-node--selected > div > a{font-weight: bold} div#dialog > .view{overflow: auto;position: absolute;top: 5%;left: 10%;width: 80%;height: 80%;z-index: 110;border: 1px solid !important}@media only screen and (max-width: 55rem){div#dialog > .view{top: 2.5%;left: 2.5%;width: 95%;height: 95%}}div#dialog.is-closed{display: none;width: 0}div#dialog .filler{position: absolute;z-index: 100;top: 0;left: 0;height: 100%;width: 100%;opacity: 0.5}div#dialog .filler span.icon{opacity: 1;font-size: 3em;font-weight: bold;text-align: center;width: 40px;height: 40px;position: absolute;right: 20px;top: 20px}#editor .dirty{font-weight: bold}.visible-for-nojs{display: none}html.nojs .noscript{display: block}.toggle-open-close{display: flex;flex-direction: column}.toggle-open-close .on-click-open-close{cursor: pointer;font-weight: normal}.toggle-open-close > .closable{transition: opacity .3s ease-out;flex: 1;display: block}.toggle-open-close.closed > .on-click-open-close > .on-closed{display: inline}.toggle-open-close.closed > .on-click-open-close > .on-open{display: none}.toggle-open-close.closed > .closable{opacity: 0;max-height: 0;overflow: hidden}.toggle-open-close.open > .closable{height: auto}.toggle-open-close.open > .on-click-open-close > .on-closed{display: none}.toggle-open-close.open > .on-click-open-close > .on-open{display: inline}html,body{width: 100%;height: 100%}div#workbench{width: 100%;height: 100%;display: flex;flex-direction: column}div#workbench > header{height: 3.0rem}div#workbench > header .toolbar-icon .arrow-down{display: inline}@media only screen and (max-width: 55rem){div#workbench > header .toolbar-icon span.label,div#workbench > header .toolbar-icon .arrow-down{display: none}}div#workbench > .or-main-area{flex: 1;min-height: 0;padding-top: 0.5em}div#workbench > .or-main-area > *{min-width: 0;min-height: 0;overflow-y: auto;overflow-x: hidden;height: 100%}div#workbench > .or-main-area > nav{width: 33%;transition: width .15s ease-in-out;position: fixed;height: calc(100% - 3.0rem - 0.5em)}@media only screen and (max-width: 55rem){div#workbench > .or-main-area > nav{width: 0}}div#workbench > .or-main-area > nav.or-nav--is-small{width: 0}div#workbench > .or-main-area > nav.or-nav--is-small ~ .or-workplace{margin-left: 0}@media only screen and (max-width: 55rem){div#workbench > .or-main-area > nav.or-nav--is-open{overflow-y: auto;width: 95%;border-right: 1px solid;-webkit-box-shadow: 3px 2px 2px #000;-moz-box-shadow: 3px 2px 2px #000;box-shadow: 3px 2px 2px #000;opacity: 0.95}}@media only screen and (min-width: 75rem){div#workbench > .or-main-area > nav{width: 33%;overflow-y: auto}}div#workbench > .or-main-area > nav div.view{height: 100%}div#workbench > .or-main-area header .or-view-icon,div#workbench > .or-main-area header .or-view-headline{margin: 0.3em;display: inline;font-size: 1.2em;line-height: 1.5em}div#workbench > .or-main-area > .or-workplace{margin-left: 33%;transition: margin-left .15s ease-in-out}@media only screen and (max-width: 55rem){div#workbench > .or-main-area > .or-workplace{margin-left: 0}}div#workbench > .or-main-area > .or-workplace > #editor{transition: opacity .5s ease;display: flex;flex-direction: column}div#workbench > .or-main-area > .or-workplace > #editor.is-closed{flex: 0.5;cursor: not-allowed;pointer-events: none}@media only screen and (max-width: 55rem){div#workbench > .or-main-area > .or-workplace > #editor.is-closed{flex: 0}}div#workbench > .or-main-area > .or-workplace > #editor > section{margin: 1.5em;border: 1px solid;border-radius: 5px;-moz-border-radius: 5px;-webkit-border-radius: 5px;-khtml-border-radius: 5px}@media only screen and (max-width: 55rem){div#workbench > .or-main-area > .or-workplace > #editor > section{margin: 0.5em}}div#workbench > .or-main-area > .or-workplace > #editor > section .view-toolbar{display: inline}div#workbench > .or-main-area > .or-workplace > #editor > section.closed .view-toolbar{display: none}nav .or-act-nav-small{display: block}nav .or-act-nav-wide{display: none}nav.or-nav--is-small .or-act-nav-small{display: none}nav.or-nav--is-small .or-act-nav-wide{display: block}.or--visible-on-mobile{display: none}@media only screen and (max-width: 55rem){.or--visible-on-mobile{display: inline}}.or--visible-on-desktop{display: inline}@media only screen and (max-width: 55rem){.or--visible-on-desktop{display: none}}#title .toggle-nav-small{display: inline}@media only screen and (max-width: 55rem){#title .toggle-nav-small{display: none}}#title .toggle-nav-open-close{display: none}@media only screen and (max-width: 55rem){#title .toggle-nav-open-close{display: inline}}@media only screen and (max-width: 55rem){#title .toolbar-icon.search input{width: 3em}}.loader{background: url(../images/loader.gif) no-repeat;background-position: center, top;height: 30px;opacity: 0.5;cursor: wait;pointer-events: none}@media only screen and (max-width: 55rem){html{font-size: 1em}}.or-breadcrumb{margin-bottom: 0.1em;margin-left: 1.5em;line-height: 18px;font-weight: normal;white-space: nowrap}.or-breadcrumb *{display: inline;margin-right: 0.3em}.or-breadcrumb .or-breadcrumb-item .image-icon{margin-right: 0.2em} .editor__text-editor{width: 100%;height: 300px}textarea.editor__code-editor{display: none}div.editor__code-editor{position: absolute;height: 500px;width: 100%;font-size: 14px;z-index: 256}textarea.editor__text-editor,textarea.editor__wiki-editor,textarea.editor__html-editor{width: 100%}a.editorlink:active,a.editorlink:hover{font-weight: normal;text-decoration: none}a.editorlink:link,a.editorlink:visited{font-weight: normal;text-decoration: none} diff --git a/modules/cms/ui/themes/default/style/theme/openrat-theme.less b/modules/cms/ui/themes/default/style/theme/openrat-theme.less @@ -189,12 +189,16 @@ html.theme-@{cms-theme-id} { input.submit, - .or-form-btn, + .or-btn, .or-link-btn { background-color: @cms-inactive-background-color; color: @cms-title-text-color; .box-shadow(0px, 0px, 15px, @cms-background-color); + border-color: @cms-background-color; + &:hover { + border-color: @cms-title-text-color; + } &--primary { background-color: @cms-title-background-color; } diff --git a/modules/template_engine/components/html/form/Form.class.php b/modules/template_engine/components/html/form/Form.class.php @@ -3,6 +3,7 @@ namespace template_engine\components; use cms\action\RequestParams; +use language\Messages; use template_engine\components\html\Component; use template_engine\element\CMSElement; use template_engine\element\HtmlElement; @@ -87,43 +88,51 @@ class FormComponent extends Component (new HtmlElement('div'))->addStyleClass('or-form-headline') ); + // Creating the action bar $actionBar = (new HtmlElement('div'))->addStyleClass('or-form-actionbar'); - // Cancel-Button nicht anzeigen, wenn cancel==false. if ($this->cancel) { + // Adding a cancel-button. $actionBar->addChild( - (new CMSElement('input')) - ->addAttribute('type', 'button') - ->addStyleClass('or-form-btn') - ->addStyleClass('or-form-btn--secondary') - ->addStyleClass('or-form-btn--cancel') - ->addAttribute('value', - Value::createExpression(ValueExpression::TYPE_MESSAGE, 'CANCEL') + (new CMSElement('div')) + ->addStyleClass('or-btn') + ->addStyleClass('or-btn--secondary') + ->addStyleClass('or-act-form-cancel') + ->addChild( + (new HtmlElement('i'))->addStyleClass(['image-icon','image-icon--form-cancel']) + )->addChild( + (new HtmlElement('span'))->addStyleClass('or-form-btn-label')->content(Value::createExpression(ValueExpression::TYPE_MESSAGE, Messages::CANCEL)) ) ); } if ($this->apply && !$this->readonly) { + // Adding an apply-button $actionBar->addChild( - (new CMSElement('input')) - ->addAttribute('type', 'button') - ->addStyleClass('or-form-btn') - ->addStyleClass('or-form-btn--primary') - ->addStyleClass('or-form-btn--apply') - ->addAttribute('value', - Value::createExpression(ValueExpression::TYPE_MESSAGE, 'APPLY') + (new CMSElement('div')) + ->addStyleClass('or-btn') + ->addStyleClass('or-btn--primary') + ->addStyleClass('or-act-form-apply') + ->addChild( + (new HtmlElement('i'))->addStyleClass(['image-icon','image-icon--form-apply']) + )->addChild( + (new HtmlElement('span'))->addStyleClass('or-form-btn-label')->content(Value::createExpression(ValueExpression::TYPE_MESSAGE, Messages::APPLY)) ) ); } if (!$this->readonly) { + // Adding the save-button $actionBar->addChild( - (new CMSElement('input')) - ->addAttribute('type', 'submit') - ->addStyleClass('or-form-btn') - ->addStyleClass('or-form-btn--primary') - ->addStyleClass('or-form-btn--save') - ->addAttribute('value', $this->label) + (new CMSElement('div')) + ->addStyleClass('or-btn') + ->addStyleClass('or-btn--primary') + ->addStyleClass('or-act-form-save') + ->addChild( + (new HtmlElement('i'))->addStyleClass(['image-icon','image-icon--form-ok']) + )->addChild( + (new HtmlElement('span'))->addStyleClass('or-form-btn-label')->content($this->label) + ) ); } diff --git a/modules/template_engine/element/Element.class.php b/modules/template_engine/element/Element.class.php @@ -51,6 +51,12 @@ class Element return $this->attributes[$name]->render(); } + /** + * The textual content of the element. + * + * @param string $content + * @return $this + */ public function content( $content ) { $this->content = $content; diff --git a/modules/template_engine/element/Value.class.php b/modules/template_engine/element/Value.class.php @@ -14,6 +14,12 @@ class Value const CONTEXT_HTML = 1; const CONTEXT_RAW = 2; + + /** + * @param int $type a type from ValueExpression + * @param string $name + * @return string + */ public static function createExpression($type, $name) { $expr = new ValueExpression($type,$name,0);