Add a compacter message view mode; closes #2906

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" : "وقد أرسلت دفعك إلى أجهزة٪ الصورة"
-}
+}

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."
-}
+}

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" : "<p>Showing <b>%s</b> archived results</p>",
   "Showing_online_users" : "Showing <b>__total_showing__</b> of __total__ users",
   "Showing_results" : "<p>Showing <b>%s</b> results</p>",
@@ -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",

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__.",

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"
-}
+}

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"
-}
+}

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 מכשירים"
-}
+}

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__を。",

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 បាន"
-}
+}

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" : "귀하의 푸시는 %의 기기에 전송"
-}
+}

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"
-}
+}

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"
-}
+}

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"
-}
+}

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"
-}
+}

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__.",

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 裝置"
-}
+}

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 台设备推送"
-}
+}

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 {

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()