Merge branch 'master' into develop

src/middleware/render.js

@@ -275,6 +275,7 @@ module.exports = function (middleware) {
 		const version = nconf.get('version');
 
 		res.locals.config.userLang = res.locals.config.acpLang || res.locals.config.userLang;
+		res.locals.config.isRTL = results.languageDirection === 'rtl';
 		const templateValues = {
 			config: res.locals.config,
 			configJSON: jsesc(JSON.stringify(res.locals.config), { isScriptContext: true }),

src/views/admin/extend/widgets.tpl

@@ -13,7 +13,7 @@
 				<button class="btn btn-light btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
 				<span class="selected-template">{templates.0.template}</span> <span class="caret"></span>
 				</button>
-				<ul class="dropdown-menu p-1">
+				<ul class="dropdown-menu {{{ if config.isRTL }}}dropdown-menu-end{{{ end }}} p-1">
 					{{{ each templates }}}
 					<li><a class="dropdown-item rounded-1" href="#" data-template="{./template}" data-toggle="pill">{./template}</a></li>
 					{{{ end }}}

src/views/admin/header.tpl

@@ -5,7 +5,7 @@
 
 		{{{each metaTags}}}{function.buildMetaTag}{{{end}}}
 		{{{each linkTags}}}{function.buildLinkTag}{{{end}}}
-		<link rel="stylesheet" type="text/css" href="{relative_path}/assets/admin.css?{cache-buster}" />
+		<link rel="stylesheet" type="text/css" href="{relative_path}/assets/admin{{{ if (languageDirection=="rtl") }}}-rtl{{{ end }}}.css?{cache-buster}" />
 
 		<script>
 			var config = JSON.parse('{{configJSON}}');

src/views/admin/partials/quick_actions/alerts.tpl

@@ -1,5 +1,5 @@
 <div class="alert {{{ if upgradeAvailable }}}alert-warning{{{ else }}}hidden{{{ end }}} mb-0 py-1 pe-2 alert-dismissible">
-	<span>[[admin/menu:alerts.version, {version}]]</span>
+	<div>[[admin/menu:alerts.version, {version}]]</div>
 	<a href="https://docs.nodebb.org/configuring/upgrade/" target="_blank">
 		[[admin/menu:alerts.upgrade, {latestVersion}]]
 	</a>