extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 18:33:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix mail preview in mobile view no longer shows email addresses in its details box

Browse Source
This commit is contained in:
hadi 2023-08-10 17:47:36 +02:00
parent 2da6961dcb
commit 906f41328f
4 changed files with 167 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mail/js/app.js
View File

@ -5831,6 +5831,18 @@ app.classes.mail = AppJS.extend(
if (id){ if (id){
content = egw.dataGetUIDdata(id); content = egw.dataGetUIDdata(id);
content.data['toolbar'] = this.et2.getArrayMgr('sel_options').getEntry('toolbar'); content.data['toolbar'] = this.et2.getArrayMgr('sel_options').getEntry('toolbar');
if (content.data.toaddress||content.data.fromaddress)
{
content.data.additionaltoaddress = (content.data.additionaltoaddress??[]).concat(content.data.toaddress);
content.data.additionaltoaddress = content.data.additionaltoaddress.filter((i, item) => {
return content.data.additionaltoaddress.indexOf(i) == item
});
content.data.additionalfromaddress = (content.data.additionalfromaddress??[]).concat(content.data.fromaddress);
content.data.additionalfromaddress = content.data.additionalfromaddress.filter((i, item) => {
return content.data.additionalfromaddress.indexOf(i) == item
});
}
// Set default actions // Set default actions
for(var action in content.data['toolbar']) for(var action in content.data['toolbar'])
{ {

75
mail/templates/mobile/app.css
View File

@ -128,6 +128,9 @@
body #popupMainDiv div#mail-view { body #popupMainDiv div#mail-view {
height: 100%; height: 100%;
} }
body #popupMainDiv div#mail-view #mail-view_subject {
font-size: 12pt;
}
body #popupMainDiv #mail-view_toaddressdetails { body #popupMainDiv #mail-view_toaddressdetails {
color: #26537c; color: #26537c;
float: right; float: right;
@ -212,14 +215,14 @@
#mail-index { #mail-index {
margin-right: 0px; margin-right: 0px;
} }
#mail-index table.egwGridView_outer tbody span.et2_date_ro.et2_label { #mail-index span.et2_date_ro.et2_label {
font-size: 9px; font-size: 9px;
} }
#mail-index table.egwGridView_outer tbody td { #mail-index td {
padding-top: 8px; padding-top: 8px;
padding-bottom: 8px; padding-bottom: 8px;
} }
#mail-index table.egwGridView_outer tbody td a[id^='mail-index_'][id$='fromaddress]'] { #mail-index td a[id^='mail-index_'][id$='fromaddress]'] {
color: #373737; color: #373737;
font-size: 12pt; font-size: 12pt;
overflow: hidden; overflow: hidden;
@ -228,14 +231,14 @@
width: 95%; width: 95%;
display: inline-block; display: inline-block;
} }
#mail-index table.egwGridView_outer tbody td span[id^='mail-index_'][id$='attachments]'] { #mail-index td span[id^='mail-index_'][id$='attachments]'] {
float: right; float: right;
} }
#mail-index table.egwGridView_outer tbody td span[id^='mail-index_'][id$='attachments]'] img { #mail-index td span[id^='mail-index_'][id$='attachments]'] img {
width: 16px; width: 16px;
height: 16px; height: 16px;
} }
#mail-index table.egwGridView_outer tbody td span[id^='mail-index_'][id$='subject]'] { #mail-index td et2-description[id^='mail-index_'][id$='subject]'] {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -243,76 +246,76 @@
font-size: 10pt; font-size: 10pt;
font-weight: normal !important; font-weight: normal !important;
} }
#mail-index table.egwGridView_outer tbody td label[id^='mail-index_'][id$='date]'] { #mail-index td label[id^='mail-index_'][id$='date]'] {
padding-top: 0; padding-top: 0;
} }
#mail-index table.egwGridView_outer tbody tr { #mail-index tr {
height: 55px; height: 55px;
} }
#mail-index table.egwGridView_outer tbody tr div.recent, #mail-index tr div.recent,
#mail-index table.egwGridView_outer tbody tr span.recent, #mail-index tr span.recent,
#mail-index table.egwGridView_outer tbody tr time.recent, #mail-index tr time.recent,
#mail-index table.egwGridView_outer tbody tr a.recent, #mail-index tr a.recent,
#mail-index table.egwGridView_outer tbody tr div.unseen, #mail-index tr div.unseen,
#mail-index table.egwGridView_outer tbody tr span.unseen, #mail-index tr span.unseen,
#mail-index table.egwGridView_outer tbody tr time.unseen, #mail-index tr time.unseen,
#mail-index table.egwGridView_outer tbody tr a.unseen { #mail-index tr a.unseen {
color: black !important; color: black !important;
font-weight: bold; font-weight: bold;
} }
#mail-index table.egwGridView_outer tbody tr span.mail.mobile_cat_col { #mail-index tr span.mail.mobile_cat_col {
background: #F5F5F5; background: #F5F5F5;
} }
#mail-index table.egwGridView_outer tbody tr span.mail.label1.mobile_cat_col { #mail-index tr span.mail.label1.mobile_cat_col {
background: #ff0080; background: #ff0080;
} }
#mail-index table.egwGridView_outer tbody tr span.mail.label2.mobile_cat_col { #mail-index tr span.mail.label2.mobile_cat_col {
background: #ff8000; background: #ff8000;
} }
#mail-index table.egwGridView_outer tbody tr span.mail.label3.mobile_cat_col { #mail-index tr span.mail.label3.mobile_cat_col {
background: #008000; background: #008000;
} }
#mail-index table.egwGridView_outer tbody tr span.mail.label4.mobile_cat_col { #mail-index tr span.mail.label4.mobile_cat_col {
background: #0000ff; background: #0000ff;
} }
#mail-index table.egwGridView_outer tbody tr span.mail.label5.mobile_cat_col { #mail-index tr span.mail.label5.mobile_cat_col {
background: #8000ff; background: #8000ff;
} }
#mail-index table.egwGridView_outer tbody tr span.mail.flagged.mobile_cat_col { #mail-index tr span.mail.flagged.mobile_cat_col {
background: #ff0000; background: #ff0000;
} }
#mail-index table.egwGridView_outer tbody tr span.mail.prio_high.mobile_cat_col { #mail-index tr span.mail.prio_high.mobile_cat_col {
background: #ac0000; background: #ac0000;
} }
#mail-index table.egwGridView_outer tbody tr span.mail.deleted.mobile_cat_col { #mail-index tr span.mail.deleted.mobile_cat_col {
background: silver; background: silver;
text-decoration: line-through; text-decoration: line-through;
} }
#mail-index table.egwGridView_outer tbody tr span.status_img { #mail-index tr span.status_img {
padding: 0 2px 2px 0; padding: 0 2px 2px 0;
} }
#mail-index table.egwGridView_outer tbody tr span.deleted.status_img { #mail-index tr span.deleted.status_img {
background-image: url(../default/images/kmmsgdel.svg); background-image: url(../default/images/kmmsgdel.svg);
} }
#mail-index table.egwGridView_outer tbody tr span.unseen.status_img { #mail-index tr span.unseen.status_img {
background-image: url(../default/images/kmmsgunseen.svg); background-image: url(../default/images/kmmsgunseen.svg);
} }
#mail-index table.egwGridView_outer tbody tr span.flagged_seen.status_img { #mail-index tr span.flagged_seen.status_img {
background-image: url(../default/images/read_flagged_small.svg); background-image: url(../default/images/read_flagged_small.svg);
} }
#mail-index table.egwGridView_outer tbody tr span.flagged_unseen.status_img { #mail-index tr span.flagged_unseen.status_img {
background-image: url(../default/images/unread_flagged_small.svg); background-image: url(../default/images/unread_flagged_small.svg);
} }
#mail-index table.egwGridView_outer tbody tr span.recent.status_img { #mail-index tr span.recent.status_img {
background-image: url(../default/images/kmmsgnew.svg); background-image: url(../default/images/kmmsgnew.svg);
} }
#mail-index table.egwGridView_outer tbody tr span.replied.status_img { #mail-index tr span.replied.status_img {
background-image: url(../default/images/mail_reply.svg); background-image: url(../default/images/mail_reply.svg);
} }
#mail-index table.egwGridView_outer tbody tr span.forwarded.status_img { #mail-index tr span.forwarded.status_img {
background-image: url(../default/images/mail_forward.svg); background-image: url(../default/images/mail_forward.svg);
} }
#mail-index table.egwGridView_outer tbody tr span.bodypreview { #mail-index tr span.bodypreview {
text-overflow: ellipsis; text-overflow: ellipsis;
padding-left: 2px; padding-left: 2px;
font-style: normal; font-style: normal;
@ -347,4 +350,8 @@
#mail-acl_grid .row { #mail-acl_grid .row {
border-bottom: 1px solid silver; border-bottom: 1px solid silver;
} }
.mailPreviewHeaders et2-lavatar {
position: inherit;
}
} }
/*# sourceMappingURL=app.css.map */

