nodebb-theme-persona 12.1.6 → 12.1.8

package/templates/partials/menu.tpl

@@ -1,113 +1,55 @@
-			<div class="d-flex align-items-center me-auto">
-				<button type="button" class="navbar-toggler border-0" id="mobile-menu">
-					<i class="fa fa-lg fa-fw fa-bars unread-count" ></i>
-					<span component="unread/icon" class="notification-icon fa fa-fw fa-book unread-count" data-content="{unreadCount.mobileUnread}" data-unread-url="{unreadCount.unreadUrl}"></span>
+			<div class="navbar-header">
+				<button type="button" class="navbar-toggle pull-left" id="mobile-menu">
+					<i class="fa fa-lg fa-fw fa-bars unread-count" data-content="{unreadCount.mobileUnread}" data-unread-url="{unreadCount.unreadUrl}"></i>
 				</button>
-				<div class="d-inline-flex align-items-center">
-					{{{ if brand:logo }}}
-					<a class="navbar-brand" href="{{{ if brand:logo:url }}}{brand:logo:url}{{{ else }}}{relative_path}/{{{ end }}}">
-						<img alt="{brand:logo:alt}" class="{brand:logo:display} forum-logo d-inline-block align-text-bottom" src="{brand:logo}?{config.cache-buster}" />
-					</a>
-					{{{ end }}}
-					{{{ if config.showSiteTitle }}}
-					<a class="navbar-brand text-truncate" href="{{{ if title:url }}}{title:url}{{{ else }}}{relative_path}/{{{ end }}}">
-						<span class="forum-title">{config.siteTitle}</span>
-					</a>
-					{{{ end }}}
-				</div>
-			</div>
+				{{{ if config.loggedIn }}}
+				<button type="button" class="navbar-toggle" id="mobile-chats">
+					<span component="notifications/icon" class="notification-icon fa fa-fw fa-bell-o unread-count" data-content="{unreadCount.notification}"></span>
+					<span component="chat/icon" class="notification-icon fa fa-fw fa-comments unread-count" data-content="{unreadCount.chat}"></span>
+					{buildAvatar(user, "md", true)}
+				</button>
+				{{{ end }}}
 
-			{{{ if config.searchEnabled }}}
-			<div class="navbar-search visible-xs">
-				<form action="{config.relative_path}/search" method="GET">
-					<button type="button" class="btn btn-link"><i class="fa fa-lg fa-fw fa-search" title="[[global:header.search]]"></i></button>
-					<input autocomplete="off" type="text" class="form-control hidden" name="term" placeholder="[[global:search]]"/>
-					<button class="btn btn-primary hidden" type="submit"></button>
-					<input type="text" class="hidden" name="in" value="{config.searchDefaultInQuick}" />
-				</form>
-				<div class="quick-search-container hidden">
-					<div class="quick-search-results-container"></div>
+				{{{ if config.searchEnabled }}}
+				<div class="navbar-search visible-xs pull-right">
+					<form action="{config.relative_path}/search" method="GET">
+						<button type="button" class="btn btn-link"><i class="fa fa-lg fa-fw fa-search" title="[[global:header.search]]"></i></button>
+						<input autocomplete="off" type="text" class="form-control hidden" name="term" placeholder="[[global:search]]"/>
+						<button class="btn btn-primary hidden" type="submit"></button>
+						<input type="text" class="hidden" name="in" value="{config.searchDefaultInQuick}" />
+					</form>
+					<div class="quick-search-container hidden">
+						<div class="quick-search-results-container"></div>
+					</div>
 				</div>
-			</div>
-			{{{ end }}}
+				{{{ end }}}
 
