diff --git a/less/flags.less b/less/flags.less new file mode 100644 index 0000000..f84218a --- /dev/null +++ b/less/flags.less @@ -0,0 +1,15 @@ +.page-flags { + [component="flags/list"] { + td { + max-width: 300px; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + } + + [component="flags/list/description"] { + font-style: italic; + color: @gray-light; + } + } +} \ No newline at end of file diff --git a/less/persona.less b/less/persona.less index 77e5f09..b03543c 100644 --- a/less/persona.less +++ b/less/persona.less @@ -17,6 +17,7 @@ @import "footer"; @import "posts_list"; @import "register"; +@import "flags"; @import "mobile"; diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl index d294845..a5bf6f7 100644 --- a/templates/account/edit.tpl +++ b/templates/account/edit.tpl @@ -7,9 +7,9 @@
diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl new file mode 100644 index 0000000..c9f1ee7 --- /dev/null +++ b/templates/flags/detail.tpl @@ -0,0 +1,201 @@ +
+
+ +
+
+

+
+ [[flags:back]] +
+ {target_readable} + +

+ +
+ + +
+
+ + + {target.user.username} + +
{target.user.icon:text}
+ + +
+
+

{target.user.username}

+ {target.content} +
+
+ + + +
+
+ + + {target.username} + +
{target.icon:text}
+ + +
+
+

{target.username}

+

+ [[flags:user-view]] | + [[flags:user-edit]] +

+
+
+ + + +
[[flags:target-purged]]
+ + +
+ +
+
+
+
+
+ +
+ + {reporter.username} + +
{reporter.icon:text}
+ + {reporter.username} +
+
+
+ +

+ {datetimeISO} +

+
+
+
+ +
{description}
+
+
+ + +
+
+ + +
+ +
+ +
+ +
+
+ + + +
+
+ +
+ +
[[flags:no-notes]]
+ + +
+
+ + + {../user.username} + +
{../user.icon:text}
+ + +
+
+

+ {../user.username} + +

+ {../content} +
+
+ +
+
+
+ + + +
+ + +
+ +
[[flags:no-history]]
+ + +
+
+ + + {../user.username} + +
{../user.icon:text}
+ + +
+
+

+ {../user.username} + +

+
    + +
  • + @key → @value +
    • + +
+
+
+ +
+
+
+
+
diff --git a/templates/flags/list.tpl b/templates/flags/list.tpl new file mode 100644 index 0000000..357b6ff --- /dev/null +++ b/templates/flags/list.tpl @@ -0,0 +1,67 @@ +
+
+ +
+
+
+
+
+
+

+ +

+
+
Daily flags
+
+
+ + +
+

+ [[flags:filter-reset]] +

+ [[flags:filter-active]] +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
[[flags:state]]
+
+ [[flags:no-flags]] +
+
[[flags:state-{../state}]] + + {../target_readable} — {../description} + + + + + +
{../reporter.icon:text}
+ + {../reporter.username} +
+
+
diff --git a/templates/partials/account/header.tpl b/templates/partials/account/header.tpl index 95103a0..1b3a7ef 100644 --- a/templates/partials/account/header.tpl +++ b/templates/partials/account/header.tpl @@ -3,9 +3,9 @@
- + -
{icon:text}
+
{icon:text}
diff --git a/templates/partials/account/menu.tpl b/templates/partials/account/menu.tpl index e879fca..96cec02 100644 --- a/templates/partials/account/menu.tpl +++ b/templates/partials/account/menu.tpl @@ -14,6 +14,9 @@
  • [[user:new_chat_with, {username}]]
    • +
  • + [[user:flag-profile]] +
  • diff --git a/templates/partials/flags/filters.tpl b/templates/partials/flags/filters.tpl new file mode 100644 index 0000000..06bc230 --- /dev/null +++ b/templates/partials/flags/filters.tpl @@ -0,0 +1,65 @@ +
    +
    +

    [[flags:quick-filters]]

    +
    +
    + +
    +
    + +
    +
    +

    [[flags:filters]]

    +
    +
    +
    +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + + +
    +
    +
    \ No newline at end of file diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl index c150740..d79ccb1 100644 --- a/templates/partials/menu.tpl +++ b/templates/partials/menu.tpl @@ -109,8 +109,8 @@
  • Moderator Tools
  • - - [[pages:flagged-posts]] + + [[pages:flagged-content]]
    • diff --git a/templates/partials/modals/flag_post_modal.tpl b/templates/partials/modals/flag_modal.tpl similarity index 54% rename from templates/partials/modals/flag_post_modal.tpl rename to templates/partials/modals/flag_modal.tpl index 1a0aeb7..66638da 100644 --- a/templates/partials/modals/flag_post_modal.tpl +++ b/templates/partials/modals/flag_modal.tpl @@ -4,25 +4,28 @@

    - [[topic:flag]] - Post #{pid} by - {username} + [[flags:modal-title]]

    +

    + [[flags:modal-body, {type}, {id}]] +

    - +
    -
    - -
    -
    - +
    +
    + +
    +
    + +
    - +
    diff --git a/templates/partials/users_list.tpl b/templates/partials/users_list.tpl index b1dd391..398522b 100644 --- a/templates/partials/users_list.tpl +++ b/templates/partials/users_list.tpl @@ -38,7 +38,7 @@
    - {users.flags} + {users.flags}