Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 20:45:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: #9967, allow dropdowns in navigation

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-11-03 16:01:32 -04:00
parent 98b98a1130
commit 2e623dd271
4 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/language/en-GB/admin/settings/navigation.json
View File

@@ -11,6 +11,8 @@
"properties": "Properties:", "properties": "Properties:",
"groups": "Groups:", "groups": "Groups:",
"open-new-window": "Open in a new window", "open-new-window": "Open in a new window",
"dropdown": "Dropdown",
"dropdown-placeholder": "Place your dropdown menu items below, ie: <br/>&lt;li&gt;&lt;a href&#x3D;&quot;https://myforum.com&quot;&gt;Link 1&lt;/a&gt;&lt;/li&gt;",
"btn.delete": "Delete", "btn.delete": "Delete",
"btn.disable": "Disable", "btn.disable": "Disable",

9
public/src/app.js
View File

@@ -284,9 +284,12 @@ app.cacheBuster = null;
$('#main-nav li') $('#main-nav li')
.removeClass('active') .removeClass('active')
.find('a') .find('a')
.filter(function (i, x) { .filter(function (i, a) {
return window.location.hostname === x.hostname && (window.location.pathname === x.pathname || return $(a).attr('href') !== '#' && window.location.hostname === a.hostname &&
window.location.pathname.startsWith(x.pathname + '/')); (
window.location.pathname === a.pathname ||
window.location.pathname.startsWith(a.pathname + '/')
);
}) })
.parent() .parent()
.addClass('active'); .addClass('active');

3
src/controllers/admin/settings.js
View File

@@ -1,5 +1,7 @@
'use strict'; 'use strict';
const validator = require('validator');
const meta = require('../../meta'); const meta = require('../../meta');
const emailer = require('../../emailer'); const emailer = require('../../emailer');
const notifications = require('../../notifications'); const notifications = require('../../notifications');
@@ -72,6 +74,7 @@ settingsController.navigation = async function (req, res) {
enabled.selected = index === 0; enabled.selected = index === 0;
enabled.title = translator.escape(enabled.title); enabled.title = translator.escape(enabled.title);
enabled.text = translator.escape(enabled.text); enabled.text = translator.escape(enabled.text);
enabled.dropdownContent = translator.escape(validator.escape(String(enabled.dropdownContent || '')));
enabled.groups = admin.groups.map(group => ({ enabled.groups = admin.groups.map(group => ({
displayName: group.displayName, displayName: group.displayName,
selected: enabled.groups.includes(group.name), selected: enabled.groups.includes(group.name),

13
src/views/admin/settings/navigation.tpl
View File

@@ -89,6 +89,19 @@
</label> </label>
</div> </div>
<div class="checkbox">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
<input class="mdl-switch__input" type="checkbox" name="dropdown" {{{ if enabled.dropdown }}}checked{{{ end }}}/>
<span class="mdl-switch__label"><strong>[[admin/settings/navigation:dropdown]]</strong></span>
</label>
</div>
<div>
<p class="help-block">
[[admin/settings/navigation:dropdown-placeholder]]
</p>
<textarea name="dropdownContent" rows="5" class="form-control">{enabled.dropdownContent}</textarea>
</div>
<button class="btn btn-danger delete">[[admin/settings/navigation:btn.delete]]</button> <button class="btn btn-danger delete">[[admin/settings/navigation:btn.delete]]</button>
<!-- IF enabled.enabled --> <!-- IF enabled.enabled -->
<button class="btn btn-warning toggle">[[admin/settings/navigation:btn.disable]]</button> <button class="btn btn-warning toggle">[[admin/settings/navigation:btn.disable]]</button>