From 3780795b938c8915736d73c416e2a8198920c3de Mon Sep 17 00:00:00 2001 From: wxiaoguang <wxiaoguang@gmail.com> Date: Sat, 8 Jul 2023 02:06:49 +0800 Subject: [PATCH] Reformat some templates (#25756) Only: indent/dedent/newline --- templates/package/shared/list.tmpl | 98 ++-- templates/package/shared/versionlist.tmpl | 70 +-- templates/projects/list.tmpl | 130 +++--- templates/projects/new.tmpl | 110 ++--- templates/projects/view.tmpl | 421 +++++++++--------- templates/user/overview/package_versions.tmpl | 22 +- 6 files changed, 425 insertions(+), 426 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" .}} - <form class="ui form ignore-dirty"> - <div class="ui fluid action input"> - {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} - <select class="ui dropdown" name="type"> - <option value="">{{.locale.Tr "packages.filter.type"}}</option> - <option value="all">{{.locale.Tr "packages.filter.type.all"}}</option> - {{range $type := .AvailableTypes}} - <option{{if eq $.PackageType $type}} selected="selected"{{end}} value="{{$type}}">{{$type.Name}}</option> - {{end}} - </select> - <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> - </div> - </form> - <div class="ui {{if .PackageDescriptors}}issue list{{end}}"> - {{range .PackageDescriptors}} - <li class="item gt-df gt-py-3"> - <div class="issue-item-main"> - <div class="issue-item-top-row"> - <a class="title" href="{{.FullWebLink}}">{{.Package.Name}}</a> - <span class="ui label">{{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}</span> - </div> - <div class="desc issue-item-bottom-row"> - {{$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}} - </div> +{{template "base/alert" .}} +<form class="ui form ignore-dirty"> + <div class="ui fluid action input"> + {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} + <select class="ui dropdown" name="type"> + <option value="">{{.locale.Tr "packages.filter.type"}}</option> + <option value="all">{{.locale.Tr "packages.filter.type.all"}}</option> + {{range $type := .AvailableTypes}} + <option{{if eq $.PackageType $type}} selected="selected"{{end}} value="{{$type}}">{{$type.Name}}</option> + {{end}} + </select> + <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> + </div> +</form> +<div class="ui {{if .PackageDescriptors}}issue list{{end}}"> + {{range .PackageDescriptors}} + <li class="item gt-df gt-py-3"> + <div class="issue-item-main"> + <div class="issue-item-top-row"> + <a class="title" href="{{.FullWebLink}}">{{.Package.Name}}</a> + <span class="ui label">{{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}</span> </div> - </li> - {{else}} - {{if not .HasPackages}} - <div class="gt-pt-5 empty center"> - {{svg "octicon-package" 48}} - <h2>{{.locale.Tr "packages.empty"}}</h2> - {{if and .Repository .CanWritePackages}} - {{$packagesUrl := URLJoin .Owner.HomeLink "-" "packages"}} - <p>{{.locale.Tr "packages.empty.repo" $packagesUrl | Safe}}</p> + <div class="desc issue-item-bottom-row"> + {{$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}} - <p>{{.locale.Tr "packages.empty.documentation" "https://docs.gitea.io/en-us/usage/packages/overview/" | Safe}}</p> </div> - {{else}} - <p>{{.locale.Tr "packages.filter.no_result"}}</p> - {{end}} + </div> + </li> + {{else}} + {{if not .HasPackages}} + <div class="gt-pt-5 empty center"> + {{svg "octicon-package" 48}} + <h2>{{.locale.Tr "packages.empty"}}</h2> + {{if and .Repository .CanWritePackages}} + {{$packagesUrl := URLJoin .Owner.HomeLink "-" "packages"}} + <p>{{.locale.Tr "packages.empty.repo" $packagesUrl | Safe}}</p> + {{end}} + <p>{{.locale.Tr "packages.empty.documentation" "https://docs.gitea.io/en-us/usage/packages/overview/" | Safe}}</p> + </div> + {{else}} + <p>{{.locale.Tr "packages.filter.no_result"}}</p> {{end}} - {{template "base/paginate" .}} - </div> + {{end}} + {{template "base/paginate" .}} +</div> 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 @@ - <p><a href="{{.PackageDescriptor.PackageWebLink}}">{{.PackageDescriptor.Package.Name}}</a> / <strong>{{.locale.Tr "packages.versions"}}</strong></p> - <form class="ui form ignore-dirty"> - <div class="ui fluid action input"> - {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} - <select class="ui dropdown" name="sort"> - <option value="version_asc"{{if eq .Sort "version_asc"}} selected="selected"{{end}}>{{.locale.Tr "filter.string.asc"}}</option> - <option value="version_desc"{{if eq .Sort "version_desc"}} selected="selected"{{end}}>{{.locale.Tr "filter.string.desc"}}</option> - <option value="created_asc"{{if eq .Sort "created_asc"}} selected="selected"{{end}}>{{.locale.Tr "repo.issues.filter_sort.oldest"}}</option> - <option value="created_desc"{{if or (eq .Sort "") (eq .Sort "created_desc")}} selected="selected"{{end}}>{{.locale.Tr "repo.issues.filter_sort.latest"}}</option> - </select> - {{if eq .PackageDescriptor.Package.Type "container"}} - <select class="ui dropdown" name="tagged"> - {{$isTagged := or (eq .Tagged "") (eq .Tagged "tagged")}} - <option value="tagged"{{if $isTagged}} selected="selected"{{end}}>{{.locale.Tr "packages.filter.container.tagged"}}</option> - <option value="untagged"{{if not $isTagged}} selected="selected"{{end}}>{{.locale.Tr "packages.filter.container.untagged"}}</option> - </select> - {{end}} - <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> - </div> - </form> - <div class="ui {{if .PackageDescriptors}}issue list{{end}}"> - {{range .PackageDescriptors}} - <li class="item gt-df gt-py-3"> - <div class="issue-item-main"> - <div class="issue-item-top-row"> - <a class="title" href="{{.FullWebLink}}">{{.Version.LowerVersion}}</a> - </div> - <div class="desc issue-item-bottom-row"> - {{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} - </div> - </div> - </li> - {{else}} - <p>{{.locale.Tr "packages.filter.no_result"}}</p> +<p><a href="{{.PackageDescriptor.PackageWebLink}}">{{.PackageDescriptor.Package.Name}}</a> / <strong>{{.locale.Tr "packages.versions"}}</strong></p> +<form class="ui form ignore-dirty"> + <div class="ui fluid action input"> + {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} + <select class="ui dropdown" name="sort"> + <option value="version_asc"{{if eq .Sort "version_asc"}} selected="selected"{{end}}>{{.locale.Tr "filter.string.asc"}}</option> + <option value="version_desc"{{if eq .Sort "version_desc"}} selected="selected"{{end}}>{{.locale.Tr "filter.string.desc"}}</option> + <option value="created_asc"{{if eq .Sort "created_asc"}} selected="selected"{{end}}>{{.locale.Tr "repo.issues.filter_sort.oldest"}}</option> + <option value="created_desc"{{if or (eq .Sort "") (eq .Sort "created_desc")}} selected="selected"{{end}}>{{.locale.Tr "repo.issues.filter_sort.latest"}}</option> + </select> + {{if eq .PackageDescriptor.Package.Type "container"}} + <select class="ui dropdown" name="tagged"> + {{$isTagged := or (eq .Tagged "") (eq .Tagged "tagged")}} + <option value="tagged"{{if $isTagged}} selected="selected"{{end}}>{{.locale.Tr "packages.filter.container.tagged"}}</option> + <option value="untagged"{{if not $isTagged}} selected="selected"{{end}}>{{.locale.Tr "packages.filter.container.untagged"}}</option> + </select> {{end}} - {{template "base/paginate" .}} + <button class="ui primary button">{{.locale.Tr "explore.search"}}</button> </div> +</form> +<div class="ui {{if .PackageDescriptors}}issue list{{end}}"> + {{range .PackageDescriptors}} + <li class="item gt-df gt-py-3"> + <div class="issue-item-main"> + <div class="issue-item-top-row"> + <a class="title" href="{{.FullWebLink}}">{{.Version.LowerVersion}}</a> + </div> + <div class="desc issue-item-bottom-row"> + {{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} + </div> + </div> + </li> + {{else}} + <p>{{.locale.Tr "packages.filter.no_result"}}</p> + {{end}} + {{template "base/paginate" .}} +</div> 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}} - <div class="gt-tr"> - <a class="ui small green button" href="{{$.Link}}/new">{{.locale.Tr "repo.projects.new"}}</a> - </div> - <div class="divider"></div> - {{end}} +{{if .CanWriteProjects}} + <div class="gt-tr"> + <a class="ui small green button" href="{{$.Link}}/new">{{.locale.Tr "repo.projects.new"}}</a> + </div> + <div class="divider"></div> +{{end}} - {{template "base/alert" .}} - <div class="small-menu-items ui compact tiny menu"> - <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{$.Link}}?state=open"> - {{svg "octicon-project-symlink" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} - </a> - <a class="item{{if .IsShowClosed}} active{{end}}" href="{{$.Link}}?state=closed"> - {{svg "octicon-check" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} - </a> - </div> +{{template "base/alert" .}} +<div class="small-menu-items ui compact tiny menu"> + <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{$.Link}}?state=open"> + {{svg "octicon-project-symlink" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} + </a> + <a class="item{{if .IsShowClosed}} active{{end}}" href="{{$.Link}}?state=closed"> + {{svg "octicon-check" 16 "gt-mr-3"}} + {{.locale.PrettyNumber .ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} + </a> +</div> - <div class="ui right floated secondary filter menu"> - <!-- Sort --> - <div class="ui dropdown type jump item"> - <span class="text"> - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - </span> - <div class="menu"> - <a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=oldest&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a> - <a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=recentupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</a> - <a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=leastupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.leastupdate"}}</a> - </div> - </div> +<div class="ui right floated secondary filter menu"> + <!-- Sort --> + <div class="ui dropdown type jump item"> + <span class="text"> + {{.locale.Tr "repo.issues.filter_sort"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + </span> + <div class="menu"> + <a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=oldest&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a> + <a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=recentupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</a> + <a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=leastupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.leastupdate"}}</a> </div> - <div class="milestone-list"> - {{range .Projects}} - <li class="milestone-card"> - <h3 class="flex-text-block gt-m-0"> - {{svg .IconName 16}} - <a class="muted" href="{{.Link}}">{{.Title}}</a> - </h3> - <div class="milestone-toolbar"> - <div class="group"> - <div class="flex-text-block"> - {{svg "octicon-issue-opened" 14}} - {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} - </div> - <div class="flex-text-block"> - {{svg "octicon-check" 14}} - {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} - </div> - </div> - {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} - <div class="group"> - <a class="flex-text-inline" href="{{.Link}}/edit">{{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}}</a> - {{if .IsClosed}} - <a class="link-action flex-text-inline" href data-url="{{.Link}}/open">{{svg "octicon-check" 14}}{{$.locale.Tr "repo.projects.open"}}</a> - {{else}} - <a class="link-action flex-text-inline" href data-url="{{.Link}}/close">{{svg "octicon-skip" 14}}{{$.locale.Tr "repo.projects.close"}}</a> - {{end}} - <a class="delete-button flex-text-inline" href="#" data-url="{{.Link}}/delete">{{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}}</a> - </div> - {{end}} + </div> +</div> +<div class="milestone-list"> + {{range .Projects}} + <li class="milestone-card"> + <h3 class="flex-text-block gt-m-0"> + {{svg .IconName 16}} + <a class="muted" href="{{.Link}}">{{.Title}}</a> + </h3> + <div class="milestone-toolbar"> + <div class="group"> + <div class="flex-text-block"> + {{svg "octicon-issue-opened" 14}} + {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} </div> - {{if .Description}} - <div class="content"> - {{.RenderedContent|Str2html}} + <div class="flex-text-block"> + {{svg "octicon-check" 14}} + {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} </div> + </div> + {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} + <div class="group"> + <a class="flex-text-inline" href="{{.Link}}/edit">{{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}}</a> + {{if .IsClosed}} + <a class="link-action flex-text-inline" href data-url="{{.Link}}/open">{{svg "octicon-check" 14}}{{$.locale.Tr "repo.projects.open"}}</a> + {{else}} + <a class="link-action flex-text-inline" href data-url="{{.Link}}/close">{{svg "octicon-skip" 14}}{{$.locale.Tr "repo.projects.close"}}</a> {{end}} - </li> + <a class="delete-button flex-text-inline" href="#" data-url="{{.Link}}/delete">{{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}}</a> + </div> + {{end}} + </div> + {{if .Description}} + <div class="content"> + {{.RenderedContent|Str2html}} + </div> {{end}} + </li> + {{end}} - {{template "base/paginate" .}} - </div> + {{template "base/paginate" .}} +</div> {{if $.CanWriteProjects}} <div class="ui g-modal-confirm delete modal"> 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 @@ - <h2 class="ui dividing header"> - {{if .PageIsEditProjects}} +<h2 class="ui dividing header"> + {{if .PageIsEditProjects}} {{.locale.Tr "repo.projects.edit"}} <div class="sub header">{{.locale.Tr "repo.projects.edit_subheader"}}</div> - {{else}} - {{.locale.Tr "repo.projects.new"}} - <div class="sub header">{{.locale.Tr "repo.projects.new_subheader"}}</div> - {{end}} - </h2> - {{template "base/alert" .}} - <form class="ui form grid" action="{{.Link}}" method="post"> - {{.CsrfTokenHtml}} - <div class="eleven wide column"> - <input type="hidden" id="redirect" name="redirect" value="{{.redirect}}"> - <div class="field {{if .Err_Title}}error{{end}}"> - <label>{{.locale.Tr "repo.projects.title"}}</label> - <input name="title" placeholder="{{.locale.Tr "repo.projects.title"}}" value="{{.title}}" autofocus required> - </div> - <div class="field"> - <label>{{.locale.Tr "repo.projects.description"}}</label> - <textarea name="content" placeholder="{{.locale.Tr "repo.projects.description_placeholder"}}">{{.content}}</textarea> - </div> - - {{if not .PageIsEditProjects}} - <div class="field"> - <label>{{.locale.Tr "repo.projects.template.desc"}}</label> - <div class="ui selection dropdown"> - <input type="hidden" name="board_type" value="{{.type}}"> - <div class="default text">{{.locale.Tr "repo.projects.template.desc_helper"}}</div> - <div class="menu"> - {{range $element := .BoardTypes}} - <div class="item" data-id="{{$element.BoardType}}" data-value="{{$element.BoardType}}">{{$.locale.Tr $element.Translation}}</div> - {{end}} - </div> - </div> - </div> - {{end}} + {{else}} + {{.locale.Tr "repo.projects.new"}} + <div class="sub header">{{.locale.Tr "repo.projects.new_subheader"}}</div> + {{end}} +</h2> +{{template "base/alert" .}} +<form class="ui form grid" action="{{.Link}}" method="post"> + {{.CsrfTokenHtml}} + <div class="eleven wide column"> + <input type="hidden" id="redirect" name="redirect" value="{{.redirect}}"> + <div class="field {{if .Err_Title}}error{{end}}"> + <label>{{.locale.Tr "repo.projects.title"}}</label> + <input name="title" placeholder="{{.locale.Tr "repo.projects.title"}}" value="{{.title}}" autofocus required> + </div> + <div class="field"> + <label>{{.locale.Tr "repo.projects.description"}}</label> + <textarea name="content" placeholder="{{.locale.Tr "repo.projects.description_placeholder"}}">{{.content}}</textarea> + </div> + {{if not .PageIsEditProjects}} <div class="field"> - <label>{{.locale.Tr "repo.projects.card_type.desc"}}</label> + <label>{{.locale.Tr "repo.projects.template.desc"}}</label> <div class="ui selection dropdown"> - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - {{range $element := .CardTypes}} - {{if or (eq $.card_type $element.CardType) (and (not $.PageIsEditProjects) (eq $element.CardType 1))}} - <input type="hidden" name="card_type" value="{{$element.CardType}}"> - <div class="default text">{{$.locale.Tr $element.Translation}}</div> - {{end}} - {{end}} + <input type="hidden" name="board_type" value="{{.type}}"> + <div class="default text">{{.locale.Tr "repo.projects.template.desc_helper"}}</div> <div class="menu"> - {{range $element := .CardTypes}} - <div class="item" data-id="{{$element.CardType}}" data-value="{{$element.CardType}}">{{$.locale.Tr $element.Translation}}</div> + {{range $element := .BoardTypes}} + <div class="item" data-id="{{$element.BoardType}}" data-value="{{$element.BoardType}}">{{$.locale.Tr $element.Translation}}</div> {{end}} </div> </div> </div> - </div> - <div class="divider"></div> - <div class="ui left"> - <a class="ui cancel button" href="{{$.CancelLink}}"> - {{.locale.Tr "repo.milestones.cancel"}} - </a> - <button class="ui primary button"> - {{if .PageIsEditProjects}}{{.locale.Tr "repo.projects.modify"}}{{else}}{{.locale.Tr "repo.projects.create"}}{{end}} - </button> + {{end}} + + <div class="field"> + <label>{{.locale.Tr "repo.projects.card_type.desc"}}</label> + <div class="ui selection dropdown"> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + {{range $element := .CardTypes}} + {{if or (eq $.card_type $element.CardType) (and (not $.PageIsEditProjects) (eq $element.CardType 1))}} + <input type="hidden" name="card_type" value="{{$element.CardType}}"> + <div class="default text">{{$.locale.Tr $element.Translation}}</div> + {{end}} + {{end}} + <div class="menu"> + {{range $element := .CardTypes}} + <div class="item" data-id="{{$element.CardType}}" data-value="{{$element.CardType}}">{{$.locale.Tr $element.Translation}}</div> + {{end}} + </div> </div> - </form> + </div> + </div> + <div class="divider"></div> + <div class="ui left"> + <a class="ui cancel button" href="{{$.CancelLink}}"> + {{.locale.Tr "repo.milestones.cancel"}} + </a> + <button class="ui primary button"> + {{if .PageIsEditProjects}}{{.locale.Tr "repo.projects.modify"}}{{else}}{{.locale.Tr "repo.projects.create"}}{{end}} + </button> + </div> +</form> 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 @@ - <div class="ui two column stackable grid"> - <div class="column"> +<div class="ui two column stackable grid"> + <div class="column"> + </div> + <div class="column right aligned"> + {{if .CanWriteProjects}} + <a class="ui small green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_column"}}</a> + {{end}} + <div class="ui small modal new-board-modal" id="new-board-item"> + <div class="header"> + {{$.locale.Tr "repo.projects.column.new"}} </div> - <div class="column right aligned"> - {{if .CanWriteProjects}} - <a class="ui small green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_column"}}</a> - {{end}} - <div class="ui small modal new-board-modal" id="new-board-item"> - <div class="header"> - {{$.locale.Tr "repo.projects.column.new"}} + <div class="content"> + <form class="ui form"> + <div class="required field"> + <label for="new_board">{{$.locale.Tr "repo.projects.column.new_title"}}</label> + <input class="new-board" id="new_board" name="title" required> </div> - <div class="content"> - <form class="ui form"> - <div class="required field"> - <label for="new_board">{{$.locale.Tr "repo.projects.column.new_title"}}</label> - <input class="new-board" id="new_board" name="title" required> - </div> - <div class="field color-field"> - <label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label> - <div class="color picker column"> - <input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color_picker" name="color"> - <div class="column precolors"> - {{template "repo/issue/label_precolors"}} - </div> - </div> + <div class="field color-field"> + <label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label> + <div class="color picker column"> + <input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color_picker" name="color"> + <div class="column precolors"> + {{template "repo/issue/label_precolors"}} </div> + </div> + </div> - <div class="text right actions"> - <button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button> - <button data-url="{{$.Link}}" class="ui primary button" id="new_board_submit">{{$.locale.Tr "repo.projects.column.new_submit"}}</button> - </div> - </form> + <div class="text right actions"> + <button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button> + <button data-url="{{$.Link}}" class="ui primary button" id="new_board_submit">{{$.locale.Tr "repo.projects.column.new_submit"}}</button> </div> - </div> + </form> </div> </div> - <div class="divider"></div> - <div class="ui two column stackable grid"> - <div class="column"> - <h2 class="project-title">{{$.Project.Title}}</h2> - <div class="content project-description">{{$.Project.RenderedContent|Str2html}}</div> + </div> +</div> +<div class="divider"></div> +<div class="ui two column stackable grid"> + <div class="column"> + <h2 class="project-title">{{$.Project.Title}}</h2> + <div class="content project-description">{{$.Project.RenderedContent|Str2html}}</div> + </div> + {{if $.CanWriteProjects}} + <div class="column right aligned"> + <div class="ui compact right mini menu"> + <a class="item" href="{{$.Link}}/edit?redirect=project"> + {{svg "octicon-pencil"}} + <span class="gt-mx-3">{{$.locale.Tr "repo.issues.label_edit"}}</span> + </a> + {{if .Project.IsClosed}} + <a class="item link-action" href data-url="{{$.Link}}/open"> + {{svg "octicon-check"}} + <span class="gt-mx-3">{{$.locale.Tr "repo.projects.open"}}</span> + </a> + {{else}} + <a class="item link-action" href data-url="{{$.Link}}/close"> + {{svg "octicon-skip"}} + <span class="gt-mx-3">{{$.locale.Tr "repo.projects.close"}}</span> + </a> + {{end}} + <a class="item delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.Project.ID}}"> + {{svg "octicon-trash"}} + <span class="gt-mx-3">{{$.locale.Tr "repo.issues.label_delete"}}</span> + </a> </div> - {{if $.CanWriteProjects}} - <div class="column right aligned"> - <div class="ui compact right mini menu"> - <a class="item" href="{{$.Link}}/edit?redirect=project"> - {{svg "octicon-pencil"}} - <span class="gt-mx-3">{{$.locale.Tr "repo.issues.label_edit"}}</span> - </a> - {{if .Project.IsClosed}} - <a class="item link-action" href data-url="{{$.Link}}/open"> - {{svg "octicon-check"}} - <span class="gt-mx-3">{{$.locale.Tr "repo.projects.open"}}</span> - </a> - {{else}} - <a class="item link-action" href data-url="{{$.Link}}/close"> - {{svg "octicon-skip"}} - <span class="gt-mx-3">{{$.locale.Tr "repo.projects.close"}}</span> - </a> - {{end}} - <a class="item delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.Project.ID}}"> - {{svg "octicon-trash"}} - <span class="gt-mx-3">{{$.locale.Tr "repo.issues.label_delete"}}</span> - </a> - </div> - </div> - {{end}} </div> - <div class="divider"></div> + {{end}} +</div> - <div id="project-board"> +<div class="divider"></div> - <div class="board {{if .CanWriteProjects}}sortable{{end}}"> - {{range $board := .Boards}} - - <div class="ui segment board-column" style="background: {{.Color}} !important;" data-id="{{.ID}}" data-sorting="{{.Sorting}}" data-url="{{$.Link}}/{{.ID}}"> - <div class="board-column-header gt-df gt-ac gt-sb"> - <div class="ui large label board-label gt-py-2"> - <div class="ui small circular grey label board-card-cnt"> - {{.NumIssues}} - </div> - {{.Title}} +<div id="project-board"> + <div class="board {{if .CanWriteProjects}}sortable{{end}}"> + {{range $board := .Boards}} + <div class="ui segment board-column" style="background: {{.Color}} !important;" data-id="{{.ID}}" data-sorting="{{.Sorting}}" data-url="{{$.Link}}/{{.ID}}"> + <div class="board-column-header gt-df gt-ac gt-sb"> + <div class="ui large label board-label gt-py-2"> + <div class="ui small circular grey label board-card-cnt"> + {{.NumIssues}} </div> - {{if and $.CanWriteProjects (ne .ID 0)}} - <div class="ui dropdown jump item"> - <div class="not-mobile gt-px-3" tabindex="-1"> - {{svg "octicon-kebab-horizontal"}} - </div> - <div class="menu user-menu" tabindex="-1"> - <a class="item show-modal button" data-modal="#edit-project-board-modal-{{.ID}}"> - {{svg "octicon-pencil"}} - {{$.locale.Tr "repo.projects.column.edit"}} + {{.Title}} + </div> + {{if and $.CanWriteProjects (ne .ID 0)}} + <div class="ui dropdown jump item"> + <div class="not-mobile gt-px-3" tabindex="-1"> + {{svg "octicon-kebab-horizontal"}} + </div> + <div class="menu user-menu" tabindex="-1"> + <a class="item show-modal button" data-modal="#edit-project-board-modal-{{.ID}}"> + {{svg "octicon-pencil"}} + {{$.locale.Tr "repo.projects.column.edit"}} + </a> + {{if not .Default}} + <a class="item show-modal button default-project-board-show" + data-modal="#default-project-board-modal-{{.ID}}" + data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.set_default"}}" + data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.set_default_desc"}}" + data-url="{{$.Link}}/{{.ID}}/default"> + {{svg "octicon-pin"}} + {{$.locale.Tr "repo.projects.column.set_default"}} </a> - {{if not .Default}} - <a class="item show-modal button default-project-board-show" - data-modal="#default-project-board-modal-{{.ID}}" - data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.set_default"}}" - data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.set_default_desc"}}" - data-url="{{$.Link}}/{{.ID}}/default"> - {{svg "octicon-pin"}} - {{$.locale.Tr "repo.projects.column.set_default"}} - </a> - {{else}} - <a class="item show-modal button default-project-board-show" - data-modal="#default-project-board-modal-{{.ID}}" - data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.unset_default"}}" - data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}" - data-url="{{$.Link}}/{{.ID}}/unsetdefault"> - {{svg "octicon-pin-slash"}} - {{$.locale.Tr "repo.projects.column.unset_default"}} - </a> - {{end}} - <a class="item show-modal button show-delete-column-modal" - data-modal="#delete-board-modal-{{.ID}}" - data-url="{{$.Link}}/{{.ID}}" - > - {{svg "octicon-trash"}} - {{$.locale.Tr "repo.projects.column.delete"}} + {{else}} + <a class="item show-modal button default-project-board-show" + data-modal="#default-project-board-modal-{{.ID}}" + data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.unset_default"}}" + data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}" + data-url="{{$.Link}}/{{.ID}}/unsetdefault"> + {{svg "octicon-pin-slash"}} + {{$.locale.Tr "repo.projects.column.unset_default"}} </a> + {{end}} + <a class="item show-modal button show-delete-column-modal" + data-modal="#delete-board-modal-{{.ID}}" + data-url="{{$.Link}}/{{.ID}}" + > + {{svg "octicon-trash"}} + {{$.locale.Tr "repo.projects.column.delete"}} + </a> - <div class="ui small modal edit-project-board" id="edit-project-board-modal-{{.ID}}"> - <div class="header"> - {{$.locale.Tr "repo.projects.column.edit"}} - </div> - <div class="content"> - <form class="ui form"> - <div class="required field"> - <label for="new_board_title">{{$.locale.Tr "repo.projects.column.edit_title"}}</label> - <input class="project-board-title" id="new_board_title" name="title" value="{{.Title}}" required> - </div> + <div class="ui small modal edit-project-board" id="edit-project-board-modal-{{.ID}}"> + <div class="header"> + {{$.locale.Tr "repo.projects.column.edit"}} + </div> + <div class="content"> + <form class="ui form"> + <div class="required field"> + <label for="new_board_title">{{$.locale.Tr "repo.projects.column.edit_title"}}</label> + <input class="project-board-title" id="new_board_title" name="title" value="{{.Title}}" required> + </div> - <div class="field color-field"> - <label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label> - <div class="color picker column"> - <input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color" name="color" value="{{.Color}}"> - <div class="column precolors"> - {{template "repo/issue/label_precolors"}} - </div> + <div class="field color-field"> + <label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label> + <div class="color picker column"> + <input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color" name="color" value="{{.Color}}"> + <div class="column precolors"> + {{template "repo/issue/label_precolors"}} </div> </div> + </div> - <div class="text right actions"> - <button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button> - <button data-url="{{$.Link}}/{{.ID}}" class="ui primary button edit-column-button">{{$.locale.Tr "repo.projects.column.edit"}}</button> - </div> - </form> - </div> + <div class="text right actions"> + <button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button> + <button data-url="{{$.Link}}/{{.ID}}" class="ui primary button edit-column-button">{{$.locale.Tr "repo.projects.column.edit"}}</button> + </div> + </form> </div> + </div> - <div class="ui g-modal-confirm modal default-project-board-modal" id="default-project-board-modal-{{.ID}}"> - <div class="header"> - <span id="default-project-board-header"></span> - </div> - <div class="content"> - <label id="default-project-board-content"></label> - </div> - {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} + <div class="ui g-modal-confirm modal default-project-board-modal" id="default-project-board-modal-{{.ID}}"> + <div class="header"> + <span id="default-project-board-header"></span> + </div> + <div class="content"> + <label id="default-project-board-content"></label> </div> + {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} + </div> - <div class="ui g-modal-confirm modal" id="delete-board-modal-{{.ID}}"> - <div class="header"> - {{$.locale.Tr "repo.projects.column.delete"}} - </div> - <div class="content"> - <label> - {{$.locale.Tr "repo.projects.column.deletion_desc"}} - </label> - </div> - {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} + <div class="ui g-modal-confirm modal" id="delete-board-modal-{{.ID}}"> + <div class="header"> + {{$.locale.Tr "repo.projects.column.delete"}} </div> + <div class="content"> + <label> + {{$.locale.Tr "repo.projects.column.deletion_desc"}} + </label> + </div> + {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} </div> </div> - {{end}} - </div> - <div class="divider"></div> + </div> + {{end}} + </div> + <div class="divider"></div> - <div class="ui cards board" data-url="{{$.Link}}/{{.ID}}" data-project="{{$.Project.ID}}" data-board="{{.ID}}" id="board_{{.ID}}"> + <div class="ui cards board" data-url="{{$.Link}}/{{.ID}}" data-project="{{$.Project.ID}}" data-board="{{.ID}}" id="board_{{.ID}}"> - {{range (index $.IssuesMap .ID)}} + {{range (index $.IssuesMap .ID)}} - <!-- start issue card --> - <div class="card board-card" data-issue="{{.ID}}"> - {{if eq $.Project.CardType 1}}{{/* Images and Text*/}} - <div class="card-attachment-images"> - {{range (index $.issuesAttachmentMap .ID)}} - <img src="{{.DownloadURL}}" alt="{{.Name}}" /> + <!-- start issue card --> + <div class="card board-card" data-issue="{{.ID}}"> + {{if eq $.Project.CardType 1}}{{/* Images and Text*/}} + <div class="card-attachment-images"> + {{range (index $.issuesAttachmentMap .ID)}} + <img src="{{.DownloadURL}}" alt="{{.Name}}" /> + {{end}} + </div> + {{end}} + <div class="content gt-p-0"> + <div class="header"> + <span class="gt-dif gt-ac gt-vm"> + {{template "shared/issueicon" .}} + </span> + <a class="project-board-title gt-vm" href="{{.Link}}"> + {{.Title}} + </a> + </div> + <div class="meta gt-my-2"> + <span class="text light grey"> + {{.Repo.FullName}}#{{.Index}} + {{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}} + {{if .OriginalAuthor}} + {{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}} + {{else if gt .Poster.ID 0}} + {{$.locale.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}} + {{else}} + {{$.locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}} {{end}} - </div> - {{end}} - <div class="content gt-p-0"> - <div class="header"> - <span class="gt-dif gt-ac gt-vm"> - {{template "shared/issueicon" .}} - </span> - <a class="project-board-title gt-vm" href="{{.Link}}"> - {{.Title}} - </a> - </div> - <div class="meta gt-my-2"> - <span class="text light grey"> - {{.Repo.FullName}}#{{.Index}} - {{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}} - {{if .OriginalAuthor}} - {{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}} - {{else if gt .Poster.ID 0}} - {{$.locale.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}} - {{else}} - {{$.locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}} - {{end}} - </span> - </div> - {{- if .MilestoneID}} - <div class="meta gt-my-2"> - <a class="milestone" href="{{$.RepoLink}}/milestone/{{.MilestoneID}}"> - {{svg "octicon-milestone" 16 "gt-mr-2 gt-vm"}} - <span class="gt-vm">{{.Milestone.Name}}</span> - </a> - </div> - {{- end}} - {{- range index $.LinkedPRs .ID}} - <div class="meta gt-my-2"> - <a href="{{$.RepoLink}}/pulls/{{.Index}}"> - <span class="gt-m-0 text {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "gt-mr-2 gt-vm"}}</span> - <span class="gt-vm">{{.Title}} <span class="text light grey">#{{.Index}}</span></span> - </a> - </div> - {{- end}} + </span> + </div> + {{- if .MilestoneID}} + <div class="meta gt-my-2"> + <a class="milestone" href="{{$.RepoLink}}/milestone/{{.MilestoneID}}"> + {{svg "octicon-milestone" 16 "gt-mr-2 gt-vm"}} + <span class="gt-vm">{{.Milestone.Name}}</span> + </a> </div> + {{- end}} + {{- range index $.LinkedPRs .ID}} + <div class="meta gt-my-2"> + <a href="{{$.RepoLink}}/pulls/{{.Index}}"> + <span class="gt-m-0 text {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "gt-mr-2 gt-vm"}}</span> + <span class="gt-vm">{{.Title}} <span class="text light grey">#{{.Index}}</span></span> + </a> + </div> + {{- end}} + </div> - {{if or .Labels .Assignees}} - <div class="extra content labels-list gt-p-0 gt-pt-2"> - {{range .Labels}} - <a target="_blank" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{RenderLabel $.Context .}}</a> + {{if or .Labels .Assignees}} + <div class="extra content labels-list gt-p-0 gt-pt-2"> + {{range .Labels}} + <a target="_blank" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{RenderLabel $.Context .}}</a> + {{end}} + <div class="right floated"> + {{range .Assignees}} + <a target="_blank" href="{{.HomeLink}}" data-tooltip-content="{{$.locale.Tr "repo.projects.column.assigned_to"}} {{.Name}}">{{avatar $.Context . 28 "mini gt-mr-3"}}</a> {{end}} - <div class="right floated"> - {{range .Assignees}} - <a target="_blank" href="{{.HomeLink}}" data-tooltip-content="{{$.locale.Tr "repo.projects.column.assigned_to"}} {{.Name}}">{{avatar $.Context . 28 "mini gt-mr-3"}}</a> - {{end}} - </div> </div> - {{end}} </div> - <!-- stop issue card --> - {{end}} </div> + <!-- stop issue card --> + + {{end}} </div> - {{end}} </div> - + {{end}} </div> +</div> + {{if .CanWriteProjects}} <div class="ui g-modal-confirm delete modal"> <div class="header"> diff --git a/templates/user/overview/package_versions.tmpl b/templates/user/overview/package_versions.tmpl index 3757e922e3..6f740e0e7c 100644 --- a/templates/user/overview/package_versions.tmpl +++ b/templates/user/overview/package_versions.tmpl @@ -8,20 +8,20 @@ </div> </div> {{else}} -<div role="main" aria-label="{{.Title}}" class="page-content user profile packages"> - <div class="ui container"> - <div class="ui stackable grid"> - <div class="ui four wide column"> - {{template "shared/user/profile_big_avatar" .}} - </div> - <div class="ui twelve wide column"> - <div class="gt-mb-4"> - {{template "user/overview/header" .}} + <div role="main" aria-label="{{.Title}}" class="page-content user profile packages"> + <div class="ui container"> + <div class="ui stackable grid"> + <div class="ui four wide column"> + {{template "shared/user/profile_big_avatar" .}} + </div> + <div class="ui twelve wide column"> + <div class="gt-mb-4"> + {{template "user/overview/header" .}} + </div> + {{template "package/shared/versionlist" .}} </div> - {{template "package/shared/versionlist" .}} </div> </div> </div> -</div> {{end}} {{template "base/footer" .}}