From fa3ee544fbe6a215b71f632dd85cf97e72aaf16d Mon Sep 17 00:00:00 2001 From: Lucas Vanhalst Date: Sun, 15 May 2016 16:50:05 +0200 Subject: [PATCH] Add compacter message view mode --- packages/rocketchat-lib/i18n/ar.i18n.json | 3 +- packages/rocketchat-lib/i18n/de.i18n.json | 3 +- packages/rocketchat-lib/i18n/en.i18n.json | 6 +- packages/rocketchat-lib/i18n/es.i18n.json | 1 - packages/rocketchat-lib/i18n/fi.i18n.json | 3 +- packages/rocketchat-lib/i18n/fr.i18n.json | 3 +- packages/rocketchat-lib/i18n/he.i18n.json | 3 +- packages/rocketchat-lib/i18n/ja.i18n.json | 1 - packages/rocketchat-lib/i18n/km.i18n.json | 3 +- packages/rocketchat-lib/i18n/ko.i18n.json | 3 +- packages/rocketchat-lib/i18n/ms-MY.i18n.json | 3 +- packages/rocketchat-lib/i18n/pl.i18n.json | 3 +- packages/rocketchat-lib/i18n/pt.i18n.json | 3 +- packages/rocketchat-lib/i18n/ro.i18n.json | 3 +- packages/rocketchat-lib/i18n/ru.i18n.json | 1 - packages/rocketchat-lib/i18n/zh-TW.i18n.json | 3 +- packages/rocketchat-lib/i18n/zh.i18n.json | 3 +- .../assets/stylesheets/base.less | 116 +++++++++++++++++- .../account/accountPreferences.coffee | 3 +- .../account/accountPreferences.html | 25 ++-- .../rocketchat-ui-master/master/main.coffee | 16 +++ .../message/message.coffee | 4 + .../message/message.html | 10 +- packages/rocketchat-ui/views/app/room.coffee | 9 +- packages/rocketchat-ui/views/app/room.html | 2 +- server/methods/saveUserPreferences.coffee | 5 +- server/startup/migrations/v054.js | 21 ++++ 27 files changed, 209 insertions(+), 50 deletions(-) create mode 100644 server/startup/migrations/v054.js diff --git a/packages/rocketchat-lib/i18n/ar.i18n.json b/packages/rocketchat-lib/i18n/ar.i18n.json index fc790f9642f21..a3eff80389ce1 100644 --- a/packages/rocketchat-lib/i18n/ar.i18n.json +++ b/packages/rocketchat-lib/i18n/ar.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "إخفاء الوسائط المدمجة بشكل تلقائي", "Color" : "اللون", "Commands" : "الأوامر", - "Compact_View" : "عرض متراص", "Confirm_password" : "تأكيد كلمة السر", "Conversation" : "محادثة", "Conversation_closed" : "المحادثة أغلقت: __comment__.", @@ -1162,4 +1161,4 @@ "Your_mail_was_sent_to_s" : "وأرسل البريد إلى %s", "Your_password_is_wrong" : "كلمة السر خاطئة", "Your_push_was_sent_to_s_devices" : "وقد أرسلت دفعك إلى أجهزة٪ الصورة" -} \ No newline at end of file +} diff --git a/packages/rocketchat-lib/i18n/de.i18n.json b/packages/rocketchat-lib/i18n/de.i18n.json index ff0e464981620..7d47491ce70f2 100644 --- a/packages/rocketchat-lib/i18n/de.i18n.json +++ b/packages/rocketchat-lib/i18n/de.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "Eingebettete Medien standardmäßig ausblenden", "Color" : "Farbe", "Commands" : "Befehle", - "Compact_View" : "Kompaktansicht", "Confirm_password" : "Bestätigen Sie Ihr Passwort.", "Conversation" : "Gespräch", "Conversation_closed" : "Gespräch geschlossen: __comment__.", @@ -1162,4 +1161,4 @@ "Your_mail_was_sent_to_s" : "Ihre E-Mail wurde an %s gesendet.", "Your_password_is_wrong" : "Falsches Passwort", "Your_push_was_sent_to_s_devices" : "Die Push-Nachricht wurde an %s Geräte gesendet." -} \ No newline at end of file +} diff --git a/packages/rocketchat-lib/i18n/en.i18n.json b/packages/rocketchat-lib/i18n/en.i18n.json index e9369e164f791..d6e26b1c8910e 100644 --- a/packages/rocketchat-lib/i18n/en.i18n.json +++ b/packages/rocketchat-lib/i18n/en.i18n.json @@ -226,7 +226,7 @@ "Collapse_Embedded_Media_By_Default" : "Collapse embedded media by default", "Color" : "Color", "Commands" : "Commands", - "Compact_View" : "Compact View", + "Compact" : "Compact", "Confirm_password" : "Confirm your password", "Conversation" : "Conversation", "Conversation_closed" : "Conversation closed: __comment__.", @@ -236,6 +236,7 @@ "Copy_to_clipboard" : "Copy to clipboard", "COPY_TO_CLIPBOARD" : "COPY TO CLIPBOARD", "Count" : "Count", + "Cozy" : "Cozy", "Create" : "Create", "Create_new" : "Create new", "Created_at" : "Created at", @@ -916,6 +917,7 @@ "Show_more" : "Show more", "Show_only_online" : "Show only online", "Show_preregistration_form" : "Show pre-registration form", + "Show_usernames" : "Show usernames", "Showing_archived_results" : "

