From 54ff8b8c0e5ecb8d240ea47501a6a08901e4d8c9 Mon Sep 17 00:00:00 2001 From: fatchan Date: Wed, 15 May 2019 07:05:55 +0000 Subject: [PATCH] details/summary tags instead of hacky hidden post form check css --- gulp/res/css/style.css | 7 +- views/includes/actionfooter.pug | 113 +++++++++---------- views/includes/actionfooter_globalmanage.pug | 62 +++++----- views/includes/actionfooter_manage.pug | 69 ++++++----- views/includes/postform.pug | 82 +++++++------- views/pages/board.pug | 2 +- views/pages/thread.pug | 1 - 7 files changed, 168 insertions(+), 168 deletions(-) diff --git a/gulp/res/css/style.css b/gulp/res/css/style.css index 115e36ef..b1c42aea 100644 --- a/gulp/res/css/style.css +++ b/gulp/res/css/style.css @@ -72,6 +72,7 @@ object { .navbar { border-bottom: 1px solid #a9a9a9; + background: #d6daf0; } .catalog-tile-button { @@ -133,6 +134,7 @@ object { } .mode { + margin-top: 1px; background-color: red; color: white; font-weight: bold; @@ -211,7 +213,8 @@ td, th { } .actions { - max-width: 100%; + text-align: left; + max-width: 200px; display: flex; flex-direction: column; margin: 2px 0; @@ -439,6 +442,7 @@ input textarea { margin-top: auto; line-height: 30px; border-top: 1px solid #a9a9a9; + background: #d6daf0; } input[type="text"], input[type="submit"], input[type="password"], input[type="file"], textarea { @@ -536,6 +540,7 @@ hr { .catalog-tile { overflow-y: hidden; + width: 48%; } .table-body { diff --git a/views/includes/actionfooter.pug b/views/includes/actionfooter.pug index 1a1bf0ea..f8255dd5 100644 --- a/views/includes/actionfooter.pug +++ b/views/includes/actionfooter.pug @@ -1,57 +1,56 @@ -label.toggle-label Toggle Post Actions - input.toggle(type='checkbox') - .action-wrapper.togglable - .actions - h4.no-m-p Actions: - label - input.post-check(type='checkbox', name='delete' value=1) - | Delete - label - input.post-check(type='checkbox', name='delete_file' value=1) - | Delete File Only - label - input.post-check(type='checkbox', name='spoiler' value=1) - | Spoiler Images - label - input#password(type='text', name='password', placeholder='post password' autocomplete='off') - label - input.post-check(type='checkbox', name='report' value=1) - | Report - 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') - .actions - h4.no-m-p Mod Actions: - 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='sticky' value=1) - | Sticky - label - input.post-check(type='checkbox', name='lock' value=1) - | Lock - label - input.post-check(type='checkbox', name='sage' value=1) - | Sage - label - input.post-check(type='checkbox', name='ban' value=1) - | Ban Poster - label - input.post-check(type='checkbox', name='global_ban' value=1) - | Global Ban Poster - label - input.post-check(type='checkbox', name='preserve_post' value=1) - | Show Post In Ban - label - input#report(type='text', name='ban_reason', placeholder='ban reason' autocomplete='off') - .actions - h4.no-m-p Captcha: - 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') +details.toggle-label + summary Show Post Actions + .actions + h4.no-m-p Actions: + label + input.post-check(type='checkbox', name='delete' value=1) + | Delete + label + input.post-check(type='checkbox', name='delete_file' value=1) + | Delete File Only + label + input.post-check(type='checkbox', name='spoiler' value=1) + | Spoiler Images + label + input#password(type='text', name='password', placeholder='post password' autocomplete='off') + label + input.post-check(type='checkbox', name='report' value=1) + | Report + 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') + .actions + h4.no-m-p Mod Actions: + 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='sticky' value=1) + | Sticky + label + input.post-check(type='checkbox', name='lock' value=1) + | Lock + label + input.post-check(type='checkbox', name='sage' value=1) + | Sage + label + input.post-check(type='checkbox', name='ban' value=1) + | Ban Poster + label + input.post-check(type='checkbox', name='global_ban' value=1) + | Global Ban Poster + label + input.post-check(type='checkbox', name='preserve_post' value=1) + | Show Post In Ban + label + input#report(type='text', name='ban_reason', placeholder='ban reason' autocomplete='off') + .actions + h4.no-m-p Captcha: + 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') diff --git a/views/includes/actionfooter_globalmanage.pug b/views/includes/actionfooter_globalmanage.pug index d91014e8..7a18be5c 100644 --- a/views/includes/actionfooter_globalmanage.pug +++ b/views/includes/actionfooter_globalmanage.pug @@ -1,32 +1,30 @@ -label.toggle-label Toggle Post Actions - input.toggle(type='checkbox') - .action-wrapper.togglable - .actions - h4.no-m-p Actions: - label - input.post-check(type='checkbox', name='delete' value=1) - | Delete - label - input.post-check(type='checkbox', name='delete_file' value=1) - | Delete File Only - label - input.post-check(type='checkbox', name='spoiler' value=1) - | Spoiler Images - label - input#report(type='text', name='report_reason', placeholder='report reason' autocomplete='off') - label - input.post-check(type='checkbox', name='delete_ip_global' value=1) - | Delete from IP globally - label - input.post-check(type='checkbox', name='global_dismiss' value=1) - | Dismiss Global Reports - label - input.post-check(type='checkbox', name='global_ban' value=1) - | Global Ban Poster - label - input.post-check(type='checkbox', name='preserve_post' value=1) - | Show Post In Ban - label - input#ban_reason(type='text', name='ban_reason', placeholder='ban reason' autocomplete='off') - input(type='submit', value='submit') - +details.toggle-label + summary Show Post Actions + .actions + h4.no-m-p Actions: + label + input.post-check(type='checkbox', name='delete' value=1) + | Delete + label + input.post-check(type='checkbox', name='delete_file' value=1) + | Delete File Only + label + input.post-check(type='checkbox', name='spoiler' value=1) + | Spoiler Images + label + input#report(type='text', name='report_reason', placeholder='report reason' autocomplete='off') + label + input.post-check(type='checkbox', name='delete_ip_global' value=1) + | Delete from IP globally + label + input.post-check(type='checkbox', name='global_dismiss' value=1) + | Dismiss Global Reports + label + input.post-check(type='checkbox', name='global_ban' value=1) + | Global Ban Poster + label + input.post-check(type='checkbox', name='preserve_post' value=1) + | Show Post In Ban + label + input#ban_reason(type='text', name='ban_reason', placeholder='ban reason' autocomplete='off') + input(type='submit', value='submit') diff --git a/views/includes/actionfooter_manage.pug b/views/includes/actionfooter_manage.pug index aeb1aeb4..5ce46915 100644 --- a/views/includes/actionfooter_manage.pug +++ b/views/includes/actionfooter_manage.pug @@ -1,36 +1,35 @@ -label.toggle-label Toggle Post Actions - input.toggle(type='checkbox') - .action-wrapper.togglable - .actions - h4.no-m-p Actions: - label - input.post-check(type='checkbox', name='delete' value=1) - | Delete - label - input.post-check(type='checkbox', name='delete_file' value=1) - | Delete File Only - label - input.post-check(type='checkbox', name='spoiler' value=1) - | Spoiler Images - 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 - label - input.post-check(type='checkbox', name='ban' value=1) - | Ban Poster - label - input.post-check(type='checkbox', name='global_ban' value=1) - | Global Ban Poster - label - input.post-check(type='checkbox', name='preserve_post' value=1) - | Show Post In Ban - label - input#ban_reason(type='text', name='ban_reason', placeholder='ban reason' autocomplete='off') - input(type='submit', value='submit') +details.toggle-label + summary Show Post Actions + .actions + h4.no-m-p Actions: + label + input.post-check(type='checkbox', name='delete' value=1) + | Delete + label + input.post-check(type='checkbox', name='delete_file' value=1) + | Delete File Only + label + input.post-check(type='checkbox', name='spoiler' value=1) + | Spoiler Images + 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 + label + input.post-check(type='checkbox', name='ban' value=1) + | Ban Poster + label + input.post-check(type='checkbox', name='global_ban' value=1) + | Global Ban Poster + label + input.post-check(type='checkbox', name='preserve_post' value=1) + | Show Post In Ban + label + input#ban_reason(type='text', name='ban_reason', placeholder='ban reason' autocomplete='off') + input(type='submit', value='submit') diff --git a/views/includes/postform.pug b/views/includes/postform.pug index e34ef2e7..356abf61 100644 --- a/views/includes/postform.pug +++ b/views/includes/postform.pug @@ -1,46 +1,46 @@ section.form-wrapper.flex-center.mv-10 - form.form-post(action=`/forms/board/${board._id}/post`, enctype='multipart/form-data', method='POST') - //input(type='hidden' name='_csrf' value=csrf) - input(type='hidden' name='thread' value=thread != null ? thread.postId : null) - unless board.settings.forceAnon - section.postform-row - .postform-label Name - input#name(type='text', name='name', placeholder=board.defaultName autocomplete='off' maxlength='50') - section.postform-row - .postform-label Subject - input#title(type='text', name='subject', autocomplete='off' maxlength='50') - section.postform-row - .postform-label Email - input#name(type='text', name='email', autocomplete='off' maxlength='50') - else - section.postform-row - .postform-label Sage - label.postform-style.ph-5 - input#spoiler(type='checkbox', name='email', value='sage') - | Sage - if !thread + details.toggle-label + summary Show Post Form + form.form-post(action=`/forms/board/${board._id}/post`, enctype='multipart/form-data', method='POST') + //input(type='hidden' name='_csrf' value=csrf) + input(type='hidden' name='thread' value=thread != null ? thread.postId : null) + unless board.settings.forceAnon + section.postform-row + .postform-label Name + input#name(type='text', name='name', placeholder=board.defaultName autocomplete='off' maxlength='50') section.postform-row .postform-label Subject input#title(type='text', name='subject', autocomplete='off' maxlength='50') - section.postform-row - .postform-label Message - textarea#message(name='message', rows='5', autocomplete='off' maxlength='2000') - if board.settings.maxFiles !== 0 + section.postform-row + .postform-label Email + input#name(type='text', name='email', autocomplete='off' maxlength='50') + else + section.postform-row + .postform-label Sage + label.postform-style.ph-5 + input#spoiler(type='checkbox', name='email', value='sage') + | Sage + if !thread + section.postform-row + .postform-label Subject + input#title(type='text', name='subject', autocomplete='off' maxlength='50') + section.postform-row + .postform-label Message + textarea#message(name='message', rows='5', autocomplete='off' maxlength='2000') + if board.settings.maxFiles !== 0 + section.postform-row + .postform-label Files + input#file(type='file', name='file' multiple='multiple') + label.postform-style.ph-5.ml-1 + input#spoiler(type='checkbox', name='spoiler', value='true') + | Spoiler + section.postform-row + .postform-label Password + input#password(type='password', name='password', autocomplete='off' placeholder='password for deleting post later' maxlength='50') section.postform-row - .postform-label Files - input#file(type='file', name='file' multiple='multiple') - label.postform-style.ph-5.ml-1 - input#spoiler(type='checkbox', name='spoiler', value='true') - | Spoiler - section.postform-row - .postform-label Password - input#password(type='password', name='password', autocomplete='off' placeholder='password for deleting post later' maxlength='50') - section.postform-row - .postform-label Captcha - .postform-col - img.captcha(src='/captcha' width=200 height=80) - input#captcha(type='text', name='captcha', autocomplete='off' placeholder='captcha text' maxlength='6') - if !thread - input(type='submit', value='New Thread') - else - input(type='submit', value='Reply') + .postform-label Captcha + .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=`New ${threads ? 'Thread' : 'Reply'}`) + //.mode Posting mode: #{threads ? 'Thread' : 'Reply'} diff --git a/views/pages/board.pug b/views/pages/board.pug index 3b225c36..4a5ac5e3 100644 --- a/views/pages/board.pug +++ b/views/pages/board.pug @@ -7,7 +7,6 @@ block head block content include ../includes/boardheader.pug include ../includes/postform.pug - .mode Posting mode: Thread nav.pages#top include ../includes/pages.pug a(href='#bottom') [Bottom] @@ -26,6 +25,7 @@ block content +post(post, true) hr(size=1) nav.pages#bottom + include ../includes/pages.pug a(href='#top') [Top] | a(href=`/${board._id}/catalog.html`) [Catalog] diff --git a/views/pages/thread.pug b/views/pages/thread.pug index 8a773247..8854d2fd 100644 --- a/views/pages/thread.pug +++ b/views/pages/thread.pug @@ -12,7 +12,6 @@ block head block content include ../includes/boardheader.pug include ../includes/postform.pug - .mode Posting mode: Reply nav.pages#top a(href='#bottom') [Bottom] |