[NEW] Setting Top navbar in embedded mode (#16064)

RocketChat · Jan 6, 2020 · 9723045 · 9723045 · Yambr · Feb 17, 2020
1 parent a082a50
commit 9723045
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
@@ -1390,6 +1390,10 @@ settings.addGroup('Layout', function() {
 			type: 'boolean',
 			public: true,
 		});
+		return this.add('UI_Show_top_navbar_embedded_layout', false, {
+			type: 'boolean',
+			public: true,
+		});
 	});
 });
 

diff --git a/app/ui/client/views/app/room.html b/app/ui/client/views/app/room.html
@@ -1,15 +1,15 @@
 <template name="room">
 	<div class="main-content-flex">
 		<section class="messages-container flex-tab-main-content {{adminClass}}" id="{{windowId}}" aria-label="{{_ "Channel"}}">
-			{{# unless embeddedVersion}}
+			{{# if showTopNavbar}}
 				{{# headerRoom}}
 					{{#with flexData}}
 						<div class="rc-header__block rc-header__block-action">
 							{{> RoomsActionTab}}
 						</div>
 					{{/with}}
 				{{/headerRoom}}
-			{{/unless}}
+			{{/if}}
 			<div class="messages-container-wrapper">
 				<div class="messages-container-main dropzone">
 					<div class="dropzone-overlay background-transparent-darkest color-content-background-color">{{_ "Drop_to_upload_file"}}</div>

diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
@@ -269,6 +269,10 @@ Template.room.helpers({
 		return Layout.isEmbedded();
 	},
 
+	showTopNavbar() {
+		return !Layout.isEmbedded() || settings.get('UI_Show_top_navbar_embedded_layout');
+	},
+
 	subscribed() {
 		const { state } = Template.instance();
 		return state.get('subscribed');

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2883,6 +2883,7 @@
   "Should_be_a_URL_of_an_image": "Should be a URL of an image.",
   "Should_exists_a_user_with_this_username": "The user must already exist.",
   "Show_Setup_Wizard": "Show Setup Wizard",
+  "UI_Show_top_navbar_embedded_layout": "Show top navbar in embedded layout",
   "Show_agent_email": "Show agent email",
   "Show_agent_info": "Show agent information",
   "Show_all": "Show All",