-			{{{ if config.loggedIn }}}
-			<button type="button" class="navbar-toggler border-0" id="mobile-chats">
-				<span component="notifications/icon" class="notification-icon fa fa-fw fa-bell-o unread-count" data-content="{unreadCount.notification}"></span>
-				<span component="chat/icon" class="notification-icon fa fa-fw fa-comments unread-count" data-content="{unreadCount.chat}"></span>
-				{buildAvatar(user, "32px", true)}
-			</button>
-			{{{ end }}}
+				<!-- IF brand:logo -->
+				<a href="<!-- IF brand:logo:url -->{brand:logo:url}<!-- ELSE -->{relative_path}/<!-- ENDIF brand:logo:url -->">
+					<img alt="{brand:logo:alt}" class="{brand:logo:display} forum-logo" src="{brand:logo}?{config.cache-buster}" />
+				</a>
+				<!-- ENDIF brand:logo -->
+				<!-- IF config.showSiteTitle -->
+				<a href="<!-- IF title:url -->{title:url}<!-- ELSE -->{relative_path}/<!-- ENDIF title:url -->">
+					<h1 class="navbar-brand forum-title">{config.siteTitle}</h1>
+				</a>
+				<!-- ENDIF config.showSiteTitle -->
 
-			<div component="navbar/title" class="visible-xs hidden">
-				<span></span>
+				<div component="navbar/title" class="visible-xs hidden">
+					<span></span>
+				</div>
 			</div>
 
-			<div id="nav-dropdown" class="collapse navbar-collapse d-none d-lg-block">
-				<ul id="main-nav" class="navbar-nav me-auto mb-2 mb-lg-0">
-					{{{each navigation}}}
-					<!-- IF function.displayMenuItem, @index -->
-					<li class="nav-item {navigation.class}{{{ if navigation.dropdown }}} dropdown{{{ end }}}" title="{navigation.title}">
-						<a class="nav-link navigation-link {{{ if navigation.dropdown }}}dropdown-toggle{{{ end }}}"
-						{{{ if navigation.dropdown }}} href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" {{{ else }}} href="{navigation.route}"{{{ end }}} {{{ if navigation.id }}}id="{navigation.id}"{{{ end }}}{{{ if navigation.targetBlank }}} target="_blank"{{{ end }}}>
-							{{{ if navigation.iconClass }}}
-							<i class="fa fa-fw {navigation.iconClass}" data-content="{navigation.content}"></i>
-							{{{ end }}}
-							{{{ if navigation.text }}}
-							<span class="{navigation.textClass}">{navigation.text}</span>
-							{{{ end }}}
-							{{{ if navigation.dropdown}}}
-							<i class="fa fa-caret-down"></i>
-							{{{ end }}}
-						</a>
-						{{{ if navigation.dropdown }}}
-						<ul class="dropdown-menu">
-							{navigation.dropdownContent}
-						</ul>
-						{{{ end }}}
-					</li>
-					<!-- ENDIF function.displayMenuItem -->
-					{{{end}}}
-				</ul>
-
-				{{{ if config.searchEnabled }}}
-				<div class="navbar-nav mb-2 mb-lg-0 position-relative">
-					<form component="search/form" id="search-form" class="d-flex justify-content-end align-items-center" role="search" method="GET">
-						<div component="search/fields" class="hidden" id="search-fields">
-							<div class="input-group flex-nowrap">
-								<input autocomplete="off" type="text" class="form-control" placeholder="[[global:search]]" name="query" value="">
+			<div id="nav-dropdown" class="hidden-xs">
+				<!-- IF !maintenanceHeader -->
+				<!-- IF config.loggedIn -->
 
