Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 10:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-07-15 20:05:27 -04:00
parent 4c311502a2 05c9cca7c4
commit a5cc5372cb
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/middleware/render.js
View File

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

2
src/views/admin/extend/widgets.tpl
View File

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

2
src/views/admin/header.tpl
View File

@@ -5,7 +5,7 @@
{{{each metaTags}}}{function.buildMetaTag}{{{end}}} {{{each metaTags}}}{function.buildMetaTag}{{{end}}}
{{{each linkTags}}}{function.buildLinkTag}{{{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> <script>
var config = JSON.parse('{{configJSON}}'); var config = JSON.parse('{{configJSON}}');

2
src/views/admin/partials/quick_actions/alerts.tpl
View File

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