holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enable web-components for all date and select (without tags or search attribute)

Browse Source 
also reverting unnecessary explicit changes to et2-* in infolog.edit
This commit is contained in:
ralf 2022-02-16 10:38:28 +02:00
parent f29da5e613
commit a7ba4c0727
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/etemplate.php
View File

@ -87,9 +87,15 @@ function send_template()
// add et2-prefix for <select-* or <date-* readonly="true" // add et2-prefix for <select-* or <date-* readonly="true"
if (isset($attrs['readonly']) && !in_array($attrs['readonly'], ['false', '0']) || if (isset($attrs['readonly']) && !in_array($attrs['readonly'], ['false', '0']) ||
// also add it for untyped/simple <select without search or tags attribute // also add it for <date* and <select* without search or tags attribute
$matches[1] === 'select' && empty($matches[2]) && !isset($attrs['type']) && !isset($attrs['search']) && !isset($attrs['tags'])) $matches[1] === 'date' || $matches[1] === 'select' && !isset($attrs['search']) && !isset($attrs['tags']))
{ {
// type attribute need to go in widget type <select type="select-account" --> <et2-select-account
if (empty($matches[2]) && isset($attrs['type']))
{
$matches[1] = $attrs['type'];
$matches[3] = str_replace('type="'.$attrs['type'].'"', '', $matches[3]);
}
return '<et2-'.$matches[1].$matches[2].' '.$matches[3].'></et2-'.$matches[1].$matches[2].'>'; return '<et2-'.$matches[1].$matches[2].' '.$matches[3].'></et2-'.$matches[1].$matches[2].'>';
} }
return $matches[0]; return $matches[0];

20
infolog/templates/default/edit.xet
View File

@ -3,7 +3,7 @@
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <overlay>
<template id="infolog.edit.description" template="" lang="" group="0" version="1.6.001"> <template id="infolog.edit.description" template="" lang="" group="0" version="1.6.001">
<et2-textarea id="info_des" no_lang="1"/> <textbox id="info_des" no_lang="1" multiline="true"/>
<checkbox id="clean_history"/> <checkbox id="clean_history"/>
</template> </template>
<template id="infolog.edit.links" template="" lang="" group="0" version="1.3.001"> <template id="infolog.edit.links" template="" lang="" group="0" version="1.3.001">
@ -154,7 +154,7 @@
<rows> <rows>
<row class="dialogHeader"> <row class="dialogHeader">
<description value="Title" for="info_subject"/> <description value="Title" for="info_subject"/>
<et2-textbox statustext="a short subject for the entry" id="info_subject" class="et2_fullWidth et2_required" maxlength="255" span="4" tabindex="1"></et2-textbox> <textbox statustext="a short subject for the entry" id="info_subject" class="et2_fullWidth et2_required" maxlength="255" span="4" tabindex="1"></textbox>
<textbox type="integer" id="info_number" readonly="true"/> <textbox type="integer" id="info_number" readonly="true"/>
<appicon src="infolog" for="info_number"/> <appicon src="infolog" for="info_number"/>
</row> </row>
@ -165,10 +165,8 @@
</menulist> </menulist>
<description/> <description/>
<description value="Startdate" for="info_startdate"/> <description value="Startdate" for="info_startdate"/>
<date-time <date-time id="info_startdate" class="et2_fullWidth"
statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)" statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)"/>
id="info_startdate" class="et2_fullWidth">
</date-time>
</row> </row>
<row class="dialogHeader3"> <row class="dialogHeader3">
<description value="Contact"/> <description value="Contact"/>
@ -220,16 +218,16 @@
</row> </row>
<row disabled="!@info_owner" class="dialogOperators"> <row disabled="!@info_owner" class="dialogOperators">
<description value="Owner"/> <description value="Owner"/>
<et2-hbox> <hbox>
<select-account id="info_owner" readonly="true"/> <select-account id="info_owner" readonly="true"/>
<date-time id="info_created" readonly="true" align="right"/> <date-time id="info_created" readonly="true" align="right"/>
</et2-hbox> </hbox>
<description/> <description/>
<description value="Last modified"/> <description value="Last modified"/>
<et2-hbox> <hbox>
<select-account id="info_modifier" readonly="true"/> <select-account id="info_modifier" readonly="true"/>
<date-time id="info_datemodified" readonly="true" align="right"/> <date-time id="info_datemodified" readonly="true" align="right"/>
</et2-hbox> </hbox>
</row> </row>
<row class="dialogFooterToolbar"> <row class="dialogFooterToolbar">
<hbox span="all"> <hbox span="all">
@ -251,4 +249,4 @@
</rows> </rows>
</grid> </grid>
</template> </template>
</overlay> </overlay>