-								<button href="#" class="btn btn-outline-secondary">
-									<i class="fa fa-gears fa-fw advanced-search-link"></i>
-								</button>
-							</div>
-
-							<div id="quick-search-container" class="quick-search-container dropdown-menu d-block mt-2 hidden">
-								<div class="form-check filter-category mb-2 ms-4">
-									<input class="form-check-input" type="checkbox" checked>
-									<label class="form-check-label name"></label>
-								</div>
-
-								<div class="text-center loading-indicator"><i class="fa fa-spinner fa-spin"></i></div>
-								<div class="quick-search-results-container"></div>
-							</div>
-							<button type="submit" class="btn btn-outline-secondary hide">[[global:search]]</button>
-						</div>
-
-						<li id="" class="nav-item"><a component="search/button" id="search-button" href="#" class="nav-link"><i class="fa fa-search fa-fw" title="Search"></i></a></li>
-					</form>
-
-				</div>
-				{{{ end }}}
-
-				{{{ if !maintenanceHeader }}}
-				{{{ if config.loggedIn }}}
-				<ul id="logged-in-menu" class="navbar-nav me-0 mb-2 mb-lg-0 align-items-center">
-					<li class="nav-item notifications dropdown d-none d-sm-block" component="notifications" title="[[global:header.notifications]]">
-						<a href="{relative_path}/notifications" class="nav-link" data-bs-toggle="dropdown" id="notif_dropdown" data-ajaxify="false" role="button">
+				<ul id="logged-in-menu" class="nav navbar-nav navbar-right">
+					<li class="notifications dropdown text-center hidden-xs" component="notifications">
+						<a href="{relative_path}/notifications" title="[[global:header.notifications]]" class="dropdown-toggle" data-toggle="dropdown" id="notif_dropdown" data-ajaxify="false" role="button">
 							<i component="notifications/icon" class="fa fa-fw fa-bell-o unread-count" data-content="{unreadCount.notification}"></i>
 						</a>
-						<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="notif_dropdown">
+						<ul class="dropdown-menu" aria-labelledby="notif_dropdown">
 							<li>
 								<ul component="notifications/list" class="notification-list">
 									<li class="loading-text">
@@ -116,20 +58,20 @@
 								</ul>
 							</li>
 							<li class="notif-dropdown-link">
-								<div class="btn-group d-flex justify-content-center">
-									<a role="button" href="#" class="btn btn-light mark-all-read"><i class="fa fa-check-double"></i> [[notifications:mark_all_read]]</a>
-									<a class="btn btn-light" href="{relative_path}/notifications"><i class="fa fa-list"></i> [[notifications:see_all]]</a>
+								<div class="btn-group btn-group-justified">
+									<a role="button" href="#" class="btn btn-secondary mark-all-read"><i class="fa fa-check-double"></i> [[notifications:mark_all_read]]</a>
+									<a class="btn btn-secondary" href="{relative_path}/notifications"><i class="fa fa-list"></i> [[notifications:see_all]]</a>
 								</div>
 							</li>
 						</ul>
 					</li>
 
 					<!-- IF canChat -->
-					<li class="nav-item chats dropdown" title="[[global:header.chats]]">
-						<a class="nav-link" data-bs-toggle="dropdown" href="{relative_path}/user/{user.userslug}/chats" id="chat_dropdown" component="chat/dropdown" data-ajaxify="false" role="button">
-							<i component="chat/icon" class="fa fa-comment-o fa-fw unread-count" data-content="{unreadCount.chat}"></i> <span class="d-inline d-sm-none">[[global:header.chats]]</span>
+					<li class="chats dropdown">
+						<a class="dropdown-toggle" data-toggle="dropdown" href="{relative_path}/user/{user.userslug}/chats" title="[[global:header.chats]]" id="chat_dropdown" component="chat/dropdown" data-ajaxify="false" role="button">
+							<i component="chat/icon" class="fa fa-comment-o fa-fw unread-count" data-content="{unreadCount.chat}"></i> <span class="visible-xs-inline">[[global:header.chats]]</span>
 						</a>
-						<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="chat_dropdown">
+						<ul class="dropdown-menu" aria-labelledby="chat_dropdown">
 							<li>
 								<ul component="chat/list" class="chat-list chats-list">
 									<li class="loading-text">
@@ -138,127 +80,192 @@
 								</ul>
 							</li>
 							<li class="notif-dropdown-link">