Showing %s archived results

", "Showing_online_users" : "Showing __total_showing__ of __total__ users", "Showing_results" : "

Showing %s results

", @@ -1118,6 +1120,8 @@ "Version" : "Version", "View_All" : "View All", "View_Logs" : "View Logs", + "View_mode" : "View mode", + "View_mode_info" : "This changes the amount of space messages take up on screen.", "Viewing_room_administration" : "Viewing room administration", "Visibility" : "Visibility", "Visible" : "Visible", diff --git a/packages/rocketchat-lib/i18n/es.i18n.json b/packages/rocketchat-lib/i18n/es.i18n.json index 8f54a9c9bdcac..7aecdb386cd38 100644 --- a/packages/rocketchat-lib/i18n/es.i18n.json +++ b/packages/rocketchat-lib/i18n/es.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "Contraer medios incorporados de forma predeterminada", "Color" : "Color", "Commands" : "Comandos", - "Compact_View" : "Vista Compacta", "Confirm_password" : "Confirma tu contraseña", "Conversation" : "Conversación", "Conversation_closed" : "Conversación cerrado: __comment__.", diff --git a/packages/rocketchat-lib/i18n/fi.i18n.json b/packages/rocketchat-lib/i18n/fi.i18n.json index ed764797f8564..fd806748d7a90 100644 --- a/packages/rocketchat-lib/i18n/fi.i18n.json +++ b/packages/rocketchat-lib/i18n/fi.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "Romahtaa upotettu media oletuksena", "Color" : "Väri", "Commands" : "Komennot", - "Compact_View" : "Suppea näkymä", "Confirm_password" : "Vahvista salasanasi", "Conversation" : "Keskustelu", "Conversation_closed" : "Conversation suljettu: __comment__.", @@ -1162,4 +1161,4 @@ "Your_mail_was_sent_to_s" : "Sähköpostisi lähetettiin, vastaanottaja %s", "Your_password_is_wrong" : "Salasana on väärä!", "Your_push_was_sent_to_s_devices" : "Push-viesti lähetettiin %s laitteeseen" -} \ No newline at end of file +} diff --git a/packages/rocketchat-lib/i18n/fr.i18n.json b/packages/rocketchat-lib/i18n/fr.i18n.json index 30ffcf0189642..21d37e2302b1b 100644 --- a/packages/rocketchat-lib/i18n/fr.i18n.json +++ b/packages/rocketchat-lib/i18n/fr.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "Réduire tous les médias intégrés par défaut", "Color" : "Couleur", "Commands" : "Commandes", - "Compact_View" : "Vue compacte", "Confirm_password" : "Confirmez votre mot de passe", "Conversation" : "Conversation", "Conversation_closed" : "Conversation fermée: __comment__.", @@ -1162,4 +1161,4 @@ "Your_mail_was_sent_to_s" : "Votre e-mail a été envoyé à %s", "Your_password_is_wrong" : "Votre mot de passe est incorrect !", "Your_push_was_sent_to_s_devices" : "Votre notification a été envoyée à %s appareils" -} \ No newline at end of file +} diff --git a/packages/rocketchat-lib/i18n/he.i18n.json b/packages/rocketchat-lib/i18n/he.i18n.json index af48ed0df85e1..f789aefa2b5a6 100644 --- a/packages/rocketchat-lib/i18n/he.i18n.json +++ b/packages/rocketchat-lib/i18n/he.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "מכווץ תקשורת מוטבעת כברירת מחדל", "Color" : "צֶבַע", "Commands" : "פקודות", - "Compact_View" : "תצוגה קומפקטית", "Confirm_password" : "אימות הססמה", "Conversation" : "שיחה", "Conversation_closed" : "בשיחה סגורה: __comment__.", @@ -1162,4 +1161,4 @@ "Your_mail_was_sent_to_s" : "הדואר שלך נשלח אל %s", "Your_password_is_wrong" : "הסיסמה שלך היא לא בסדר!", "Your_push_was_sent_to_s_devices" : "הודעת ה-push נשלח בהצלחה ל-%s מכשירים" -} \ No newline at end of file +} diff --git a/packages/rocketchat-lib/i18n/ja.i18n.json b/packages/rocketchat-lib/i18n/ja.i18n.json index b840df0f8ac60..c1c61ef367846 100644 --- a/packages/rocketchat-lib/i18n/ja.i18n.json +++ b/packages/rocketchat-lib/i18n/ja.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "デフォルトでは、埋め込まれたメディアを折りたたみます", "Color" : "色", "Commands" : "コマンド", - "Compact_View" : "コンパクト表示", "Confirm_password" : "パスワードの確認", "Conversation" : "会話", "Conversation_closed" : "会話が閉じ：__comment__を。", diff --git a/packages/rocketchat-lib/i18n/km.i18n.json b/packages/rocketchat-lib/i18n/km.i18n.json index 75d42968f1c32..28b4e609c81cf 100644 --- a/packages/rocketchat-lib/i18n/km.i18n.json +++ b/packages/rocketchat-lib/i18n/km.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "វេញប្រព័ន្ធផ្សព្វផ្សាយដែលបានបង្កប់ដោយលំនាំដើម", "Color" : "color", "Commands" : "ឃ្លាបញ្ជា", - "Compact_View" : "មើលជាតារាង", "Confirm_password" : "បញ្ជាក់​ពាក្យ​សម្ងាត់", "Conversation" : "កិច្ច​ពិភាក្សា", "Conversation_closed" : "សន្ទនាបានបិទ: __comment__ ។", @@ -1162,4 +1161,4 @@ "Your_mail_was_sent_to_s" : "សំបុត្ររបស់អ្នកត្រូវបានបញ្ជូនទៅកាន់ %s", "Your_password_is_wrong" : "ពាក្យសម្ងាត់របស់អ្នកគឺខុស!", "Your_push_was_sent_to_s_devices" : "ការជំរុញរបស់អ្នកត្រូវបានបញ្ជូនទៅកាន់ឧបករណ៍ %s បាន" -} \ No newline at end of file +} diff --git a/packages/rocketchat-lib/i18n/ko.i18n.json b/packages/rocketchat-lib/i18n/ko.i18n.json index 5a575a9de78b5..0cd92f645e1c3 100644 --- a/packages/rocketchat-lib/i18n/ko.i18n.json +++ b/packages/rocketchat-lib/i18n/ko.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "기본적으로 포함 된 미디어 축소", "Color" : "색", "Commands" : "명령", - "Compact_View" : "축소해 보기", "Confirm_password" : "암호를 확인하세요", "Conversation" : "대화", "Conversation_closed" : "대화 폐쇄 : __comment__합니다.", @@ -1162,4 +1161,4 @@ "Your_mail_was_sent_to_s" : "메일은 %s의 전송되었습니다", "Your_password_is_wrong" : "암호가 잘못되었습니다!", "Your_push_was_sent_to_s_devices" : "귀하의 푸시는 %의 기기에 전송" -} \ No newline at end of file +} diff --git a/packages/rocketchat-lib/i18n/ms-MY.i18n.json b/packages/rocketchat-lib/i18n/ms-MY.i18n.json index f75b713fc8db3..2703343254ac7 100644 --- a/packages/rocketchat-lib/i18n/ms-MY.i18n.json +++ b/packages/rocketchat-lib/i18n/ms-MY.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "Runtuh media tertanam secara lalai", "Color" : "warna", "Commands" : "Arahan", - "Compact_View" : "Paparan Kompak", "Confirm_password" : "Sahkan kata laluan anda", "Conversation" : "Perbualan", "Conversation_closed" : "Perbualan ditutup: __comment__.", @@ -1162,4 +1161,4 @@ "Your_mail_was_sent_to_s" : "mel anda telah dihantar ke %s", "Your_password_is_wrong" : "Kata laluan anda adalah salah!", "Your_push_was_sent_to_s_devices" : "push anda telah dihantar ke peranti %s" -} \ No newline at end of file +} diff --git a/packages/rocketchat-lib/i18n/pl.i18n.json b/packages/rocketchat-lib/i18n/pl.i18n.json index 041bb1dcd9a81..4c47dc2820e9e 100644 --- a/packages/rocketchat-lib/i18n/pl.i18n.json +++ b/packages/rocketchat-lib/i18n/pl.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "Zwiń media (obrazki itp.) domyślnie", "Color" : "Kolor", "Commands" : "Polecenia", - "Compact_View" : "Widok kompaktowy", "Confirm_password" : "Potwierdź hasło", "Conversation" : "Rozmowa", "Conversation_closed" : "Rozmowa zamknięty: __comment__.", @@ -1162,4 +1161,4 @@ "Your_mail_was_sent_to_s" : "Twoja wiadomość została wysłana do użytkownika %s", "Your_password_is_wrong" : "To nie jest poprawne hasło!", "Your_push_was_sent_to_s_devices" : "Twój push została wysłany do urządzeń: %s" -} \ No newline at end of file +} diff --git a/packages/rocketchat-lib/i18n/pt.i18n.json b/packages/rocketchat-lib/i18n/pt.i18n.json index 8dd27ae221023..6e0b7ac5f097b 100644 --- a/packages/rocketchat-lib/i18n/pt.i18n.json +++ b/packages/rocketchat-lib/i18n/pt.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "Esconder mídia por padrão", "Color" : "Cor", "Commands" : "Comandos", - "Compact_View" : "Visão Compacta", "Confirm_password" : "Confirmar a senha", "Conversation" : "Conversa", "Conversation_closed" : "Conversa fechada: __comment__.", @@ -1162,4 +1161,4 @@ "Your_mail_was_sent_to_s" : "O seu e-mail foi enviado para %s", "Your_password_is_wrong" : "Sua senha está errada!", "Your_push_was_sent_to_s_devices" : "Sua natificação foi enviada para %s dispositivos" -} \ No newline at end of file +} diff --git a/packages/rocketchat-lib/i18n/ro.i18n.json b/packages/rocketchat-lib/i18n/ro.i18n.json index d7f2c37938128..1c537c89f7611 100644 --- a/packages/rocketchat-lib/i18n/ro.i18n.json +++ b/packages/rocketchat-lib/i18n/ro.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "Colaps mass-media încorporate în mod implicit", "Color" : "Culoare", "Commands" : "Comenzi", - "Compact_View" : "Vizualizare compactă", "Confirm_password" : "Confirmați parola", "Conversation" : "Conversaţie", "Conversation_closed" : "Conversație închisă: __comment__.", @@ -1162,4 +1161,4 @@ "Your_mail_was_sent_to_s" : "E-mail-ul a fost trimis la %s", "Your_password_is_wrong" : "Parola dvs. este greșită!", "Your_push_was_sent_to_s_devices" : "Mesajul Push a fost trimis la %s dispozitive" -} \ No newline at end of file +} diff --git a/packages/rocketchat-lib/i18n/ru.i18n.json b/packages/rocketchat-lib/i18n/ru.i18n.json index 722ae1018d4ad..209e7c3cbabf0 100644 --- a/packages/rocketchat-lib/i18n/ru.i18n.json +++ b/packages/rocketchat-lib/i18n/ru.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "Сворачивать вложенные медиа по умолчанию", "Color" : "Цвет", "Commands" : "Команды", - "Compact_View" : "Компактный вид", "Confirm_password" : "Подтвердить пароль", "Conversation" : "Диалог", "Conversation_closed" : "Разговор закрыт: __comment__.", diff --git a/packages/rocketchat-lib/i18n/zh-TW.i18n.json b/packages/rocketchat-lib/i18n/zh-TW.i18n.json index f396c6112265d..504e82d6c968d 100644 --- a/packages/rocketchat-lib/i18n/zh-TW.i18n.json +++ b/packages/rocketchat-lib/i18n/zh-TW.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "關閉默認的嵌入式媒體", "Color" : "顏色", "Commands" : "命令", - "Compact_View" : "Compact View", "Confirm_password" : "確認密碼", "Conversation" : "對話", "Conversation_closed" : "會話關閉：__comment__。", @@ -1162,4 +1161,4 @@ "Your_mail_was_sent_to_s" : "您的郵件已發送到％s", "Your_password_is_wrong" : "您的密碼是錯誤的！", "Your_push_was_sent_to_s_devices" : "你的推播被送到 %s 裝置" -} \ No newline at end of file +} diff --git a/packages/rocketchat-lib/i18n/zh.i18n.json b/packages/rocketchat-lib/i18n/zh.i18n.json index 156c94625260f..59d30a625f9b2 100644 --- a/packages/rocketchat-lib/i18n/zh.i18n.json +++ b/packages/rocketchat-lib/i18n/zh.i18n.json @@ -224,7 +224,6 @@ "Collapse_Embedded_Media_By_Default" : "关闭默认的嵌入式媒体", "Color" : "颜色", "Commands" : "指令", - "Compact_View" : "预览", "Confirm_password" : "确认密码", "Conversation" : "谈话", "Conversation_closed" : "会话关闭：__comment__。", @@ -1162,4 +1161,4 @@ "Your_mail_was_sent_to_s" : "您的邮件发送至 %s", "Your_password_is_wrong" : "密码错误！", "Your_push_was_sent_to_s_devices" : "成功向 %s 台设备推送" -} \ No newline at end of file +} diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less index 9f9e1f9c74c8d..824921485275e 100644 --- a/packages/rocketchat-theme/assets/stylesheets/base.less +++ b/packages/rocketchat-theme/assets/stylesheets/base.less @@ -2778,12 +2778,68 @@ body:not(.is-cordova) { } } -.compact { +.cozy { .message { padding: 4px 20px 4px 70px; .body { - margin-top: 0px; + margin-top: 0; + } + } +} +.compact{ + .message{ + min-height: 26px; + padding: 5px 15px 0 37px; + .body{ + display: inline; + .inline-image img{ + max-height: 100px; + } + .inline-video{ + max-height: 150px; + } + .attachment { + .attachment-title > a { + font-size: 0.9em; + } + .attachment-author img{ + border-radius: 2px; + } + } + blockquote iframe{ + height: 150px; + width: 266px; + } + } + .info{ + .avatar-image{ + border-radius: 2px; + } + .role-tag{ + display: none; + } } + .thumb{ + height: 20px; + width: 20px; + left: 10px; + } + &.sequential{ + .thumb:not(.thumb-small), .user { + display: inline-block; + } + .info{ + position: relative; + text-align: right; + left: 0; + .time, .edited{ + display: inline-block; + } + } + } + } + .message-cog-container .message-cog{ + visibility: visible; } } @@ -2834,6 +2890,62 @@ body:not(.is-cordova) { } } } +.compact{ + .message{ + min-height: 26px; + padding: 5px 15px 0 37px; + .body{ + display: inline; + .inline-image img{ + max-height: 100px; + } + .inline-video{ + max-height: 150px; + } + .attachment { + .attachment-title > a { + font-size: 0.9em; + } + .attachment-author img{ + border-radius: 2px; + } + } + blockquote iframe{ + height: 150px; + width: 266px; + } + } + .info{ + .avatar-image{ + border-radius: 2px; + } + .role-tag{ + display: none; + } + } + .thumb{ + height: 20px; + width: 20px; + left: 10px; + } + &.sequential{ + .thumb:not(.thumb-small), .user { + display: inline-block; + } + .info{ + position: relative; + text-align: right; + left: 0; + .time, .edited{ + display: inline-block; + } + } + } + } + .message-cog-container .message-cog{ + visibility: visible; + } +} // FLEX-TAB and FLEX-TAB views .flex-tab { diff --git a/packages/rocketchat-ui-account/account/accountPreferences.coffee b/packages/rocketchat-ui-account/account/accountPreferences.coffee index 82e75421cec21..35b3d99d21050 100644 --- a/packages/rocketchat-ui-account/account/accountPreferences.coffee +++ b/packages/rocketchat-ui-account/account/accountPreferences.coffee @@ -68,7 +68,8 @@ Template.accountPreferences.onCreated -> data.convertAsciiEmoji = $('input[name=convertAsciiEmoji]:checked').val() data.saveMobileBandwidth = $('input[name=saveMobileBandwidth]:checked').val() data.collapseMediaByDefault = $('input[name=collapseMediaByDefault]:checked').val() - data.compactView = $('input[name=compactView]:checked').val() + data.viewMode = parseInt($('#viewMode').find('select').val()) + data.showUsernames = $('#showUsernames').find('input:checked').val() data.unreadRoomsMode = $('input[name=unreadRoomsMode]:checked').val() data.autoImageLoad = $('input[name=autoImageLoad]:checked').val() data.emailNotificationMode = $('select[name=emailNotificationMode]').val() diff --git a/packages/rocketchat-ui-account/account/accountPreferences.html b/packages/rocketchat-ui-account/account/accountPreferences.html index c9749483eeec6..68135b1268576 100644 --- a/packages/rocketchat-ui-account/account/accountPreferences.html +++ b/packages/rocketchat-ui-account/account/accountPreferences.html @@ -77,13 +77,6 @@