210
mail/templates/mobile/app.less
View File

@ -137,6 +137,10 @@
} }
div#mail-view { div#mail-view {
height: 100%; height: 100%;
#mail-view_subject
{
.mob-fontsize-l;
}
} }
#mail-view_toaddressdetails { #mail-view_toaddressdetails {
color: #26537c; color: #26537c;
@ -220,115 +224,113 @@
#mail-index { #mail-index {
margin-right: 0px; margin-right: 0px;
table.egwGridView_outer tbody { span.et2_date_ro.et2_label {
span.et2_date_ro.et2_label { font-size: 9px;
font-size: 9px; }
td {
padding-top: 8px;
padding-bottom: 8px;
a[id^='mail-index_'][id$='fromaddress]']{
color:@gray_80;
.mob-fontsize-l;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width: 95%;
display: inline-block;
} }
td { span[id^='mail-index_'][id$='attachments]'] {
padding-top: 8px; float: right;
padding-bottom: 8px; img {
a[id^='mail-index_'][id$='fromaddress]']{ width: 16px;
color:@gray_80; height: 16px;
.mob-fontsize-l;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width: 95%;
display: inline-block;
}
span[id^='mail-index_'][id$='attachments]'] {
float: right;
img {
width: 16px;
height: 16px;
}
}
span[id^='mail-index_'][id$='subject]'] {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
width: 95%;
.mob-fontsize-n;
font-weight: normal !important;
}
label[id^='mail-index_'][id$='date]']{
padding-top: 0;
} }
} }
tr{ et2-description[id^='mail-index_'][id$='subject]'] {
height:55px; overflow: hidden;
div.recent , white-space: nowrap;
span.recent , text-overflow: ellipsis;
time.recent , width: 95%;
a.recent, .mob-fontsize-n;
div.unseen , font-weight: normal !important;
span.unseen , }
time.unseen , label[id^='mail-index_'][id$='date]']{
a.unseen { padding-top: 0;
color: black !important; }
font-weight: bold; }
} tr{
span.mail.mobile_cat_col { height:55px;
background: #F5F5F5; div.recent ,
} span.recent ,
span.mail.label1.mobile_cat_col { time.recent ,
background: #ff0080; a.recent,
} div.unseen ,
span.mail.label2.mobile_cat_col{ span.unseen ,
background: #ff8000; time.unseen ,
} a.unseen {
span.mail.label3.mobile_cat_col { color: black !important;
background: #008000; font-weight: bold;
} }
span.mail.label4.mobile_cat_col { span.mail.mobile_cat_col {
background: #0000ff; background: #F5F5F5;
} }
span.mail.label5.mobile_cat_col { span.mail.label1.mobile_cat_col {
background: #8000ff; background: #ff0080;
} }
span.mail.label2.mobile_cat_col{
background: #ff8000;
}
span.mail.label3.mobile_cat_col {
background: #008000;
}
span.mail.label4.mobile_cat_col {
background: #0000ff;
}
span.mail.label5.mobile_cat_col {
background: #8000ff;
}
span.mail.flagged.mobile_cat_col { span.mail.flagged.mobile_cat_col {
background: #ff0000; background: #ff0000;
} }
span.mail.prio_high.mobile_cat_col { span.mail.prio_high.mobile_cat_col {
background: #ac0000; background: #ac0000;
} }
span.mail.deleted.mobile_cat_col { span.mail.deleted.mobile_cat_col {
background: silver; background: silver;
text-decoration : line-through; text-decoration : line-through;
} }
span.status_img { span.status_img {
padding:0 2px 2px 0; padding:0 2px 2px 0;
} }
span.deleted.status_img { span.deleted.status_img {
background-image: url(../default/images/kmmsgdel.svg); background-image: url(../default/images/kmmsgdel.svg);
} }
span.unseen.status_img { span.unseen.status_img {
background-image: url(../default/images/kmmsgunseen.svg); background-image: url(../default/images/kmmsgunseen.svg);
} }
span.flagged_seen.status_img { span.flagged_seen.status_img {
background-image: url(../default/images/read_flagged_small.svg); background-image: url(../default/images/read_flagged_small.svg);
} }
span.flagged_unseen.status_img { span.flagged_unseen.status_img {
background-image: url(../default/images/unread_flagged_small.svg); background-image: url(../default/images/unread_flagged_small.svg);
} }
span.recent.status_img { span.recent.status_img {
background-image: url(../default/images/kmmsgnew.svg); background-image: url(../default/images/kmmsgnew.svg);
} }
span.replied.status_img { span.replied.status_img {
background-image: url(../default/images/mail_reply.svg); background-image: url(../default/images/mail_reply.svg);
} }
span.forwarded.status_img { span.forwarded.status_img {
background-image: url(../default/images/mail_forward.svg); background-image: url(../default/images/mail_forward.svg);
} }
span.bodypreview { span.bodypreview {
text-overflow: ellipsis; text-overflow: ellipsis;
padding-left: 2px; padding-left: 2px;
font-style: normal; font-style: normal;
.mob-fontsize-n; .mob-fontsize-n;
}
} }
} }
.mail-index_quotabox { .mail-index_quotabox {
@ -359,5 +361,5 @@
#mail-acl_grid { #mail-acl_grid {
.row{border-bottom: 1px solid silver;} .row{border-bottom: 1px solid silver;}
} }
.mailPreviewHeaders et2-lavatar {position: inherit}
} }

