From 7fda45959464cdd8822b4b677659a16602b16f70 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 10 Aug 2017 15:28:48 -0400
Subject: [PATCH] re: nodebb/nodebb#5862, added new components and moved chat
 message list to its own partial

---
 templates/chats.tpl                         | 37 ++-------------------
 templates/partials/chats/message-window.tpl | 32 ++++++++++++++++++
 2 files changed, 35 insertions(+), 34 deletions(-)
 create mode 100644 templates/partials/chats/message-window.tpl

diff --git a/templates/chats.tpl b/templates/chats.tpl
index d45cb7e..a35c06c 100644
--- a/templates/chats.tpl
+++ b/templates/chats.tpl
@@ -2,7 +2,7 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
 
 <div class="row chats-page">
-	<div class="col-md-4">
+	<div class="col-md-4" component="chat/nav-wrapper">
 		<div class="chat-search hidden-xs">
 			<input class="form-control" type="text" component="chat/search" placeholder="[[users:enter_username]]" />
 		</div>
@@ -16,38 +16,7 @@
 		</ul>
 	</div>
 
-	<div class="col-md-8 hidden-sm hidden-xs">
-		<!-- IF roomId -->
-		<div component="chat/messages" class="expanded-chat" data-roomid="{roomId}">
-			<button type="button" class="close" data-action="pop-out"><span aria-hidden="true"><i class="fa fa-compress"></i></span><span class="sr-only">[[modules:chat.pop-out]]</span></button>
-			<button class="close controlsToggle" component="expanded-chat/controlsToggle"><i class="fa fa-gear"></i></button>
-
-			<div class="controls hide" component="expanded-chat/controls">
-				<!-- IF showUserInput -->
-				<div class="users-tag-container">
-					<input class="users-tag-input" type="text" class="form-control" placeholder="[[modules:chat.add-users-to-room]]" tabindex="4"/>
-				</div>
-				<!-- ENDIF showUserInput -->
-
-				<input class="form-control" component="chat/room/name" value="{roomName}" <!-- IF !isOwner -->disabled<!-- ENDIF !isOwner -->/>
-				<hr />
-			</div>
-
-			<ul class="chat-content">
-				<!-- IMPORT partials/chats/messages.tpl -->
-			</ul>
-			<div class="input-group">
-				<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input mousetrap" rows="1" <!-- IF !canReply -->readonly<!-- ENDIF !canReply -->></textarea>
-				<span class="input-group-btn">
-					<button class="btn btn-primary" type="button" data-action="send" <!-- IF !canReply -->disabled<!-- ENDIF !canReply -->>[[modules:chat.send]]</button>
-				</span>
-			</div>
-			<span component="chat/message/length">0</span>/<span>{maximumChatMessageLength}</span>
-		</div>
-		<!-- ELSE -->
-		<div class="alert alert-info">
-			[[modules:chat.no-messages]]
-		</div>
-		<!-- ENDIF roomId -->
+	<div class="col-md-8 hidden-sm hidden-xs" component="chat/main-wrapper">
+		<!-- IMPORT partials/chats/message-window.tpl -->
 	</div>
 </div>
diff --git a/templates/partials/chats/message-window.tpl b/templates/partials/chats/message-window.tpl
new file mode 100644
index 0000000..01a3a6f
--- /dev/null
+++ b/templates/partials/chats/message-window.tpl
@@ -0,0 +1,32 @@
+<!-- IF roomId -->
+<div component="chat/messages" class="expanded-chat" data-roomid="{roomId}">
+	<button type="button" class="close" data-action="pop-out"><span aria-hidden="true"><i class="fa fa-compress"></i></span><span class="sr-only">[[modules:chat.pop-out]]</span></button>
+	<button class="close controlsToggle" component="expanded-chat/controlsToggle"><i class="fa fa-gear"></i></button>
+
+	<div class="controls hide" component="expanded-chat/controls">
+		<!-- IF showUserInput -->
+		<div class="users-tag-container">
+			<input class="users-tag-input" type="text" class="form-control" placeholder="[[modules:chat.add-users-to-room]]" tabindex="4"/>
+		</div>
+		<!-- ENDIF showUserInput -->
+
+		<input class="form-control" component="chat/room/name" value="{roomName}" <!-- IF !isOwner -->disabled<!-- ENDIF !isOwner -->/>
+		<hr />
+	</div>
+
+	<ul class="chat-content">
+		<!-- IMPORT partials/chats/messages.tpl -->
+	</ul>
+	<div class="input-group">
+		<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input mousetrap" rows="1" <!-- IF !canReply -->readonly<!-- ENDIF !canReply -->></textarea>
+		<span class="input-group-btn">
+			<button class="btn btn-primary" type="button" data-action="send" <!-- IF !canReply -->disabled<!-- ENDIF !canReply -->>[[modules:chat.send]]</button>
+		</span>
+	</div>
+	<span component="chat/message/length">0</span>/<span>{maximumChatMessageLength}</span>
+</div>
+<!-- ELSE -->
+<div class="alert alert-info">
+	[[modules:chat.no-messages]]
+</div>
+<!-- ENDIF roomId -->
\ No newline at end of file