openrat-cms

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

commit 6e803c3efef3778713d9d36612421890b44d0dfd
parent 7f0df8f0bd48439052f40787fd69a958b6d23194
Author: Jan Dankert <develop@jandankert.de>
Date:   Thu, 11 Mar 2021 00:24:26 +0100

Cleanup: No need for the logo component any more.

Diffstat:
Mmodules/cms/ui/themes/default/html/views/login/password.php | 97++++++++++++++++++++++++++++++++++++++++---------------------------------------
Mmodules/cms/ui/themes/default/html/views/login/password.tpl.src.xml | 35+++++++++++++++++++----------------
Mmodules/cms/ui/themes/default/html/views/login/passwordcode.php | 65+++++++++++++++++++++++++++++++++--------------------------------
Mmodules/cms/ui/themes/default/html/views/login/passwordcode.tpl.src.xml | 15+++++++++------
Mmodules/cms/ui/themes/default/html/views/login/register.php | 77+++++++++++++++++++++++++++++++++++++++--------------------------------------
Mmodules/cms/ui/themes/default/html/views/login/register.tpl.src.xml | 29++++++++++++++++-------------
Mmodules/cms/ui/themes/default/html/views/login/registercode.php | 77+++++++++++++++++++++++++++++++++++++++--------------------------------------
Mmodules/cms/ui/themes/default/html/views/login/registercode.tpl.src.xml | 29++++++++++++++++-------------
Mmodules/cms/ui/themes/default/html/views/profile/confirmmail.php | 67++++++++++++++++++++++++++++++++++---------------------------------
Mmodules/cms/ui/themes/default/html/views/profile/confirmmail.tpl.src.xml | 16++++++++++------
Mmodules/cms/ui/themes/default/html/views/profile/mail.php | 12++----------
Mmodules/cms/ui/themes/default/html/views/profile/mail.tpl.src.xml | 3+--
Mmodules/cms/ui/themes/default/html/views/profile/pw.php | 10+---------
Mmodules/cms/ui/themes/default/html/views/profile/pw.tpl.src.xml | 7+++----
Mmodules/cms/ui/themes/default/style/openrat.css | 21---------------------
Mmodules/cms/ui/themes/default/style/openrat.min.css | 1-
Mmodules/template_engine/components/components.ini | 1-
Dmodules/template_engine/components/html/component_logo/LogoComponent.class.php | 34----------------------------------
Dmodules/template_engine/components/html/component_logo/logo.less | 27---------------------------
Mmodules/template_engine/components/template.xsd | 77-----------------------------------------------------------------------------
Mmodules/util/Mail.class.php | 2+-
21 files changed, 272 insertions(+), 430 deletions(-)

