diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-04-29 19:35:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-29 07:35:59 -0400 |
| commit | 5a5ab8ef5ac5fbdb893707933f06ff6bcd8e834a (patch) | |
| tree | 4b52759c1203f3a796be9bfcc587bd157fae5daf /templates/repo | |
| parent | 72e956b79a3b2e055bb5d4d5e20e88eaa2eeec96 (diff) | |
| download | gitea-5a5ab8ef5ac5fbdb893707933f06ff6bcd8e834a.tar.gz gitea-5a5ab8ef5ac5fbdb893707933f06ff6bcd8e834a.zip | |
Start cleaning the messy ".ui.left / .ui.right", improve label list page, fix stackable menu (#24393)
Since 2015/2016, there is a global pollution: ".ui.left" / ".ui.right".
Fomantic UI doesn't work this way, it just conflicts with many Fomantic
definitions.
This PR starts the cleaning work of such techinical debts.
And, the "label list" page has been quite messy for long time, for
example, why "li" appears in "div" ......
And fix #24296
<details>
</details>
Diffstat (limited to 'templates/repo')
| -rw-r--r-- | templates/repo/cite/cite_modal.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/diff/conversation.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/header.tmpl | 20 | ||||
| -rw-r--r-- | templates/repo/issue/labels/label_list.tmpl | 123 | ||||
| -rw-r--r-- | templates/repo/issue/list.tmpl | 2 |
5 files changed, 71 insertions, 80 deletions
diff --git a/templates/repo/cite/cite_modal.tmpl b/templates/repo/cite/cite_modal.tmpl index 8f69f7d0ed..c515874a06 100644 --- a/templates/repo/cite/cite_modal.tmpl +++ b/templates/repo/cite/cite_modal.tmpl @@ -3,7 +3,7 @@ {{.locale.Tr "repo.cite_this_repo"}} </div> <div class="content"> - <div class="ui stackable secondary menu mobile--margin-between-items mobile--no-negative-margins no-vertical-tabs"> + <div class="ui stackable secondary menu"> <div class="fitted item"> <div class="ui action input" id="citation-panel"> {{template "repo/cite/cite_buttons" .}} diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl index 999197f94a..8d4064967e 100644 --- a/templates/repo/diff/conversation.tmpl +++ b/templates/repo/diff/conversation.tmpl @@ -9,11 +9,11 @@ <b>{{$resolveDoer.Name}}</b> {{$.locale.Tr "repo.issues.review.resolved_by"}} </div> <div> - <button id="show-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="ui tiny right labeled button show-outdated gt-df gt-ac"> + <button id="show-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="ui tiny labeled button show-outdated gt-df gt-ac"> {{svg "octicon-unfold" 16 "gt-mr-3"}} {{$.locale.Tr "repo.issues.review.show_resolved"}} </button> - <button id="hide-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="ui tiny right labeled button hide-outdated gt-df gt-ac gt-hidden"> + <button id="hide-outdated-{{(index .comments 0).ID}}" data-comment="{{(index .comments 0).ID}}" class="ui tiny labeled button hide-outdated gt-df gt-ac gt-hidden"> {{svg "octicon-fold" 16 "gt-mr-3"}} {{$.locale.Tr "repo.issues.review.hide_resolved"}} </button> diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 9b3b2ce794..ab50dd175a 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -151,7 +151,7 @@ {{end}} <div class="ui tabs container"> {{if not (or .Repository.IsBeingCreated .Repository.IsBroken)}} - <div class="ui tabular stackable menu navbar"> + <div class="ui tabular menu navbar gt-overflow-x-auto gt-overflow-y-hidden"> {{if .Permission.CanRead $.UnitTypeCode}} <a class="{{if .PageIsViewCode}}active {{end}}item" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL}}{{end}}"> {{svg "octicon-code"}} {{.locale.Tr "repo.code"}} @@ -236,20 +236,16 @@ {{template "custom/extra_tabs" .}} {{if .Permission.IsAdmin}} - <div class="right menu"> - <a class="{{if .PageIsRepoSettings}}active {{end}}item" href="{{.RepoLink}}/settings"> - {{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}} - </a> - </div> + <a class="{{if .PageIsRepoSettings}}active {{end}}right item" href="{{.RepoLink}}/settings"> + {{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}} + </a> {{end}} </div> {{else if .Permission.IsAdmin}} - <div class="ui tabular stackable menu navbar"> - <div class="right menu"> - <a class="{{if .PageIsRepoSettings}}active {{end}}item" href="{{.RepoLink}}/settings"> - {{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}} - </a> - </div> + <div class="ui tabular menu navbar gt-overflow-x-auto gt-overflow-y-hidden"> + <a class="{{if .PageIsRepoSettings}}active {{end}}right item" href="{{.RepoLink}}/settings"> + {{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}} + </a> </div> {{end}} </div> diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index b294036f0c..325efd1da6 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -1,58 +1,59 @@ <h4 class="ui top attached header"> - {{.locale.Tr "repo.issues.label_count" .NumLabels}} - <div class="ui right"> - <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 or (eq .SortType "alphabetically") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=alphabetically&state={{$.State}}">{{.locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a> - <a class="{{if eq .SortType "reversealphabetically"}}active {{end}}item" href="{{$.Link}}?sort=reversealphabetically&state={{$.State}}">{{.locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a> - <a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="{{$.Link}}?sort=leastissues&state={{$.State}}">{{.locale.Tr "repo.milestones.filter_sort.least_issues"}}</a> - <a class="{{if eq .SortType "mostissues"}}active {{end}}item" href="{{$.Link}}?sort=mostissues&state={{$.State}}">{{.locale.Tr "repo.milestones.filter_sort.most_issues"}}</a> - </div> + {{.locale.Tr "repo.issues.label_count" .NumLabels}} + <div class="ui right"> + <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 or (eq .SortType "alphabetically") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=alphabetically&state={{$.State}}">{{.locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a> + <a class="{{if eq .SortType "reversealphabetically"}}active {{end}}item" href="{{$.Link}}?sort=reversealphabetically&state={{$.State}}">{{.locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a> + <a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="{{$.Link}}?sort=leastissues&state={{$.State}}">{{.locale.Tr "repo.milestones.filter_sort.least_issues"}}</a> + <a class="{{if eq .SortType "mostissues"}}active {{end}}item" href="{{$.Link}}?sort=mostissues&state={{$.State}}">{{.locale.Tr "repo.milestones.filter_sort.most_issues"}}</a> </div> </div> - </div> <!-- filter menu --> + </div> + </div> <!-- filter menu --> </h4> <div class="ui attached segment"> - <div class="labelspage"> - {{if and (not $.PageIsOrgSettingsLabels) (or $.CanWriteIssues $.CanWritePulls) (eq .NumLabels 0) (not $.Repository.IsArchived)}} - {{template "repo/issue/labels/label_load_template" .}} - <div class="ui divider"></div> - {{else if and ($.PageIsOrgSettingsLabels) (eq .NumLabels 0)}} - {{template "repo/issue/labels/label_load_template" .}} - {{end}} + {{if and (not $.PageIsOrgSettingsLabels) (or $.CanWriteIssues $.CanWritePulls) (eq .NumLabels 0) (not $.Repository.IsArchived)}} + {{template "repo/issue/labels/label_load_template" .}} + <div class="ui divider"></div> + {{else if and ($.PageIsOrgSettingsLabels) (eq .NumLabels 0)}} + {{template "repo/issue/labels/label_load_template" .}} + <div class="ui divider"></div> + {{end}} + + <ul class="issue-label-list"> {{range .Labels}} - <li class="item"> - <div class="ui grid middle aligned"> - <div class="eight wide column"> - {{RenderLabel $.Context .}} - {{if .Description}}<br><small class="desc">{{.Description | RenderEmoji $.Context}}</small>{{end}} - </div> - <div class="five wide column"> - {{if $.PageIsOrgSettingsLabels}} - <a class="ui left open-issues" href="{{AppSubUrl}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a> - {{else}} - <a class="ui left open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a> - {{end}} - </div> - <div class="three wide column"> - {{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}} - <a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a> - <a class="ui right edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" {{if .Exclusive}}data-exclusive{{end}} data-num-issues="{{.NumIssues}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}}</a> - {{else if $.PageIsOrgSettingsLabels}} - <a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a> - <a class="ui right edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" {{if .Exclusive}}data-exclusive{{end}} data-num-issues="{{.NumIssues}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}}</a> - {{end}} - </div> + <li class="item"> + <div class="label-title"> + {{RenderLabel $.Context .}} + {{if .Description}}<br><small class="desc">{{.Description | RenderEmoji $.Context}}</small>{{end}} </div> - </li> + <div class="label-issues"> + {{if $.PageIsOrgSettingsLabels}} + <a class="open-issues" href="{{AppSubUrl}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a> + {{else}} + <a class="open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a> + {{end}} + </div> + <div class="label-operation"> + {{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}} + <a class="edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" {{if .Exclusive}}data-exclusive{{end}} data-num-issues="{{.NumIssues}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}}</a> + <a class="delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a> + {{else if $.PageIsOrgSettingsLabels}} + <a class="edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" {{if .Exclusive}}data-exclusive{{end}} data-num-issues="{{.NumIssues}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}}</a> + <a class="delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a> + {{end}} + </div> + </li> {{end}} + {{if and (not .PageIsOrgSettingsLabels) (.OrgLabels)}} <li class="item"> <div class="ui grid middle aligned"> @@ -64,25 +65,19 @@ </div> </div> </li> - {{if (not $.PageIsOrgSettingsLabels)}} - <div class="orglabel"> - {{range .OrgLabels}} - <li class="item"> - <div class="ui grid middle aligned"> - <div class="nine wide column"> - {{RenderLabel $.Context .}} - {{if .Description}}<br><small class="desc">{{.Description | RenderEmoji $.Context}}</small>{{end}} - </div> - <div class="four wide column"> - <a class="ui left open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}}</a> - </div> - <div class="three wide column"> - </div> - </div> - </li> - {{end}} + + {{range .OrgLabels}} + <li class="item org-label"> + <div class="label-title"> + {{RenderLabel $.Context .}} + {{if .Description}}<br><small class="desc">{{.Description | RenderEmoji $.Context}}</small>{{end}} </div> + <div class="label-issues"> + <a class="open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}}</a> + </div> + <div class="label-operation"></div> + </li> {{end}} {{end}} - </div> + </ul> </div> diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 9c31262355..a99680c024 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -34,7 +34,7 @@ {{template "repo/issue/openclose" .}} </div> <div class="ten wide right aligned column"> - <div class="ui secondary filter stackable menu labels"> + <div class="ui secondary filter menu labels gt-overflow-x-auto gt-overflow-y-hidden"> <!-- Label --> <div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item label-filter" style="margin-left: auto"> <span class="text"> |