-								<div class="btn-group d-flex justify-content-center">
-									<a class="btn btn-light mark-all-read" href="#" component="chats/mark-all-read"><i class="fa fa-check-double"></i> [[modules:chat.mark_all_read]]</a>
-									<a class="btn btn-light" href="{relative_path}/user/{user.userslug}/chats"><i class="fa fa-comments"></i> [[modules:chat.see_all]]</a>
+								<div class="btn-group btn-group-justified">
+									<a class="btn btn-secondary mark-all-read" href="#" component="chats/mark-all-read"><i class="fa fa-check-double"></i> [[modules:chat.mark_all_read]]</a>
+									<a class="btn btn-secondary" href="{relative_path}/user/{user.userslug}/chats"><i class="fa fa-comments"></i> [[modules:chat.see_all]]</a>
 								</div>
 							</li>
 						</ul>
 					</li>
 					<!-- ENDIF canChat -->
 
-					<li id="user_label" class="nav-item dropdown" title="[[global:header.profile]]">
-						<label for="user-control-list-check" class="" data-bs-toggle="dropdown" id="user_dropdown" role="button">
-							{buildAvatar(user, "32px", true)}
-							<span id="user-header-name" class="d-block d-sm-none">{user.username}</span>
+					<li id="user_label" class="dropdown">
+						<label for="user-control-list-check" class="dropdown-toggle" data-toggle="dropdown" id="user_dropdown" title="[[global:header.profile]]" role="button">
+							{buildAvatar(user, "md", true)}
+							<span id="user-header-name" class="visible-xs-inline">{user.username}</span>
 						</label>
 						<input type="checkbox" class="hidden" id="user-control-list-check" aria-hidden="true">
-						<ul id="user-control-list" component="header/usercontrol" class="dropdown-menu dropdown-menu-end" aria-labelledby="user_dropdown">
+						<ul id="user-control-list" component="header/usercontrol" class="dropdown-menu" aria-labelledby="user_dropdown">
 							<li>
-								<a class="dropdown-item" component="header/profilelink" href="{relative_path}/user/{user.userslug}">
+								<a component="header/profilelink" href="{relative_path}/user/{user.userslug}">
 									<i component="user/status" class="fa fa-fw fa-circle status {user.status}"></i> <span component="header/username">{user.username}</span>
 								</a>
 							</li>
-							<li role="presentation" class="dropdown-divider"></li>
-							<li><h6 class="dropdown-header">[[global:status]]</h6></li>
+							<li role="presentation" class="divider"></li>
 							<li>
-								<a href="#" class="dropdown-item user-status" data-status="online">
+								<a href="#" class="user-status" data-status="online">
 									<i class="fa fa-fw fa-circle status online"></i><span <!-- IF user.online -->class="bold"<!-- ENDIF user.online -->> [[global:online]]</span>
 								</a>
 							</li>
 							<li>
-								<a href="#" class="dropdown-item user-status" data-status="away">
+								<a href="#" class="user-status" data-status="away">
 									<i class="fa fa-fw fa-circle status away"></i><span <!-- IF user.away -->class="bold"<!-- ENDIF user.away -->> [[global:away]]</span>
 								</a>
 							</li>
 							<li>
-								<a href="#" class="dropdown-item user-status" data-status="dnd">
+								<a href="#" class="user-status" data-status="dnd">
 									<i class="fa fa-fw fa-circle status dnd"></i><span <!-- IF user.dnd -->class="bold"<!-- ENDIF user.dnd -->> [[global:dnd]]</span>
 								</a>
 							</li>
 							<li>
-								<a href="#" class="dropdown-item user-status" data-status="offline">
+								<a href="#" class="user-status" data-status="offline">
 									<i class="fa fa-fw fa-circle status offline"></i><span <!-- IF user.offline -->class="bold"<!-- ENDIF user.offline -->> [[global:invisible]]</span>
 								</a>
 							</li>
-							<li role="presentation" class="dropdown-divider"></li>
+							<li role="presentation" class="divider"></li>
 							<li>
-								<a class="dropdown-item" component="header/profilelink/edit" href="{relative_path}/user/{user.userslug}/edit">
+								<a component="header/profilelink/edit" href="{relative_path}/user/{user.userslug}/edit">
 									<i class="fa fa-fw fa-edit"></i> <span>[[user:edit-profile]]</span>
 								</a>
 							</li>
 							<li>
