commit 8c702c226ef3447997c68b2a4a035dfb2aec8877 parent c774d418e1caf44e0248bd9d1bcf1ec49abec6be Author: Jan Dankert <develop@jandankert.de> Date: Wed, 11 Nov 2020 20:53:45 +0100 Cleaned up some view. Diffstat:
10 files changed, 258 insertions(+), 241 deletions(-)
diff --git a/modules/cms/base/DefaultConfig.class.php b/modules/cms/base/DefaultConfig.class.php @@ -641,7 +641,7 @@ class DefaultConfig { 'user' => [ 'show_admin_mail' => true, - 'show_mail' => true, + 'show_mail' => false, 'send_message' => true, ], 'content-security-policy' => true, diff --git a/modules/cms/ui/themes/default/html/views/folder/pub.php b/modules/cms/ui/themes/default/html/views/folder/pub.php @@ -13,44 +13,44 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('folder') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('pub') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> - <?php $if3=($pages); if($if3) { ?> - <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> - <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?> - </h3> - <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-label') ?>"><?php echo O::escapeHtml('') ?> - </div> - <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('pages') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$pages){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> - <label class="<?php echo O::escapeHtml('or-label') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(' ') ?> - </span> - <span><?php echo O::escapeHtml(''.@O::lang('pages').'') ?> - </span> - </label> - </div> - </div> - </section> - <?php } ?> - <?php $if3=($files); if($if3) { ?> - <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> - <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?> - </h3> - <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-label') ?>"><?php echo O::escapeHtml('') ?> - </div> - <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('files') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$files){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> - <label class="<?php echo O::escapeHtml('or-label') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(' ') ?> - </span> - <span><?php echo O::escapeHtml(''.@O::lang('files').'') ?> - </span> - </label> - </div> - </div> - </section> - <?php } ?> + <section class="<?php echo O::escapeHtml('or-group or-collapsible or-collapsible--is-open or-collapsible--show') ?>"><?php echo O::escapeHtml('') ?> + <h2 class="<?php echo O::escapeHtml('or-collapsible-title or-group-title or-collapsible-act-switch') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--node-closed or-collapsible--on-closed') ?>"><?php echo O::escapeHtml('') ?> + </i> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--node-open or-collapsible--on-open') ?>"><?php echo O::escapeHtml('') ?> + </i> + <span><?php echo O::escapeHtml(''.@O::lang('publish').'') ?> + </span> + </h2> + <div class="<?php echo O::escapeHtml('or-collapsible-value or-group-value') ?>"><?php echo O::escapeHtml('') ?> + <?php $if4=($pages); if($if4) { ?> + <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> + <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?> + </h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <label><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('pages') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$pages){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('pages').'') ?> + </span> + </label> + </div> + </section> + <?php } ?> + <?php $if4=($files); if($if4) { ?> + <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> + <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?> + </h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <label><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('files') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$files){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('files').'') ?> + </span> + </label> + </div> + </section> + <?php } ?> + </div> + </section> <section class="<?php echo O::escapeHtml('or-group or-collapsible or-collapsible--is-open or-collapsible--show') ?>"><?php echo O::escapeHtml('') ?> <h2 class="<?php echo O::escapeHtml('or-collapsible-title or-group-title or-collapsible-act-switch') ?>"><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--node-closed or-collapsible--on-closed') ?>"><?php echo O::escapeHtml('') ?> @@ -66,17 +66,11 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?> </h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-label') ?>"><?php echo O::escapeHtml('') ?> - </div> - <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('subdirs') ?>" disabled="<?php echo O::escapeHtml('disabled') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$subdirs){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> - <label class="<?php echo O::escapeHtml('or-label') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(' ') ?> - </span> - <span><?php echo O::escapeHtml(''.@O::lang('PUBLISH_WITH_SUBDIRS').'') ?> - </span> - </label> - </div> + <label><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('subdirs') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$subdirs){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('PUBLISH_WITH_SUBDIRS').'') ?> + </span> + </label> </div> </section> <?php } ?> @@ -85,17 +79,11 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?> </h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-label') ?>"><?php echo O::escapeHtml('') ?> - </div> - <div class="<?php echo O::escapeHtml('or-value') ?>"><?php echo O::escapeHtml('') ?> + <label><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('clean') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$clean){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> - <label class="<?php echo O::escapeHtml('or-label') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(' ') ?> - </span> - <span><?php echo O::escapeHtml(''.@O::lang('CLEAN_AFTER_PUBLISH').'') ?> - </span> - </label> - </div> + <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CLEAN_AFTER_PUBLISH').'') ?> + </span> + </label> </div> </section> <?php } ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/pub.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/pub.tpl.src.xml @@ -1,66 +1,37 @@ -<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <!-- - Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. - --> - <if true="${config:security/nopublish}"> - <part class="message warn"> - <text value="${message:NOPUBLISH_DESC}" class="help"/> - </part> - </if> - <form label="${message:publish}" async="true"> - <if true="${pages}"> - <fieldset class="line" label=""> - <part class="label"> - </part> - <part class="value"> - <checkbox name="pages"/> - <label for="pages"> - <text value=" "/> - <text value="${message:pages}"/> - </label> - </part> - </fieldset> - </if> - <if true="${files}"> - <fieldset class="line" label=""> - <part class="label"> - </part> - <part class="value"> - <checkbox name="files"/> - <label for="files"> - <text value=" "/> - <text value="${message:files}"/> - </label> - </part> - </fieldset> - </if> - <group title="${message:options}"> - <if present="subdirs"> - <fieldset class="line" label=""> - <part class="label"> - </part> - <part class="value"> - <checkbox readonly="${subdirs}" name="subdirs"/> - <label for="subdirs"> - <text value=" "/> - <text value="${message:PUBLISH_WITH_SUBDIRS}"/> - </label> - </part> - </fieldset> - </if> - <if present="clean"> - <fieldset class="line" label=""> - <part class="label"> - </part> - <part class="value"> - <checkbox name="clean"/> - <label for="clean"> - <text value=" "/> - <text value="${message:CLEAN_AFTER_PUBLISH}"/> - </label> - </part> - </fieldset> - </if> - </group> - </form> +<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + + <if true="${config:security/nopublish}"> + <!-- Publishing is disabled --> + <part class="message warn"> + <text value="${message:NOPUBLISH_DESC}" class="help"/> + </part> + </if> + + <form label="${message:publish}" async="true"> + <group title="${message:publish}"> + <if true="${pages}"> + <fieldset label=""> + <checkbox name="pages" label="${message:pages}"/> + </fieldset> + </if> + <if true="${files}"> + <fieldset> + <checkbox name="files" label="${message:files}"/> + </fieldset> + </if> + </group> + <group title="${message:options}"> + <if present="subdirs"> + <fieldset label=""> + <checkbox name="subdirs" label="${message:PUBLISH_WITH_SUBDIRS}"/> + </fieldset> + </if> + <if present="clean"> + <fieldset label=""> + <checkbox name="clean" label="${message:CLEAN_AFTER_PUBLISH}"/> + </fieldset> + </if> + </group> + </form> </output> diff --git a/modules/cms/ui/themes/default/html/views/folder/remove.php b/modules/cms/ui/themes/default/html/views/folder/remove.php @@ -7,22 +7,38 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('folder') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('remove') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> - <label class="<?php echo O::escapeHtml('or-form-row') ?>"><?php echo O::escapeHtml('') ?> - <span class="<?php echo O::escapeHtml('or-form-input') ?>"><?php echo O::escapeHtml('') ?> - </span> - <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('NAME').'') ?> - </span> - </label> - <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('delete') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> - <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('DELETE').'') ?> - </span> - </label> - <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('withChildren') ?>" disabled="<?php echo O::escapeHtml('disabled') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$withChildren){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> - <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('DELETE_WITH_CHILDREN').'') ?> - </span> - </label> + <section class="<?php echo O::escapeHtml('or-group or-collapsible--is-open or-collapsible--show') ?>"><?php echo O::escapeHtml('') ?> + <h2 class="<?php echo O::escapeHtml('or-collapsible-title or-group-title or-collapsible-act-switch') ?>"><?php echo O::escapeHtml('') ?> + <span><?php echo O::escapeHtml(''.@O::lang('delete').'') ?> + </span> + </h2> + <div class="<?php echo O::escapeHtml('or-collapsible-value or-group-value') ?>"><?php echo O::escapeHtml('') ?> + <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> + <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml(''.@O::lang('name').'') ?> + </h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <span><?php echo O::escapeHtml(''.@$name.'') ?> + </span> + </div> + </section> + <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> + <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?> + </h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <label><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('delete') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('DELETE').'') ?> + </span> + </label> + <label><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('withChildren') ?>" disabled="<?php echo O::escapeHtml('disabled') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$withChildren){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('DELETE_WITH_CHILDREN').'') ?> + </span> + </label> + </div> + </section> + </div> + </section> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-btn or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/remove.tpl.src.xml @@ -1,7 +1,16 @@ -<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <form> - <text label="NAME" value="${name}"/> - <checkbox label="${message:DELETE}" name="delete"/> - <checkbox label="${message:DELETE_WITH_CHILDREN}" name="withChildren" readonly="not:var:hasChildren"/> - </form> +<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <group title="${message:delete}" collapsible="false"> + + <fieldset label="${message:name}"> + <text value="${name}"/> + </fieldset> + + <fieldset> + <checkbox label="${message:DELETE}" name="delete"/> + <checkbox label="${message:DELETE_WITH_CHILDREN}" name="withChildren" readonly="${hasChildren}"/> + </fieldset> + </group> + </form> </output> diff --git a/modules/cms/ui/themes/default/html/views/object/info.php b/modules/cms/ui/themes/default/html/views/object/info.php @@ -199,44 +199,54 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml(''.@O::lang('created').'') ?> </h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-el_date') ?>"><?php echo O::escapeHtml('') ?> - </i> - <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($create_date); ?> - <?php } ?> - <br /><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?> - </i> - <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($create_user); ?> - <?php } ?> + <span><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-el_date') ?>"><?php echo O::escapeHtml('') ?> + </i> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($create_date); ?> + <?php } ?> + </span> + <span><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?> + </i> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($create_user); ?> + <?php } ?> + </span> </div> </section> <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml(''.@O::lang('lastchange').'') ?> </h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-el_date') ?>"><?php echo O::escapeHtml('') ?> - </i> - <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastchange_date); ?> - <?php } ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?> - </i> - <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($lastchange_user); ?> - <?php } ?> + <span><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-el_date') ?>"><?php echo O::escapeHtml('') ?> + </i> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($lastchange_date); ?> + <?php } ?> + </span> + <span><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?> + </i> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($lastchange_user); ?> + <?php } ?> + </span> </div> </section> <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml(''.@O::lang('published').'') ?> </h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-el_date') ?>"><?php echo O::escapeHtml('') ?> - </i> - <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($published_date); ?> - <?php } ?> - <br /><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?> - </i> - <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($published_user); ?> - <?php } ?> + <span><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-el_date') ?>"><?php echo O::escapeHtml('') ?> + </i> + <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($published_date); ?> + <?php } ?> + </span> + <span><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?> + </i> + <?php include_once( 'modules/template_engine/components/html/component_user/component-user.php'); { component_user($published_user); ?> + <?php } ?> + </span> </div> </section> </div> @@ -252,9 +262,6 @@ </h2> <div class="<?php echo O::escapeHtml('or-collapsible-value or-group-value') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input or-table-filter-input') ?>" /><?php echo O::escapeHtml('') ?> - </div> <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table width="<?php echo O::escapeHtml('100%') ?>" class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> <?php foreach((array)$settings as $list_key=>$entry) { ?> diff --git a/modules/cms/ui/themes/default/html/views/object/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/object/info.tpl.src.xml @@ -1,42 +1,43 @@ -<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<output xmlns="http://www.openrat.de/template" xmlns:html="http://www.w3.org/1999/xhtml" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <group> - <fieldset class="line" label="${message:name}"> + <fieldset label="${message:name}"> <text value="${name}" class="name"/> </fieldset> - <fieldset class="line" label="${message:filename}"> + <fieldset label="${message:filename}"> <text value="${filename}" class="filename"/> </fieldset> - <fieldset class="line" label="${message:file_extension}"> + <fieldset label="${message:file_extension}"> <text value="${extension}" class="extension"/> </fieldset> - <fieldset class="line" label="${message:description}"> + <fieldset label="${message:description}"> <text value="${description}"/> </fieldset> </group> <group title="${message:additional_info}"> - <fieldset class="line" label="${message:full_filename}"> + <fieldset label="${message:full_filename}"> <text value="${full_filename}"/> </fieldset> - <fieldset class="line" label="${message:FILE_SIZE}"> + <fieldset label="${message:FILE_SIZE}"> <text value="${size}"/> </fieldset> - <fieldset class="line" label="${message:FILE_mimetype}"> + <fieldset label="${message:FILE_mimetype}"> <text value="${mimetype}"/> </fieldset> - <fieldset class="line" label=""> + <fieldset label=""> <part class="value,act-clickable"> <link class="action" type="dialog" subaction="size"> <text value="${message:menu_file_size}"/> </link> </part> </fieldset> - <fieldset class="line" label="${message:id}"> + <fieldset label="${message:id}"> <text value="${objectid}"/> </fieldset> <if present="cache_filename"> - <fieldset class="line" label="${message:CACHE_FILENAME}"> + <fieldset label="${message:CACHE_FILENAME}"> <part> <text value="${cache_filename}"/> <newline/> @@ -45,7 +46,7 @@ </part> </fieldset> </if> - <fieldset class="line" label="${message:FILE_PAGES}"> + <fieldset label="${message:FILE_PAGES}"> <table> <list list="${pages}" extract="true"> <row> @@ -66,7 +67,7 @@ <group title="${message:validity}"> <part class="act-clickable"> <link subaction="settings" type="dialog"> - <fieldset class="line" label="${message:state}"> + <fieldset label="${message:state}"> <if true="${is_valid}"> <text value="${message:is_yes}"/> </if> @@ -74,41 +75,51 @@ <text value="${message:is_no}"/> </else> </fieldset> - <fieldset class="line" label="${message:from}"> + <fieldset label="${message:from}"> <date date="${valid_from_date}"/> </fieldset> - <fieldset class="line" label="${message:until}"> + <fieldset label="${message:until}"> <date date="${valid_to_date}"/> </fieldset> </link> </part> </group> <group title="${message:prop_userinfo}"> - <fieldset class="line" label="${message:created}"> - <image elementtype="date"/> - <date date="${create_date}"/> - <newline/> - <image action="user"/> - <user user="${create_user}"/> + <fieldset label="${message:created}"> + <html:span> + <image elementtype="date"/> + <date date="${create_date}"/> + </html:span> + <html:span> + <image action="user"/> + <user user="${create_user}"/> + </html:span> </fieldset> - <fieldset class="line" label="${message:lastchange}"> - <image elementtype="date"/> - <date date="${lastchange_date}"/> - <image action="user"/> - <user user="${lastchange_user}"/> + <fieldset label="${message:lastchange}"> + <html:span> + <image elementtype="date"/> + <date date="${lastchange_date}"/> + </html:span> + <html:span> + <image action="user"/> + <user user="${lastchange_user}"/> + </html:span> </fieldset> - <fieldset class="line" label="${message:published}"> - <image elementtype="date"/> - <date date="${published_date}"/> - <newline/> - <image action="user"/> - <user user="${published_user}"/> + <fieldset label="${message:published}"> + <html:span> + <image elementtype="date"/> + <date date="${published_date}"/> + </html:span> + <html:span> + <image action="user"/> + <user user="${published_user}"/> + </html:span> </fieldset> </group> <group title="${message:settings}"> - <table filter="true"> + <table filter="false"> <list list="${settings}" value="entry"> <row class="data"> <column> diff --git a/modules/cms/ui/themes/default/html/views/object/prop.php b/modules/cms/ui/themes/default/html/views/object/prop.php @@ -17,26 +17,32 @@ </span> </h2> <div class="<?php echo O::escapeHtml('or-collapsible-value or-group-value') ?>"><?php echo O::escapeHtml('') ?> - <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> - <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('filename').'') ?> - </span> - <input name="<?php echo O::escapeHtml('filename') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('150') ?>" value="<?php echo O::escapeHtml(''.@$filename.'') ?>" class="<?php echo O::escapeHtml('or-filename or-input') ?>" /><?php echo O::escapeHtml('') ?> - </label> - <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> - <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('alias').'') ?> - </span> - <input name="<?php echo O::escapeHtml('alias_filename') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('150') ?>" value="<?php echo O::escapeHtml(''.@$alias_filename.'') ?>" class="<?php echo O::escapeHtml('or-filename or-input') ?>" /><?php echo O::escapeHtml('') ?> - </label> - <label class="<?php echo O::escapeHtml('or-form-row or-form-input') ?>"><?php echo O::escapeHtml('') ?> - <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('folder').'') ?> - </span> - <select name="<?php echo O::escapeHtml('alias_folderid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> - <?php foreach($folders as $_key=>$_value) { ?> - <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$alias_folderid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> - </option> - <?php } ?> - </select> - </label> + <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> + <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml(''.@O::lang('filename').'') ?> + </h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('filename') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('150') ?>" value="<?php echo O::escapeHtml(''.@$filename.'') ?>" class="<?php echo O::escapeHtml('or-filename or-input') ?>" /><?php echo O::escapeHtml('') ?> + </div> + </section> + <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> + <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml(''.@O::lang('alias').'') ?> + </h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('alias_filename') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('150') ?>" value="<?php echo O::escapeHtml(''.@$alias_filename.'') ?>" class="<?php echo O::escapeHtml('or-filename or-input') ?>" /><?php echo O::escapeHtml('') ?> + </div> + </section> + <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> + <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml(''.@O::lang('folder').'') ?> + </h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('alias_folderid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> + <?php foreach($folders as $_key=>$_value) { ?> + <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$alias_folderid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?> + </option> + <?php } ?> + </select> + </div> + </section> </div> </section> </div> @@ -50,7 +56,7 @@ <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('or-image-icon or-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 class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?> </span> </div> </div> diff --git a/modules/cms/ui/themes/default/html/views/object/prop.tpl.src.xml b/modules/cms/ui/themes/default/html/views/object/prop.tpl.src.xml @@ -1,9 +1,18 @@ -<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <form label="${message:save}"> - <group title="${message:prop}"> - <input name="filename" label="${message:filename}" class="filename" maxlength="150" focus="true"/> - <input name="alias_filename" label="${message:alias}" class="filename" maxlength="150"/> - <selectbox name="alias_folderid" label="${message:folder}" list="folders"/> - </group> - </form> +<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <form> + <group title="${message:prop}"> + <fieldset label="${message:filename}"> + <input name="filename" class="filename" maxlength="150" focus="true"/> + </fieldset> + + <fieldset label="${message:alias}"> + <input name="alias_filename" class="filename" maxlength="150"/> + </fieldset> + + <fieldset label="${message:folder}"> + <selectbox name="alias_folderid" list="folders"/> + </fieldset> + </group> + </form> </output> diff --git a/modules/cms/ui/themes/default/html/views/object/settings.tpl.src.xml b/modules/cms/ui/themes/default/html/views/object/settings.tpl.src.xml @@ -2,13 +2,13 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form> <group title="${message:validity}"> - <fieldset class="line" label="${message:from}"> + <fieldset label="${message:from}"> <part tag="span"> <input type="date" name="valid_from_date"/> <input type="time" name="valid_from_time"/> </part> </fieldset> - <fieldset class="line" label="${message:until}"> + <fieldset label="${message:until}"> <part tag="span"> <input type="date" name="valid_until_date"/> <input type="time" name="valid_until_time"/> @@ -17,7 +17,7 @@ </group> <group title="${message:settings}"> - <fieldset class="line" label="${message:SETTINGS}"> + <fieldset label="${message:SETTINGS}"> <editor name="settings" type="code" mode="yaml"/> </fieldset> </group>