From fec7a9eb4714feea0f07c91a8e151a954625abe6 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 29 Nov 2016 22:11:26 -0500 Subject: [PATCH 01/23] WIP theme stuff for nodebb/nodebb#5232 --- less/flags.less | 15 +++++++ less/persona.less | 1 + templates/flags/detail.tpl | 47 ++++++++++++++++++++++ templates/flags/list.tpl | 47 ++++++++++++++++++++++ templates/partials/flags/quick-filters.tpl | 9 +++++ 5 files changed, 119 insertions(+) create mode 100644 less/flags.less create mode 100644 templates/flags/detail.tpl create mode 100644 templates/flags/list.tpl create mode 100644 templates/partials/flags/quick-filters.tpl 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/flags/detail.tpl b/templates/flags/detail.tpl new file mode 100644 index 0000000..56f0d43 --- /dev/null +++ b/templates/flags/detail.tpl @@ -0,0 +1,47 @@ +
+
+ +
+
+

+ {target_readable} + +

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

{target.user.username}

+ {target.content} +
+
+ +
+ +
+
+
+
+ + +
+
+
+
+
+
diff --git a/templates/flags/list.tpl b/templates/flags/list.tpl new file mode 100644 index 0000000..953c420 --- /dev/null +++ b/templates/flags/list.tpl @@ -0,0 +1,47 @@ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
[[flags:state]]
+
+ [[flags:no-flags]] +
+
{../state} + + {../target_readable} — {../description} + + + + + +
{../reporter.icon:text}
+ + {../reporter.username} +
+
+
diff --git a/templates/partials/flags/quick-filters.tpl b/templates/partials/flags/quick-filters.tpl new file mode 100644 index 0000000..d9d6f2b --- /dev/null +++ b/templates/partials/flags/quick-filters.tpl @@ -0,0 +1,9 @@ +
+
+

[[flags:quick-filters]]

+
+ +
\ No newline at end of file From 67074e1b6382a5454bf48833231027a526e6fdd7 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 30 Nov 2016 20:34:40 -0500 Subject: [PATCH 02/23] corresponds to nodebb/nodebb@c5c2d27, nodebb/nodebb#5232 --- templates/flags/detail.tpl | 47 +++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl index 56f0d43..9db261b 100644 --- a/templates/flags/detail.tpl +++ b/templates/flags/detail.tpl @@ -12,11 +12,11 @@
- + - {target.user.username} + {target.user.username} -
{target.user.icon:text}
+
{target.user.icon:text}
@@ -40,7 +40,48 @@
+
+ + +
+ + + +
+ +
+
+ + +
+
+ + +
+
+ + + {../user.username} + +
{../user.icon:text}
+ + +
+
+

+ {../user.username} + +

+ {../content} +
+
+ From 53da2fc5513ef61bf1760c7193e11b2d34eb9b80 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 1 Dec 2016 11:42:32 -0500 Subject: [PATCH 03/23] companion to nodebb/nodebb@d9d60c2, nodebb/nodebb#5232 --- templates/flags/detail.tpl | 46 ++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl index 9db261b..59cb01a 100644 --- a/templates/flags/detail.tpl +++ b/templates/flags/detail.tpl @@ -30,10 +30,10 @@
-
+
- @@ -42,7 +42,7 @@
- @@ -58,30 +58,32 @@
+
- - -
-
- - - {../user.username} - -
{../user.icon:text}
- - -
-
-

- {../user.username} - -

- {../content} +
+ +
+
+ + + {../user.username} + +
{../user.icon:text}
+ + +
+
+

+ {../user.username} + +

+ {../content} +
+
-
From 1c437a7a485a740b9d57e1113eadd479490a421e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 1 Dec 2016 16:22:28 -0500 Subject: [PATCH 04/23] companion to nodebb/nodebb@f1d144f, nodebb/nodebb#5232 --- templates/flags/detail.tpl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl index 59cb01a..3d5ebba 100644 --- a/templates/flags/detail.tpl +++ b/templates/flags/detail.tpl @@ -4,6 +4,9 @@

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