-								<a class="dropdown-item" component="header/profilelink/settings" href="{relative_path}/user/{user.userslug}/settings">
+								<a component="header/profilelink/settings" href="{relative_path}/user/{user.userslug}/settings">
 									<i class="fa fa-fw fa-gear"></i> <span>[[user:settings]]</span>
 								</a>
 							</li>
 							{{{ if showModMenu }}}
-							<li role="presentation" class="dropdown-divider"></li>
-							<li><h6 class="dropdown-header">[[pages:moderator-tools]]</h6></li>
+							<li role="presentation" class="divider"></li>
+							<li class="dropdown-header">[[pages:moderator-tools]]</li>
 							<li>
-								<a class="dropdown-item" href="{relative_path}/flags">
+								<a href="{relative_path}/flags">
 									<i class="fa fa-fw fa-flag"></i> <span>[[pages:flagged-content]]</span>
 								</a>
 							</li>
 							<li>
-								<a class="dropdown-item" href="{relative_path}/post-queue">
+								<a href="{relative_path}/post-queue">
 									<i class="fa fa-fw fa-list-alt"></i> <span>[[pages:post-queue]]</span>
 								</a>
 							</li>
 							<li>
-								<a class="dropdown-item" href="{relative_path}/ip-blacklist">
+								<a href="{relative_path}/ip-blacklist">
 									<i class="fa fa-fw fa-ban"></i> <span>[[pages:ip-blacklist]]</span>
 								</a>
 							</li>
 							{{{ else }}}
 							{{{ if postQueueEnabled }}}
 							<li>
-								<a class="dropdown-item" href="{relative_path}/post-queue">
+								<a href="{relative_path}/post-queue">
 									<i class="fa fa-fw fa-list-alt"></i> <span>[[pages:post-queue]]</span>
 								</a>
 							</li>
 							{{{ end }}}
 							{{{ end }}}
 
-							<li role="presentation" class="dropdown-divider"></li>
+							<li role="presentation" class="divider"></li>
 							<li component="user/logout">
 								<form method="post" action="{relative_path}/logout">
 									<input type="hidden" name="_csrf" value="{config.csrf_token}">
 									<input type="hidden" name="noscript" value="true">
-									<button type="submit" class="dropdown-item">
+									<button type="submit" class="btn btn-link">
 										<i class="fa fa-fw fa-sign-out"></i><span> [[global:logout]]</span>
 									</button>
 								</form>
 							</li>
 						</ul>
 					</li>
+
 				</ul>
-				{{{ else }}}
-				<ul id="logged-out-menu" class="navbar-nav me-0 mb-2 mb-lg-0 align-items-center">
-					{{{ if allowRegistration }}}
-					<li class="nav-item">
-						<a class="nav-link" href="{relative_path}/register">
-							<i class="fa fa-pencil fa-fw d-inline-block d-sm-none"></i>
+				<!-- ELSE -->
+				<ul id="logged-out-menu" class="nav navbar-nav navbar-right">
+					<!-- IF allowRegistration -->
+					<li>
+						<a href="{relative_path}/register">
+							<i class="fa fa-pencil fa-fw hidden-sm hidden-md hidden-lg"></i>
 							<span>[[global:register]]</span>
 						</a>
 					</li>
-					{{{ end }}}
-					<li class="nav-item">
-						<a class="nav-link" href="{relative_path}/login">
-							<i class="fa fa-sign-in fa-fw d-inline-block d-sm-none"></i>
+					<!-- ENDIF allowRegistration -->
+					<li>
+						<a href="{relative_path}/login">
+							<i class="fa fa-sign-in fa-fw hidden-sm hidden-md hidden-lg"></i>
 							<span>[[global:login]]</span>
 						</a>
 					</li>
 				</ul>
