Dont show webring link in navbar if disabled reference #145

merge-requests/208/head
fatchan 4 years ago
parent 3ad9490da2
commit 84b9bdb578
  1. 4
      gulp/res/css/style.css
  2. 5
      helpers/render.js
  3. 3
      server.js
  4. 5
      views/includes/navbar.pug

@ -905,10 +905,6 @@ input:invalid, textarea:invalid {
text-align: center;
}
.nav-item:nth-of-type(3) {
line-height:1.5em;
}
.left {
float: left;
}

@ -1,6 +1,8 @@
'use strict';
const { enableUserBoardCreation, enableUserAccountCreation, lockWait, globalLimits, boardDefaults, cacheTemplates, meta } = require(__dirname+'/../configs/main.js')
const { enableUserBoardCreation, enableUserAccountCreation,
lockWait, globalLimits, boardDefaults, cacheTemplates,
meta, enableWebring } = require(__dirname+'/../configs/main.js')
, { outputFile } = require('fs-extra')
, formatSize = require(__dirname+'/files/formatsize.js')
, pug = require('pug')
@ -22,6 +24,7 @@ module.exports = async (htmlName, templateName, options, json=null) => {
enableUserAccountCreation,
enableUserBoardCreation,
globalLimits,
enableWebring,
});
const lock = await redlock.lock(`locks:${htmlName}`, lockWait);
const htmlPromise = outputFile(`${uploadDirectory}/html/${htmlName}`, html);

@ -13,7 +13,7 @@ const express = require('express')
, cookieParser = require('cookie-parser')
, { cacheTemplates, boardDefaults, sessionSecret, globalLimits,
enableUserBoardCreation, enableUserAccountCreation, secureCookies,
debugLogs, ipHashPermLevel, meta, port } = require(__dirname+'/configs/main.js')
debugLogs, ipHashPermLevel, meta, port, enableWebring } = require(__dirname+'/configs/main.js')
, referrerCheck = require(__dirname+'/helpers/referrercheck.js')
, { themes, codeThemes } = require(__dirname+'/helpers/themes.js')
, Mongo = require(__dirname+'/db/db.js')
@ -87,6 +87,7 @@ const express = require('express')
app.locals.defaultCodeTheme = boardDefaults.codeTheme;
app.locals.globalLimits = globalLimits;
app.locals.ipHashPermLevel = ipHashPermLevel;
app.locals.enableWebring = enableWebring;
app.locals.commit = commit;
app.locals.meta = meta;

@ -2,9 +2,10 @@ unless minimal
nav.navbar
a.nav-item(href='/index.html') Home
a.nav-item(href='/news.html') News
a.nav-item(href='/boards.html')
a.nav-item(href='/boards.html' style=(enableWebring ? 'line-height: 1.5em' : null))
| Boards
.rainbow +Webring
if enableWebring
.rainbow +Webring
a.nav-item(href='/account.html') Account
if board
a.nav-item(href=`/${board._id}/manage/reports.html`) Manage

Loading…
Cancel
Save