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

Get vacation notice shown again

Browse Source
This commit is contained in:
Hadi Nategh 2022-09-15 16:06:10 +02:00
parent 06a7767194
commit 0a3e6503ac
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/js/app.js
View File

@ -1543,11 +1543,13 @@ app.classes.mail = AppJS.extend(
if (!this.et2 && !this.checkET2()) return;
if (_data == null)
{
this.et2.getWidgetById('mail.index.vacationnotice').set_disabled(true);
this.et2.getWidgetById(this.nm_index+'[vacationnotice]').set_value('');
this.et2.getWidgetById(this.nm_index+'[vacationrange]').set_value('');
}
else
{
this.et2.getWidgetById('mail.index.vacationnotice').set_disabled(false);
this.et2.getWidgetById(this.nm_index+'[vacationnotice]').set_value(_data.vacationnotice);
this.et2.getWidgetById(this.nm_index+'[vacationrange]').set_value(_data.vacationrange);
}

12
mail/templates/default/app.css
View File

@ -1046,4 +1046,14 @@ div#mail-index_nm.splitter-pane {min-height: 100px;}
border: none;
}
#popupMainDiv {height: 100%}
.treeContainer {height: calc(100% - 100px)}
.treeContainer {height: calc(100% - 100px)}
#mail-index_mail-index-header_right {gap: 1ex;}
#mail-index_mail-index-header_right et2-details.vacationnotice {
min-width: 8em;
}
#mail-index_mail-index-header_right et2-details.vacationnotice::part(base) {
background: #dee9f3;
border-color: #0f65968f;
border-width: 1px;
height: 2.6em;
}

11
mail/templates/default/index.xet
View File

@ -125,12 +125,11 @@
<buttononly id="button[mailcreate]" onclick="app.mail.mail_compose(false);" label="Compose" image="add"/>
</template>
<template id="mail.index.header_right" template="" lang="" group="0" version="1.9.001">
<hbox id="mail.index.vacationnotice" class="mail-index_vacation">
<vbox>
<description id="nm[vacationnotice]" class="@nm[vacationclass]"/>
<description id="nm[vacationrange]" class="@nm[vacationrangeclass]"/>
</vbox>
</hbox>
<et2-details id="mail.index.vacationnotice" summary="on vacation" toggleOnHover="true" hoist="true" class="vacationnotice">
<description id="nm[vacationnotice]" class="@nm[vacationclass]"/>
<description id="nm[vacationrange]" class="@nm[vacationrangeclass]"/>
</et2-details>
<hbox id="mail.index.datefilter" class="mail-index_datefilter">
<date id="startdate" label="Start" onchange="app.mail.mail_refreshMessageGrid(false,true);"/>
<date id="enddate" label="End" onchange="app.mail.mail_refreshMessageGrid(false,true);"/>