From 3780795b938c8915736d73c416e2a8198920c3de Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 8 Jul 2023 02:06:49 +0800 Subject: [PATCH] Reformat some templates (#25756) Only: indent/dedent/newline --- templates/package/shared/list.tmpl | 102 ++-- templates/package/shared/versionlist.tmpl | 70 +-- templates/projects/list.tmpl | 134 ++--- templates/projects/new.tmpl | 112 ++--- templates/projects/view.tmpl | 459 +++++++++--------- templates/user/overview/package_versions.tmpl | 22 +- 6 files changed, 449 insertions(+), 450 deletions(-) diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 1acafff41a..b2f339285f 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -1,53 +1,53 @@ - {{template "base/alert" .}} -
-
- {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} - - -
-
-
- {{range .PackageDescriptors}} -
  • -
    -
    - {{.Package.Name}} - {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}} -
    -
    - {{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}} - {{$hasRepositoryAccess := false}} - {{if .Repository}} - {{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}} - {{end}} - {{if $hasRepositoryAccess}} - {{$.locale.Tr "packages.published_by_in" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) .Repository.Link (.Repository.FullName | Escape) | Safe}} - {{else}} - {{$.locale.Tr "packages.published_by" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} - {{end}} -
    -
    -
    • - {{else}} - {{if not .HasPackages}} -
    - {{svg "octicon-package" 48}} -

    {{.locale.Tr "packages.empty"}}

    - {{if and .Repository .CanWritePackages}} - {{$packagesUrl := URLJoin .Owner.HomeLink "-" "packages"}} -

    {{.locale.Tr "packages.empty.repo" $packagesUrl | Safe}}

    - {{end}} -

    {{.locale.Tr "packages.empty.documentation" "https://docs.gitea.io/en-us/usage/packages/overview/" | Safe}}

    -
    - {{else}} -

    {{.locale.Tr "packages.filter.no_result"}}

    +{{template "base/alert" .}} +
    +
    + {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} + +
    +
    +
    + {{range .PackageDescriptors}} +
  • +
    +
    + {{.Package.Name}} + {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}} +
    +
    + {{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}} + {{$hasRepositoryAccess := false}} + {{if .Repository}} + {{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}} + {{end}} + {{if $hasRepositoryAccess}} + {{$.locale.Tr "packages.published_by_in" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) .Repository.Link (.Repository.FullName | Escape) | Safe}} + {{else}} + {{$.locale.Tr "packages.published_by" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} + {{end}} +
    +
    +
    • + {{else}} + {{if not .HasPackages}} +
    + {{svg "octicon-package" 48}} +

    {{.locale.Tr "packages.empty"}}

    + {{if and .Repository .CanWritePackages}} + {{$packagesUrl := URLJoin .Owner.HomeLink "-" "packages"}} +

    {{.locale.Tr "packages.empty.repo" $packagesUrl | Safe}}

    + {{end}} +

    {{.locale.Tr "packages.empty.documentation" "https://docs.gitea.io/en-us/usage/packages/overview/" | Safe}}

    +
    + {{else}} +

    {{.locale.Tr "packages.filter.no_result"}}

    + {{end}} + {{end}} + {{template "base/paginate" .}} +
    diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index be5c2a16de..afd92efff9 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -1,37 +1,37 @@ -

    {{.PackageDescriptor.Package.Name}} / {{.locale.Tr "packages.versions"}}

    -
    -
    - {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} - - {{if eq .PackageDescriptor.Package.Type "container"}} - - {{end}} - -
    -
    -
    - {{range .PackageDescriptors}} -
  • -
    -
    - {{.Version.LowerVersion}} -
    -
    - {{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} -
    -
    -
    • - {{else}} -

    {{.locale.Tr "packages.filter.no_result"}}

    +

    {{.PackageDescriptor.Package.Name}} / {{.locale.Tr "packages.versions"}}

    +
    +
    + {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} + + {{if eq .PackageDescriptor.Package.Type "container"}} + {{end}} - {{template "base/paginate" .}} +
    +
    +
    + {{range .PackageDescriptors}} +
  • +
    +
    + {{.Version.LowerVersion}} +
    +
    + {{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} +
    +
    +
    • + {{else}} +

    {{.locale.Tr "packages.filter.no_result"}}

    + {{end}} + {{template "base/paginate" .}} +
    diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index ebce0ea48f..79e18678d4 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -1,76 +1,76 @@ - {{if .CanWriteProjects}} -
    - {{.locale.Tr "repo.projects.new"}} -
    -
    - {{end}} +{{if .CanWriteProjects}} +
    + {{.locale.Tr "repo.projects.new"}} +
    +
    +{{end}} - {{template "base/alert" .}} -
    - - {{svg "octicon-project-symlink" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} - - - {{svg "octicon-check" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} - +{{template "base/alert" .}} +
    + + {{svg "octicon-project-symlink" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} + + + {{svg "octicon-check" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} + +
    + +
    + +
    + + {{.locale.Tr "repo.issues.filter_sort"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
    + {{.locale.Tr "repo.issues.filter_sort.oldest"}} + {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{.locale.Tr "repo.issues.filter_sort.leastupdate"}}
    - -
    - -
    - - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
    - {{.locale.Tr "repo.issues.filter_sort.oldest"}} - {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} +
    +
    +
    + {{range .Projects}} +
  • +

    + {{svg .IconName 16}} + {{.Title}} +

    +
    +
    +
    + {{svg "octicon-issue-opened" 14}} + {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} +
    +
    + {{svg "octicon-check" 14}} + {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} +
    -
    -
    • -
    - {{range .Projects}} -
  • -

    - {{svg .IconName 16}} - {{.Title}} -

    -
    -
    -
    - {{svg "octicon-issue-opened" 14}} - {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} -
    -
    - {{svg "octicon-check" 14}} - {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} -
    -
    - {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} -
    - {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} - {{if .IsClosed}} - {{svg "octicon-check" 14}}{{$.locale.Tr "repo.projects.open"}} - {{else}} - {{svg "octicon-skip" 14}}{{$.locale.Tr "repo.projects.close"}} - {{end}} - {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}} -
    - {{end}} -
    - {{if .Description}} -
    - {{.RenderedContent|Str2html}} -
    + {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} +
    + {{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}} + {{if .IsClosed}} + {{svg "octicon-check" 14}}{{$.locale.Tr "repo.projects.open"}} + {{else}} + {{svg "octicon-skip" 14}}{{$.locale.Tr "repo.projects.close"}} {{end}} -
    • + {{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}} +
    + {{end}} +
    + {{if .Description}} +
    + {{.RenderedContent|Str2html}} +
    {{end}} + + {{end}} - {{template "base/paginate" .}} -
    + {{template "base/paginate" .}} +
    {{if $.CanWriteProjects}}
    diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index e110e880cf..6b110e0292 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -1,66 +1,66 @@ -

    - {{if .PageIsEditProjects}} +

    + {{if .PageIsEditProjects}} {{.locale.Tr "repo.projects.edit"}}
    {{.locale.Tr "repo.projects.edit_subheader"}}
    - {{else}} - {{.locale.Tr "repo.projects.new"}} -
    {{.locale.Tr "repo.projects.new_subheader"}}
    - {{end}} -

    - {{template "base/alert" .}} -
    - {{.CsrfTokenHtml}} -
    - -
    - - -
    -
    - - -
    + {{else}} + {{.locale.Tr "repo.projects.new"}} +
    {{.locale.Tr "repo.projects.new_subheader"}}
    + {{end}} + +{{template "base/alert" .}} + + {{.CsrfTokenHtml}} +
    + +
    + + +
    +
    + + +
    - {{if not .PageIsEditProjects}} -
    - -
    - -
    {{.locale.Tr "repo.projects.template.desc_helper"}}
    -
    - {{range $element := .BoardTypes}} -
    {{$.locale.Tr $element.Translation}}
    - {{end}} -
    + {{if not .PageIsEditProjects}} +
    + +
    + +
    {{.locale.Tr "repo.projects.template.desc_helper"}}
    +
    + {{range $element := .BoardTypes}} +
    {{$.locale.Tr $element.Translation}}
    + {{end}}
    - {{end}} +
    + {{end}} -
    - -
    - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - {{range $element := .CardTypes}} - {{if or (eq $.card_type $element.CardType) (and (not $.PageIsEditProjects) (eq $element.CardType 1))}} - -
    {{$.locale.Tr $element.Translation}}
    - {{end}} +
    + +
    + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + {{range $element := .CardTypes}} + {{if or (eq $.card_type $element.CardType) (and (not $.PageIsEditProjects) (eq $element.CardType 1))}} + +
    {{$.locale.Tr $element.Translation}}
    + {{end}} + {{end}} +
    + {{range $element := .CardTypes}} +
    {{$.locale.Tr $element.Translation}}
    {{end}} -
    - {{range $element := .CardTypes}} -
    {{$.locale.Tr $element.Translation}}
    - {{end}} -
    -
    -
    - - {{.locale.Tr "repo.milestones.cancel"}} - - -
    - +
    +
    +
    + + {{.locale.Tr "repo.milestones.cancel"}} + + +
    + diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 2f0556856f..6689bea220 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -1,256 +1,255 @@ -
    -
    +
    +
    +
    +
    + {{if .CanWriteProjects}} + {{.locale.Tr "new_project_column"}} + {{end}} +