@@ -85,6 +88,32 @@
+
+ +
+ +
+
+ + + {../user.username} + +
{../user.icon:text}
+ + +
+
+

+ {../user.username} + +

+ [[flags:updated]]: + @value  +
+
+ +
+
From da3086b1b42964f2941b7d4d3e5372ac81ee5716 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 1 Dec 2016 16:36:44 -0500 Subject: [PATCH 05/23] template tweaks for nodebb/nodebb#5232 --- templates/flags/detail.tpl | 6 ++++++ templates/flags/list.tpl | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl index 3d5ebba..b639244 100644 --- a/templates/flags/detail.tpl +++ b/templates/flags/detail.tpl @@ -66,6 +66,9 @@
+ +
[[flags:no-notes]]
+
@@ -91,6 +94,9 @@
+ +
[[flags:no-history]]
+
diff --git a/templates/flags/list.tpl b/templates/flags/list.tpl index 953c420..52d2304 100644 --- a/templates/flags/list.tpl +++ b/templates/flags/list.tpl @@ -24,7 +24,7 @@ - {../state} + [[flags:state-{../state}]] {../target_readable} — {../description} From a35d14f8f7dd8e1d59db98612d5db2bb582d0202 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 2 Dec 2016 09:32:07 -0500 Subject: [PATCH 06/23] fixed avatar size to match new avatar class rejigger --- templates/account/edit.tpl | 4 ++-- templates/partials/account/header.tpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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/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}
From 2317f45befed6391d8a538ed52236b61c522b67c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 2 Dec 2016 11:24:45 -0500 Subject: [PATCH 07/23] adding reporter info to flag details page --- templates/flags/detail.tpl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl index b639244..10bb93d 100644 --- a/templates/flags/detail.tpl +++ b/templates/flags/detail.tpl @@ -34,6 +34,25 @@
+
+
+ + +
+
+ +

+ {datetimeISO} +

+
+
- +
@@ -110,7 +110,7 @@
-
+
@@ -132,11 +132,10 @@ {../user.username} - [[flags:updated]]:
  • - {../attribute} → {../value} + {history.fields.attribute} → {history.fields.value}
diff --git a/templates/flags/list.tpl b/templates/flags/list.tpl index 52d2304..525b7f4 100644 --- a/templates/flags/list.tpl +++ b/templates/flags/list.tpl @@ -2,7 +2,7 @@
-
+
From 48b2841d7b7e2ba53a0f585d76ab9624b7597aaf Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 2 Dec 2016 15:28:51 -0500 Subject: [PATCH 10/23] companion to nodebb/nodebb@753d4b0, nodebb/nodebb#5232 --- templates/flags/detail.tpl | 4 +++ templates/partials/flags/quick-filters.tpl | 34 +++++++++++++++++++--- templates/partials/menu.tpl | 2 +- templates/partials/users_list.tpl | 2 +- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl index 5dde0f2..3489e94 100644 --- a/templates/flags/detail.tpl +++ b/templates/flags/detail.tpl @@ -53,6 +53,10 @@

