openrat-cms

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

commit cc988c2a685110a4a45675cd3ef6462d47fdf65e
parent 9bd7ed935cdf1bf2b0feddea67b35a9be813614f
Author: Jan Dankert <develop@jandankert.de>
Date:   Thu,  3 Dec 2020 00:10:41 +0100

Fix: Using variable syntax for default values.

Diffstat:
Mmodules/cms/ui/themes/default/html/views/login/password.php | 4++--
Mmodules/cms/ui/themes/default/html/views/login/password.tpl.src.xml | 4++--
Mmodules/cms/ui/themes/default/html/views/login/passwordcode.php | 2+-
Mmodules/cms/ui/themes/default/html/views/login/passwordcode.tpl.src.xml | 2+-
4 files changed, 6 insertions(+), 6 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 @@ -27,7 +27,7 @@ <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> + <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> @@ -40,7 +40,7 @@ </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> + <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_next').' ...') ?></span> </div> </div> </form> 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,14 +1,14 @@ <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"> + <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"/> + <selectbox name="dbid" list="dbids" default="${actdbid}"/> </fieldset> </form> </if> diff --git a/modules/cms/ui/themes/default/html/views/login/passwordcode.php b/modules/cms/ui/themes/default/html/views/login/passwordcode.php @@ -18,7 +18,7 @@ <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') ?>" 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('') ?> + <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> 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 @@ -4,7 +4,7 @@ <logo name="password"/> <fieldset label="${message:mail_code}"> - <input type="text" name="code" size="30"/> + <input type="text" name="code" size="30" focus="true" hint="${message:mail_code}"/> </fieldset> </form> </output>