diff --git a/src/views/400.tpl b/src/views/400.tpl index c36f1b2f48..6658e27f99 100644 --- a/src/views/400.tpl +++ b/src/views/400.tpl @@ -1,12 +1,9 @@
[[global:400.title]] - -

{error}

- -

[[global:400.message, {config.relative_path}]]

- - +

{{{ if error }}}{error}{{{ else }}}[[global:400.message, {config.relative_path}]]{{{ end }}}

+ + {{{ if returnLink }}}

[[error:goback]]

- + {{{ end }}}
diff --git a/src/views/403.tpl b/src/views/403.tpl index bf93b496cd..a68d8672f8 100644 --- a/src/views/403.tpl +++ b/src/views/403.tpl @@ -1,16 +1,13 @@
[[global:403.title]] - -

{error}

- -

[[global:403.message]]

- - +

{{{ if error }}}{error}{{{ else }}}[[global:403.message]]{{{ end }}}

+ + {{{ if returnLink }}}

[[error:goback]]

- + {{{ end }}} - + {{{ if !loggedIn }}}

[[global:403.login, {config.relative_path}]]

- + {{{ end }}}
\ No newline at end of file diff --git a/src/views/404.tpl b/src/views/404.tpl index 2a0a645bc8..5d1fb9d43c 100644 --- a/src/views/404.tpl +++ b/src/views/404.tpl @@ -1,8 +1,4 @@
{path} [[global:404.title]] - -

{error}

- -

[[global:404.message, {config.relative_path}]]

- +

{{{ if error }}}{error}{{{ else }}}[[global:404.message, {config.relative_path}]]{{{ end }}}

\ No newline at end of file diff --git a/src/views/500.tpl b/src/views/500.tpl index 7795fbbf8a..e0ddffae26 100644 --- a/src/views/500.tpl +++ b/src/views/500.tpl @@ -2,9 +2,9 @@ [[global:500.title]]

[[global:500.message]]

{path}

-

{error}

+ {{{ if error }}}

{error}

{{{ end }}} - + {{{ if returnLink }}}

[[error:goback]]

- + {{{ end }}} diff --git a/src/views/503.tpl b/src/views/503.tpl index 5bd60e430d..2654ab8429 100644 --- a/src/views/503.tpl +++ b/src/views/503.tpl @@ -1,6 +1,6 @@

[[pages:maintenance.text, {site_title}]]

- +{{{ if message }}}

[[pages:maintenance.messageIntro]]

@@ -9,4 +9,4 @@
- \ No newline at end of file +{{{ end }}} \ No newline at end of file diff --git a/src/views/admin/advanced/database.tpl b/src/views/admin/advanced/database.tpl index 6646cc984f..311ff9deef 100644 --- a/src/views/admin/advanced/database.tpl +++ b/src/views/admin/advanced/database.tpl @@ -22,9 +22,9 @@ [[admin/advanced/database:mongo.data-size]] [[admin/advanced/database:x-gb, {mongo.dataSize}]]
[[admin/advanced/database:mongo.storage-size]] [[admin/advanced/database:x-gb, {mongo.storageSize}]]
[[admin/advanced/database:mongo.index-size]] [[admin/advanced/database:x-gb, {mongo.indexSize}]]
- + {{{ if mongo.fileSize }}} [[admin/advanced/database:mongo.file-size]] [[admin/advanced/database:x-gb, {mongo.fileSize}]]
- + {{{ end }}}
[[admin/advanced/database:mongo.resident-memory]] [[admin/advanced/database:x-gb, {mongo.mem.resident}]]
[[admin/advanced/database:mongo.virtual-memory]] [[admin/advanced/database:x-gb, {mongo.mem.virtual}]]
diff --git a/src/views/admin/advanced/errors.tpl b/src/views/admin/advanced/errors.tpl index 5b84d04aeb..bf70584e5a 100644 --- a/src/views/admin/advanced/errors.tpl +++ b/src/views/admin/advanced/errors.tpl @@ -55,13 +55,13 @@ [[admin/advanced/errors:count]] - + {{{ each not-found }}} - {../value} - {../score} + {./value} + {./score} - - + {{{ end }}} + {{{ if !not-found.length }}}
@@ -69,7 +69,7 @@
- + {{{ end }}} diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl index 2fab55dbba..d5d0fa8022 100644 --- a/src/views/admin/advanced/events.tpl +++ b/src/views/admin/advanced/events.tpl @@ -13,7 +13,7 @@ #{events.eid} {events.type} uid {events.uid} - {events.ip} + {{{ if events.ip }}}{events.ip}{{{ end }}} {buildAvatar(events.user, "24px", true)} {events.user.username} @@ -35,9 +35,9 @@
diff --git a/src/views/admin/dashboard.tpl b/src/views/admin/dashboard.tpl index d353849c73..7a7ca43f24 100644 --- a/src/views/admin/dashboard.tpl +++ b/src/views/admin/dashboard.tpl @@ -70,21 +70,21 @@
[[admin/dashboard:control-panel]]
- - + +
- + {{{ if lastrestart }}}

