diff --git a/gulp/res/css/style.css b/gulp/res/css/style.css index f65cd5e2..35cc1445 100644 --- a/gulp/res/css/style.css +++ b/gulp/res/css/style.css @@ -119,6 +119,11 @@ object { flex-flow: row wrap; } +.detected { + background: #FAF8F8; + color: #3060A8; +} + .spoiler { background: black; } @@ -181,6 +186,7 @@ blockquote { background: #D6DAF0; border: 1px solid #000333; border-spacing: 0; + width: 800px; } .table-head { @@ -532,7 +538,7 @@ hr { overflow-y: hidden; } - .boards-table { + .table-body { width: 100%; } diff --git a/views/includes/actionfooter_manage.pug b/views/includes/actionfooter_manage.pug index 79b61474..aeb1aeb4 100644 --- a/views/includes/actionfooter_manage.pug +++ b/views/includes/actionfooter_manage.pug @@ -12,14 +12,12 @@ label.toggle-label Toggle Post Actions label input.post-check(type='checkbox', name='spoiler' value=1) | Spoiler Images - label - input.post-check(type='checkbox', name='global_report' value=1) - | Global Report - label - input#report(type='text', name='report_reason', placeholder='report reason' autocomplete='off') label input.post-check(type='checkbox', name='delete_ip_board' value=1) | Delete from IP on board + label + input.post-check(type='checkbox', name='delete_ip_global' value=1) + | Delete from IP globally label input.post-check(type='checkbox', name='dismiss' value=1) | Dismiss Reports diff --git a/views/includes/postform.pug b/views/includes/postform.pug index 23e473f8..9e512408 100644 --- a/views/includes/postform.pug +++ b/views/includes/postform.pug @@ -39,5 +39,7 @@ section.form-wrapper.flex-center.mv-10 .postform-col img.captcha(src='/captcha' width=200 height=80) input#captcha(type='text', name='captcha', autocomplete='off' placeholder='captcha text' maxlength='6') - - input(type='submit', value='submit') + if !thread + input(type='submit', value='New Thread') + else + input(type='submit', value='Reply') diff --git a/views/mixins/ban.pug b/views/mixins/ban.pug index 3baf4082..9fa72d2a 100644 --- a/views/mixins/ban.pug +++ b/views/mixins/ban.pug @@ -1,18 +1,21 @@ include ./post.pug -mixin ban(ban) +mixin ban(ban, showcheck) .ban - input.post-check(type='checkbox', name='checkedbans[]' value=ban._id) - if ban.board - div Board: #[a(href=`/${ban.board}/`) /#{ban.board}/] - else - div Global ban. - div Reason: #{ban.reason} - div Issuer: #{ban.issuer} - div Date: #{ban.date} - div Expiry: #{ban.expireAt} + if showcheck + input.post-check(type='checkbox', name='checkedbans[]' value=ban._id) + span + | You were banned + if ban.board + | from #[a(href=`/${ban.board}/`) /#{ban.board}/] + else + | globally + | for: #{ban.reason} + div Issued by: #{ban.issuer} + div Banned: #{ban.date.toLocaleString()} + div Expires: #{ban.expireAt.toLocaleString()} if ban.post - span Post: + span Banned for the following post: section.thread +post(ban.post, false) diff --git a/views/mixins/post.pug b/views/mixins/post.pug index e3b86c04..1116335d 100644 --- a/views/mixins/post.pug +++ b/views/mixins/post.pug @@ -32,7 +32,7 @@ mixin post(post, truncate, manage=false, globalmanage=false) | span #{post.date.toLocaleString()} | - if board.settings.ids && post.userId + if post.userId && board.settings.ids span.user-id(style=`background: #${post.userId}`) #{post.userId} | span: a(href=postURL) No.#{post.postId} diff --git a/views/pages/ban.pug b/views/pages/ban.pug index 1a733185..21b28435 100644 --- a/views/pages/ban.pug +++ b/views/pages/ban.pug @@ -6,8 +6,7 @@ block head block content h1.board-title Banned! - hr(size=1) - Bans currently in place against your IP: + h4.board-description Bans currently in place against your IP: hr(size=1) for ban in bans +ban(ban) diff --git a/views/pages/catalog.pug b/views/pages/catalog.pug index 82e0efe2..69ff69e0 100644 --- a/views/pages/catalog.pug +++ b/views/pages/catalog.pug @@ -13,7 +13,6 @@ block content hr(size=1) if threads.length === 0 p No posts. - hr(size=1) section.catalog for thread in threads +catalogtile(board, thread) diff --git a/views/pages/globalmanage.pug b/views/pages/globalmanage.pug index 20ce3b41..b60a0eaa 100644 --- a/views/pages/globalmanage.pug +++ b/views/pages/globalmanage.pug @@ -30,7 +30,7 @@ block content else for ban in bans section.thread - +ban(ban) + +ban(ban, true) hr(size=1) section.action-wrapper input(type='submit', value='unban') diff --git a/views/pages/home.pug b/views/pages/home.pug index bb002899..c8611d9b 100644 --- a/views/pages/home.pug +++ b/views/pages/home.pug @@ -4,7 +4,8 @@ block head title Board list block content - h1.board-title Board List + h1.board-title Imageboard + h4.board-description Board list .table-container.flex-center.mv-10 table.table-body tr.table-head diff --git a/views/pages/manage.pug b/views/pages/manage.pug index f01bf2b2..235aa902 100644 --- a/views/pages/manage.pug +++ b/views/pages/manage.pug @@ -78,7 +78,7 @@ block content else for ban in bans section.thread - +ban(ban) + +ban(ban, true) hr(size=1) section.action-wrapper input(type='submit', value='unban')