-				{{{ end }}}
-				{{{ else }}}
-				<ul class="navbar-nav me-0 mb-2 mb-lg-0"></ul>
-					<li class="nav-item">
+				<!-- ENDIF config.loggedIn -->
+				<!-- IF config.searchEnabled -->
+				<ul class="nav navbar-nav navbar-right">
+					<li>
+						<form id="search-form" class="navbar-form navbar-right hidden-xs" role="search" method="GET">
+							<button id="search-button" type="button" class="btn btn-link"><i class="fa fa-search fa-fw" title="[[global:header.search]]"></i></button>
+							<div class="hidden" id="search-fields">
+								<div class="form-group">
+									<input autocomplete="off" type="text" class="form-control" placeholder="[[global:search]]" name="query" value="">
+									<a href="#"><i class="fa fa-gears fa-fw advanced-search-link"></i></a>
+								</div>
+								<button type="submit" class="btn btn-default hide">[[global:search]]</button>
+							</div>
+						</form>
+						<div id="quick-search-container" class="quick-search-container hidden">
+							<div class="checkbox filter-category">
+								<label>
+									<input type="checkbox" checked><span class="name"></span>
+								</label>
+							</div>
+							<div class="text-center loading-indicator"><i class="fa fa-spinner fa-spin"></i></div>
+							<div class="quick-search-results-container"></div>
+						</div>
+					</li>
+					<li class="visible-xs" id="search-menu">
+						<a href="{relative_path}/search">
+							<i class="fa fa-search fa-fw"></i> [[global:search]]
+						</a>
+					</li>
+				</ul>
+				<!-- ENDIF config.searchEnabled -->
+
+				<ul class="nav navbar-nav navbar-right hidden-xs">
+					<li>
+						<a href="#" id="reconnect" class="hide" title="[[global:reconnecting-message, {config.siteTitle}]]">
+							<i class="fa fa-check"></i>
+						</a>
+					</li>
+				</ul>
+
+				<ul id="main-nav" class="nav navbar-nav">
+					{{{each navigation}}}
+					<!-- IF function.displayMenuItem, @index -->
+					<li class="{navigation.class}{{{ if navigation.dropdown }}} dropdown{{{ end }}}">
+						<a title="{navigation.title}" class="navigation-link {{{ if navigation.dropdown }}}dropdown-toggle{{{ end }}}"
+						{{{ if navigation.dropdown }}} href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" {{{ else }}} href="{navigation.route}"{{{ end }}} {{{ if navigation.id }}}id="{navigation.id}"{{{ end }}}{{{ if navigation.targetBlank }}} target="_blank"{{{ end }}}>
+							{{{ if navigation.iconClass }}}
+							<i class="fa fa-fw {navigation.iconClass}" data-content="{navigation.content}"></i>
+							{{{ end }}}
+							{{{ if navigation.text }}}
+							<span class="{navigation.textClass}">{navigation.text}</span>
+							{{{ end }}}
+							{{{ if navigation.dropdown}}}
+							<i class="fa fa-caret-down"></i>
+							{{{ end }}}
+						</a>
+						{{{ if navigation.dropdown }}}
+						<ul class="dropdown-menu">
+							{navigation.dropdownContent}
+						</ul>
+						{{{ end }}}
+					</li>
+					<!-- ENDIF function.displayMenuItem -->
+					{{{end}}}
+				</ul>
+
+				<!-- ELSE -->
+				<ul class="nav navbar-nav navbar-right">
+					<li>
 						<a href="{relative_path}/login">
-							<i class="fa fa-sign-in fa-fw d-block d-sm-none"></i>
+							<i class="fa fa-sign-in fa-fw hidden-sm hidden-md hidden-lg"></i>
 							<span>[[global:login]]</span>
 						</a>
 					</li>
 				</ul>
-				{{{ end }}}
+				<!-- ENDIF !maintenanceHeader -->
 			</div>

package/templates/partials/merge_topics_modal.tpl