[[admin/dashboard:last-restarted-by]]
{lastrestart.user.username}

- -

- + {{{ end }}} +

+ {{{ if canRestart }}} [[admin/dashboard:restart-warning]] - + {{{ else }}} [[admin/dashboard:restart-disabled]] - + {{{ end }}}

[[admin/dashboard:maintenance-mode]] @@ -106,26 +106,26 @@

[[admin/dashboard:updates]]
-
+

[[admin/dashboard:running-version, {version}]]

- + {{{ if lookupFailed }}} [[admin/dashboard:latest-lookup-failed]] - - - + {{{ else }}} + {{{ if upgradeAvailable }}} + {{{ if currentPrerelease }}} [[admin/dashboard:prerelease-upgrade-available, {latestVersion}]] - + {{{ else }}} [[admin/dashboard:upgrade-available, {latestVersion}]] - - - + {{{ end }}} + {{{ else }}} + {{{ if currentPrerelease }}} [[admin/dashboard:prerelease-warning]] - + {{{ else }}} [[admin/dashboard:up-to-date]] - - - + {{{ end }}} + {{{ end }}} + {{{ end }}}

@@ -137,17 +137,17 @@

[[admin/dashboard:notices]]
- + {{{ each notices}}}
- - {notices.doneText} - - - {notices.notDoneText} - - + {{{ if ./done }}} + {./doneText} + {{{ else }}} + {{{ if ./link }}}{{{ end }}} + {./notDoneText} + {{{ if ./link }}}{{{ end }}} + {{{ end }}}
- + {{{ end }}}
diff --git a/src/views/admin/development/info.tpl b/src/views/admin/development/info.tpl index 44cd32b1f6..4b4c97f878 100644 --- a/src/views/admin/development/info.tpl +++ b/src/views/admin/development/info.tpl @@ -24,7 +24,7 @@ - + {{{ each info }}} {info.os.hostname}:{info.process.port} @@ -50,7 +50,7 @@ {info.os.load} {info.process.uptimeHumanReadable} - + {{{ end }}}
diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl index 8c6491a4c5..c93c22fbac 100644 --- a/src/views/admin/extend/plugins.tpl +++ b/src/views/admin/extend/plugins.tpl @@ -51,9 +51,9 @@
    - + {{{ each installed }}} - + {{{ end }}}
@@ -71,9 +71,9 @@
    - + {{{ each download }}} - + {{{ end }}}
@@ -90,7 +90,7 @@
- checked/> +
diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl index 8f624bae8c..c8100f798d 100644 --- a/src/views/admin/extend/rewards.tpl +++ b/src/views/admin/extend/rewards.tpl @@ -32,9 +32,9 @@
@@ -58,11 +58,11 @@
- + {{{ if active.disabled }}} - + {{{ else }}} - + {{{ end }}}
diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl index b273d85af7..e25b4e3d93 100644 --- a/src/views/admin/extend/widgets.tpl +++ b/src/views/admin/extend/widgets.tpl @@ -6,7 +6,7 @@
@@ -15,10 +15,10 @@
{{{ each templates }}} -
+
{{{ each templates.areas }}} -
-

{../name} {templates.template} / {../location}

+
+

{./name} {templates.template} / {./location}

@@ -37,32 +37,32 @@

[[admin/extend/widgets:explanation]]

- + {{{ if !availableWidgets.length }}}
[[admin/extend/widgets:none-installed, {config.relative_path}/admin/extend/plugins]]
- + {{{ end }}}

- + {{{ each availableWidgets }}}
-
+
- {availableWidgets.name} -
{availableWidgets.description} + {./name} +
{./description}
- + {{{ end }}}
@@ -71,11 +71,11 @@
diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl index 001e35c459..ef1354cd08 100644 --- a/src/views/admin/header.tpl +++ b/src/views/admin/header.tpl @@ -19,9 +19,9 @@ - - - + {{{ each scripts }}} + + {{{ end }}} diff --git a/src/views/admin/manage/admins-mods.tpl b/src/views/admin/manage/admins-mods.tpl index 442c0b590c..c3d386e238 100644 --- a/src/views/admin/manage/admins-mods.tpl +++ b/src/views/admin/manage/admins-mods.tpl @@ -1,28 +1,28 @@
-

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

