commit 3a4a00ee5c967816adfeddab5f437a5a87fc2407 parent 9aa8c91519cf04bdd463c02e03d67c8635f09274 Author: Jan Dankert <develop@jandankert.de> Date: Mon, 17 Aug 2020 22:22:54 +0200 Cleanup: Templates with text component should only use 'value'. Diffstat:
45 files changed, 66 insertions(+), 94 deletions(-)
diff --git a/modules/cms/ui/themes/default/html/views/configuration/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/configuration/show.tpl.src.xml @@ -15,7 +15,7 @@ <text value="${key}"></text> </column> <column class="${class}"> - <text class="${class}" var="value"></text> + <text class="${class}" value="${value}"></text> </column> </row> </list> diff --git a/modules/cms/ui/themes/default/html/views/element/info.php b/modules/cms/ui/themes/default/html/views/element/info.php @@ -14,7 +14,7 @@ <td><?php echo escapeHtml('') ?> <i class="<?php echo escapeHtml('image-icon image-icon--action-el_'.@$type.'') ?>"><?php echo escapeHtml('') ?> </i> - <span><?php echo escapeHtml(''.@lang(''.@$type.'').'') ?> + <span><?php echo escapeHtml(''.@lang('el_'.@$type.'').'') ?> </span> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/element/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/element/info.tpl.src.xml @@ -7,7 +7,7 @@ </column> <column> <image elementtype="${type}" /> - <text value="${message:${type}}" prefix="el_" /> + <text value="${message:el_${type}}" /> </column> </row> <row class="data"> diff --git a/modules/cms/ui/themes/default/html/views/file/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/file/remove.tpl.src.xml @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form> - <text label="GLOBAL_NAME" var="name"></text> + <text label="GLOBAL_NAME" value="${name}"></text> <checkbox label="${message:GLOBAL_DELETE}" name="delete"></checkbox> </form> diff --git a/modules/cms/ui/themes/default/html/views/file/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/file/show.tpl.src.xml @@ -1,4 +1,4 @@ <text 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" - var="value" escape="false" type="none" newline="false"></text>- \ No newline at end of file + value="${value}" escape="false" type="none" newline="false"></text>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/advanced.php b/modules/cms/ui/themes/default/html/views/folder/advanced.php @@ -95,7 +95,7 @@ <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> <span><?php echo escapeHtml(' ') ?> </span> - <span><?php echo escapeHtml(''.@lang(''.@$actiontype.'').'') ?> + <span><?php echo escapeHtml(''.@lang('FOLDER_SELECT_'.@$actiontype.'').'') ?> </span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/folder/advanced.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/advanced.tpl.src.xml @@ -66,7 +66,7 @@ <radio name="type" value="${actiontype}"></radio> <label for="type" value="${actiontype}"> <text value=" "></text> - <text value="${message:${actiontype}}" prefix="FOLDER_SELECT_"></text> + <text value="${message:FOLDER_SELECT_${actiontype}}"></text> </label> </part> </part> diff --git a/modules/cms/ui/themes/default/html/views/folder/content.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/content.tpl.src.xml @@ -18,7 +18,7 @@ <text value=".."></text> </column> <column> - <text raw=""></text> + <text value=""></text> </column> </row> </if> diff --git a/modules/cms/ui/themes/default/html/views/folder/createfile.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createfile.tpl.src.xml @@ -23,7 +23,7 @@ <part class="line"> <part class="label"> - <text class="help" key="file_max_size"></text> + <text class="help" value="${message:file_max_size}"></text> </part> <part class="input"> <text value="${max_size}"></text> diff --git a/modules/cms/ui/themes/default/html/views/folder/createimage.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createimage.tpl.src.xml @@ -23,7 +23,7 @@ <part class="line"> <part class="label"> - <text class="help" key="file_max_size"></text> + <text class="help" value="${message:file_max_size}"></text> </part> <part class="input"> <text value="${max_size}"></text> diff --git a/modules/cms/ui/themes/default/html/views/folder/createtext.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createtext.tpl.src.xml @@ -22,7 +22,7 @@ <part class="line"> <part class="label"> - <text class="help" key="file_max_size"></text> + <text class="help" value="${message:file_max_size}"></text> </part> <part class="input"> <text value="${max_size}"></text> diff --git a/modules/cms/ui/themes/default/html/views/folder/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/edit.tpl.src.xml @@ -21,7 +21,7 @@ </link> </column> <column> - <text raw=""></text> + <text value=""></text> </column> </row> </if> 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 @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form> - <text label="GLOBAL_NAME" var="name"></text> + <text label="GLOBAL_NAME" value="${name}"></text> <checkbox label="${message:GLOBAL_DELETE}" name="delete"></checkbox> diff --git a/modules/cms/ui/themes/default/html/views/folder/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/show.tpl.src.xml @@ -21,7 +21,7 @@ <text value=".."></text> </column> <column> - <text raw=""></text> + <text value=""></text> </column> </row> </if> diff --git a/modules/cms/ui/themes/default/html/views/group/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/group/info.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form readonly="true" cancel="false"> - <text class="headline" var="name" /> + <text class="headline" value="${name}" /> <part class="line"> <part class="label"> diff --git a/modules/cms/ui/themes/default/html/views/group/rights.php b/modules/cms/ui/themes/default/html/views/group/rights.php @@ -45,7 +45,7 @@ </td> <?php foreach((array)$show as $list_key=>$t) { ?> <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> - <span title="<?php echo escapeHtml('message:acl_{t}') ?>"><?php echo escapeHtml(''.@lang(''.@$t.'').'') ?> + <span title="<?php echo escapeHtml('message:acl_{t}') ?>"><?php echo escapeHtml(''.@lang('acl_'.@$t.'_abbrev').'') ?> </span> </td> <?php } ?> diff --git a/modules/cms/ui/themes/default/html/views/group/rights.tpl.src.xml b/modules/cms/ui/themes/default/html/views/group/rights.tpl.src.xml @@ -26,7 +26,7 @@ </column> <list list="${show}" value="t"> <column class="help"> - <text value="${message:${t}}" prefix="acl_" suffix="_abbrev" + <text value="${message:acl_${t}_abbrev}" title="message:acl_{t}"></text> </column> </list> diff --git a/modules/cms/ui/themes/default/html/views/language/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/language/info.tpl.src.xml @@ -3,7 +3,7 @@ <form readonly="true" cancel="false"> - <text class="headline" var="name"/> + <text class="headline" value="${name}"/> <part class="line"> <part class="label"> diff --git a/modules/cms/ui/themes/default/html/views/language/listing.tpl.src.xml b/modules/cms/ui/themes/default/html/views/language/listing.tpl.src.xml @@ -9,13 +9,13 @@ <text value="${message:name}"></text> </column> <column> - <text raw=""></text> + <text value=""></text> </column> <column> - <text raw=""></text> + <text value=""></text> </column> <column> - <text raw=""></text> + <text value=""></text> </column> </row> <list list="${el}" extract="true"> diff --git a/modules/cms/ui/themes/default/html/views/languagelist/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/languagelist/show.tpl.src.xml @@ -9,7 +9,7 @@ <text value="${message:LANGUAGE_ISOCODE}"></text> </column> <column> - <text raw=""></text> + <text value=""></text> </column> </row> <list list="${el}" extract="true"> diff --git a/modules/cms/ui/themes/default/html/views/link/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/link/remove.tpl.src.xml @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form> - <text label="GLOBAL_NAME" var="name"></text> + <text label="GLOBAL_NAME" value="${name}"></text> <checkbox label="${message:GLOBAL_DELETE}" name="delete"></checkbox> </form> diff --git a/modules/cms/ui/themes/default/html/views/model/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/model/info.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form readonly="true" cancel="false"> - <text class="headline" var="name"/> + <text class="headline" value="${name}"/> <part class="line"> <part class="label"> diff --git a/modules/cms/ui/themes/default/html/views/model/listing.tpl.src.xml b/modules/cms/ui/themes/default/html/views/model/listing.tpl.src.xml @@ -9,10 +9,10 @@ <text value="${message:name}"></text> </column> <column> - <text raw=""></text> + <text value=""></text> </column> <column> - <text raw=""></text> + <text value=""></text> </column> </row> <list list="${el}" extract="true"> diff --git a/modules/cms/ui/themes/default/html/views/modellist/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/modellist/show.tpl.src.xml @@ -6,10 +6,10 @@ <text value="${message:name}"></text> </column> <column> - <text raw=""></text> + <text value=""></text> </column> <column> - <text raw=""></text> + <text value=""></text> </column> </row> <list list="${el}" extract="true"> diff --git a/modules/cms/ui/themes/default/html/views/page/edit.php b/modules/cms/ui/themes/default/html/views/page/edit.php @@ -45,7 +45,7 @@ <td><?php echo escapeHtml('') ?> <i class="<?php echo escapeHtml('image-icon image-icon--action-el_'.@$typename.'') ?>"><?php echo escapeHtml('') ?> </i> - <span><?php echo escapeHtml(''.@lang(''.@$typename.'').'') ?> + <span><?php echo escapeHtml(''.@lang('el_'.@$typename.'').'') ?> </span> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/page/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/page/edit.tpl.src.xml @@ -32,7 +32,7 @@ </column> <column> <image elementtype="${typename}"/> - <text prefix="el_" key="${typename}"></text> + <text value="${message:el_${typename}}"></text> </column> </row> </list> diff --git a/modules/cms/ui/themes/default/html/views/page/info.php b/modules/cms/ui/themes/default/html/views/page/info.php @@ -188,7 +188,7 @@ <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('global_created').'') ?> + <span><?php echo escapeHtml('') ?> </span> </label> </div> @@ -205,7 +205,7 @@ <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('global_lastchange').'') ?> + <span><?php echo escapeHtml('') ?> </span> </label> </div> @@ -222,7 +222,7 @@ <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('global_published').'') ?> + <span><?php echo escapeHtml('') ?> </span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/page/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/page/info.tpl.src.xml @@ -46,10 +46,10 @@ <group title="${languagename}"> - <text label="name" var="name" /> - <text label="description" var="description" /> + <text label="name" value="${name}" /> + <text label="description" value="${description}" /> - <text label="alias" var="alias" /> + <text label="alias" value="${alias}" /> <part class="clickable"> <link class="or-link-btn" type="edit" action="page" subaction="name" var1="languageid" value1="${languageid}"> diff --git a/modules/cms/ui/themes/default/html/views/page/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/page/remove.tpl.src.xml @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form> - <text label="GLOBAL_NAME" var="name"></text> + <text label="GLOBAL_NAME" value="${name}"></text> <checkbox label="${message:GLOBAL_DELETE}" name="delete"></checkbox> </form> diff --git a/modules/cms/ui/themes/default/html/views/page/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/page/show.tpl.src.xml @@ -1,4 +1,4 @@ <text 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" - var="output" escape="false" type="none" newline="false"></text>- \ No newline at end of file + value="${output}" escape="false" type="none" newline="false"></text>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/pageelement/diff.tpl.src.xml b/modules/cms/ui/themes/default/html/views/pageelement/diff.tpl.src.xml @@ -4,13 +4,13 @@ <row> <column></column> <column> - <text type="emphatic" text="GLOBAL_COMPARE"></text> + <text type="emphatic" value="${message:GLOBAL_COMPARE}"></text> <text value=" "></text> <date date="${date_left}"></date> </column> <column></column> <column> - <text type="emphatic" text="GLOBAL_WITH"></text> + <text type="emphatic" value="${message:GLOBAL_WITH}"></text> <text value=" "></text> <date date="${date_right}"></date> </column> diff --git a/modules/cms/ui/themes/default/html/views/profile/mail.php b/modules/cms/ui/themes/default/html/views/profile/mail.php @@ -43,7 +43,7 @@ </fieldset> <div class="<?php echo escapeHtml('clickable') ?>"><?php echo escapeHtml('') ?> <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('dialog') ?>" data-action="<?php echo escapeHtml('profile') ?>" data-method="<?php echo escapeHtml('confirmmail') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('{\'dialogAction\':\'profile\',\'dialogMethod\':\'confirmmail\'}') ?>" href="<?php echo escapeHtml('/#/profile/') ?>"><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang('mail_code').'') ?> + <span><?php echo escapeHtml(''.@$mail_code.'') ?> </span> </a> </div> 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 @@ -20,7 +20,7 @@ <link action="profile" subaction="confirmmail" type="dialog"> <text - key="mail_code"/> + value="${mail_code}"/> </link> </part> diff --git a/modules/cms/ui/themes/default/html/views/project/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/project/info.tpl.src.xml @@ -3,7 +3,7 @@ <form readonly="true"> <list list="${info}"> - <text label="${list_key}" var="list_value"/> + <text label="${list_key}" value="${list_value}"/> </list> </form> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/template/edit.php b/modules/cms/ui/themes/default/html/views/template/edit.php @@ -28,7 +28,7 @@ </a> </td> <td><?php echo escapeHtml('') ?> - <span><?php echo escapeHtml(''.@lang(''.@$type.'').'') ?> + <span><?php echo escapeHtml(''.@lang('el_'.@$type.'').'') ?> </span> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/template/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/template/edit.tpl.src.xml @@ -20,7 +20,7 @@ </link> </column> <column> - <text value="${message:${type}}" prefix="EL_"></text> + <text value="${message:el_${type}}"></text> </column> </row> </list> diff --git a/modules/cms/ui/themes/default/html/views/text/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/text/show.tpl.src.xml @@ -1,4 +1,4 @@ <text 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" - var="value" escape="false" type="none" newline="false"></text>- \ No newline at end of file + value="${value}" escape="false" type="none" newline="false"></text>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/title/show.php b/modules/cms/ui/themes/default/html/views/title/show.php @@ -14,7 +14,7 @@ <div class="<?php echo escapeHtml('toolbar-icon') ?>"><?php echo escapeHtml('') ?> <i class="<?php echo escapeHtml('image-icon image-icon--action-database') ?>"><?php echo escapeHtml('') ?> </i> - <span class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml(' ') ?> + <span class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </span> <div class="<?php echo escapeHtml('arrow arrow-down') ?>"><?php echo escapeHtml('') ?> </div> diff --git a/modules/cms/ui/themes/default/html/views/title/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/title/show.tpl.src.xml @@ -19,12 +19,11 @@ <if present="dbname"> <part class="toolbar-icon"> <image action="database"></image> - <text class="label" raw=" "/> + <text class="label" value=""/> <part class="arrow arrow-down"/> <part class="dropdown"> <part class="entry"> - <text title="${dbid}" var="dbname" - maxlength="50"></text> + <text title="${dbid}" value="${dbname}" /> </part> </part> </part> @@ -82,7 +81,7 @@ <if true="${isLoggedIn}"> <part class="toolbar-icon menu"> <image action="file"></image> - <text class="label" key="file"></text> + <text class="label" value="${message:file}"></text> <part class="arrow arrow-down"/> <part class="dropdown"> <part @@ -214,7 +213,7 @@ <part class="toolbar-icon menu"> <image menu="edit"></image> - <text class="label" key="edit"></text> + <text class="label" value="${message:edit}"></text> <part class="arrow arrow-down"/> <part class="dropdown"> <part @@ -297,7 +296,7 @@ <part class="toolbar-icon menu"> <image menu="extra"></image> - <text class="label" key="extras"></text> + <text class="label" value="${message:extras}"></text> <part class="arrow arrow-down"/> <part class="dropdown"> @@ -470,7 +469,7 @@ <if not="" empty="${config:login/motd}"> <part class="toolbar-icon menu"> <image method="motd"></image> - <text class="label" raw=" "/> + <text class="label" value=" "/> <part class="arrow arrow-down"/> <part class="dropdown"> <part class="entry"> @@ -505,7 +504,7 @@ <part class="toolbar-icon user menu"> <image action="user"></image> - <text class="label" var="userfullname" maxlength="25"></text> + <text class="label" value="${userfullname}"></text> <part class="arrow arrow-down"/> <!-- <part class="arrow arrow-down" />--> @@ -580,7 +579,7 @@ <input name="text" hint="${message:search}"></input> <part class="arrow arrow-down"/> <part class="dropdown"> - <text raw=""></text> + <text value=""></text> </part> </part> </if> diff --git a/modules/cms/ui/themes/default/html/views/url/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/url/remove.tpl.src.xml @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form> - <text label="GLOBAL_NAME" var="name"></text> + <text label="GLOBAL_NAME" value="${name}"></text> <checkbox label="${message:GLOBAL_DELETE}" name="delete"></checkbox> </form> diff --git a/modules/cms/ui/themes/default/html/views/user/listing.tpl.src.xml b/modules/cms/ui/themes/default/html/views/user/listing.tpl.src.xml @@ -10,7 +10,7 @@ <text value="${message:name}"></text> </column> <column> - <text raw=""></text> + <text value=""></text> </column> <column> <text value="${message:LOGIN}"></text> diff --git a/modules/cms/ui/themes/default/html/views/user/rights.php b/modules/cms/ui/themes/default/html/views/user/rights.php @@ -38,9 +38,9 @@ </td> <?php foreach((array)$show as $list_key=>$t) { ?> <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> - <span title="<?php echo escapeHtml(''.@lang('acl_'.@$t.'').'') ?>"><?php echo escapeHtml(''.@lang('acl_'.@$t.'').'') ?> + <span title="<?php echo escapeHtml(''.@lang('acl_'.@$t.'').'') ?>"><?php echo escapeHtml(''.@lang('acl_'.@$t.'_abbrev').'') ?> </span> - <span title="<?php echo escapeHtml(''.@lang('acl_').'') ?>"><?php echo escapeHtml(''.@lang('acl_').'') ?> + <span title="<?php echo escapeHtml(''.@lang('acl_').'') ?>"><?php echo escapeHtml(''.@lang('acl__abbrev').'') ?> </span> </td> <?php } ?> diff --git a/modules/cms/ui/themes/default/html/views/user/rights.tpl.src.xml b/modules/cms/ui/themes/default/html/views/user/rights.tpl.src.xml @@ -22,8 +22,8 @@ </column> <list list="${show}" value="t"> <column class="help"> - <text value="${message:acl_${t}}" prefix="acl_" suffix="_abbrev" title="${message:acl_${t}}"></text> - <text value="${message:acl_${data:t}}" prefix="acl_" suffix="_abbrev" title="${message:acl_${data:t}}"></text> + <text value="${message:acl_${t}_abbrev}" title="${message:acl_${t}}"></text> + <text value="${message:acl_${data:t}_abbrev}" title="${message:acl_${data:t}}"></text> </column> </list> </row> diff --git a/modules/cms/ui/themes/default/html/views/userlist/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/userlist/show.tpl.src.xml @@ -8,7 +8,7 @@ <text value="${message:name}"></text> </column> <column> - <text raw=""></text> + <text value=""></text> </column> <column> <text value="${message:LOGIN}"></text> diff --git a/modules/template_engine/components/html/text/Text.class.php b/modules/template_engine/components/html/text/Text.class.php @@ -9,22 +9,11 @@ use template_engine\element\ValueExpression; class TextComponent extends HtmlComponent { - public $prefix = ''; - public $suffix = ''; public $title; - public $titlekey; public $type; public $escape = true; - public $var; - public $text; - public $key; - public $raw; public $value; - public $maxlength; // DEPRECATED - use CSS. - public $accesskey; - public $cut = 'both'; public $label; - public $newline = true; public function createElement() { @@ -73,10 +62,6 @@ class TextComponent extends HtmlComponent if ( $this->title ) $text->addAttribute('title',$this->title); - elseif ( $this->titlekey ) - //$text->addAttribute('title', Value::createExpression(ValueExpression::TYPE_MESSAGE,$this->titlekey)); - //$text->addAttribute('title', $this->titlekey); - $text->addAttribute('title', new ValueExpression( ValueExpression::TYPE_MESSAGE,$this->titlekey,0) ); //if ( $this->newline) // $functions[] = 'nl2br(@)'; @@ -85,19 +70,7 @@ class TextComponent extends HtmlComponent //if ( !empty($this->accesskey) ) // $functions[] = "Text::accessKey('".$this->accesskey."',@)"; - if ( $this->key ) - $text->content( new ValueExpression( ValueExpression::TYPE_MESSAGE,$this->key,0) ); - - elseif ( $this->text ) - $text->content( Value::createExpression(ValueExpression::TYPE_MESSAGE,$this->text) ); - - elseif ( $this->var ) - $text->content( Value::createExpression(ValueExpression::TYPE_DATA_VAR,$this->var) ); - - elseif ( $this->raw ) - $text->content( str_replace('_',' ',$this->raw) ); - - elseif ( $this->value ) + if ( $this->value ) $text->content( $this->value );