+
+ +
{description}
+
+
+ +
+ + +
+ + + + \ No newline at end of file diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl index c150740..4282656 100644 --- a/templates/partials/menu.tpl +++ b/templates/partials/menu.tpl @@ -109,7 +109,7 @@
  • Moderator Tools
  • - + [[pages:flagged-posts]]
    • diff --git a/templates/partials/users_list.tpl b/templates/partials/users_list.tpl index b1dd391..34a72d3 100644 --- a/templates/partials/users_list.tpl +++ b/templates/partials/users_list.tpl @@ -38,7 +38,7 @@
    - {users.flags} + {users.flags}
    From 285d03b0d23d5273c39d7636fdc69d90ced076e5 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 5 Dec 2016 12:40:43 -0500 Subject: [PATCH 11/23] companion to nodebb/nodebb@8e1d441, nodebb/nodebb#5232 --- templates/flags/list.tpl | 8 ++++++++ templates/partials/flags/quick-filters.tpl | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/templates/flags/list.tpl b/templates/flags/list.tpl index 525b7f4..fdd6813 100644 --- a/templates/flags/list.tpl +++ b/templates/flags/list.tpl @@ -3,6 +3,14 @@
    + +
    +

    + [[flags:filter-reset]] +

    + [[flags:filter-active]] +
    +
    diff --git a/templates/partials/flags/quick-filters.tpl b/templates/partials/flags/quick-filters.tpl index 2d77933..5eed226 100644 --- a/templates/partials/flags/quick-filters.tpl +++ b/templates/partials/flags/quick-filters.tpl @@ -4,8 +4,7 @@
    From e37b2b9e8b0b3395485f9f25a496a565d3d579e7 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 5 Dec 2016 15:21:54 -0500 Subject: [PATCH 12/23] fix duplicate ids in detail and quick filter template #5232 --- templates/partials/flags/quick-filters.tpl | 23 ++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/templates/partials/flags/quick-filters.tpl b/templates/partials/flags/quick-filters.tpl index 5eed226..5c04692 100644 --- a/templates/partials/flags/quick-filters.tpl +++ b/templates/partials/flags/quick-filters.tpl @@ -16,18 +16,33 @@
    - - + +
    - -
    +
    + + +
    + +
    + + +
    +
    From ef2055673e79b9ec8afa1784cd51fbe6df65f394 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 6 Dec 2016 16:12:15 -0500 Subject: [PATCH 13/23] companion to nodebb/nodebb@9f90510, nodebb/nodebb#5232 --- templates/flags/detail.tpl | 21 +++++++++++++++++++++ templates/partials/flags/quick-filters.tpl | 5 +++++ 2 files changed, 26 insertions(+) diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl index 3489e94..bffbc46 100644 --- a/templates/flags/detail.tpl +++ b/templates/flags/detail.tpl @@ -115,6 +115,27 @@
    + + + +
    +
    diff --git a/templates/partials/flags/quick-filters.tpl b/templates/partials/flags/quick-filters.tpl index 5c04692..973a984 100644 --- a/templates/partials/flags/quick-filters.tpl +++ b/templates/partials/flags/quick-filters.tpl @@ -38,6 +38,11 @@
    +
    + + +
    +
    From d4592118bf4ccfb9257439f854c1a87038dc4eca Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 7 Dec 2016 12:07:46 -0500 Subject: [PATCH 14/23] companion to nodebb/nodebb@5dd892b, nodebb/nodebb#5232 --- templates/flags/detail.tpl | 23 +++++++++++++++++++ templates/partials/account/menu.tpl | 3 +++ .../{flag_post_modal.tpl => flag_modal.tpl} | 23 +++++++++++-------- 3 files changed, 39 insertions(+), 10 deletions(-) rename templates/partials/modals/{flag_post_modal.tpl => flag_modal.tpl} (54%) diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl index bffbc46..2a47132 100644 --- a/templates/flags/detail.tpl +++ b/templates/flags/detail.tpl @@ -13,6 +13,7 @@
    +
    @@ -28,6 +29,28 @@ {target.content}
    + + + +
    +
    + + + {target.username} + +
    {target.icon:text}
    + +     +
    +
    +

    {target.username}

    +

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

    +
    +
    +
    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/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}]] +

    - +
    -
    - -
    -
    - +
    +
    + +
    +
    + +
    - +
    From f93d2c42a64e6efb23cc067e66bf4e188a4454fb Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 7 Dec 2016 13:07:18 -0500 Subject: [PATCH 15/23] renaming user dropdown menu item --- templates/partials/menu.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl index 4282656..d79ccb1 100644 --- a/templates/partials/menu.tpl +++ b/templates/partials/menu.tpl @@ -110,7 +110,7 @@
  • Moderator Tools
  • - [[pages:flagged-posts]] + [[pages:flagged-content]]
    • From bf0f8725d6182d3e1cd6887bfdc00d261b06a4c9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 7 Dec 2016 15:34:07 -0500 Subject: [PATCH 16/23] changed history changeset labelling, nodebb/nodebb#5232 --- templates/flags/detail.tpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl index 2a47132..0af9104 100644 --- a/templates/flags/detail.tpl +++ b/templates/flags/detail.tpl @@ -183,7 +183,8 @@
    • - {history.fields.attribute} → {history.fields.value} + @key + @value
    From 59fb7f48c1670c44f2f86eda76149d457ba03f77 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 7 Dec 2016 15:43:05 -0500 Subject: [PATCH 17/23] some tweaks to history render in flag details --- templates/flags/detail.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl index 0af9104..be4e968 100644 --- a/templates/flags/detail.tpl +++ b/templates/flags/detail.tpl @@ -183,8 +183,7 @@
    • - @key - @value + @key → @value
    From 319737cd3663e0cdb56742cc5edc2afed9789c2e Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 9 Dec 2016 14:34:34 -0500 Subject: [PATCH 18/23] chart element for nodebb/nodebb#5232 --- templates/flags/list.tpl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/templates/flags/list.tpl b/templates/flags/list.tpl index fdd6813..ec53eff 100644 --- a/templates/flags/list.tpl +++ b/templates/flags/list.tpl @@ -3,6 +3,18 @@
    +
    +
    +
    +
    +

    + +

    +
    +
    Daily flags
    +
    +
    +

    From 7e33dae6667f7fdaed877c8863ec35f7b77dab69 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 14 Dec 2016 10:04:14 -0500 Subject: [PATCH 19/23] companion to nodebb/nodebb@e6768ab57286749821eec15cb69e39641139577a nodebb/nodebb#5232 --- templates/partials/flags/quick-filters.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/partials/flags/quick-filters.tpl b/templates/partials/flags/quick-filters.tpl index 973a984..314e434 100644 --- a/templates/partials/flags/quick-filters.tpl +++ b/templates/partials/flags/quick-filters.tpl @@ -18,6 +18,7 @@

    +
    + + +
    +
    From b52cec05fa7f6ca015f2a7c029f5ce1397339050 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 16 Dec 2016 14:00:17 -0500 Subject: [PATCH 21/23] fixed link to flags page in users page --- templates/partials/users_list.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/partials/users_list.tpl b/templates/partials/users_list.tpl index 34a72d3..398522b 100644 --- a/templates/partials/users_list.tpl +++ b/templates/partials/users_list.tpl @@ -38,7 +38,7 @@
    - {users.flags} + {users.flags}
    From c54b0a9dda8e5bfa5d9508b5b35c3739492ac455 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 19 Dec 2016 11:17:28 -0500 Subject: [PATCH 22/23] companion to nodebb/nodebb@ad633aad, nodebb/nodebb#5232 --- templates/flags/detail.tpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl index 3832e41..c9f1ee7 100644 --- a/templates/flags/detail.tpl +++ b/templates/flags/detail.tpl @@ -52,6 +52,10 @@
    + +
    [[flags:target-purged]]
    + +
    From 58d54078f14c615150e1605ca0533760e73d95e8 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 3 Jan 2017 13:39:52 -0500 Subject: [PATCH 23/23] companion to nodebb/nodebb@541f51e, nodebb/nodebb#5232 --- templates/partials/flags/filters.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/partials/flags/filters.tpl b/templates/partials/flags/filters.tpl index eab5bf3..06bc230 100644 --- a/templates/partials/flags/filters.tpl +++ b/templates/partials/flags/filters.tpl @@ -41,7 +41,7 @@
    -