diff --git a/app/ui/client/views/app/room.html b/app/ui/client/views/app/room.html index b6c1bb644c92..d18548b15e9b 100644 --- a/app/ui/client/views/app/room.html +++ b/app/ui/client/views/app/room.html @@ -11,139 +11,143 @@ {{/headerRoom}} {{/if}}
-
-
{{_ dragAndDropLabel}}
- {{#unless embeddedVersion}} - {{#if announcement}} -
-

{{{RocketChatMarkdownInline announcement}}}

-
- {{/if}} - {{/unless}} -
- {{#with unreadData}} - {{#if since}} - {{#if count}} -
- + + {{_ "S_new_messages_since_s" count formatUnreadSince}} + + + {{_ "N_new_messages" count}} + + +
+ {{/if}} + {{/if}} + {{/with}} + {{#each uploading}} +
+ {{#if error}} +
+ {{error}} +
+ - - {{_ "S_new_messages_since_s" count formatUnreadSince}} - - - {{_ "N_new_messages" count}} - - + {{/if}} +
+ {{/each}} +
+
+
+ +
+ +
+ {{#unless canPreview}} +
+
+ {{_ "You_must_join_to_view_messages_in_this_channel"}}
- {{/if}} - {{/if}} - {{/with}} - {{#each uploading}} -
- {{#if error}} -
- {{error}} -
-
+ {{/unless}} + {{#with roomLeader}} +
+ - {{else}} -
-
- [{{percentage}}%] {{name}} +
{{name}}
+
+ + {{statusDisplay}}
- - {{/if}} -
- {{/each}} -
-
-
- -
- -
- {{#unless canPreview}} -
-
- {{_ "You_must_join_to_view_messages_in_this_channel"}} + {{_ "Chat_Now"}}
-
- {{/unless}} - {{#with roomLeader}} -
- -
{{name}}
-
- - {{statusDisplay}} -
- {{_ "Chat_Now"}} -
- {{/with}} -
-
    - {{#if canPreview}} - {{#if hasMore}} + {{/with}} +
    +
      + {{#if canPreview}} + {{#if hasMore}} +
    • + {{#if isLoading}} + {{> loading}} + {{/if}} +
      • + {{else}} +
    • + {{#if hasPurge}} +
      + {{> icon block="start__purge-warning-icon" icon="warning"}} + {{#unless filesOnly}} + {{#unless excludePinned}} + {{_ "RetentionPolicy_RoomWarning" time=purgeTimeout}} + {{else}} + {{_ "RetentionPolicy_RoomWarning_Unpinned" time=purgeTimeout}} + {{/unless}} + {{else}} + {{#unless excludePinned}} + {{_ "RetentionPolicy_RoomWarning_FilesOnly" time=purgeTimeout}} + {{else}} + {{_ "RetentionPolicy_RoomWarning_UnpinnedFilesOnly" time=purgeTimeout}} + {{/unless}} + {{/unless}} +
      + {{/if}} + {{_ "Start_of_conversation"}} +
      • + {{/if}} + {{/if}} + + {{# with messageContext}} + {{#each msg in messagesHistory}}{{> message index=@index shouldCollapseReplies=true msg=msg room=room subscription=subscription settings=settings u=u}}{{/each}} + {{/with}} + + {{#if hasMoreNext}}
    • {{#if isLoading}} {{> loading}} {{/if}}
      • - {{else}} -
    • - {{#if hasPurge}} -
      - {{> icon block="start__purge-warning-icon" icon="warning"}} - {{#unless filesOnly}} - {{#unless excludePinned}} - {{_ "RetentionPolicy_RoomWarning" time=purgeTimeout}} - {{else}} - {{_ "RetentionPolicy_RoomWarning_Unpinned" time=purgeTimeout}} - {{/unless}} - {{else}} - {{#unless excludePinned}} - {{_ "RetentionPolicy_RoomWarning_FilesOnly" time=purgeTimeout}} - {{else}} - {{_ "RetentionPolicy_RoomWarning_UnpinnedFilesOnly" time=purgeTimeout}} - {{/unless}} - {{/unless}} -
      - {{/if}} - {{_ "Start_of_conversation"}} -
      • {{/if}} - {{/if}} - - {{# with messageContext}} - {{#each msg in messagesHistory}}{{> message index=@index shouldCollapseReplies=true msg=msg room=room subscription=subscription settings=settings u=u}}{{/each}} - {{/with}} - - {{#if hasMoreNext}} -
    • - {{#if isLoading}} - {{> loading}} - {{/if}} -
      • - {{/if}} -
    +
+
+
+ {{> messageBox messageboxData}} +
- -
+ {{/if}} {{#with flexData}} {{> contextualBar}} {{/with}} diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js index 286706a2684e..3a0011fc92e8 100644 --- a/app/ui/client/views/app/room.js +++ b/app/ui/client/views/app/room.js @@ -277,6 +277,14 @@ export const dropzoneHelpers = { Template.room.helpers({ ...dropzoneHelpers, + + openSearchPage() { + if (!isMobile()) { + return false; + } + return Session.get('openSearchPage'); + }, + isTranslated() { const { state } = Template.instance(); return settings.get('AutoTranslate_Enabled') @@ -1006,6 +1014,8 @@ Template.room.events({ Template.room.onCreated(function() { // this.scrollOnBottom = true // this.typing = new msgTyping this.data._id + Session.set('openSearchPage', false); + const rid = this.data._id; this.onFile = (filesToUpload) => {