@@ -0,0 +1,58 @@
+<div class="panel panel-primary merge-topic-card">
+	<div class="panel-heading">
+		<h3 class="panel-title">[[topic:thread_tools.merge_topics]]</h3>
+	</div>
+	<div class="panel-body">
+		<p>
+			[[topic:merge_topics_instruction]]
+		</p>
+		<p>
+			<div class="input-group">
+				<input class="form-control topic-search-input" type="text">
+				<span class="input-group-addon">
+					<i class="fa fa-search"></i>
+				</span>
+			</div>
+		</p>
+		<div style="position: relative;">
+			<div class="quick-search-container hidden">
+				<div class="text-center loading-indicator"><i class="fa fa-spinner fa-spin"></i></div>
+				<div class="quick-search-results-container"></div>
+			</div>
+		</div>
+		<p><strong>[[topic:merge-topic-list-title]]</strong></p>
+		<ul class="topics-section">
+			{{{each topics}}}
+			<li><a href="{config.relative_path}/topic/{topics.tid}"><strong>{topics.title}</strong></a></li>
+			{{{end}}}
+		</ul>
+		<p>
+			<strong>[[topic:merge-options]]</strong>
+		</p>
+		<form>
+			<p>
+				<input class="merge-main-topic-radio" type="radio" name="merge-topic-option" checked="true"> [[topic:merge-select-main-topic]]
+			</p>
+			<p>
+				<select class="form-control merge-main-topic-select">
+					{{{each topics}}}
+					<option value="{topics.tid}">{topics.title}</option>
+					{{{end}}}
+				</select>
+			</p>
+			<p>
+				<input class="merge-new-title-radio" type="radio" name="merge-topic-option"> [[topic:merge-new-title-for-topic]]
+			</p>
+			<p>
+				<input class="merge-new-title-input form-control" type="text">
+			</p>
+		</form>
+	</div>
+	<div class="panel-footer">
+		&nbsp;
+		<div class="btn-group pull-right">
+			<button class="btn btn-link btn-xs" id="merge_topics_cancel">[[global:buttons.close]]</button>
+			<button class="btn btn-primary btn-xs" id="merge_topics_confirm" disabled>[[topic:thread_tools.merge]]</button>
+		</div>
+	</div>
+</div>

package/templates/partials/modals/change_picture_modal.tpl

@@ -0,0 +1,73 @@
+<div class="row">
+	<div class="col-xs-6 col-sm-8 col-md-6">
+		<div class="list-group media">
+			<button type="button" class="list-group-item" data-type="default">
+				<div class="media-left">
+					<!-- IF defaultAvatar -->
+					<img class="media-object" src="{defaultAvatar}"  />
+					<!-- ELSE -->
+					<div class="user-icon media-object" style="background-color: {icon.bgColor};">{icon.text}</div>
+					<!-- ENDIF defaultAvatar -->
+				</div>
+				<div class="media-body">
+					<h4 class="media-heading">[[user:default_picture]]</h4>
+				</div>
+			</button>
+			{{{each pictures}}}
+			<button type="button" class="list-group-item" data-type="{pictures.type}">
+				<div class="media-left">
+					<img class="media-object" src="{pictures.url}" title="{pictures.text}" />
+				</div>
+				<div class="media-body">
+					<h4 class="media-heading">{pictures.text}</h4>
+				</div>
+			</button>
+			{{{end}}}
+		</div>
+	</div>
+	<div class="col-xs-6 col-sm-4 col-md-6">
+		<div class="btn-group-vertical btn-block" role="group">
+			<!-- IF allowProfileImageUploads -->
+			<button type="button" class="btn btn-default" data-action="upload">
+				<span class="hidden-xs hidden-sm">
+					[[user:upload_new_picture]]
+				</span>
+				<span class="visible-xs-inline visible-sm-inline">
+					<i class="fa fa-plus"></i>
+					<i class="fa fa-upload"></i>
+				</span>
+			</button>
+			<!-- ENDIF allowProfileImageUploads -->
+			<button type="button" class="btn btn-default" data-action="upload-url">
+				<span class="hidden-xs hidden-sm">
+					[[user:upload_new_picture_from_url]]
+				</span>
+				<span class="visible-xs-inline visible-sm-inline">
+					<i class="fa fa-plus"></i>
+					<i class="fa fa-link"></i>
+				</span>
+			</button>
+			<!-- IF uploaded -->
+			<button type="button" class="btn btn-default" data-action="remove-uploaded">
+				<span class="hidden-xs hidden-sm">
+					[[user:remove_uploaded_picture]]
+				</span>
+				<span class="visible-xs-inline visible-sm-inline">
+					<i class="fa fa-picture-o"></i>
+					<i class="fa fa-long-arrow-right"></i>
+					<i class="fa fa-trash-o"></i>
+				</span>
+			</button>
+			<!-- ENDIF uploaded -->
+		</div>
+	</div>
+</div>
+
+<hr />
+
+<h4>[[user:avatar-background-colour]]</h4>
+
+<label><input type="radio" name="icon:bgColor" value="transparent" /><span></span></label>
+{{{ each iconBackgrounds }}}
+<label><input type="radio" name="icon:bgColor" value="{@value}" /><span style="background-color: {@value};"></span></label>
+{{{ end }}}

