fatchan
/
jschan
mirror of https://gitgud.io/fatchan/jschan.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add table-container and horscroll to new filter components for better mobile

Browse Source 
Fix "Filters FAQ" link placement on add/edit filters pages
Change filters table display to join filters anf put them in a textarea like e.g. ban appeals
Fix missing uplevel arg to editfilters managenav mixin
merge-requests/341/head
Thomas Lynch 11 months ago
parent 9c1b881b4b
commit 132b474a0d
7 changed files with 59 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      views/includes/filtereditform.pug
  2. 6
      views/includes/filternewform.pug
  3. 3
      views/mixins/filter.pug
  4. 10
      views/pages/editfilter.pug
  5. 10
      views/pages/globaleditfilter.pug
  6. 41
      views/pages/globalmanagefilters.pug
  7. 33
      views/pages/managefilters.pug

6
views/includes/filtereditform.pug
Unescape View File

@ -1,6 +1,6 @@
input(type='hidden' name='_csrf' value=csrf)
input(type='hidden' name='filter_id' value=filter._id)
.table-container.flex-center.mv-5
.table-container.flex-center.mv-5.horscroll
table
tr
th #{__('Filters')}
@ -11,7 +11,7 @@ input(type='hidden' name='filter_id' value=filter._id)
th #{__('Filter Bans Appealable')}
tr
td
textarea(name='filters' rows='2' placeholder=__('Newline separated') required) #{filter.filters.join('\n')}
textarea(name='filters' rows='10' placeholder=__('Newline separated') required) #{filter.filters.join('\n')}
td.text-center
input(type='checkbox', name='strict_filtering', value='true', checked=filter.strictFiltering)
td
@ -25,4 +25,4 @@ input(type='hidden' name='filter_id' value=filter._id)
input(type='text' name='filter_ban_duration' placeholder=__('e.g. 3d') value=filter.filterBanDuration)
td.text-center
input(type='checkbox', name='filter_ban_appealable', value='true', checked=filter.filterBanAppealable)
input(type='submit', value=__('Save'))
input(type='submit', value=__('Save'))

6
views/includes/filternewform.pug
Unescape View File

@ -1,5 +1,5 @@
input(type='hidden' name='_csrf' value=csrf)
.table-container.flex-center.mv-5
.table-container.mv-5.horscroll
table
tr
th #{__('Filters')}
@ -10,7 +10,7 @@ input(type='hidden' name='_csrf' value=csrf)
th #{__('Filter Bans Appealable')}
tr
td
textarea(name='filters' rows='2' placeholder=__('Newline separated') required)
textarea(name='filters' rows='3' placeholder=__('Newline separated') required)
td.text-center
label
input(type='checkbox', name='strict_filtering', value='true')
@ -26,4 +26,4 @@ input(type='hidden' name='_csrf' value=csrf)
td.text-center
label
input(type='checkbox', name='filter_ban_appealable', value='true')
input(type='submit', value=__('Submit'))
input(type='submit', value=__('Submit'))

3
views/mixins/filter.pug
Unescape View File

@ -4,8 +4,7 @@ mixin filter(f, globalmanage=false)
td
input.left.post-check(type='checkbox', name='checkedfilters' value=f._id)
td
each line in f.filters
pre.no-m-p.nowrap #{line}
textarea(rows='2' readonly=true) #{f.filters.join('\n')}
td.text-center
label
input(type='checkbox', name='strict_filtering', value='true', checked=f.strictFiltering, disabled='true')

10
views/pages/editfilter.pug
Unescape View File

@ -8,11 +8,13 @@ block head
block content
+boardheader(__('Edit Filter'))
br
+managenav('filters')
+managenav('filters', true)
hr(size=1)
h4.mv-5
a(href='/faq.html#filters') #{__('Filters FAQ')}:
h4.mv-5 #{__('Edit Filter')}:
h4.no-m-p
| #{__('Edit Filter')}
| (
a(href='/faq.html#filters') #{__('Filters FAQ')}
| ):
.form-wrapper.flex-center.mv-10
form.form-post(action=`/forms/board/${board._id}/editfilter` method='POST')
include ../includes/filtereditform.pug