{{_ "Messages"}}

-
- -
- - -
-
@@ -91,6 +84,24 @@

{{_ "Messages"}}

+
+ +
+ + +
+
+
+ +
+ +
{{_ "View_mode_info"}}
+
+
diff --git a/packages/rocketchat-ui-master/master/main.coffee b/packages/rocketchat-ui-master/master/main.coffee index 06ff78fe296ff..01da69a1f39d5 100644 --- a/packages/rocketchat-ui-master/master/main.coffee +++ b/packages/rocketchat-ui-master/master/main.coffee @@ -247,3 +247,19 @@ Template.main.onRendered -> if not $(':focus').is('INPUT,TEXTAREA') $('.input-message').focus() , 100 + + $(window).on('mouseleave', (e) -> + elem = $(e.fromElement) + avatarElem = elem.find('a.thumb') + if avatarElem.attr('data-username') + RocketChat.tooltip.hide(); + ) + + $(window).on('mouseenter', (e) -> + elem = $(e.fromElement) + avatarElem = elem.find('a.thumb') + username = avatarElem.attr('data-username') + if username + e.stopPropagation() + RocketChat.tooltip.showElement($('').text(username), avatarElem) + ) diff --git a/packages/rocketchat-ui-message/message/message.coffee b/packages/rocketchat-ui-message/message/message.coffee index 1162efe0e6f8f..ec14a6cb66450 100644 --- a/packages/rocketchat-ui-message/message/message.coffee +++ b/packages/rocketchat-ui-message/message/message.coffee @@ -116,6 +116,10 @@ Template.message.helpers data.index = index return + showUserNames: -> + prefs = Meteor.user()?.settings?.preferences + return if prefs?.showUsernames? then prefs.showUsernames else true + Template.message.onCreated -> msg = Template.currentData() diff --git a/packages/rocketchat-ui-message/message/message.html b/packages/rocketchat-ui-message/message/message.html index ff1f3cefeb331..bf2cc6bfa4127 100644 --- a/packages/rocketchat-ui-message/message/message.html +++ b/packages/rocketchat-ui-message/message/message.html @@ -21,10 +21,12 @@ {{/if}} {{/if}} - {{#if alias}} - - {{else}} - + {{#if showUserNames}} + {{#if alias}} + + {{else}} + + {{/if}} {{/if}} {{#each roleTags}} diff --git a/packages/rocketchat-ui/views/app/room.coffee b/packages/rocketchat-ui/views/app/room.coffee index 0c82d6519a3cf..10f3487dffd0e 100644 --- a/packages/rocketchat-ui/views/app/room.coffee +++ b/packages/rocketchat-ui/views/app/room.coffee @@ -105,8 +105,13 @@ Template.room.helpers showToggleFavorite: -> return true if isSubscribed(this._id) and favoritesEnabled() - compactView: -> - return 'compact' if Meteor.user()?.settings?.preferences?.compactView + viewMode: -> + viewMode = Meteor.user()?.settings?.preferences?.viewMode + switch viewMode + when 1 then cssClass = 'cozy' + when 2 then cssClass = 'compact' + else cssClass = '' + return cssClass selectable: -> return Template.instance().selectable.get() diff --git a/packages/rocketchat-ui/views/app/room.html b/packages/rocketchat-ui/views/app/room.html index a4245dafbfa21..72a310a3fd19b 100644 --- a/packages/rocketchat-ui/views/app/room.html +++ b/packages/rocketchat-ui/views/app/room.html @@ -60,7 +60,7 @@

{{/each}}
-
+