package/templates/partials/modals/flag_modal.tpl

@@ -0,0 +1,45 @@
+<div class="modal" tabindex="-1" role="dialog" aria-labelledby="[[flags:modal-title]]" aria-hidden="true">
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+				<h4 class="modal-title">
+					[[flags:modal-title]]
+				</h4>
+			</div>
+			<div class="modal-body">
+				<p class="lead">
+					[[flags:modal-body, {type}, {id}]]
+				</p>
+				<div>
+					<div class="radio">
+						<label for="flag-reason-spam">
+							<input type="radio" name="flag-reason" id="flag-reason-spam" value="[[flags:modal-reason-spam]]">
+							[[flags:modal-reason-spam]]
+						</label>
+					</div>
+
+					<div class="radio">
+						<label for="flag-reason-offensive">
+							<input type="radio" name="flag-reason" id="flag-reason-offensive" value="[[flags:modal-reason-offensive]]">
+							[[flags:modal-reason-offensive]]
+						</label>
+					</div>
+
+					<div class="radio">
+						<label for="flag-reason-other">
+							<input type="radio" name="flag-reason" id="flag-reason-other" value="[[flags:modal-reason-other]]">
+							[[flags:modal-reason-other]]
+						</label>
+					</div>
+				</div>
+				<div class="form-group">
+					<textarea class="form-control" id="flag-reason-custom" placeholder="[[flags:modal-reason-custom]]" disabled="disabled"></textarea>
+				</div>
+
+				<button type="button" class="btn btn-primary pull-right" id="flag-post-commit" disabled>[[flags:modal-submit]]</button>
+				<div class="clear"></div>
+			</div>
+		</div>
+	</div>
+</div>

package/templates/partials/modals/manage_room.tpl

@@ -0,0 +1,11 @@
+<div class="form-group">
+	<input class="form-control" type="text" placeholder="[[global:user-search-prompt]]" />
+	<p class="text-danger"></p>
+	<p class="help-block">[[modules:chat.add-user-help]]</p>
+
+	<hr />
+
+	<ul class="list-group">
+		<li class="list-group-item"><i class="fa fa-spinner fa-spin"></i> [[modules:chat.retrieving-users]]</li>
+	</ul>
+</div>

package/templates/partials/modals/manage_room_users.tpl

@@ -0,0 +1,7 @@
+{{{each users}}}
+<li class="list-group-item">
+	<!-- IF ../canKick --><button class="pull-right btn btn-xs btn-link" data-action="kick" data-uid="{../uid}">[[modules:chat.kick]]</button><!-- END -->
+	{buildAvatar(users, "sm", true)}
+	<span>{../username} <!-- IF ../isOwner --><i class="fa fa-star text-warning" title="[[modules:chat.owner]]"></i><!-- END --></span>
+</li>
+{{{end}}}