Merge remote-tracking branch 'origin/master' into develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.20",
+  "version": "7.2.23",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

templates/account/settings.tpl

@@ -126,11 +126,29 @@
 		<div class="col-xs-12 col-md-6">
 			<h4>[[global:language]]</h4>
 			<div class="well">
-				<select data-property="userLang" class="form-control">
-					<!-- BEGIN languages -->
-					<option value="{languages.code}" <!-- IF languages.selected -->selected<!-- ENDIF languages.selected -->>{languages.name} ({languages.code})</option>
-					<!-- END languages -->
-				</select>
+				<div class="row">
+					<div class="form-group col-lg-12">
+						<select data-property="userLang" class="form-control">
+							<!-- BEGIN languages -->
+							<option value="{languages.code}" <!-- IF languages.selected -->selected<!-- ENDIF languages.selected -->>{languages.name} ({languages.code})</option>
+							<!-- END languages -->
+						</select>
+					</div>
+				</div>
+				<!-- IF isAdmin -->
+				<!-- IF isSelf -->
+				<label>[[user:acp_language]]</label>
+				<div class="row">
+					<div class="form-group col-lg-12">
+						<select data-property="acpLang" class="form-control">
+							<!-- BEGIN acpLanguages -->
+							<option value="{acpLanguages.code}" <!-- IF acpLanguages.selected -->selected<!-- ENDIF acpLanguages.selected -->>{acpLanguages.name} ({acpLanguages.code})</option>
+							<!-- END acpLanguages -->
+						</select>
+					</div>
+				</div>
+				<!-- ENDIF isSelf -->
+				<!-- ENDIF isAdmin -->
 			</div>
 
 			<h4>[[topic:watch]]</h4>

templates/partials/topic/post-menu-list.tpl

@@ -36,6 +36,22 @@
 	</a>
 </li>
 <!-- ENDIF posts.display_move_tools -->
+
+<!-- IF posts.ip -->
+<li role="presentation">
+	<a component="post/copy-ip" role="menuitem" tabindex="-1" href="#" data-clipboard-text="{posts.ip}">
+		<span class="menu-icon" ><i class="fa fa-copy"></i></span> [[topic:copy-ip]] {posts.ip}
+	</a>
+</li>
+<!-- IF posts.display_ip_ban -->
+<li role="presentation">
+	<a component="post/ban-ip" role="menuitem" tabindex="-1" href="#" data-ip="{posts.ip}">
+		<span class="menu-icon"><i class="fa fa-ban"></i></span> [[topic:ban-ip]] {posts.ip}
+	</a>
+</li>
+<!-- ENDIF posts.display_ip_ban -->
+<!-- ENDIF posts.ip -->
+
 <li role="presentation" class="divider"></li>
 <!-- ENDIF posts.display_moderator_tools -->
 

templates/partials/topics_list.tpl

@@ -79,19 +79,19 @@
 			<span class="human-readable-number">{topics.postcount}</span> <a href="{config.relative_path}/topic/{topics.slug}/{topics.teaser.index}"><i class="fa fa-arrow-circle-right"></i></a>
 		</div>
 
-		<div class="col-md-1 hidden-sm hidden-xs stats">
+		<div class="col-md-1 hidden-sm hidden-xs stats stats-votes">
 			<!-- IF !reputation:disabled -->
 			<span class="human-readable-number" title="{topics.votes}">{topics.votes}</span><br />
 			<small>[[global:votes]]</small>
 			<!-- END -->
 		</div>
 
-		<div class="col-md-1 hidden-sm hidden-xs stats">
+		<div class="col-md-1 hidden-sm hidden-xs stats stats-postcount">
 			<span class="human-readable-number" title="{topics.postcount}">{topics.postcount}</span><br />
 			<small>[[global:posts]]</small>
 		</div>
 
-		<div class="col-md-1 hidden-sm hidden-xs stats">
+		<div class="col-md-1 hidden-sm hidden-xs stats stats-viewcount">
 			<span class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</span><br />
 			<small>[[global:views]]</small>
 		</div>