From 7e05905372ed86214fe176fe3bfaaddb78893ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 31 May 2023 21:15:33 -0400 Subject: [PATCH] some mobile fixes for tables and headers --- .../en-GB/admin/appearance/customise.json | 1 + .../en-GB/admin/appearance/skins.json | 2 + .../en-GB/admin/appearance/themes.json | 2 + public/language/en-GB/admin/settings/api.json | 2 + src/views/admin/advanced/errors.tpl | 48 +-- src/views/admin/appearance/customise.tpl | 116 ++++---- src/views/admin/appearance/skins.tpl | 22 +- src/views/admin/appearance/themes.tpl | 21 +- src/views/admin/dashboard/logins.tpl | 48 +-- src/views/admin/dashboard/searches.tpl | 32 +- src/views/admin/dashboard/topics.tpl | 35 +-- src/views/admin/dashboard/users.tpl | 48 +-- src/views/admin/extend/rewards.tpl | 13 +- src/views/admin/manage/admins-mods.tpl | 8 +- src/views/admin/manage/categories.tpl | 2 +- src/views/admin/manage/groups.tpl | 84 +++--- src/views/admin/manage/tags.tpl | 6 +- src/views/admin/manage/users.tpl | 8 +- .../partials/categories/category-rows.tpl | 11 +- .../admin/partials/download_plugin_item.tpl | 6 +- .../admin/partials/installed_plugin_item.tpl | 14 +- .../admin/partials/privileges/category.tpl | 278 +++++++++--------- .../admin/partials/privileges/global.tpl | 230 ++++++++------- src/views/admin/partials/save_button.tpl | 2 +- src/views/admin/settings/api.tpl | 157 +++++----- 25 files changed, 627 insertions(+), 569 deletions(-) diff --git a/public/language/en-GB/admin/appearance/customise.json b/public/language/en-GB/admin/appearance/customise.json index c95e62c0f0..3b6a7f1795 100644 --- a/public/language/en-GB/admin/appearance/customise.json +++ b/public/language/en-GB/admin/appearance/customise.json @@ -1,4 +1,5 @@ { + "customise": "Customise", "custom-css": "Custom CSS/SASS", "custom-css.description": "Enter your own CSS/SASS declarations here, which will be applied after all other styles.", "custom-css.enable": "Enable Custom CSS/SASS", diff --git a/public/language/en-GB/admin/appearance/skins.json b/public/language/en-GB/admin/appearance/skins.json index 4db6fbdd8a..a4c6f150de 100644 --- a/public/language/en-GB/admin/appearance/skins.json +++ b/public/language/en-GB/admin/appearance/skins.json @@ -1,7 +1,9 @@ { + "skins": "Skins", "loading": "Loading Skins...", "homepage": "Homepage", "select-skin": "Select Skin", + "revert-skin": "Revert Skin", "current-skin": "Current Skin", "skin-updated": "Skin Updated", "applied-success": "%1 skin was succesfully applied", diff --git a/public/language/en-GB/admin/appearance/themes.json b/public/language/en-GB/admin/appearance/themes.json index 597830f379..a6b65e46f3 100644 --- a/public/language/en-GB/admin/appearance/themes.json +++ b/public/language/en-GB/admin/appearance/themes.json @@ -1,7 +1,9 @@ { + "themes": "Themes", "checking-for-installed": "Checking for installed themes...", "homepage": "Homepage", "select-theme": "Select Theme", + "revert-theme": "Revert Theme", "current-theme": "Current Theme", "no-themes": "No installed themes found", "revert-confirm": "Are you sure you wish to restore the default NodeBB theme?", diff --git a/public/language/en-GB/admin/settings/api.json b/public/language/en-GB/admin/settings/api.json index 6fe1c23cc9..671e5eeb90 100644 --- a/public/language/en-GB/admin/settings/api.json +++ b/public/language/en-GB/admin/settings/api.json @@ -21,6 +21,8 @@ "last-seen-never": "This key has never been used.", "no-description": "No description specified.", "actions": "Actions", + "edit": "Edit", + "roll": "Roll", "delete-confirm": "Are you sure you wish to delete this token? It will not be recoverable.", "roll-confirm": "Are you sure you wish to regenerate this token? The old token will be immediately revoked and will not be recoverable." diff --git a/src/views/admin/advanced/errors.tpl b/src/views/admin/advanced/errors.tpl index 683b835fee..c582d4f022 100644 --- a/src/views/admin/advanced/errors.tpl +++ b/src/views/admin/advanced/errors.tpl @@ -50,29 +50,31 @@ [[admin/advanced/errors:error.404]]
- - - - - - - {{{ each not-found }}} - - - - - {{{ end }}} - {{{ if !not-found.length }}} - - - - {{{ end }}} - -
[[admin/advanced/errors:route]][[admin/advanced/errors:count]]
{./value}{./score}
-
- [[admin/advanced/errors:no-routes-not-found]] -
-
+
+ + + + + + + {{{ each not-found }}} + + + + + {{{ end }}} + {{{ if !not-found.length }}} + + + + {{{ end }}} + +
[[admin/advanced/errors:route]][[admin/advanced/errors:count]]
{./value}{./score}
+
+ [[admin/advanced/errors:no-routes-not-found]] +
+
+
diff --git a/src/views/admin/appearance/customise.tpl b/src/views/admin/appearance/customise.tpl index 3170480182..94bdbfb989 100644 --- a/src/views/admin/appearance/customise.tpl +++ b/src/views/admin/appearance/customise.tpl @@ -1,68 +1,76 @@ -
- +
+
+
+

[[admin/appearance/customise:customise]]

+ +
+
+ +
+
-
-
-

- [[admin/appearance/customise:custom-css.description]] -

-
- +
+
+
+

+ [[admin/appearance/customise:custom-css.description]] +

+
+ -
-
-
- - -
-
-
+
+
+
+ + +
+
+
-
-

- [[admin/appearance/customise:custom-js.description]] -

-
- +
+

+ [[admin/appearance/customise:custom-js.description]] +

+
+ -
-
-
- - -
-
-
+
+
+
+ + +
+
+
-
-

- [[admin/appearance/customise:custom-header.description]] -

+
+

+ [[admin/appearance/customise:custom-header.description]] +

-
- +
+ + +
+
+
+ + +
+
+
-
- - + + +
[[admin/appearance/customise:custom-css.livereload.description]]
- -
-
- - -
[[admin/appearance/customise:custom-css.livereload.description]]
-
-
- - \ No newline at end of file diff --git a/src/views/admin/appearance/skins.tpl b/src/views/admin/appearance/skins.tpl index f3bba94a1d..450caafb18 100644 --- a/src/views/admin/appearance/skins.tpl +++ b/src/views/admin/appearance/skins.tpl @@ -1,11 +1,17 @@ -
-
- [[admin/appearance/skins:loading]] +
+
+
+

[[admin/appearance/skins:skins]]

+
+
+
+ +
+
- -
- +
+
+ [[admin/appearance/skins:loading]] +
diff --git a/src/views/admin/appearance/themes.tpl b/src/views/admin/appearance/themes.tpl index d4e1cd8a4d..1daa2c24ac 100644 --- a/src/views/admin/appearance/themes.tpl +++ b/src/views/admin/appearance/themes.tpl @@ -1,9 +1,16 @@ -
-
- [[admin/appearance/themes:checking-for-installed]] +
+
+
+

[[admin/appearance/themes:themes]]

+
+
+ +
-
- \ No newline at end of file +
+
+ [[admin/appearance/themes:checking-for-installed]] +
+
+
diff --git a/src/views/admin/dashboard/logins.tpl b/src/views/admin/dashboard/logins.tpl index 4689f2233b..552ded83e1 100644 --- a/src/views/admin/dashboard/logins.tpl +++ b/src/views/admin/dashboard/logins.tpl @@ -4,28 +4,30 @@
[[admin/dashboard:details.logins-static, {loginDays}]]
- - - - - - - {{{ if !sessions.length}}} - - - - {{{ end }}} - {{{ each sessions }}} - - - - - {{{ end }}} - -
[[admin/manage/users:users.username]][[admin/dashboard:details.logins-login-time]]
[[admin/dashboard:details.no-logins]]
- {buildAvatar(./user, "18px", true)} - {./user.username} - {function.userAgentIcons} {../browser} {../version} on {../platform} -
+
+ + + + + + + {{{ if !sessions.length}}} + + + + {{{ end }}} + {{{ each sessions }}} + + + + + {{{ end }}} + +
[[admin/manage/users:users.username]][[admin/dashboard:details.logins-login-time]]
[[admin/dashboard:details.no-logins]]
+ {buildAvatar(./user, "18px", true)} + {./user.username} + {function.userAgentIcons} {../browser} {../version} on {../platform} +
+
\ No newline at end of file diff --git a/src/views/admin/dashboard/searches.tpl b/src/views/admin/dashboard/searches.tpl index 9bca96df6c..27bf1ca11d 100644 --- a/src/views/admin/dashboard/searches.tpl +++ b/src/views/admin/dashboard/searches.tpl @@ -1,22 +1,22 @@
-
-
-
- - -
-
- - -
-
- -
-
-
- + +
+ + +
+
+ + +
+
+ +
+ + + +
diff --git a/src/views/admin/dashboard/topics.tpl b/src/views/admin/dashboard/topics.tpl index 9f56cd8b3e..b4b69eca3b 100644 --- a/src/views/admin/dashboard/topics.tpl +++ b/src/views/admin/dashboard/topics.tpl @@ -2,22 +2,23 @@
- -
Count Term
- - {{{ if !topics.length}}} - - - - {{{ end }}} - {{{ each topics }}} - - - - - - {{{ end }}} - -
[[admin/dashboard:details.no-topics]]
{../title}[[topic:posted_by, {../user.username}]]
+
+ + + {{{ if !topics.length}}} + + + + {{{ end }}} + {{{ each topics }}} + + + + + + {{{ end }}} + +
[[admin/dashboard:details.no-topics]]
{../title}[[topic:posted_by, {../user.username}]]
+
\ No newline at end of file diff --git a/src/views/admin/dashboard/users.tpl b/src/views/admin/dashboard/users.tpl index c005c20444..4fbd026ef3 100644 --- a/src/views/admin/dashboard/users.tpl +++ b/src/views/admin/dashboard/users.tpl @@ -3,28 +3,30 @@ - - - - - - - - - {{{ if !users.length}}} - - - - {{{ end }}} - {{{ each users }}} - - - - - - - {{{ end }}} - -
[[admin/manage/users:users.uid]][[admin/manage/users:users.username]][[admin/manage/users:users.email]][[admin/manage/users:users.joined]]
[[admin/dashboard:details.no-logins]]
{../uid}{../username}{../email}
+
+ + + + + + + + + {{{ if !users.length}}} + + + + {{{ end }}} + {{{ each users }}} + + + + + + + {{{ end }}} + +
[[admin/manage/users:users.uid]][[admin/manage/users:users.username]][[admin/manage/users:users.email]][[admin/manage/users:users.joined]]
[[admin/dashboard:details.no-users]]
{../uid}{../username}{../email}
+
\ No newline at end of file diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index c6277b0607..5c17dda540 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -17,7 +17,7 @@ {{{ each active }}}
  • -
    +
    -
    +
    + - + - - - +
    diff --git a/src/views/admin/manage/admins-mods.tpl b/src/views/admin/manage/admins-mods.tpl index cf4cdc363c..db609949a7 100644 --- a/src/views/admin/manage/admins-mods.tpl +++ b/src/views/admin/manage/admins-mods.tpl @@ -6,7 +6,7 @@
    -
    +

    [[admin/manage/admins-mods:administrators]]

    @@ -24,7 +24,7 @@
    -
    +

    {{{ if globalMods.icon }}} {{{ end }}}[[admin/manage/admins-mods:global-moderators]]

    @@ -62,8 +62,8 @@
    {{{ end }}}
    -
    -
    +
    +
    {buildCategoryIcon(@value, "28px", "rounded-1")}
    {categoryMods.name}
    diff --git a/src/views/admin/manage/categories.tpl b/src/views/admin/manage/categories.tpl index 6eb6dee440..1c3ebc142b 100644 --- a/src/views/admin/manage/categories.tpl +++ b/src/views/admin/manage/categories.tpl @@ -4,7 +4,7 @@

    [[admin/manage/categories:manage-categories]]

    - + diff --git a/src/views/admin/manage/groups.tpl b/src/views/admin/manage/groups.tpl index 72faf9d15b..3879dac9c8 100644 --- a/src/views/admin/manage/groups.tpl +++ b/src/views/admin/manage/groups.tpl @@ -16,51 +16,53 @@
    - - - - - - - - - - - {{{ each groups }}} - - - - +
    +
    [[admin/manage/groups:name]][[admin/manage/groups:badge]][[admin/manage/groups:properties]]
    - {./displayName} ({./memberCount}) -

    {./description}

    -     		- {{{ if ./icon }}} {{{ end }}}{./userTitle} - - {{{ if ./system }}} - [[admin/manage/groups:system]] - {{{ end }}} - {{{ if ./private }}} - [[admin/manage/groups:private]] - {{{ end }}} - {{{ if ./hidden }}} - [[admin/manage/groups:hidden]] - {{{ end }}} -
    + + + + + + + + + + {{{ each groups }}} + + + + - - - {{{ end }}} - -
    [[admin/manage/groups:name]][[admin/manage/groups:badge]][[admin/manage/groups:properties]]
    + {./displayName} ({./memberCount}) +

    {./description}

    +     		+ {{{ if ./icon }}} {{{ end }}}{./userTitle} + + {{{ if ./system }}} + [[admin/manage/groups:system]] + {{{ end }}} + {{{ if ./private }}} + [[admin/manage/groups:private]] + {{{ end }}} + {{{ if ./hidden }}} + [[admin/manage/groups:hidden]] + {{{ end }}} + -
    - [[admin/admin:view]] +
    		+
    + [[admin/admin:view]] - [[admin/admin:edit]] + [[admin/admin:edit]] - -
    -
    + +
    + + + {{{ end }}} + + +
    diff --git a/src/views/admin/manage/tags.tpl b/src/views/admin/manage/tags.tpl index 02665ce770..edeff453c6 100644 --- a/src/views/admin/manage/tags.tpl +++ b/src/views/admin/manage/tags.tpl @@ -4,9 +4,9 @@

    [[admin/manage/tags:manage-tags]]

    -
    -
    - +
    +
    +
    diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl index 2360df5f9f..54cba3eb81 100644 --- a/src/views/admin/manage/users.tpl +++ b/src/views/admin/manage/users.tpl @@ -4,10 +4,10 @@

    [[admin/manage/users:manage-users]]

    -
    -
    -
    - +
    +
    +
    +
    -
    - - {function.spawnPrivilegeStates, privileges.groups.name, ../privileges} - - {{{ end }}} - - - - - -
    - - - - -
    - - - - + {privileges.groups.name} + + +
    + + +
    + + +
    + +
    + + {function.spawnPrivilegeStates, privileges.groups.name, ../privileges} + + {{{ end }}} + + + + + +
    + + + + +
    + + + + +
    [[admin/manage/categories:privileges.inherit]]
    @@ -90,61 +92,63 @@
    - - - - + + + + + +
    -
    - - - - {{{ if privileges.columnCountUserOther }}} - +
    + + + + + + + + + {{{ each privileges.labels.users }}} + {{{ end }}} - - - - - - - {{{ each privileges.labels.users }}} - + + + + {{{ each privileges.users }}} + + + + + {function.spawnPrivilegeStates, privileges.users.username, ../privileges} + {{{ end }}} - - - - {{{ each privileges.users }}} - - - - - {function.spawnPrivilegeStates, privileges.users.username, ../privileges} - - {{{ end }}} - - - - - - - -
    +
    + + + + {{{ if privileges.columnCountUserOther }}} + + {{{ end }}} +
    +
    [[admin/manage/categories:privileges.section-user]][[admin/manage/privileges:select-clear-all]]{@value}
    [[admin/manage/categories:privileges.section-user]][[admin/manage/privileges:select-clear-all]]{@value}
    + {buildAvatar(privileges.users, "24px", true)} + {{{ if privileges.users.banned }}} + + {{{ end }}} + {privileges.users.username} + + + +
    + +
    +
    - {buildAvatar(privileges.users, "24px", true)} - {{{ if privileges.users.banned }}} - - {{{ end }}} - {privileges.users.username} - - - -
    - -
    -
    -
    - -
    -
    + +
    +
    + +
    +
    +
    diff --git a/src/views/admin/partials/privileges/global.tpl b/src/views/admin/partials/privileges/global.tpl index ab5f6eb1a1..614b3635a8 100644 --- a/src/views/admin/partials/privileges/global.tpl +++ b/src/views/admin/partials/privileges/global.tpl @@ -1,124 +1,128 @@ - - - {{{ if !isAdminPriv }}} - - - - {{{ end }}} - - - - {{{ each privileges.labels.groups }}} - +
    +
    -
    - - - - {{{ if privileges.columnCountGroupOther }}} - - {{{ end }}} -
    -
    [[admin/manage/categories:privileges.section-group]][[admin/manage/privileges:select-clear-all]]{@value}
    + + {{{ if !isAdminPriv }}} + + + {{{ end }}} - - - - {{{ each privileges.groups }}} - - + + + {{{ each privileges.labels.groups }}} + + {{{ end }}} + + + + {{{ each privileges.groups }}} + + - - - {function.spawnPrivilegeStates, privileges.groups.name, ../privileges} - - {{{ end }}} - - - - - - - -
    +
    + + + + {{{ if privileges.columnCountGroupOther }}} + + {{{ end }}} +
    +
    - {{{ if privileges.groups.isPrivate }}} - {{{ if (privileges.groups.name == "banned-users") }}} - +
    [[admin/manage/categories:privileges.section-group]][[admin/manage/privileges:select-clear-all]]{@value}
    + {{{ if privileges.groups.isPrivate }}} + {{{ if (privileges.groups.name == "banned-users") }}} + + {{{ else }}} + + {{{ end }}} {{{ else }}} - + {{{ end }}} - {{{ else }}} - - {{{ end }}} - {privileges.groups.name} -
    -
    - -
    -
    + {privileges.groups.name} + + + + {function.spawnPrivilegeStates, privileges.groups.name, ../privileges} + + {{{ end }}} + + + + + +
    + +
    + + + + +
    [[admin/manage/categories:privileges.inherit]]
    - - - {{{ if !isAdminPriv }}} - - - - {{{ end }}} - - - - {{{ each privileges.labels.users }}} - +
    +
    -
    - - - - {{{ if privileges.columnCountUserOther }}} - - {{{ end }}} -
    -
    [[admin/manage/categories:privileges.section-user]][[admin/manage/privileges:select-clear-all]]{@value}
    + + {{{ if !isAdminPriv }}} + + + {{{ end }}} - - - - {{{ each privileges.users }}} - - - + + + {{{ each privileges.labels.users }}} + {{{ end }}} - {privileges.users.username} - - - {function.spawnPrivilegeStates, privileges.users.username, ../privileges} - - {{{ end }}} - - - - - - - -
    +
    + + + + {{{ if privileges.columnCountUserOther }}} + + {{{ end }}} +
    +
    - {{{ if ./picture }}} - - {{{ else }}} -
    {../icon:text}
    - {{{ end }}} -     		- {{{ if privileges.users.banned }}} - +
    [[admin/manage/categories:privileges.section-user]][[admin/manage/privileges:select-clear-all]]{@value}
    -
    - -
    -
    + + + + {{{ each privileges.users }}} + + + {{{ if ./picture }}} + + {{{ else }}} +
    {../icon:text}
    + {{{ end }}} + + + {{{ if privileges.users.banned }}} + + {{{ end }}} + {privileges.users.username} + + + {function.spawnPrivilegeStates, privileges.users.username, ../privileges} + + {{{ end }}} + + + + + +
    + +
    + + + + +
    diff --git a/src/views/admin/partials/save_button.tpl b/src/views/admin/partials/save_button.tpl index ec5c298896..c2c7646841 100644 --- a/src/views/admin/partials/save_button.tpl +++ b/src/views/admin/partials/save_button.tpl @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/src/views/admin/settings/api.tpl b/src/views/admin/settings/api.tpl index 3a42fffd07..d38b546a37 100644 --- a/src/views/admin/settings/api.tpl +++ b/src/views/admin/settings/api.tpl @@ -1,12 +1,8 @@ -
    -

    [[admin/settings/api:lead-text]]

    -

    [[admin/settings/api:intro]]

    -

    [[admin/settings/api:warning]]

    -
    - - - [[admin/settings/api:docs]] - +
    +
    +

    {title}

    +
    +
    +
    - - - - - - - - - - - - - {{{ each tokens }}} - - - - - - - - - {{{ end }}} - -
    [[admin/settings/api:token]][[admin/settings/api:description]][[admin/settings/api:uid]][[admin/settings/api:last-seen]][[admin/settings/api:created]][[admin/settings/api:actions]]
    - - - {./token} - - {{{ if ./description }}} - {./description} - {{{ else }}} - [[admin/settings/api:no-description]] - {{{ end }}} - - {{{ if (./uid == "0") }}} - [[admin/settings/api:master-token]] - {{{ else }}} - {./uid} - {{{ end }}} - - {{{ if ./lastSeen }}} - - {{{ else }}} - [[admin/settings/api:last-seen-never]] - {{{ end }}} - - - - - - -
    + +

    [[admin/settings/api:lead-text]]

    +

    [[admin/settings/api:intro]]

    +

    [[admin/settings/api:warning]]

    +
    + + + [[admin/settings/api:docs]] + +
    -
    -
    [[admin/settings/api:settings]]
    -
    -
    - - -

    [[admin/settings/api:require-https-caveat]]

    -
    +
    +
    + + +

    [[admin/settings/api:require-https-caveat]]

    + +
    + + + + + + + + + + + + + {{{ each tokens }}} + + + + + + + + + {{{ end }}} + +
    [[admin/settings/api:token]][[admin/settings/api:description]][[admin/settings/api:uid]][[admin/settings/api:last-seen]][[admin/settings/api:created]][[admin/settings/api:actions]]
    + + + {./token} + + {{{ if ./description }}} + {./description} + {{{ else }}} + [[admin/settings/api:no-description]] + {{{ end }}} + + {{{ if (./uid == "0") }}} + [[admin/settings/api:master-token]] + {{{ else }}} + {./uid} + {{{ end }}} + + {{{ if ./lastSeen }}} + + {{{ else }}} + [[admin/settings/api:last-seen-never]] + {{{ end }}} + + + + + + +
    +