From 4747cb2c239b43719ddb3eb71b3a7ef41e1f3eef Mon Sep 17 00:00:00 2001 From: ralf Date: Mon, 16 Sep 2024 09:57:35 +0200 Subject: [PATCH] fix one image url and add tooltips to icons I did not understand right away --- mail/inc/class.mail_ui.inc.php | 10 +++++----- mail/lang/egw_de.lang | 2 ++ mail/lang/egw_en.lang | 2 ++ mail/templates/default/preview.css | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index c5eefac7f8..275ba394b9 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -2052,7 +2052,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2); $imageHTMLBlock = ''; //error_log(__METHOD__.__LINE__.array2string($header)); - if (in_array("attachments", $cols)) + if (in_array('attachments', $cols)) { if (!empty($header['attachments']) && (in_array($header['mimetype'], array( 'multipart/mixed', 'multipart/signed', 'multipart/related', 'multipart/report', @@ -2085,11 +2085,11 @@ $filter['before']= date("d-M-Y", $cutoffdate2); // show priority flag if ($header['priority'] < 3) { - $image = Api\Html::image('mail','prio_high'); + $image = Api\Html::image('mail','prio_high', lang('High priority')); } elseif ($header['priority'] > 3) { - $image = Api\Html::image('mail','prio_low'); + $image = Api\Html::image('mail','prio_low', lang('Low priority')); } else { @@ -2099,9 +2099,9 @@ $filter['before']= date("d-M-Y", $cutoffdate2); $imageflagged =''; if ($header['flagged']) { - $imageflagged = Api\Html::image('mail','unread_flagged_small'); + $imageflagged = Api\Html::image('mail','unread_flagged_small', lang('Unread')); } - $data["attachments"] = $image.$attachmentFlag.$imageflagged; // icon for attachments available + $data['attachments'] = $image.$attachmentFlag.$imageflagged; // icon for attachments available } // sent or draft or template folder -> to address diff --git a/mail/lang/egw_de.lang b/mail/lang/egw_de.lang index c1e087728b..56d68f7795 100644 --- a/mail/lang/egw_de.lang +++ b/mail/lang/egw_de.lang @@ -277,6 +277,7 @@ handling of external http images / mixed content in mails mail de Behandlung von header mail de Kopfzeilen header lines mail de Kopfzeilen anzeigen high mail de hoch +high priority mail de Hohe Priorität hold %1 to drag files to your computer mail de %1 halten um Dateien auf Ihren Computer zu ziehen home page folders mail de Darstellung von E-Mails auf der Startseite hostname or ip mail de Hostname oder IP @@ -333,6 +334,7 @@ learning as spam failed because of %1 mail de Als Spam lernen fehlgeschlagen, da less than mail de kleiner als limit mailing list results when searching for addresses mail de Limitierung der Ergebnisse von Gruppen und Verteilerlisten bei der Suche nach Adressen list of actions to be switched/activated on by default (eg. mail compose save as infolog action) mail de Liste der Aktionen, die standardmäßig eingeschaltet bzw. aktiviert werden sollen (z.B. E-Mail verfassen und als InfoLog speichern). +low priority mail de Niedrige Priorität mail common de E-Mail mail acl mail de Zugriffsrechte mail filter mail de Filter diff --git a/mail/lang/egw_en.lang b/mail/lang/egw_en.lang index 9b06fb3508..da4dbe399b 100644 --- a/mail/lang/egw_en.lang +++ b/mail/lang/egw_en.lang @@ -277,6 +277,7 @@ handling of external http images / mixed content in mails mail en Handling of ex header mail en Header header lines mail en Header lines high mail en High +high priority mail en High priority hold %1 to drag files to your computer mail en Hold %1 to drag files to your computer home page folders mail en home page folders hostname or ip mail en Hostname or IP @@ -333,6 +334,7 @@ learning as spam failed because of %1 mail en Learning as spam failed because of less than mail en less than limit mailing list results when searching for addresses mail en Limit mailing list results when searching for addresses list of actions to be switched/activated on by default (eg. mail compose save as infolog action) mail en List of actions to be switched/activated on by default (eg. email compose "Save as InfoLog" action). +low priority mail en Low priority mail common en Mail mail acl mail en Email access rights mail filter mail en Filter diff --git a/mail/templates/default/preview.css b/mail/templates/default/preview.css index 9c41046b64..8736ab5971 100644 --- a/mail/templates/default/preview.css +++ b/mail/templates/default/preview.css @@ -104,7 +104,7 @@ blockquote blockquote blockquote blockquote blockquote blockquote{ .mail_externalImagesMsg button.closeBtn { float: right; - background-image: url(../api/templates/default/images/close.svg); + background-image: url(../node_modules/bootstrap-icons/icons/x-lg.svg); height: 30px; width: 50px; background-repeat: no-repeat;