From a24a67b2667db55baf5cd641d5d659df02adb234 Mon Sep 17 00:00:00 2001 From: Tom Stroemer Date: Thu, 23 Nov 2023 21:40:49 +0100 Subject: [PATCH 1/2] feat(messages): show recipients in thread view --- app/assets/stylesheets/bootstrap_and_overrides.css.less | 4 ++++ plugins/messages/app/views/messages/thread.haml | 5 +++++ plugins/messages/config/locales/de.yml | 1 + plugins/messages/config/locales/en.yml | 1 + plugins/messages/config/locales/es.yml | 1 + plugins/messages/config/locales/nl.yml | 1 + plugins/messages/config/locales/tr.yml | 1 + 7 files changed, 14 insertions(+) diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index 971308c95..573a9bb69 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -540,3 +540,7 @@ span.negative_amout { .deleted_row { text-decoration: line-through; } + +details { + cursor: pointer; +} \ No newline at end of file diff --git a/plugins/messages/app/views/messages/thread.haml b/plugins/messages/app/views/messages/thread.haml index 4bc36bcba..e7e211b53 100644 --- a/plugins/messages/app/views/messages/thread.haml +++ b/plugins/messages/app/views/messages/thread.haml @@ -9,6 +9,11 @@ .panel-heading %b= h(message.sender_name) = format_time(message.created_at) + %br + - # show the list of recipients in a expandable detail/summary panel + %details + %summary= t '.recipients' + = message.recipients.map(&:display).join(', ') .panel-body= simple_format(h(message.body)) %p diff --git a/plugins/messages/config/locales/de.yml b/plugins/messages/config/locales/de.yml index 2f423dc1f..cb6a683e5 100644 --- a/plugins/messages/config/locales/de.yml +++ b/plugins/messages/config/locales/de.yml @@ -119,6 +119,7 @@ de: thread: all_message_threads: Alle Nachrichtenverläufe reply: Antworten + recipients: Empfänger_innen toggle_private: not_allowed: Du kannst die Sichtbarkeit dieser Nachricht nicht ändern. message_threads: diff --git a/plugins/messages/config/locales/en.yml b/plugins/messages/config/locales/en.yml index ccd8bb6c8..692064efb 100644 --- a/plugins/messages/config/locales/en.yml +++ b/plugins/messages/config/locales/en.yml @@ -119,6 +119,7 @@ en: thread: all_message_threads: All message threads reply: Reply + recipients: Recipients toggle_private: not_allowed: You can not change the visibility of the message. message_threads: diff --git a/plugins/messages/config/locales/es.yml b/plugins/messages/config/locales/es.yml index 81a9a2061..879579340 100644 --- a/plugins/messages/config/locales/es.yml +++ b/plugins/messages/config/locales/es.yml @@ -119,6 +119,7 @@ es: thread: all_message_threads: Todos los hilos de mensaje reply: Responde + recipients: Destinatarios toggle_private: not_allowed: No puede cambiar la visibilidad del mensaje. message_threads: diff --git a/plugins/messages/config/locales/nl.yml b/plugins/messages/config/locales/nl.yml index 56738c0bc..fc8df1cca 100644 --- a/plugins/messages/config/locales/nl.yml +++ b/plugins/messages/config/locales/nl.yml @@ -119,6 +119,7 @@ nl: thread: all_message_threads: Alle conversaties reply: Antwoord + recipients: Geadresseerden toggle_private: not_allowed: Je kunt de zichtbaarheid van het bericht niet wijzigen. message_threads: diff --git a/plugins/messages/config/locales/tr.yml b/plugins/messages/config/locales/tr.yml index 002d1c9b9..45db3d87d 100644 --- a/plugins/messages/config/locales/tr.yml +++ b/plugins/messages/config/locales/tr.yml @@ -119,6 +119,7 @@ tr: thread: all_message_threads: Tüm mesaj konuları reply: Yanıtla + recipients: Alıcılar toggle_private: not_allowed: Mesajın görünürlüğünü değiştiremezsiniz. message_threads: From ae8bf57387f912b768acbe4a2223784ffa495686 Mon Sep 17 00:00:00 2001 From: Tom Stroemer Date: Mon, 4 Dec 2023 20:39:24 +0100 Subject: [PATCH 2/2] chore: ignore intellij iml files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 185b2f74c..bdf8f58ec 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ config/environments/development.rb nbproject/ .*.sw? *~ +*.iml coverage tags