diff --git a/modules/cms/ui/themes/default/html/views/login/password.php b/modules/cms/ui/themes/default/html/views/login/password.php @@ -1,52 +1,53 @@ <?php /* THIS FILE IS GENERATED from password.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <?php $if2=(O::config(['login','send_password'])); if($if2) { ?> - <form name="<?php echo O::escapeHtml('') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-target="<?php echo O::escapeHtml('view') ?>" action="<?php echo O::escapeHtml('./') ?>" data-forward-to="<?php echo O::escapeHtml('passwordcode') ?>" data-method="<?php echo O::escapeHtml('password') ?>" data-action="<?php echo O::escapeHtml('login') ?>" data-id="<?php echo O::escapeHtml(''.@$_id.'') ?>" method="<?php echo O::escapeHtml('POST') ?>" enctype="<?php echo O::escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo O::escapeHtml('') ?>" data-autosave="<?php echo O::escapeHtml('') ?>" data-after-success="<?php echo O::escapeHtml('forward') ?>" class="<?php echo O::escapeHtml('or-form or-login') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-form-headline') ?>"><?php echo O::escapeHtml('') ?></div> - <div class="<?php echo O::escapeHtml('or-form-content') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('token') ?>" value="<?php echo O::escapeHtml(''.@$_token.'') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('login') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('password') ?>" /><?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('') ?> - <div class="<?php echo O::escapeHtml('or-logo') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-logo-icon') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-password') ?>"><?php echo O::escapeHtml('') ?></i> + <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('logo_password').'') ?></span> + </h2> + <p class="<?php echo O::escapeHtml('or-group-description') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_password_text').'') ?></p> + <div class="<?php echo O::escapeHtml('or-collapsible-value or-group-value') ?>"><?php echo O::escapeHtml('') ?> + <?php $if3=(O::config(['login','send_password'])); if($if3) { ?> + <form name="<?php echo O::escapeHtml('') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-target="<?php echo O::escapeHtml('view') ?>" action="<?php echo O::escapeHtml('./') ?>" data-forward-to="<?php echo O::escapeHtml('passwordcode') ?>" data-method="<?php echo O::escapeHtml('password') ?>" data-action="<?php echo O::escapeHtml('login') ?>" data-id="<?php echo O::escapeHtml(''.@$_id.'') ?>" method="<?php echo O::escapeHtml('POST') ?>" enctype="<?php echo O::escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo O::escapeHtml('') ?>" data-autosave="<?php echo O::escapeHtml('') ?>" data-after-success="<?php echo O::escapeHtml('forward') ?>" class="<?php echo O::escapeHtml('or-form or-login') ?>"><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-form-headline') ?>"><?php echo O::escapeHtml('') ?></div> + <div class="<?php echo O::escapeHtml('or-form-content') ?>"><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('token') ?>" value="<?php echo O::escapeHtml(''.@$_token.'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('login') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('password') ?>" /><?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('') ?> + <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('USER_USERNAME').'') ?></h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('username') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$username.'') ?>" class="<?php echo O::escapeHtml('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('DATABASE').'') ?></h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> + <?php foreach($dbids as $_key=>$_value) { ?> + <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$actdbid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?></option> + <?php } ?> + </select> + </div> + </section> </div> - <div class="<?php echo O::escapeHtml('or-logo-description') ?>"><?php echo O::escapeHtml('') ?> - <h2 class="<?php echo O::escapeHtml('or-logo-headline') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_password').'') ?></h2> - <p class="<?php echo O::escapeHtml('or-logo-text') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_password_text').'') ?></p> + <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--control or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-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--control 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('button_next').' ...') ?></span> + </div> </div> + </form> + <?php } ?> + <?php if(!$if3) { ?> + <div class="<?php echo O::escapeHtml('or-message error') ?>"><?php echo O::escapeHtml('') ?> + <span><?php echo O::escapeHtml(''.@O::lang('PASSWORD_NOT_ENABLED').'') ?></span> </div> - <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('USER_USERNAME').'') ?></h3> - <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('username') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$username.'') ?>" class="<?php echo O::escapeHtml('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('DATABASE').'') ?></h3> - <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> - <?php foreach($dbids as $_key=>$_value) { ?> - <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$actdbid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?></option> - <?php } ?> - </select> - </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--control or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-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--control 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('button_next').' ...') ?></span> - </div> - </div> - </form> - <?php } ?> - <?php if(!$if2) { ?> - <div class="<?php echo O::escapeHtml('or-message error') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@O::lang('PASSWORD_NOT_ENABLED').'') ?></span> + <?php } ?> </div> - <?php } ?>- \ No newline at end of file + </section>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/login/password.tpl.src.xml b/modules/cms/ui/themes/default/html/views/login/password.tpl.src.xml @@ -1,20 +1,23 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <if true="${config:login/send_password}"> - <form afterSuccess="forward" forwardTo="passwordcode" label="${message:button_next} ..."> - <logo name="password"/> - <fieldset label="${message:USER_USERNAME}"> - <input type="text" name="username" value="" maxlength="128" focus="true"/> - </fieldset> - <fieldset label="${message:DATABASE}"> - <selectbox name="dbid" list="dbids" default="${actdbid}"/> - </fieldset> - </form> - </if> - <else> - <part class="message error"> - <text value="${message:PASSWORD_NOT_ENABLED}"/> - </part> - </else> + <group title="${message:logo_password}" description="${message:logo_password_text}"> + + <if true="${config:login/send_password}"> + <form afterSuccess="forward" forwardTo="passwordcode" label="${message:button_next} ..."> + + <fieldset label="${message:USER_USERNAME}"> + <input type="text" name="username" value="" maxlength="128" focus="true"/> + </fieldset> + <fieldset label="${message:DATABASE}"> + <selectbox name="dbid" list="dbids" default="${actdbid}"/> + </fieldset> + </form> + </if> + <else> + <part class="message error"> + <text value="${message:PASSWORD_NOT_ENABLED}"/> + </part> + </else> + </group> </output> diff --git a/modules/cms/ui/themes/default/html/views/login/passwordcode.php b/modules/cms/ui/themes/default/html/views/login/passwordcode.php @@ -1,35 +1,36 @@ <?php /* THIS FILE IS GENERATED from passwordcode.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <form name="<?php echo O::escapeHtml('') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-target="<?php echo O::escapeHtml('view') ?>" action="<?php echo O::escapeHtml('./') ?>" data-method="<?php echo O::escapeHtml('passwordcode') ?>" data-action="<?php echo O::escapeHtml('login') ?>" data-id="<?php echo O::escapeHtml(''.@$_id.'') ?>" method="<?php echo O::escapeHtml('POST') ?>" enctype="<?php echo O::escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo O::escapeHtml('') ?>" data-autosave="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-form or-login') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-form-headline') ?>"><?php echo O::escapeHtml('') ?></div> - <div class="<?php echo O::escapeHtml('or-form-content') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('token') ?>" value="<?php echo O::escapeHtml(''.@$_token.'') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('login') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('passwordcode') ?>" /><?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('') ?> - <div class="<?php echo O::escapeHtml('or-logo') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-logo-icon') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-password') ?>"><?php echo O::escapeHtml('') ?></i> + <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('logo_password').'') ?></span> + </h2> + <p class="<?php echo O::escapeHtml('or-group-description') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_password_text').'') ?></p> + <div class="<?php echo O::escapeHtml('or-collapsible-value or-group-value') ?>"><?php echo O::escapeHtml('') ?> + <form name="<?php echo O::escapeHtml('') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-target="<?php echo O::escapeHtml('view') ?>" action="<?php echo O::escapeHtml('./') ?>" data-method="<?php echo O::escapeHtml('passwordcode') ?>" data-action="<?php echo O::escapeHtml('login') ?>" data-id="<?php echo O::escapeHtml(''.@$_id.'') ?>" method="<?php echo O::escapeHtml('POST') ?>" enctype="<?php echo O::escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo O::escapeHtml('') ?>" data-autosave="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-form or-login') ?>"><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-form-headline') ?>"><?php echo O::escapeHtml('') ?></div> + <div class="<?php echo O::escapeHtml('or-form-content') ?>"><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('token') ?>" value="<?php echo O::escapeHtml(''.@$_token.'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('login') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('passwordcode') ?>" /><?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('') ?> + <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('mail_code').'') ?></h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('code') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('mail_code').'') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$code.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> + </div> + </section> </div> - <div class="<?php echo O::escapeHtml('or-logo-description') ?>"><?php echo O::escapeHtml('') ?> - <h2 class="<?php echo O::escapeHtml('or-logo-headline') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_password').'') ?></h2> - <p class="<?php echo O::escapeHtml('or-logo-text') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_password_text').'') ?></p> + <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--control or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-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--control 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('button_ok').'') ?></span> + </div> </div> - </div> - <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('mail_code').'') ?></h3> - <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('code') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('mail_code').'') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$code.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> - </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--control or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-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--control 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('button_ok').'') ?></span> - </div> + </form> </div> - </form>- \ No newline at end of file + </section>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/login/passwordcode.tpl.src.xml b/modules/cms/ui/themes/default/html/views/login/passwordcode.tpl.src.xml @@ -1,10 +1,13 @@ <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> - <logo name="password"/> - <fieldset label="${message:mail_code}"> - <input type="text" name="code" size="30" focus="true" hint="${message:mail_code}"/> - </fieldset> - </form> + <group title="${message:logo_password}" description="${message:logo_password_text}"> + + <form> + + <fieldset label="${message:mail_code}"> + <input type="text" name="code" size="30" focus="true" hint="${message:mail_code}"/> + </fieldset> + </form> + </group> </output> diff --git a/modules/cms/ui/themes/default/html/views/login/register.php b/modules/cms/ui/themes/default/html/views/login/register.php @@ -1,42 +1,43 @@ <?php /* THIS FILE IS GENERATED from register.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <?php $if2=(O::config(['login','register'])); if($if2) { ?> - <form name="<?php echo O::escapeHtml('') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-target="<?php echo O::escapeHtml('view') ?>" action="<?php echo O::escapeHtml('./') ?>" data-forward-to="<?php echo O::escapeHtml('registercode') ?>" data-method="<?php echo O::escapeHtml('register') ?>" data-action="<?php echo O::escapeHtml('login') ?>" data-id="<?php echo O::escapeHtml(''.@$_id.'') ?>" method="<?php echo O::escapeHtml('POST') ?>" enctype="<?php echo O::escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo O::escapeHtml('') ?>" data-autosave="<?php echo O::escapeHtml('') ?>" data-after-success="<?php echo O::escapeHtml('forward') ?>" class="<?php echo O::escapeHtml('or-form or-login') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-form-headline') ?>"><?php echo O::escapeHtml('') ?></div> - <div class="<?php echo O::escapeHtml('or-form-content') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('token') ?>" value="<?php echo O::escapeHtml(''.@$_token.'') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('login') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('register') ?>" /><?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('') ?> - <div class="<?php echo O::escapeHtml('or-logo') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-logo-icon') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-register') ?>"><?php echo O::escapeHtml('') ?></i> + <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('logo_register').'') ?></span> + </h2> + <p class="<?php echo O::escapeHtml('or-group-description') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_register_text').'') ?></p> + <div class="<?php echo O::escapeHtml('or-collapsible-value or-group-value') ?>"><?php echo O::escapeHtml('') ?> + <?php $if3=(O::config(['login','register'])); if($if3) { ?> + <form name="<?php echo O::escapeHtml('') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-target="<?php echo O::escapeHtml('view') ?>" action="<?php echo O::escapeHtml('./') ?>" data-forward-to="<?php echo O::escapeHtml('registercode') ?>" data-method="<?php echo O::escapeHtml('register') ?>" data-action="<?php echo O::escapeHtml('login') ?>" data-id="<?php echo O::escapeHtml(''.@$_id.'') ?>" method="<?php echo O::escapeHtml('POST') ?>" enctype="<?php echo O::escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo O::escapeHtml('') ?>" data-autosave="<?php echo O::escapeHtml('') ?>" data-after-success="<?php echo O::escapeHtml('forward') ?>" class="<?php echo O::escapeHtml('or-form or-login') ?>"><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-form-headline') ?>"><?php echo O::escapeHtml('') ?></div> + <div class="<?php echo O::escapeHtml('or-form-content') ?>"><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('token') ?>" value="<?php echo O::escapeHtml(''.@$_token.'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('login') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('register') ?>" /><?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('') ?> + <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('USER_MAIL').'') ?></h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('mail') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-focus or-input') ?>" /><?php echo O::escapeHtml('') ?> + </div> + </section> </div> - <div class="<?php echo O::escapeHtml('or-logo-description') ?>"><?php echo O::escapeHtml('') ?> - <h2 class="<?php echo O::escapeHtml('or-logo-headline') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_register').'') ?></h2> - <p class="<?php echo O::escapeHtml('or-logo-text') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_register_text').'') ?></p> + <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--control or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-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--control 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('button_ok').'') ?></span> + </div> </div> + </form> + <?php } ?> + <?php if(!$if3) { ?> + <div class="<?php echo O::escapeHtml('or-message or-error') ?>"><?php echo O::escapeHtml('') ?> + <span><?php echo O::escapeHtml(''.@O::lang('REGISTER_NOT_ENABLED').'') ?></span> </div> - <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('USER_MAIL').'') ?></h3> - <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('mail') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-focus or-input') ?>" /><?php echo O::escapeHtml('') ?> - </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--control or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-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--control 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('button_ok').'') ?></span> - </div> - </div> - </form> - <?php } ?> - <?php if(!$if2) { ?> - <div class="<?php echo O::escapeHtml('or-message or-error') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@O::lang('REGISTER_NOT_ENABLED').'') ?></span> + <?php } ?> </div> - <?php } ?>- \ No newline at end of file + </section>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/login/register.tpl.src.xml b/modules/cms/ui/themes/default/html/views/login/register.tpl.src.xml @@ -1,16 +1,19 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <if true="${config:login/register}"> - <form afterSuccess="forward" forwardTo="registercode"> - <logo name="register"/> - <fieldset label="${message:USER_MAIL}"> - <input name="mail" default="" class="focus"/> - </fieldset> - </form> - </if> - <else> - <part class="message,error"> - <text value="${message:REGISTER_NOT_ENABLED}"/> - </part> - </else> + <group title="${message:logo_register}" description="${message:logo_register_text}"> + + <if true="${config:login/register}"> + <form afterSuccess="forward" forwardTo="registercode"> + <fieldset label="${message:USER_MAIL}"> + <input name="mail" default="" class="focus"/> + </fieldset> + </form> + </if> + <else> + <part class="message,error"> + <text value="${message:REGISTER_NOT_ENABLED}"/> + </part> + </else> + + </group> </output> diff --git a/modules/cms/ui/themes/default/html/views/login/registercode.php b/modules/cms/ui/themes/default/html/views/login/registercode.php @@ -6,44 +6,45 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('login') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('registercode') ?>" /><?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('') ?> - <div class="<?php echo O::escapeHtml('or-logo') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-logo-icon') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-register') ?>"><?php echo O::escapeHtml('') ?></i> - </div> - <div class="<?php echo O::escapeHtml('or-logo-description') ?>"><?php echo O::escapeHtml('') ?> - <h2 class="<?php echo O::escapeHtml('or-logo-headline') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_register').'') ?></h2> - <p class="<?php echo O::escapeHtml('or-logo-text') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_register_text').'') ?></p> - </div> - </div> - <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('USER_REGISTER_CODE').'') ?></h3> - <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('code') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-focus 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('USER_USERNAME').'') ?></h3> - <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('username') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$username.'') ?>" class="<?php echo O::escapeHtml('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('USER_PASSWORD').'') ?></h3> - <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password') ?>" size="<?php echo O::escapeHtml('25') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password.'') ?>" class="<?php echo O::escapeHtml('or- or-input or-input--password') ?>" /><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--visible or-act-make-visible or-btn') ?>"><?php echo O::escapeHtml('') ?></i> - </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('DATABASE').'') ?></h3> - <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> - <?php foreach($dbids as $_key=>$_value) { ?> - <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==actdbid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?></option> - <?php } ?> - </select> + <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('logo_register').'') ?></span> + </h2> + <p class="<?php echo O::escapeHtml('or-group-description') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_register_text').'') ?></p> + <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('USER_REGISTER_CODE').'') ?></h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('code') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-focus 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('USER_USERNAME').'') ?></h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('username') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$username.'') ?>" class="<?php echo O::escapeHtml('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('USER_PASSWORD').'') ?></h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <span><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('password') ?>" name="<?php echo O::escapeHtml('password') ?>" size="<?php echo O::escapeHtml('25') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$password.'') ?>" class="<?php echo O::escapeHtml('or- or-input or-input--password') ?>" /><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--visible or-act-make-visible or-btn') ?>"><?php echo O::escapeHtml('') ?></i> + </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('DATABASE').'') ?></h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <select name="<?php echo O::escapeHtml('dbid') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> + <?php foreach($dbids as $_key=>$_value) { ?> + <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$actdbid){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?></option> + <?php } ?> + </select> + </div> + </section> </div> </section> </div> diff --git a/modules/cms/ui/themes/default/html/views/login/registercode.tpl.src.xml b/modules/cms/ui/themes/default/html/views/login/registercode.tpl.src.xml @@ -1,19 +1,22 @@ <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> - <logo name="register"/> + <group title="${message:logo_register}" description="${message:logo_register_text}"> - <fieldset label="${message:USER_REGISTER_CODE}"> - <input name="code" default="" size="25" class="focus"/> - </fieldset> - <fieldset label="${message:USER_USERNAME}"> - <input type="text" name="username" value="" size="25"/> - </fieldset> - <fieldset label="${message:USER_PASSWORD}"> - <password name="password" default="" size="25"/> - </fieldset> - <fieldset label="${message:DATABASE}"> - <selectbox name="dbid" list="dbids" default="actdbid"/> - </fieldset> + <fieldset label="${message:USER_REGISTER_CODE}"> + <input name="code" default="" size="25" class="focus"/> + </fieldset> + <fieldset label="${message:USER_USERNAME}"> + <input type="text" name="username" value="" size="25"/> + </fieldset> + <fieldset label="${message:USER_PASSWORD}"> + <password name="password" default="" size="25"/> + </fieldset> + <fieldset label="${message:DATABASE}"> + <selectbox name="dbid" list="dbids" default="${actdbid}"/> + </fieldset> + + </group> </form> + </output> diff --git a/modules/cms/ui/themes/default/html/views/profile/confirmmail.php b/modules/cms/ui/themes/default/html/views/profile/confirmmail.php @@ -1,35 +1,36 @@ <?php /* THIS FILE IS GENERATED from confirmmail.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <div class="<?php echo O::escapeHtml('or-logo') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-logo-icon') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-changemail') ?>"><?php echo O::escapeHtml('') ?></i> - </div> - <div class="<?php echo O::escapeHtml('or-logo-description') ?>"><?php echo O::escapeHtml('') ?> - <h2 class="<?php echo O::escapeHtml('or-logo-headline') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_changemail').'') ?></h2> - <p class="<?php echo O::escapeHtml('or-logo-text') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_changemail_text').'') ?></p> - </div> - </div> - <form name="<?php echo O::escapeHtml('') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-target="<?php echo O::escapeHtml('view') ?>" action="<?php echo O::escapeHtml('./') ?>" data-method="<?php echo O::escapeHtml('confirmmail') ?>" data-action="<?php echo O::escapeHtml('profile') ?>" data-id="<?php echo O::escapeHtml(''.@$_id.'') ?>" method="<?php echo O::escapeHtml('POST') ?>" enctype="<?php echo O::escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo O::escapeHtml('') ?>" data-autosave="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-form or-profile') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-form-headline') ?>"><?php echo O::escapeHtml('') ?></div> - <div class="<?php echo O::escapeHtml('or-form-content') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('token') ?>" value="<?php echo O::escapeHtml(''.@$_token.'') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('profile') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('confirmmail') ?>" /><?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('') ?> - <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('mail_code').'') ?></h3> - <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <input name="<?php echo O::escapeHtml('code') ?>" required="<?php echo O::escapeHtml('required') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$code.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> + <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('logo_changemail').'') ?></span> + </h2> + <p class="<?php echo O::escapeHtml('or-group-description') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_changemail_text').'') ?></p> + <div class="<?php echo O::escapeHtml('or-collapsible-value or-group-value') ?>"><?php echo O::escapeHtml('') ?> + <form name="<?php echo O::escapeHtml('') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-target="<?php echo O::escapeHtml('view') ?>" action="<?php echo O::escapeHtml('./') ?>" data-method="<?php echo O::escapeHtml('confirmmail') ?>" data-action="<?php echo O::escapeHtml('profile') ?>" data-id="<?php echo O::escapeHtml(''.@$_id.'') ?>" method="<?php echo O::escapeHtml('POST') ?>" enctype="<?php echo O::escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo O::escapeHtml('') ?>" data-autosave="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-form or-profile') ?>"><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-form-headline') ?>"><?php echo O::escapeHtml('') ?></div> + <div class="<?php echo O::escapeHtml('or-form-content') ?>"><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('token') ?>" value="<?php echo O::escapeHtml(''.@$_token.'') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('profile') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('confirmmail') ?>" /><?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('') ?> + <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('mail_code').'') ?></h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <input name="<?php echo O::escapeHtml('code') ?>" required="<?php echo O::escapeHtml('required') ?>" autofocus="<?php echo O::escapeHtml('autofocus') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$code.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> + </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--control or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-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--control 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('button_ok').'') ?></span> - </div> + <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> + <div class="<?php echo O::escapeHtml('or-btn or-btn--control or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-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--control 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('button_ok').'') ?></span> + </div> + </div> + </form> </div> - </form>- \ No newline at end of file + </section>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/profile/confirmmail.tpl.src.xml b/modules/cms/ui/themes/default/html/views/profile/confirmmail.tpl.src.xml @@ -1,9 +1,13 @@ <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"> - <logo name="changemail"/> - <form> - <fieldset label="${message:mail_code}"> - <input type="text" name="code" size="30" focus="true" required="true"/> - </fieldset> - </form> + + <group title="${message:logo_changemail}" description="${message:logo_changemail_text}"> + + <form> + <fieldset label="${message:mail_code}"> + <input type="text" name="code" size="30" focus="true" required="true"/> + </fieldset> + </form> + </group> + </output> diff --git a/modules/cms/ui/themes/default/html/views/profile/mail.php b/modules/cms/ui/themes/default/html/views/profile/mail.php @@ -6,21 +6,13 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('profile') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('mail') ?>" /><?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('') ?> - <div class="<?php echo O::escapeHtml('or-logo') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-logo-icon') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-changemail') ?>"><?php echo O::escapeHtml('') ?></i> - </div> - <div class="<?php echo O::escapeHtml('or-logo-description') ?>"><?php echo O::escapeHtml('') ?> - <h2 class="<?php echo O::escapeHtml('or-logo-headline') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_changemail').'') ?></h2> - <p class="<?php echo O::escapeHtml('or-logo-text') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_changemail_text').'') ?></p> - </div> - </div> <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('user_mail').'') ?></span> + <span><?php echo O::escapeHtml(''.@O::lang('logo_changemail').'') ?></span> </h2> + <p class="<?php echo O::escapeHtml('or-group-description') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_changemail_text').'') ?></p> <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('user_new_mail').'') ?></h3> diff --git a/modules/cms/ui/themes/default/html/views/profile/mail.tpl.src.xml b/modules/cms/ui/themes/default/html/views/profile/mail.tpl.src.xml @@ -1,9 +1,8 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form method="post" forwardTo="confirmmail" afterSuccess="forward"> - <logo name="changemail"/> - <group title="${message:user_mail}"> + <group title="${message:logo_changemail}" description="${message:logo_changemail_text}"> <fieldset label="${message:user_new_mail}"> <input name="mail" focus="true"/> </fieldset> diff --git a/modules/cms/ui/themes/default/html/views/profile/pw.php b/modules/cms/ui/themes/default/html/views/profile/pw.php @@ -7,19 +7,11 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('pw') ?>" /><?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=($pwchange_enabled); if($if3) { ?> - <div class="<?php echo O::escapeHtml('or-logo') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-logo-icon') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-changepassword') ?>"><?php echo O::escapeHtml('') ?></i> - </div> - <div class="<?php echo O::escapeHtml('or-logo-description') ?>"><?php echo O::escapeHtml('') ?> - <h2 class="<?php echo O::escapeHtml('or-logo-headline') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_changepassword').'') ?></h2> - <p class="<?php echo O::escapeHtml('or-logo-text') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_changepassword_text').'') ?></p> - </div> - </div> <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('user_act_password').'') ?></span> </h2> + <p class="<?php echo O::escapeHtml('or-group-description') ?>"><?php echo O::escapeHtml(''.@O::lang('logo_changepassword_text').'') ?></p> <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('user_password').'') ?></h3> diff --git a/modules/cms/ui/themes/default/html/views/profile/pw.tpl.src.xml b/modules/cms/ui/themes/default/html/views/profile/pw.tpl.src.xml @@ -2,14 +2,13 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form> <if true="${pwchange_enabled}"> - <logo name="changepassword"/> - <group title="${message:user_act_password}" collapsible="false"> - <fieldset class="line" label="${message:user_password}"> + <group title="${message:user_act_password}" description="${message:logo_changepassword_text}" collapsible="false"> + <fieldset label="${message:user_password}"> <password name="act_password" class="focus" required="true"/> </fieldset> </group> <group title="${message:user_new_password}" collapsible="false"> - <fieldset class="line" label="${message:user_new_password}"> + <fieldset label="${message:user_new_password}"> <password name="password1" minlength="${config:security/password/min_length}" hint="${message:USER_NEW_PASSWORD}" required="true"/> <password name="password2" minlength="${config:security/password/min_length}" diff --git a/modules/cms/ui/themes/default/style/openrat.css b/modules/cms/ui/themes/default/style/openrat.css @@ -1707,27 +1707,6 @@ a.editorlink:visited { /* Include style: /../../../template_engine/components/html/component_image/image */ /*# sourceMappingURL=data:application/json,%7B%22version%22%3A3%2C%22sources%22%3A%5B%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22%22%7D */ -/* Include style: /../../../template_engine/components/html/component_logo/logo */ -.or-logo { - display: flex; -} -.or-logo-icon { - width: 1em; - height: 1em; - font-size: 4.8em; - padding-top: 0.3em; -} -.or-logo-description { - flex: 1; -} -.or-logo-headline { - font-weight: normal; - font-size: 2em; -} -.or-logo-text { - font-size: 1.3em; -} -/*# 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%2Ftemplate_engine%5C%2Fcomponents%5C%2Fhtml%5C%2Fcomponent_logo%5C%2Flogo.less%22%5D%2C%22names%22%3A%5B%5D%2C%22mappings%22%3A%22AAEI%2CGAAC%3BCACG%3B%3BAAEA%2CGAHH%2CKAGI%3BCACG%3BCACA%3BCACA%3BCACA%3B%3BAAGJ%2CGAVH%2CKAUI%3BCACG%3B%3BAAGJ%2CGAdH%2CKAcI%3BCACG%3BCACA%3B%3BAAGL%2CGAnBF%2CKAmBG%3BCACI%22%7D */ /* Include style: /../../../template_engine/components/html/component_table/table */ .or-table { overflow: auto; diff --git a/modules/cms/ui/themes/default/style/openrat.min.css b/modules/cms/ui/themes/default/style/openrat.min.css @@ -23,7 +23,6 @@ html,body{width: 100%;height: 100%}@media only screen and (min-width: 56rem){bod .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} .or-group{margin: 2em 0}.or-group-title{font-size: 1.1em;font-weight: normal;border-bottom: 1px solid} -.or-logo{display: flex}.or-logo-icon{width: 1em;height: 1em;font-size: 4.8em;padding-top: 0.3em}.or-logo-description{flex: 1}.or-logo-headline{font-weight: normal;font-size: 2em}.or-logo-text{font-size: 1.3em} .or-table{overflow: auto;border: 2px;width: 100%;table-layout: fixed}.or-table-column-date{width: 12em}.or-table-column-user{width: 7em}.or-table-column-action{width: 5em}.or-table-column-auto{width: auto;max-width: 0}@media screen and (max-width: 40em){.or-table-area{overflow-x: auto}}.or-table-filter{width: 100%;text-align: right}.or-table-filter-input{border-radius: 3px;-moz-border-radius: 3px;-webkit-border-radius: 3px;-khtml-border-radius: 3px;padding: 0.5em;margin: 1em;border: 1px solid #000;width: 7.5em}.or-table tr.or-headline > td,.or-table tr{padding: 0.3em}.or-table tr.or-headline > td .or-row--on-hover,.or-table tr .or-row--on-hover{visibility: hidden}@media only screen and (max-width: 55rem){.or-table tr.or-headline > td .or-row--on-hover,.or-table tr .or-row--on-hover{visibility: visible}}.or-table tr.or-headline > td:hover .or-row--on-hover,.or-table tr:hover .or-row--on-hover{visibility: visible}.or-table tr > th{padding: 3px;font-weight: bold}.or-table tr > th.or-sort-asc > span:last-child:after{content: " \2193"}.or-table tr > th.or-sort-desc > span:last-child:after{content: " \2191"}.or-table tr.or-data > td{padding: 3px}.or-table tr > td{white-space: nowrap;text-overflow: ellipsis;overflow: hidden}.or-table td.or-readonly{font-style: italic;font-weight: normal}.or-table td.or-default{font-style: normal;font-weight: normal}.or-table td.or-changed{font-style: normal;font-weight: bold}.or-table td:hover > div.or-onrowvisible{visibility: visible}.or-table tr td.or-help{font-style: italic}.or-table tr.or-headline td.or-help{font-style: normal}.or-table-sort-value{display: none} div.or-dropzone-upload > div.input{width: 100%;height: 100px;border: 1px dotted} /** diff --git a/modules/template_engine/components/components.ini b/modules/template_engine/components/components.ini @@ -18,7 +18,6 @@ insert = label = link = list = -logo = newline = output = part = diff --git a/modules/template_engine/components/html/component_logo/LogoComponent.class.php b/modules/template_engine/components/html/component_logo/LogoComponent.class.php @@ -1,34 +0,0 @@ -<?php - -namespace template_engine\components\html\component_logo; - -use template_engine\components\html\Component; -use template_engine\element\CMSElement;use template_engine\element\HtmlElement; -use template_engine\element\Value; -use template_engine\element\ValueExpression; - -class LogoComponent extends Component -{ - public $name; - - public function createElement() - { - $logo = (new CMSElement('div'))->addStyleClass('logo'); - - $label = (new HtmlElement('div'))->addStyleClass('logo-icon'); - - $image = (new CMSElement('i'))->addStyleClass(['image-icon','image-icon--method-'.$this->name]); - $label->addChild($image); - - $logo->addChild($label); - - $holder = (new HtmlElement('div'))->addStyleClass('logo-description'); - $logo->addChild($holder); - - $holder->addChild( (new CMSElement('h2'))->addStyleClass('logo-headline')->content(Value::createExpression( ValueExpression::TYPE_MESSAGE,'logo_'.$this->name ))); - $holder->addChild( (new CMSElement('p') )->addStyleClass('logo-text' )->content(Value::createExpression( ValueExpression::TYPE_MESSAGE,'logo_'.$this->name.'_text'))); - - return $logo; - } - -} diff --git a/modules/template_engine/components/html/component_logo/logo.less b/modules/template_engine/components/html/component_logo/logo.less @@ -1,27 +0,0 @@ -.or { - - &-logo { - display: flex; - - &-icon { - width:1em; - height: 1em; - font-size: 4.8em; - padding-top:0.3em; - } - - &-description { - flex: 1; - } - - &-headline { - font-weight: normal; - font-size: 2em; - } - - &-text { - font-size: 1.3em; - } - - } -} diff --git a/modules/template_engine/components/template.xsd b/modules/template_engine/components/template.xsd @@ -25,7 +25,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -72,7 +71,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -119,7 +117,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -171,7 +168,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -214,7 +210,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -265,7 +260,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -307,7 +301,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -351,7 +344,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -411,7 +403,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -459,7 +450,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -506,7 +496,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -558,7 +547,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -616,7 +604,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -659,7 +646,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -718,7 +704,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -773,7 +758,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -818,7 +802,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -864,7 +847,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -932,7 +914,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -957,49 +938,6 @@ <xsd:attribute name="value" type="xsd:string"/> <xsd:attribute name="request" type="xsd:string"/> </xsd:complexType> - <xsd:element name="logo" type="logoType"/> - <xsd:complexType name="logoType"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:element ref="button" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="checkbox" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="column" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="date" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="editor" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="else" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="fieldset" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="form" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="group" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="hidden" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="if" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="image" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="include" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="input" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="inputarea" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="insert" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="password" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="qrcode" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="radio" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="radiobox" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="row" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="selectbox" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="selector" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="set" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="table" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="text" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="upload" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="user" maxOccurs="unbounded" minOccurs="0"/> - <xsd:any namespace="http://www.w3.org/1999/xhtml"/> - </xsd:choice> - <xsd:attribute name="name" type="xsd:string"/> - <xsd:attribute name="request" type="xsd:string"/> - </xsd:complexType> <xsd:element name="newline" type="newlineType"/> <xsd:complexType name="newlineType"> <xsd:choice maxOccurs="unbounded" minOccurs="0"> @@ -1022,7 +960,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1064,7 +1001,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1106,7 +1042,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1151,7 +1086,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1203,7 +1137,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1246,7 +1179,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1298,7 +1230,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1346,7 +1277,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1391,7 +1321,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1443,7 +1372,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1490,7 +1418,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1535,7 +1462,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1579,7 +1505,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1627,7 +1552,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> @@ -1674,7 +1598,6 @@ <xsd:element ref="label" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="link" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="list" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="logo" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="newline" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="output" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="part" maxOccurs="unbounded" minOccurs="0"/> diff --git a/modules/util/Mail.class.php b/modules/util/Mail.class.php @@ -500,7 +500,7 @@ class Mail public static function checkAddress($email_address) { // Source: de.php.net/ereg - return \preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,})$/i", $email_address); + return \preg_match("/^[_a-z0-9-+]+(\.[_a-z0-9-+]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,})$/i", $email_address); }