Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json

less/chats.less

@@ -1,6 +1,5 @@
 .chats-list {
 	padding: 0;
-	max-height: 608px;
 	overflow-x: hidden;
 	overflow-y: auto;
 	border-top: 1px solid @gray-lighter;

templates/categories.tpl

@@ -1,7 +1,7 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<h1 class="categories-title">[[category:categories]]</h1>
+<h1 class="categories-title">[[pages:categories]]</h1>
 <ul class="categories" itemscope itemtype="http://www.schema.org/ItemList">
 	<!-- BEGIN categories -->
 	<!-- IMPORT partials/categories/item.tpl -->
 	<!-- END categories -->
-</ul>
+</ul>

templates/chats.tpl

@@ -20,10 +20,10 @@
 		</div>
 		<!-- ENDIF !allowed -->
 		<!-- IF meta -->
-		<div class="expanded-chat" data-uid="{meta.uid}" data-username="{meta.username}">
+		<div component="chat/messages" class="expanded-chat" data-uid="{meta.uid}" data-username="{meta.username}">
 
 			<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>
-			<h1>{meta.username}</h1>
+			<h1 component="chat/title">{meta.username}</h1>
 
 
 			<span class="since-bar"><a href="#" class="selected" data-since="recent">[[recent:title]]</a> &bull; <a href="#" data-since="week">[[modules:chat.seven_days]]</a> &bull; <a href="#" data-since="month">[[modules:chat.thirty_days]]</a> &bull; <a href="#" data-since="threemonths">[[modules:chat.three_months]]</a></span>
@@ -31,7 +31,7 @@
 				<!-- IMPORT partials/chat_messages.tpl -->
 			</ul>
 			<div class="input-group">
-				<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input" rows="1"></textarea>
+				<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input mousetrap" rows="1"></textarea>
 				<span class="input-group-btn">
 					<button class="btn btn-primary" type="button" data-action="send">[[modules:chat.send]]</button>
 				</span>

templates/footer.tpl

@@ -4,7 +4,7 @@
 	<div class="hide tpl-500">
 	<!-- IMPORT 500.tpl -->
 	</div>
-	<!-- IMPORT partials/modals/upload_picture_modal.tpl -->
+
 
 	<div class="topic-search hidden">
 		<div class="btn-group">

templates/header.tpl

@@ -8,7 +8,7 @@
 	<link rel="stylesheet" type="text/css" href="{relative_path}/stylesheet.css?{config.cache-buster}" />
 	<!-- IF bootswatchCSS --><link id="bootswatchCSS" href="{bootswatchCSS}" rel="stylesheet" media="screen"><!-- ENDIF bootswatchCSS -->
 	<!-- BEGIN linkTags -->
-	<link<!-- IF linkTags.link --> link="{linkTags.link}"<!-- ENDIF linkTags.link --><!-- IF linkTags.rel --> rel="{linkTags.rel}"<!-- ENDIF linkTags.rel --><!-- IF linkTags.type --> type="{linkTags.type}"<!-- ENDIF linkTags.type --><!-- IF linkTags.href --> href="{linkTags.href}"<!-- ENDIF linkTags.href --> />
+	{function.buildLinkTag}
 	<!-- END linkTags -->
 
 	<!--[if lt IE 9]>

templates/partials/breadcrumbs.tpl

@@ -1,7 +1,7 @@
 <!-- IF breadcrumbs.length -->
 <ol class="breadcrumb">
 	<!-- BEGIN breadcrumbs -->
-	<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb" <!-- IF @last -->class="active"<!-- ENDIF @last -->>
+	<li<!-- IF @last --> component="breadcrumb/current"<!-- ENDIF @last --> itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb" <!-- IF @last -->class="active"<!-- ENDIF @last -->>
 		<!-- IF !@last --><a href="{breadcrumbs.url}" itemprop="url"><!-- ENDIF !@last -->
 			<span itemprop="title">
 				{breadcrumbs.text}

templates/partials/fork_thread_modal.tpl

@@ -1,4 +1,4 @@
-<div id="fork-thread-modal" class="hide" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
+<div id="fork-thread-modal" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">

templates/partials/modals/upload_picture_modal.tpl

@@ -29,6 +29,6 @@
 					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
 					<button id="pictureUploadSubmitBtn" class="btn btn-primary">[[user:upload_picture]]</button>
 				</div>
-			</div><!-- /.modal-content -->
-		</div><!-- /.modal-dialog -->
-	</div><!-- /.modal -->
+			</div>
+		</div>
+	</div>

templates/partials/move_post_modal.tpl

@@ -1,4 +1,4 @@
-<div id="move-post-modal" class="hide" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
+<div id="move-post-modal" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">

templates/partials/move_thread_modal.tpl

@@ -6,7 +6,8 @@
 				<h3>[[topic:move_topic]]</h3>
 			</div>
 			<div class="modal-body">
-				<p id="categories-loading"><i class="fa fa-spin fa-refresh"></i> [[topic:load_categories]]</p>
+				<!-- IMPORT partials/category_list.tpl -->
+
 				<p>
 					[[topic:disabled_categories_note]]
 				</p>

templates/topic.tpl

@@ -34,13 +34,14 @@
 				<meta itemprop="dateModified" content="{posts.relativeEditTime}">
 
 				<!-- IMPORT partials/topic/post.tpl -->
-			</li>
 
-			<!-- IF !posts.index -->
-			<li class="post-bar" data-index="{posts.index}">
-				<!-- IMPORT partials/post_bar.tpl -->
+				<!-- IF !posts.index -->
+				<div class="post-bar" data-index="{posts.index}">
+					<!-- IMPORT partials/post_bar.tpl -->
+				</div>
+				<!-- ENDIF !posts.index -->
 			</li>
-			<!-- ENDIF !posts.index -->
+
 		<!-- END posts -->
 	</ul>
 
@@ -52,9 +53,6 @@
 		<!-- IMPORT partials/paginator.tpl -->
 	<!-- ENDIF config.usePagination -->
 
-	<!-- IMPORT partials/move_thread_modal.tpl -->
-	<!-- IMPORT partials/fork_thread_modal.tpl -->
-	<!-- IMPORT partials/move_post_modal.tpl -->
 </div>
 
 <!-- IF !config.usePagination -->