From b784e51c9c67bc6b8ecafbcf77bb88db047013d2 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Tue, 4 Apr 2017 21:37:58 -0300
Subject: [PATCH] FIX messageBox code require and room info

---
 .../client/messageBox.html                    | 141 ++++++++++--------
 1 file changed, 79 insertions(+), 62 deletions(-)

diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
index 1e76c2b20d0f..e6a3aa38962c 100644
--- a/packages/rocketchat-ui-message/client/messageBox.html
+++ b/packages/rocketchat-ui-message/client/messageBox.html
@@ -3,76 +3,87 @@
 		<form class="message-form" method="post" action="/">
 			{{> messagePopupConfig getPopupConfig}}
 
-			<div class="message-input border-component-color">
+			{{#if allowedToSend}}
+				<div class="message-input border-component-color">
 
-				<div class="input-message-container">
+					<div class="input-message-container">
 
-					<textarea dir="auto" name="msg" maxlength="{{maxMessageLength}}" class="input-message autogrow-short" placeholder="{{_ 'Message'}}"></textarea>
+						<textarea dir="auto" name="msg" maxlength="{{maxMessageLength}}" class="input-message autogrow-short" placeholder="{{_ 'Message'}}"></textarea>
 
-					<div class="inner-left-toolbar">
-						<i class="emoji-picker-icon icon-people"></i>
-					</div>
+						<div class="inner-left-toolbar">
+							<i class="emoji-picker-icon icon-people secondary-font-color"></i>
+						</div>
 
-				</div>
+					</div>
 
-				{{#unless showSend}}
+					{{#unless showSend}}
 
-					<div class="share-items {{groupAttachHidden}}">
+						<div class="share-items {{groupAttachHidden}}">
 
-						{{#if fileUploadEnabled}}
+							{{#if fileUploadEnabled}}
 
-							<div class="message-buttons file">
-								<i class="icon-attach file"></i>
-								<input type="file" accept="{{fileUploadAllowedMediaTypes}}">
-							</div>
+								<div class="message-buttons file">
+									<i class="icon-attach file"></i>
+									<input type="file" accept="{{fileUploadAllowedMediaTypes}}">
+								</div>
 
-							{{#if showMic}}
-								<div class="message-buttons mic-button">
-									<div class="mic">
-										<i class="icon-mic" aria-label="{{_ "Record"}}"></i>
+								{{#if showMic}}
+									<div class="message-buttons mic-button">
+										<div class="mic">
+											<i class="icon-mic" aria-label="{{_ "Record"}}"></i>
+										</div>
+										<div class="stop-mic hidden">
+											<i class="icon-stop" aria-label="{{_ "Stop_Recording"}}"></i>
+										</div>
 									</div>
-									<div class="stop-mic hidden">
-										<i class="icon-stop" aria-label="{{_ "Stop_Recording"}}"></i>
+								{{/if}}
+
+								{{#if showVRec}}
+									<div class="message-buttons video-button">
+										<i class="icon-videocam" aria-label="{{_ "Record"}}"></i>
 									</div>
-								</div>
+								{{/if}}
+
 							{{/if}}
 
-							{{#if showVRec}}
-								<div class="message-buttons video-button">
-									<i class="icon-videocam" aria-label="{{_ "Record"}}"></i>
+							{{#if showLocation}}
+								<div class="message-buttons location-button">
+									<i class="icon-location"></i>
 								</div>
 							{{/if}}
 
-						{{/if}}
+							{{#if showSandstorm}}
+								<div class="message-buttons sandstorm-offer">
+									<i class="icon-plus" title="{{_ "Sandstorm_Powerbox_Share"}}"></i>
+								</div>
+							{{/if}}
 
-						{{#if showLocation}}
-							<div class="message-buttons location-button">
-								<i class="icon-location"></i>
-							</div>
-						{{/if}}
+						</div>
 
-						{{#if showSandstorm}}
-							<div class="message-buttons sandstorm-offer">
-								<i class="icon-plus" title="{{_ "Sandstorm_Powerbox_Share"}}"></i>
+						{{#if groupAttachHidden}}
+							<div class="message-buttons share">
+								<i class="icon-plus"></i>
 							</div>
 						{{/if}}
 
-					</div>
+					{{/unless}}
 
-					{{#if groupAttachHidden}}
-						<div class="message-buttons share">
-							<i class="icon-plus"></i>
+					{{#if showSend}}
+						<div class="message-buttons send-button">
+							<i class="icon-paper-plane" aria-label="{{_ "Send"}}"></i>
 						</div>
 					{{/if}}
+				</div>
+			{{else}}
+				<div class="stream-info">
+					{{#if isBlockedOrBlocker}}
+						{{_ "room_is_blocked"}}
+					{{else}}
+						{{_ "room_is_read_only"}}
+					{{/if}}
+				</div>
+			{{/if}}
 
-				{{/unless}}
-
-				{{#if showSend}}
-					<div class="message-buttons send-button">
-						<i class="icon-paper-plane" aria-label="{{_ "Send"}}"></i>
-					</div>
-				{{/if}}
-			</div>
 			<div class="users-typing">
 				{{#with usersTyping}}
 					<strong>{{users}}</strong>
@@ -92,25 +103,28 @@
 				{{/with}}
 			</div>
 
-			{{#if showFormattingTips}}
-			<div class="formatting-tips" aria-hidden="true" dir="auto">
-				{{#if showMarkdown}}
-				<b>*{{_ "bold"}}*</b>
-				<i>_{{_ "italics"}}_</i>
-				<span>~<strike>{{_ "strike"}}</strike>~</span>
-				{{/if}}
-				{{#if showMarkdownCode}}
-				<code class="code-colors inline">`{{_ "inline_code"}}`</code>
-				<code class="code-colors inline"><span class="hidden-br"><br></span>```<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "multi"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "line"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>```</code>
-				{{/if}}
-				{{#if katexSyntax}}
-				<span><a href="https://github.com/Khan/KaTeX/wiki/Function-Support-in-KaTeX" target="_blank">{{katexSyntax}}</a></span>
-				{{/if}}
-				{{#if showMarkdown}}
-				<q><span class="hidden-br"><br></span>&gt;{{_ "quote"}}</q>
+			{{#if allowedToSend}}
+				{{#if showFormattingTips}}
+					<div class="formatting-tips" aria-hidden="true" dir="auto">
+						{{#if showMarkdown}}
+							<b>*{{_ "bold"}}*</b>
+							<i>_{{_ "italics"}}_</i>
+							<span>~<strike>{{_ "strike"}}</strike>~</span>
+						{{/if}}
+						{{#if showMarkdownCode}}
+							<code class="code-colors inline">`{{_ "inline_code"}}`</code>
+							<code class="code-colors inline"><span class="hidden-br"><br></span>```<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "multi"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>{{_ "line"}}<span class="hidden-br"><br></span><i class="icon-level-down"></i>```</code>
+						{{/if}}
+						{{#if katexSyntax}}
+							<span><a href="https://github.com/Khan/KaTeX/wiki/Function-Support-in-KaTeX" target="_blank">{{katexSyntax}}</a></span>
+						{{/if}}
+						{{#if showMarkdown}}
+							<q><span class="hidden-br"><br></span>&gt;{{_ "quote"}}</q>
+						{{/if}}
+					</div>
 				{{/if}}
-			</div>
 			{{/if}}
+
 			<div class="editing-commands" aria-hidden="true" dir="auto">
 				<div class="editing-commands-cancel">{{_ 'Esc_to'}} <button type="button">{{_ 'Cancel_message_input'}}</button></div>
 				<div class="editing-commands-save">{{_ 'Enter_to'}} <button type="button">{{_ 'Save_changes'}}</button></div>
@@ -123,6 +137,9 @@
 			{{#if canJoin}}
 			<div>
 				{{{_ "you_are_in_preview_mode_of" room_name=roomName}}}
+				{{#if joinCodeRequired}}
+					<input type="text" name="joinCode" placeholder="{{_ 'Code'}}" style="width: 100px">
+				{{/if}}
 				<button class="button join"><span><i class="icon-login"></i> {{_ "join"}}</span></button>
 			</div>
 			{{/if}}