+

{{{ if admins.icon }}} {{{ end }}}[[admin/manage/admins-mods:administrators]]

- + {{{ each admins.members }}}
{buildAvatar(admins.members, "24px", true)} {admins.members.username}
- + {{{ end }}}
-

[[admin/manage/admins-mods:global-moderators]]

+

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

- + {{{ each globalMods.members }}}
{buildAvatar(globalMods.members, "24px", true)} {globalMods.members.username}
- + {{{ end }}}
[[admin/manage/admins-mods:no-global-moderators]]
diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl index 2698f0079b..5cfd56aafc 100644 --- a/src/views/admin/manage/category.tpl +++ b/src/views/admin/manage/category.tpl @@ -61,11 +61,11 @@ - + - + {{{ each customClasses }}} - + {{{ end }}}
@@ -125,7 +125,7 @@
- checked /> +
@@ -148,9 +148,9 @@
@@ -164,14 +164,14 @@ [[admin/manage/categories:upload-image]]
- + {{{ if category.backgroundImage }}}
- + {{{ end }}}
@@ -185,11 +185,11 @@
-
+
- @@ -210,12 +210,12 @@
- + {buildAvatar(delivery, "24px", true)} {./username} + {{{if ./setting}}}{./setting}{{{else}}}[[admin/manage/digest:default]]{{{end}}} + {./lastDelivery} + - - + {{{ end }}} + {{{ if !delivery.length }}}
@@ -29,7 +29,7 @@
- + {{{ end }}} diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl index 91946fade8..318849c2ed 100644 --- a/src/views/admin/manage/group.tpl +++ b/src/views/admin/manage/group.tpl @@ -4,7 +4,7 @@
- readonly/>
+
@@ -16,14 +16,14 @@
- {group.userTitle} + {group.userTitle}

-
+
@@ -44,7 +44,7 @@
@@ -52,16 +52,16 @@
@@ -69,7 +69,7 @@
@@ -87,7 +87,7 @@
diff --git a/src/views/admin/manage/groups.tpl b/src/views/admin/manage/groups.tpl index ebe99459b1..92ef545dcc 100644 --- a/src/views/admin/manage/groups.tpl +++ b/src/views/admin/manage/groups.tpl @@ -18,25 +18,25 @@ - - + {{{ each groups }}} + - {groups.displayName} ({groups.memberCount}) -

{groups.description}

+ {./displayName} ({./memberCount}) +

{./description}

- {groups.userTitle} + {{{ 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 }}} @@ -49,7 +49,7 @@
- + {{{ end }}} diff --git a/src/views/admin/manage/registration.tpl b/src/views/admin/manage/registration.tpl index e4005335f4..146db16602 100644 --- a/src/views/admin/manage/registration.tpl +++ b/src/views/admin/manage/registration.tpl @@ -4,11 +4,11 @@
[[admin/manage/registration:queue]]
- + {{{ if !users.length }}}