12
mail/templates/mobile/view.xet
View File

@ -17,22 +17,26 @@
</et2-hbox> </et2-hbox>
</et2-hbox> </et2-hbox>
<et2-hbox width="100%" class="mailPreviewHeaders"> <et2-hbox width="100%" class="mailPreviewHeaders">
<et2-lavatar src="@avatar" lname="@address" shape="rounded" size="2.75em"></et2-lavatar> <et2-lavatar contactId="email:$cont[fromaddress]" lname="$cont[fromlavatar][lname]" fname="$cont[fromlavatar][fname]" shape="rounded" size="2.75em"></et2-lavatar>
<et2-vbox> <et2-vbox>
<et2-hbox> <et2-hbox>
<et2-details class="details" toggleOnHover="true" hoist="true" toggleAlign="left"> <et2-details class="details" toggleOnHover="true" hoist="true" toggleAlign="left">
<et2-select-email slot="summary" id="fromaddress" readonly="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"/> <et2-select-email slot="summary" id="fromaddress" readonly="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"/>
<et2-hbox> <et2-hbox>
<et2-description value="From" class="firstColumnTitle"></et2-description> <et2-description value="From" class="firstColumnTitle"></et2-description>
<et2-select-email id="additionalfromaddress" readonly="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email> <et2-select-email id="additionalfromaddress" rows="1" multiple="true" readonly="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email>
</et2-hbox> </et2-hbox>
<et2-hbox disabled="!@toaddress" width="100%"> <et2-hbox disabled="!@toaddress" width="100%">
<et2-description value="To" class="firstColumnTitle"></et2-description> <et2-description value="To" class="firstColumnTitle"></et2-description>
<et2-select-email id="additionaltoaddress" readonly="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email> <et2-select-email id="additionaltoaddress" rows="1" multiple="true" readonly="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email>
</et2-hbox> </et2-hbox>
<et2-hbox disabled="!@ccaddress" width="100%"> <et2-hbox disabled="!@ccaddress" width="100%">
<et2-description value="Cc" class="firstColumnTitle"></et2-description> <et2-description value="Cc" class="firstColumnTitle"></et2-description>
<et2-select-email id="ccaddress" readonly="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email> <et2-select-email id="ccaddress" readonly="true" rows="1" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email>
</et2-hbox>
<et2-hbox disabled="!@bccaddress" width="100%">
<et2-description value="BCc" class="firstColumnTitle"></et2-description>
<et2-select-email id="bccaddress" readonly="true" rows="1" multiple="true" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"></et2-select-email>
</et2-hbox> </et2-hbox>
</et2-details> </et2-details>
<et2-date-time-today align="right" id="date" readonly="true"></et2-date-time-today> <et2-date-time-today align="right" id="date" readonly="true"></et2-date-time-today>