diff --git a/gulp/res/css/style.css b/gulp/res/css/style.css index 326b05d5..488731c1 100644 --- a/gulp/res/css/style.css +++ b/gulp/res/css/style.css @@ -153,7 +153,13 @@ pre { cursor: pointer; } -.pages, .live { +.statwrap { + display: flex; + justify-content: space-between; + flex-flow: row wrap; +} + +.pages, #livetext, #poststats { box-sizing: border-box; padding: 10px; width: max-content; diff --git a/views/pages/board.pug b/views/pages/board.pug index 8df7fdd4..2373ba04 100644 --- a/views/pages/board.pug +++ b/views/pages/board.pug @@ -14,7 +14,7 @@ block content br include ../includes/announcements.pug include ../includes/stickynav.pug - nav.pages + .pages include ../includes/boardpages.pug +boardnav(null, false, false) form(action='/forms/board/'+board._id+'/actions' method='POST' enctype='application/x-www-form-urlencoded') @@ -28,7 +28,7 @@ block content for post in thread.replies +post(post, true) hr(size=1) - nav.pages + .pages include ../includes/boardpages.pug +boardnav(null, false, false) include ../includes/actionfooter.pug diff --git a/views/pages/boardlist.pug b/views/pages/boardlist.pug index 0d1178a4..4f85170f 100644 --- a/views/pages/boardlist.pug +++ b/views/pages/boardlist.pug @@ -59,5 +59,5 @@ block content td(style=`background-color: ${board.lastPostTimestamp.color}`) #{board.lastPostTimestamp.text} else td - - nav.pages.text-center.mt-5.mv-0 + .pages.text-center.mt-5.mv-0 include ../includes/pages.pug diff --git a/views/pages/catalog.pug b/views/pages/catalog.pug index 6b049f73..14818304 100644 --- a/views/pages/catalog.pug +++ b/views/pages/catalog.pug @@ -14,7 +14,7 @@ block content br include ../includes/announcements.pug include ../includes/stickynav.pug - nav.pages + .pages +boardnav('catalog', true, false) hr(size=1) if threads.length === 0 @@ -24,5 +24,5 @@ block content for thread, i in threads +catalogtile(board, thread, i+1) hr(size=1) - nav.pages + .pages +boardnav('catalog', true, false) diff --git a/views/pages/globalmanageaccounts.pug b/views/pages/globalmanageaccounts.pug index 2863ecf9..8235b193 100644 --- a/views/pages/globalmanageaccounts.pug +++ b/views/pages/globalmanageaccounts.pug @@ -25,7 +25,7 @@ block content td: input(type='checkbox', name='checkedaccounts' value=account._id) td #{account._id} td #{account.authLevel} - nav.pages.mt-5 + .pages.mt-5 include ../includes/pages.pug .row .label Delete Accounts diff --git a/views/pages/globalmanagerecent.pug b/views/pages/globalmanagerecent.pug index 740042d8..559c4bc3 100644 --- a/views/pages/globalmanagerecent.pug +++ b/views/pages/globalmanagerecent.pug @@ -24,6 +24,6 @@ block content .thread +post(p, false, false, true) hr(size=1) - nav.pages.mv-5 + .pages.mv-5 include ../includes/pages.pug include ../includes/actionfooter_globalmanage.pug diff --git a/views/pages/modlog.pug b/views/pages/modlog.pug index 2d4eed24..299129f2 100644 --- a/views/pages/modlog.pug +++ b/views/pages/modlog.pug @@ -10,7 +10,7 @@ block content +boardheader('Logs') br include ../includes/stickynav.pug - nav.pages + .pages +boardnav('logs', true, true) hr(size=1) .table-container.flex-center.mv-10.text-center @@ -29,5 +29,5 @@ block content td #{log.postIds} td #{log.message || '-'} hr(size=1) - nav.pages + .pages +boardnav('logs', true, true) diff --git a/views/pages/modloglist.pug b/views/pages/modloglist.pug index 7283bff5..1cd3ab88 100644 --- a/views/pages/modloglist.pug +++ b/views/pages/modloglist.pug @@ -10,7 +10,7 @@ block content +boardheader('Logs') br include ../includes/stickynav.pug - nav.pages + .pages +boardnav('logs', true, false) hr(size=1) if dates.length === 0 @@ -32,5 +32,5 @@ block content td: a(href=`logs/${logName}.html`) #{logName} td #{count} hr(size=1) - nav.pages + .pages +boardnav('logs', true, false) diff --git a/views/pages/thread.pug b/views/pages/thread.pug index 07eda68f..53175b41 100644 --- a/views/pages/thread.pug +++ b/views/pages/thread.pug @@ -33,18 +33,28 @@ block content br include ../includes/announcements.pug include ../includes/stickynav.pug - nav.pages + .pages +boardnav(null, true, true) + - board.settings.ids ? const uids = new Set() : void 0; form(action=`/forms/board/${board._id}/actions` method='POST' enctype='application/x-www-form-urlencoded') hr(size=1) .thread +post(thread) for post in thread.replies + - uids && post.userId && uids.add(post.userId) +post(post) hr(size=1) - div.jsonly.live#livetext + .statwrap + .pages + +boardnav(null, true, true) + #threadstats + span #{thread.replyposts} repl#{thread.replyposts === 1 ? 'y' : 'ies'} + | | + span #{thread.replyfiles} file#{thread.replyfiles === 1 ? '' : 's'} + if board.settings.ids + | | + span #{uids.size} UID#{uids.size === 1 ? '' : 's'} + .jsonly#livetext .dot#livecolor | Connecting... - nav.pages - +boardnav(null, true, true) include ../includes/actionfooter.pug