[[admin/manage/registration:description, {config.relative_path}/admin/settings/user#user-registration]]

- + {{{ end }}}
@@ -17,65 +17,65 @@ - - - + {{{ each customHeaders }}} + + {{{ end }}} {{{ each users }}} - + - {{{ each users.customRows }}} - + {{{ each ./customRows }}} + {{{ end }}} - + - + {{{ if showPids }}}{{{ end }}} - + {{{ each files }}} - + {{{ if files.isDirectory }}} - + {{{ end }}} - + {{{ if files.isFile }}} - + {{{ end }}} - + {{{ if showPids }}} - + {{{ end }}} - + - + - + {{{ end }}}
[[admin/manage/registration:list.email]]
- - - - + {{{ if ./usernameSpam }}} + + {{{ else }}} + {{{ if ./spamChecked }}} - - - {users.username} + {{{ end }}} + {{{ end }}} + {./username} - - - - + {{{ if ./emailSpam }}} + + {{{ else }}} + {{{ if ./spamChecked }}} - - - {users.email} + {{{ end }}} + {{{ end }}} + {./email}
- {{{ each users.customActions }}} - {{{ end }}}
@@ -110,7 +110,7 @@ {{{ each invites.invitations }}}
{invites.username}{{{ if @first }}}{invites.username}{{{ end }}} {invites.invitations.email} {invites.invitations.username}
diff --git a/src/views/admin/manage/tags.tpl b/src/views/admin/manage/tags.tpl index a1c5faa434..13acef00d2 100644 --- a/src/views/admin/manage/tags.tpl +++ b/src/views/admin/manage/tags.tpl @@ -6,12 +6,12 @@

[[admin/manage/tags:description]]

- + {{{ if !tags.length }}} [[admin/manage/tags:none]] - + {{{ end }}}
- + {{{ each tags }}}
- + {{{ end }}}
diff --git a/src/views/admin/manage/uploads.tpl b/src/views/admin/manage/uploads.tpl index ff0bce2746..757312c730 100644 --- a/src/views/admin/manage/uploads.tpl +++ b/src/views/admin/manage/uploads.tpl @@ -15,42 +15,42 @@
[[admin/manage/uploads:filename]][[admin/manage/uploads:usage]][[admin/manage/uploads:usage]][[admin/manage/uploads:size/filecount]]
{files.name} {files.name} - {{{ each ../inPids }}} + {{{ each ./inPids }}} {@value} {{{ end }}} - + {{{ if !./inPids.length }}} [[admin/manage/uploads:orphaned]] - + {{{ end }}} {files.sizeHumanReadable}[[admin/manage/uploads:filecount, {files.fileCount}]]{{{ if files.isFile }}}{files.sizeHumanReadable}{{{ else }}}[[admin/manage/uploads:filecount, {files.fileCount}]]{{{ end }}}
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl index 4e25575828..c86ce850d1 100644 --- a/src/views/admin/manage/users.tpl +++ b/src/views/admin/manage/users.tpl @@ -85,12 +85,6 @@
[[admin/manage/users:search.not-found]]
- - [[admin/manage/users:inactive.3-months]] - [[admin/manage/users:inactive.6-months]] - [[admin/manage/users:inactive.12-months]] - -
@@ -108,19 +102,19 @@ - + {{{ each users }}} - + - + {{{ end }}}
{users.uid} - - + + {users.username} {{{ if ../email }}} - - + + {../email} {{{ else }}} @@ -130,11 +124,11 @@ {users.ip} {users.postcount} {users.reputation}{users.flags}0{{{ if users.flags }}}{users.flags}{{{ else }}}0{{{ end }}}
diff --git a/src/views/admin/partials/blacklist-validate.tpl b/src/views/admin/partials/blacklist-validate.tpl index 3d4aba6225..723c5ece14 100644 --- a/src/views/admin/partials/blacklist-validate.tpl +++ b/src/views/admin/partials/blacklist-validate.tpl @@ -2,13 +2,13 @@ [[ip-blacklist:validate.x-valid, {valid.length}, {numRules}]]

- +{{{ if invalid.length }}}

[[ip-blacklist:validate.x-invalid, {invalid.length}]]

    - + {{{ each invalid }}}
  • {@value}
    • - + {{{ end }}}
- \ No newline at end of file +{{{ end }}} \ No newline at end of file diff --git a/src/views/admin/partials/categories/category-rows.tpl b/src/views/admin/partials/categories/category-rows.tpl index 4a1e964a81..670f0d50f9 100644 --- a/src/views/admin/partials/categories/category-rows.tpl +++ b/src/views/admin/partials/categories/category-rows.tpl @@ -1,6 +1,6 @@
    {{{ each categories }}} -
  • class="disabled"> +
  • diff --git a/src/views/admin/partials/categories/select-category.tpl b/src/views/admin/partials/categories/select-category.tpl index fec3de06e5..06aa8a7887 100644 --- a/src/views/admin/partials/categories/select-category.tpl +++ b/src/views/admin/partials/categories/select-category.tpl @@ -11,7 +11,7 @@
    • - + {{{ each categories }}} - + {{{ end }}}
diff --git a/src/views/admin/partials/dashboard/stats.tpl b/src/views/admin/partials/dashboard/stats.tpl index 9d8cb67ba3..c7df18edca 100644 --- a/src/views/admin/partials/dashboard/stats.tpl +++ b/src/views/admin/partials/dashboard/stats.tpl @@ -16,32 +16,32 @@ - + {{{ each stats }}} - {{{ if ../href }}} - {../name} + {{{ if ./href }}} + {./name} {{{ else }}} - {../name} + {./name} {{{ end }}} - {stats.yesterday} - {stats.today} - {stats.dayIncrease}% + {./yesterday} + {./today} + {./dayIncrease}% - {stats.lastweek} - {stats.thisweek} - {stats.weekIncrease}% + {./lastweek} + {./thisweek} + {./weekIncrease}% - {stats.lastmonth} - {stats.thismonth} - {stats.monthIncrease}% + {./lastmonth} + {./thismonth} + {./monthIncrease}% - {stats.alltime} + {./alltime} - + {{{ end }}}
\ No newline at end of file diff --git a/src/views/admin/partials/download_plugin_item.tpl b/src/views/admin/partials/download_plugin_item.tpl index ab8db31850..61c1e6e8be 100644 --- a/src/views/admin/partials/download_plugin_item.tpl +++ b/src/views/admin/partials/download_plugin_item.tpl @@ -1,25 +1,25 @@ -
  • +
  • -

    {../name}

    +

    {./name}

    - -

    {../description}

    - + {{{ if ./description }}} +

    {./description}

    + {{{ end }}} - [[admin/extend/plugins:plugin-item.latest]] {../latest} + [[admin/extend/plugins:plugin-item.latest]] {./latest}

    - + {{{ if ./isCompatible }}} [[admin/extend/plugins:plugin-item.compatible, {version}]] - + {{{ else }}} [[admin/extend/plugins:plugin-item.not-compatible]] - + {{{ end }}}

    - -

    [[admin/extend/plugins:plugin-item.more-info]] {../url}

    - + {{{ if ./url }}} +

    [[admin/extend/plugins:plugin-item.more-info]] {./url}

    + {{{ end }}}
    • diff --git a/src/views/admin/partials/groups/memberlist.tpl b/src/views/admin/partials/groups/memberlist.tpl index d92eaf05ab..0dfbbb304e 100644 --- a/src/views/admin/partials/groups/memberlist.tpl +++ b/src/views/admin/partials/groups/memberlist.tpl @@ -1,10 +1,10 @@
    - + {{{ if group.isOwner }}}
    - -
    + {{{ end }}} +
    @@ -14,15 +14,16 @@ - + {{{ each group.members }}} - + {{{ end }}}
    {buildAvatar(group.members, "24px", true)} - {group.members.username} + {group.members.username} - + {{{ if group.isOwner }}}
    @@ -32,9 +33,9 @@
    - + {{{ end }}}
    \ No newline at end of file diff --git a/src/views/admin/partials/groups/privileges-select-category.tpl b/src/views/admin/partials/groups/privileges-select-category.tpl index baca01edf4..454f512cdf 100644 --- a/src/views/admin/partials/groups/privileges-select-category.tpl +++ b/src/views/admin/partials/groups/privileges-select-category.tpl @@ -10,7 +10,7 @@ [[search:no-matches]] {{{each categories}}} -
  • + {{{ if !./error }}} +
  • - {{{ if ../installed }}} - + {{{ if ./installed }}} + {{{ if ./isTheme }}} [[admin/extend/plugins:plugin-item.themes]] - - - + {{{ else }}} + + {{{ end }}} - - - [[admin/extend/plugins:plugin-item.settings]] - - + {{{ if ./active }}} + {{{ if ./settingsRoute }}} + [[admin/extend/plugins:plugin-item.settings]] + {{{ end }}} + {{{ end }}} {{{ else }}} {{{ end }}}
    -

    {../name}

    +

    {./name}

    - -

    {../description}

    - - - [[admin/extend/plugins:plugin-item.installed]] {../version} | [[admin/extend/plugins:plugin-item.latest]] {../latest} + {{{ if ./description }}} +

    {./description}

    + {{{ end }}} + {{{ if ./outdated }}} {{{ end }}} + [[admin/extend/plugins:plugin-item.installed]] {./version} | [[admin/extend/plugins:plugin-item.latest]] {./latest} - + {{{ if ./outdated }}}

    - + {{{ if ./isCompatible }}} [[admin/extend/plugins:plugin-item.compatible, {version}]] - + {{{ else }}} [[admin/extend/plugins:plugin-item.not-compatible]] - + {{{ end }}}

    - + {{{ end }}} - -

    [[admin/extend/plugins:plugin-item.more-info]] {../url}

    - + {{{ if ./url }}} +

    [[admin/extend/plugins:plugin-item.more-info]] {./url}

    + {{{ end }}}
    • - - -
  • + {{{ end }}} + {{{ if ./error }}} +
  • -

    {../id}

    +

    {./id}

    [[admin/extend/plugins:plugin-item.unknown-explanation]]

    • - + {{{ end }}} diff --git a/src/views/admin/partials/manage_user_groups.tpl b/src/views/admin/partials/manage_user_groups.tpl index 3a5f4f42e8..5d686d730f 100644 --- a/src/views/admin/partials/manage_user_groups.tpl +++ b/src/views/admin/partials/manage_user_groups.tpl @@ -4,7 +4,7 @@
    {{{ each users.groups }}}
    - {users.groups.displayName} + {{{ if users.groups.icon }}} {{{ end }}}{users.groups.displayName}
    {{{ end }}}
    diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl index dbadb09ae2..35ecd54797 100644 --- a/src/views/admin/partials/menu.tpl +++ b/src/views/admin/partials/menu.tpl @@ -77,31 +77,31 @@ - + {{{ if plugins.length }}}

    [[admin/menu:section-plugins]]

    - + {{{ end }}} - + {{{ if authentication.length }}}

    [[admin/menu:section-social-auth]]

    - + {{{ end }}} {{{ end }}} {{{ if user.privileges.superadmin }}} @@ -114,9 +114,9 @@
  • [[admin/menu:advanced/cache]]
  • [[admin/menu:advanced/errors]]
  • [[admin/menu:advanced/logs]]
    • - + {{{ if env }}}
  • [[admin/menu:development/logger]]
    • - + {{{ end }}} {{{ end }}} @@ -253,34 +253,32 @@
  • [[admin/menu:extend/rewards]]
    • - + {{{ if plugins.length }}}
    • - + {{{ end }}} {{{ end }}} {{{ if user.privileges.superadmin }}} @@ -293,9 +291,9 @@
  • [[admin/menu:advanced/cache]]
  • [[admin/menu:advanced/errors]]
  • [[admin/menu:advanced/logs]]
    • - + {{{ if env }}}
  • [[admin/menu:development/logger]]
    • - + {{{ end }}} {{{ end }}} diff --git a/src/views/admin/partials/privileges/category.tpl b/src/views/admin/partials/privileges/category.tpl index c6cad475a1..e53b9a8056 100644 --- a/src/views/admin/partials/privileges/category.tpl +++ b/src/views/admin/partials/privileges/category.tpl @@ -7,9 +7,9 @@ - + {{{ if privileges.columnCountGroupOther }}} - + {{{ end }}}
    @@ -22,8 +22,8 @@ - - + {{{ each privileges.groups }}} + {{{ if privileges.groups.isPrivate }}} {{{ if (privileges.groups.name == "banned-users") }}} @@ -55,7 +55,7 @@ {function.spawnPrivilegeStates, privileges.groups.name, ../privileges} - + {{{ end }}} @@ -96,9 +96,9 @@ - + {{{ if privileges.columnCountUserOther }}} - + {{{ end }}}
    @@ -111,14 +111,14 @@ - + {{{ each privileges.users }}} - + {{{ if ./picture }}} - + {{{ else }}}
    {../icon:text}
    - + {{{ end }}} {{{ if privileges.users.banned }}} @@ -129,7 +129,7 @@ {function.spawnPrivilegeStates, privileges.users.username, ../privileges} - + {{{ end }}} diff --git a/src/views/admin/partials/privileges/global.tpl b/src/views/admin/partials/privileges/global.tpl index 7b3b71f474..dedc9c0ac8 100644 --- a/src/views/admin/partials/privileges/global.tpl +++ b/src/views/admin/partials/privileges/global.tpl @@ -8,9 +8,9 @@ - + {{{ if privileges.columnCountGroupOther }}} - + {{{ end }}}
    @@ -24,8 +24,8 @@ - - + {{{ each privileges.groups }}} + {{{ if privileges.groups.isPrivate }}} {{{ if (privileges.groups.name == "banned-users") }}} @@ -42,7 +42,7 @@ {function.spawnPrivilegeStates, privileges.groups.name, ../privileges} - + {{{ end }}} @@ -72,9 +72,9 @@ - + {{{ if privileges.columnCountUserOther }}} - + {{{ end }}}
    @@ -88,14 +88,14 @@ - + {{{ each privileges.users }}} - + {{{ if ./picture }}} - + {{{ else }}}
    {../icon:text}
    - + {{{ end }}} {{{ if privileges.users.banned }}} @@ -106,7 +106,7 @@ {function.spawnPrivilegeStates, privileges.users.username, ../privileges} - + {{{ end }}} diff --git a/src/views/admin/partials/quick_actions/alerts.tpl b/src/views/admin/partials/quick_actions/alerts.tpl index 96f34a4848..60ca2f3959 100644 --- a/src/views/admin/partials/quick_actions/alerts.tpl +++ b/src/views/admin/partials/quick_actions/alerts.tpl @@ -1,10 +1,10 @@ -
    +
    [[admin/menu:alerts.version, {version}]] - + {{{ if upgradeAvailable }}} [[admin/menu:alerts.upgrade, {latestVersion}]] - + {{{ end }}}
    \ No newline at end of file diff --git a/src/views/admin/partials/theme_list.tpl b/src/views/admin/partials/theme_list.tpl index 1316b40de5..4ac0a67743 100644 --- a/src/views/admin/partials/theme_list.tpl +++ b/src/views/admin/partials/theme_list.tpl @@ -1,24 +1,24 @@ - -
    +{{{ each themes }}} +
    - +
    -
    {themes.name}
    +
    {./name}

    - {themes.description} + {./description}

    - {{{ if themes.url }}} + {{{ if ./url }}}

    - [[admin/appearance/themes:homepage]] + [[admin/appearance/themes:homepage]]

    {{{ end }}}
    - {{{ if themes.skin }}}[[admin/appearance/skins:select-skin]]{{{ else }}}[[admin/appearance/themes:select-theme]]{{{ end }}} + {{{ if ./skin }}}[[admin/appearance/skins:select-skin]]{{{ else }}}[[admin/appearance/themes:select-theme]]{{{ end }}}
    - +{{{ end }}} diff --git a/src/views/admin/partials/widgets/show_hide_groups.tpl b/src/views/admin/partials/widgets/show_hide_groups.tpl index 12c72e1684..583a405947 100644 --- a/src/views/admin/partials/widgets/show_hide_groups.tpl +++ b/src/views/admin/partials/widgets/show_hide_groups.tpl @@ -2,17 +2,17 @@
    \ No newline at end of file diff --git a/src/views/admin/settings/email.tpl b/src/views/admin/settings/email.tpl index e973963679..f5a7482e4c 100644 --- a/src/views/admin/settings/email.tpl +++ b/src/views/admin/settings/email.tpl @@ -175,9 +175,9 @@
    @@ -195,9 +195,9 @@
    diff --git a/src/views/admin/settings/homepage.tpl b/src/views/admin/settings/homepage.tpl index 915550effd..785f323e57 100644 --- a/src/views/admin/settings/homepage.tpl +++ b/src/views/admin/settings/homepage.tpl @@ -10,9 +10,9 @@
    diff --git a/src/views/emails/banned.tpl b/src/views/emails/banned.tpl index 20d82ba8df..be84592268 100644 --- a/src/views/emails/banned.tpl +++ b/src/views/emails/banned.tpl @@ -16,7 +16,7 @@

    [[email:banned.text1, {username}, {site_title}]]

    - + {{{ if reason }}}

    @@ -27,8 +27,8 @@

    - - + {{{ end }}} + {{{ if until }}}

    @@ -36,7 +36,7 @@

    - + {{{ end }}} diff --git a/src/views/emails/digest.tpl b/src/views/emails/digest.tpl index cb30a3afab..b6d827187c 100644 --- a/src/views/emails/digest.tpl +++ b/src/views/emails/digest.tpl @@ -17,20 +17,20 @@

    [[email:digest.title.{interval}]]

    - + {{{ if notifications.length }}}
      - + {{{ each notifications }}}
    • - + {{{ if notifications.image }}} - + {{{ else }}}
      {notifications.user.icon:text}
      - + {{{ end }}}

      {notifications.bodyShort}

      @@ -38,17 +38,17 @@
      • - + {{{ end }}}
    - - + {{{ end }}} + {{{ if topTopics.length }}}

    [[email:digest.top-topics, {site_title}]]

      - + {{{ each topTopics }}}
    • @@ -70,20 +70,20 @@
      • - + {{{ if !@last }}}
    • - - + {{{ end }}} + {{{ end }}}
    - - + {{{ end }}} + {{{ if popularTopics.length }}}

    [[email:digest.popular-topics, {site_title}]]

      - + {{{ each popularTopics }}}
    • @@ -105,20 +105,20 @@
      • - + {{{ if !@last }}}
    • - - + {{{ end }}} + {{{ end }}}
    - - + {{{ end }}} + {{{ if recent.length }}}

    [[email:digest.latest_topics, {site_title}]]

      - + {{{ each recent }}}
    • @@ -140,14 +140,14 @@
      • - + {{{ if !@last }}}
    • - - + {{{ end }}} + {{{ end }}}
    - + {{{ end }}} diff --git a/src/views/emails/notification.tpl b/src/views/emails/notification.tpl index f39eafc983..bcc72e5c3d 100644 --- a/src/views/emails/notification.tpl +++ b/src/views/emails/notification.tpl @@ -31,7 +31,7 @@ - [[email:notif.cta-{notification.cta-type}]] → + [[email:notif.cta{{{ if notification.cta-type }}}-{notification.cta-type}{{{ end }}}]] → diff --git a/src/views/emails/partials/footer.tpl b/src/views/emails/partials/footer.tpl index 98fb2824e4..aa9dc7938f 100644 --- a/src/views/emails/partials/footer.tpl +++ b/src/views/emails/partials/footer.tpl @@ -3,10 +3,10 @@

    - + {{{ if showUnsubscribe }}} [[email:notif.post.unsub.info]] [[email:unsub.cta]].
    [[email:notif.post.unsub.one-click]] [[email:unsubscribe]]. - + {{{ end }}}

    diff --git a/src/views/emails/partials/header.tpl b/src/views/emails/partials/header.tpl index e292b13830..44fddbc78e 100644 --- a/src/views/emails/partials/header.tpl +++ b/src/views/emails/partials/header.tpl @@ -165,7 +165,7 @@ 1. max-width for all clients except Desktop Windows Outlook, allowing the email to squish on narrow but never go wider than 600px. 2. MSO tags for Desktop Windows Outlook enforce a 600px width. --> - diff --git a/src/views/modals/invite.tpl b/src/views/modals/invite.tpl index 8e7ff9e88b..5b35cba696 100644 --- a/src/views/modals/invite.tpl +++ b/src/views/modals/invite.tpl @@ -5,8 +5,8 @@
    \ No newline at end of file diff --git a/src/views/modals/post-history.tpl b/src/views/modals/post-history.tpl index 1f187e991e..433d015e41 100644 --- a/src/views/modals/post-history.tpl +++ b/src/views/modals/post-history.tpl @@ -1,21 +1,21 @@

    - + {{{ if numDiffs }}} [[topic:diffs.description, {numDiffs}]] - + {{{ else }}} [[topic:diffs.no-revisions-description, {numDiffs}]] - + {{{ end }}}

    - +{{{ if numDiffs }}}
    @@ -33,4 +33,4 @@ {{{ end }}}
    - +{{{ end }}} diff --git a/src/views/modals/upload-file.tpl b/src/views/modals/upload-file.tpl index 6f46f54d6a..537f6efd01 100644 --- a/src/views/modals/upload-file.tpl +++ b/src/views/modals/upload-file.tpl @@ -8,19 +8,19 @@
    - + {{{ if description }}} - - accept="{accept}"> - + {{{ end }}} + + {{{ if showHelp }}}

    - + {{{ if accept }}} [[global:allowed-file-types, {accept}]] - + {{{ end }}} - ([[uploads:maximum-file-size, {fileSize}]]) + {{{ if fileSize }}}([[uploads:maximum-file-size, {fileSize}]]){{{ end }}}

    - + {{{ end }}}
    diff --git a/src/views/modals/votes.tpl b/src/views/modals/votes.tpl index e38fa3e374..6c0b54e277 100644 --- a/src/views/modals/votes.tpl +++ b/src/views/modals/votes.tpl @@ -1,10 +1,14 @@ -

    [[global:upvoters]] ({upvoteCount})

    -{{{each upvoters}}} -{buildAvatar(upvoters, "24px", true)} -{{{end}}} - -

    [[global:downvoters]] ({downvoteCount})

    -{{{each downvoters}}} -{buildAvatar(downvoters, "24px", true)} -{{{end}}} - +
    +

    [[global:upvoters]] ({upvoteCount})

    + {{{ each upvoters }}} + {buildAvatar(@value, "24px", true)} + {{{ end }}} +
    +{{{ if showDownvotes }}} +
    +

    [[global:downvoters]] ({downvoteCount})

    + {{{ each downvoters }}} + {buildAvatar(@value, "24px", true)} + {{{ end }}} +
    +{{{ end }}} \ No newline at end of file diff --git a/src/views/partials/footer/js.tpl b/src/views/partials/footer/js.tpl index a0b8668f4c..5e35e36830 100644 --- a/src/views/partials/footer/js.tpl +++ b/src/views/partials/footer/js.tpl @@ -12,9 +12,9 @@ } function prepareFooter() { - + {{{ if useCustomJS }}} {{customJS}} - + {{{ end }}} $(document).ready(function () { app.coldLoad(); diff --git a/src/views/partials/gdpr_consent.tpl b/src/views/partials/gdpr_consent.tpl index 7ee5b7db4d..50a80f2478 100644 --- a/src/views/partials/gdpr_consent.tpl +++ b/src/views/partials/gdpr_consent.tpl @@ -8,13 +8,13 @@

    [[user:consent.email_intro]] - + {{{ if digestEnabled }}} [[user:consent.digest_frequency, {digestFrequency}]] - + {{{ else }}} [[user:consent.digest_off]] - + {{{ end }}}

    - +