10
views/pages/globaleditfilter.pug
Unescape View File

@ -9,10 +9,12 @@ block content
br
+globalmanagenav('filters', true)
hr(size=1)
h4.mv-5
a(href='/faq.html#filters') #{__('Filters FAQ')}:
h4.no-m-p #{__('Edit Filter')}:
h4.no-m-p
| #{__('Edit Filter')}
| (
a(href='/faq.html#filters') #{__('Filters FAQ')}
| ):
include ../includes/stickynav.pug
.form-wrapper.flex-center.mv-10
form.form-post(action='/forms/global/editfilter' method='POST')
include ../includes/filtereditform.pug
include ../includes/filtereditform.pug

41
views/pages/globalmanagefilters.pug
Unescape View File

@ -10,28 +10,31 @@ block content
br
+globalmanagenav('filters')
hr(size=1)
h4.mv-5
a(href='/faq.html#filters') #{__('Filters FAQ')}:
h4.no-m-p #{__('Add Filter')}:
h4.no-m-p
| #{__('Add Filter')}
| (
a(href='/faq.html#filters') #{__('Filters FAQ')}
| ):
.form-wrapper.flexleft
form.form-post(action='/forms/global/addfilter', enctype='application/x-www-form-urlencoded', method='POST')
include ../includes/filternewform.pug
if filters.length > 0
hr(size=1)
h4.no-m-p #{__('Manage Filters')}:
.form-wrapper.flexleft
form.form-post(action='/forms/global/deletefilter', enctype='application/x-www-form-urlencoded', method='POST')
input(type='hidden' name='_csrf' value=csrf)
table
tr
th
th #{__('Filters')}
th #{__('Strict Filtering')}
th #{__('Filter Mode')}
th #{__('Block/Ban Message')}
th #{__('Filter Auto Ban Duration')}
th #{__('Filter Bans Appealable')}
th #{__('Edit')}
each f in filters
+filter(f, true)
input(type='submit', value=__('Delete'))
.form-wrapper.flexleft
form.form-post(action='/forms/global/deletefilter', enctype='application/x-www-form-urlencoded', method='POST')
input(type='hidden' name='_csrf' value=csrf)
.table-container.mv-5.horscroll
table
tr
th
th #{__('Filters')}
th #{__('Strict Filtering')}
th #{__('Filter Mode')}
th #{__('Block/Ban Message')}
th #{__('Filter Auto Ban Duration')}
th #{__('Filter Bans Appealable')}
th #{__('Edit')}
each f in filters
+filter(f, true)
input(type='submit', value=__('Delete'))

33
views/pages/managefilters.pug
Unescape View File

@ -11,9 +11,11 @@ block content
br
+managenav('filters')
hr(size=1)
h4.mv-5
a(href='/faq.html#filters') #{__('Filters FAQ')}:
h4.mv-5 #{__('Add Filter')}:
h4.no-m-p
| #{__('Add Filter')}
| (
a(href='/faq.html#filters') #{__('Filters FAQ')}
| ):
.form-wrapper.flexleft
form.form-post(action=`/forms/board/${board._id}/addfilter`, enctype='application/x-www-form-urlencoded', method='POST')
include ../includes/filternewform.pug
@ -23,16 +25,17 @@ block content
.form-wrapper.flexleft
form.form-post(action=`/forms/board/${board._id}/deletefilter`, enctype='application/x-www-form-urlencoded', method='POST')
input(type='hidden' name='_csrf' value=csrf)
table
tr
th
th #{__('Filters')}
th #{__('Strict Filtering')}
th #{__('Filter Mode')}
th #{__('Block/Ban Message')}
th #{__('Filter Auto Ban Duration')}
th #{__('Filter Bans Appealable')}
th #{__('Edit')}
each f in filters
+filter(f)
.table-container.mv-5.horscroll
table
tr
th
th #{__('Filters')}
th #{__('Strict Filtering')}
th #{__('Filter Mode')}
th #{__('Block/Ban Message')}
th #{__('Filter Auto Ban Duration')}
th #{__('Filter Bans Appealable')}
th #{__('Edit')}
each f in filters
+filter(f)
input(type='submit', value=__('Delete'))

Write Preview
Loading…
Cancel
Save