Skip to content

Commit 5a5ab8e

Browse files
wxiaoguangwxiaoguang
authored
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> ![image](https://user-images.githubusercontent.com/2114189/235051281-54c5374c-b5fd-4b5f-9aa2-02d4bb2d9112.png) ![image](https://user-images.githubusercontent.com/2114189/235055703-2ba042e0-4db7-4e63-8646-02f390d496b5.png) ![image](https://user-images.githubusercontent.com/2114189/235056310-4f6ffdc2-5758-4927-8fb8-314d9fb72a6b.png) ![image](https://user-images.githubusercontent.com/2114189/235058400-dab1c9ec-3325-4671-8345-aee6b0b68042.png) ![image](https://user-images.githubusercontent.com/2114189/235058424-85509532-b9bc-43ad-b00f-a87184c60f22.png) </details>
1 parent 72e956b commit 5a5ab8e

19 files changed

+168
-162
lines changed

‎templates/admin/dashboard.tmpl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,51 +23,51 @@
2323
<tbody>
2424
<tr>
2525
<td>{{.locale.Tr "admin.dashboard.delete_inactive_accounts"}}</td>
26-
<td><button type="submit" class="ui green button right" name="op" value="delete_inactive_accounts">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
26+
<td class="text right"><button type="submit" class="ui green button" name="op" value="delete_inactive_accounts">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
2727
</tr>
2828
<tr>
2929
<td>{{.locale.Tr "admin.dashboard.delete_repo_archives"}}</td>
30-
<td><button type="submit" class="ui green button right" name="op" value="delete_repo_archives">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
30+
<td class="text right"><button type="submit" class="ui green button" name="op" value="delete_repo_archives">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
3131
</tr>
3232
<tr>
3333
<td>{{.locale.Tr "admin.dashboard.delete_missing_repos"}}</td>
34-
<td><button type="submit" class="ui green button right" name="op" value="delete_missing_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
34+
<td class="text right"><button type="submit" class="ui green button" name="op" value="delete_missing_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
3535
</tr>
3636
<tr>
3737
<td>{{.locale.Tr "admin.dashboard.git_gc_repos"}}</td>
38-
<td><button type="submit" class="ui green button right" name="op" value="git_gc_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
38+
<td class="text right"><button type="submit" class="ui green button" name="op" value="git_gc_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
3939
</tr>
4040
{{if and (not .SSH.Disabled) (not .SSH.StartBuiltinServer)}}
4141
<tr>
4242
<td>{{.locale.Tr "admin.dashboard.resync_all_sshkeys"}}<br>
4343
{{.locale.Tr "admin.dashboard.resync_all_sshkeys.desc"}}</td>
44-
<td><button type="submit" class="ui green button right" name="op" value="resync_all_sshkeys">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
44+
<td class="text right"><button type="submit" class="ui green button" name="op" value="resync_all_sshkeys">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
4545
</tr>
4646
<tr>
4747
<td>{{.locale.Tr "admin.dashboard.resync_all_sshprincipals"}}<br>
4848
{{.locale.Tr "admin.dashboard.resync_all_sshprincipals.desc"}}</td>
49-
<td><button type="submit" class="ui green button right" name="op" value="resync_all_sshprincipals">{{svg "octicon-play" 16}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
49+
<td class="text right"><button type="submit" class="ui green button" name="op" value="resync_all_sshprincipals">{{svg "octicon-play" 16}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
5050
</tr>
5151
{{end}}
5252
<tr>
5353
<td>{{.locale.Tr "admin.dashboard.resync_all_hooks"}}</td>
54-
<td><button type="submit" class="ui green button right" name="op" value="resync_all_hooks">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
54+
<td class="text right"><button type="submit" class="ui green button" name="op" value="resync_all_hooks">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
5555
</tr>
5656
<tr>
5757
<td>{{.locale.Tr "admin.dashboard.reinit_missing_repos"}}</td>
58-
<td><button type="submit" class="ui green button right" name="op" value="reinit_missing_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
58+
<td class="text right"><button type="submit" class="ui green button" name="op" value="reinit_missing_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
5959
</tr>
6060
<tr>
6161
<td>{{.locale.Tr "admin.dashboard.sync_external_users"}}</td>
62-
<td><button type="submit" class="ui green button right" name="op" value="sync_external_users">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
62+
<td class="text right"><button type="submit" class="ui green button" name="op" value="sync_external_users">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
6363
</tr>
6464
<tr>
6565
<td>{{.locale.Tr "admin.dashboard.repo_health_check"}}</td>
66-
<td><button type="submit" class="ui green button right" name="op" value="repo_health_check">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
66+
<td class="text right"><button type="submit" class="ui green button" name="op" value="repo_health_check">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
6767
</tr>
6868
<tr>
6969
<td>{{.locale.Tr "admin.dashboard.delete_generated_repository_avatars"}}</td>
70-
<td><button type="submit" class="ui green button right" name="op" value="delete_generated_repository_avatars">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
70+
<td class="text right"><button type="submit" class="ui green button" name="op" value="delete_generated_repository_avatars">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
7171
</tr>
7272
</tbody>
7373
</table>

‎templates/base/footer_content.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<footer role="group" aria-label="{{.locale.Tr "aria.footer"}}">
2-
<div class="ui left" role="contentinfo" aria-label="{{.locale.Tr "aria.footer.software"}}">
1+
<footer class="page-footer" role="group" aria-label="{{.locale.Tr "aria.footer"}}">
2+
<div class="left-links" role="contentinfo" aria-label="{{.locale.Tr "aria.footer.software"}}">
33
<a target="_blank" rel="noopener noreferrer" href="https://gitea.io">{{.locale.Tr "powered_by" "Gitea"}}</a>
44
{{if (or .ShowFooterVersion .PageIsAdmin)}}
55
{{.locale.Tr "version"}}:
@@ -14,7 +14,7 @@
1414
{{.locale.Tr "template"}}{{if .TemplateName}} {{.TemplateName}}{{end}}: <strong>{{call .TemplateLoadTimes}}</strong>
1515
{{end}}
1616
</div>
17-
<div class="ui right links" role="group" aria-label="{{.locale.Tr "aria.footer.links"}}">
17+
<div class="right-links" role="group" aria-label="{{.locale.Tr "aria.footer.links"}}">
1818
<div class="ui dropdown upward language">
1919
<span>{{svg "octicon-globe"}} {{.locale.LangName}}</span>
2020
<div class="menu language-menu">

‎templates/base/head.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
{{template "custom/body_inner_pre" .}}
8484

8585
{{if not .PageIsInstall}}
86-
<div class="ui top secondary stackable main menu following bar light no-vertical-tabs">
86+
<div class="ui top secondary stackable main menu following bar light">
8787
{{template "base/head_navbar" .}}
8888
</div><!-- end bar -->
8989
{{end}}

‎templates/org/team/members.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@
5050
<div class="ui bottom attached table segment members">
5151
{{range .Invites}}
5252
<div class="item">
53+
{{.Email}}
5354
<form action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/remove_invite" method="post">
5455
{{$.CsrfTokenHtml}}
5556
<input type="hidden" name="iid" value="{{.ID}}">
56-
<button class="ui red button right">{{$.locale.Tr "org.members.remove"}}</button>
57+
<button class="ui red button gt-float-right">{{$.locale.Tr "org.members.remove"}}</button>
5758
</form>
58-
{{.Email}}
5959
</div>
6060
{{end}}
6161
</div>

‎templates/org/team/repositories.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
</div>
2626
<div class="inline ui field right">
2727
<form class="ui form" id="repo-multiple-form" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/repositories" method="post">
28-
<button class="ui red button delete-button right" data-modal-id="org-team-remove-all-repo" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/removeall">{{.locale.Tr "remove_all"}}</button>
29-
<button class="ui green button add-all-button right" data-modal-id="org-team-add-all-repo" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/addall">{{.locale.Tr "add_all"}}</button>
28+
<button class="ui green button add-all-button" data-modal-id="org-team-add-all-repo" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/addall">{{.locale.Tr "add_all"}}</button>
29+
<button class="ui red button delete-button" data-modal-id="org-team-remove-all-repo" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/removeall">{{.locale.Tr "remove_all"}}</button>
3030
</form>
3131
</div>
3232
</div>

‎templates/repo/cite/cite_modal.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{{.locale.Tr "repo.cite_this_repo"}}
44
</div>
55
<div class="content">
6-
<div class="ui stackable secondary menu mobile--margin-between-items mobile--no-negative-margins no-vertical-tabs">
6+
<div class="ui stackable secondary menu">
77
<div class="fitted item">
88
<div class="ui action input" id="citation-panel">
99
{{template "repo/cite/cite_buttons" .}}

‎templates/repo/diff/conversation.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<b>{{$resolveDoer.Name}}</b> {{$.locale.Tr "repo.issues.review.resolved_by"}}
1010
</div>
1111
<div>
12-
<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">
12+
<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">
1313
{{svg "octicon-unfold" 16 "gt-mr-3"}}
1414
{{$.locale.Tr "repo.issues.review.show_resolved"}}
1515
</button>
16-
<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">
16+
<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">
1717
{{svg "octicon-fold" 16 "gt-mr-3"}}
1818
{{$.locale.Tr "repo.issues.review.hide_resolved"}}
1919
</button>

‎templates/repo/header.tmpl

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
{{end}}
152152
<div class="ui tabs container">
153153
{{if not (or .Repository.IsBeingCreated .Repository.IsBroken)}}
154-
<div class="ui tabular stackable menu navbar">
154+
<div class="ui tabular menu navbar gt-overflow-x-auto gt-overflow-y-hidden">
155155
{{if .Permission.CanRead $.UnitTypeCode}}
156156
<a class="{{if .PageIsViewCode}}active {{end}}item" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL}}{{end}}">
157157
{{svg "octicon-code"}} {{.locale.Tr "repo.code"}}
@@ -236,20 +236,16 @@
236236
{{template "custom/extra_tabs" .}}
237237

238238
{{if .Permission.IsAdmin}}
239-
<div class="right menu">
240-
<a class="{{if .PageIsRepoSettings}}active {{end}}item" href="{{.RepoLink}}/settings">
241-
{{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}}
242-
</a>
243-
</div>
239+
<a class="{{if .PageIsRepoSettings}}active {{end}}right item" href="{{.RepoLink}}/settings">
240+
{{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}}
241+
</a>
244242
{{end}}
245243
</div>
246244
{{else if .Permission.IsAdmin}}
247-
<div class="ui tabular stackable menu navbar">
248-
<div class="right menu">
249-
<a class="{{if .PageIsRepoSettings}}active {{end}}item" href="{{.RepoLink}}/settings">
250-
{{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}}
251-
</a>
252-
</div>
245+
<div class="ui tabular menu navbar gt-overflow-x-auto gt-overflow-y-hidden">
246+
<a class="{{if .PageIsRepoSettings}}active {{end}}right item" href="{{.RepoLink}}/settings">
247+
{{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}}
248+
</a>
253249
</div>
254250
{{end}}
255251
</div>

‎templates/repo/issue/labels/label_list.tmpl

Lines changed: 59 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,59 @@
11
<h4 class="ui top attached header">
2-
{{.locale.Tr "repo.issues.label_count" .NumLabels}}
3-
<div class="ui right">
4-
<div class="ui right floated secondary filter menu">
5-
<!-- Sort -->
6-
<div class="ui dropdown type jump item">
7-
<span class="text">
8-
{{.locale.Tr "repo.issues.filter_sort"}}
9-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
10-
</span>
11-
<div class="menu">
12-
<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>
13-
<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>
14-
<a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="{{$.Link}}?sort=leastissues&state={{$.State}}">{{.locale.Tr "repo.milestones.filter_sort.least_issues"}}</a>
15-
<a class="{{if eq .SortType "mostissues"}}active {{end}}item" href="{{$.Link}}?sort=mostissues&state={{$.State}}">{{.locale.Tr "repo.milestones.filter_sort.most_issues"}}</a>
16-
</div>
2+
{{.locale.Tr "repo.issues.label_count" .NumLabels}}
3+
<div class="ui right">
4+
<div class="ui right floated secondary filter menu">
5+
<!-- Sort -->
6+
<div class="ui dropdown type jump item">
7+
<span class="text">
8+
{{.locale.Tr "repo.issues.filter_sort"}}
9+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
10+
</span>
11+
<div class="menu">
12+
<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>
13+
<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>
14+
<a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="{{$.Link}}?sort=leastissues&state={{$.State}}">{{.locale.Tr "repo.milestones.filter_sort.least_issues"}}</a>
15+
<a class="{{if eq .SortType "mostissues"}}active {{end}}item" href="{{$.Link}}?sort=mostissues&state={{$.State}}">{{.locale.Tr "repo.milestones.filter_sort.most_issues"}}</a>
1716
</div>
1817
</div>
19-
</div> <!-- filter menu -->
18+
</div>
19+
</div> <!-- filter menu -->
2020
</h4>
2121

2222
<div class="ui attached segment">
23-
<div class="labelspage">
24-
{{if and (not $.PageIsOrgSettingsLabels) (or $.CanWriteIssues $.CanWritePulls) (eq .NumLabels 0) (not $.Repository.IsArchived)}}
25-
{{template "repo/issue/labels/label_load_template" .}}
26-
<div class="ui divider"></div>
27-
{{else if and ($.PageIsOrgSettingsLabels) (eq .NumLabels 0)}}
28-
{{template "repo/issue/labels/label_load_template" .}}
29-
{{end}}
23+
{{if and (not $.PageIsOrgSettingsLabels) (or $.CanWriteIssues $.CanWritePulls) (eq .NumLabels 0) (not $.Repository.IsArchived)}}
24+
{{template "repo/issue/labels/label_load_template" .}}
25+
<div class="ui divider"></div>
26+
{{else if and ($.PageIsOrgSettingsLabels) (eq .NumLabels 0)}}
27+
{{template "repo/issue/labels/label_load_template" .}}
28+
<div class="ui divider"></div>
29+
{{end}}
30+
31+
<ul class="issue-label-list">
3032
{{range .Labels}}
31-
<li class="item">
32-
<div class="ui grid middle aligned">
33-
<div class="eight wide column">
34-
{{RenderLabel $.Context .}}
35-
{{if .Description}}<br><small class="desc">{{.Description | RenderEmoji $.Context}}</small>{{end}}
36-
</div>
37-
<div class="five wide column">
38-
{{if $.PageIsOrgSettingsLabels}}
39-
<a class="ui left open-issues" href="{{AppSubUrl}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a>
40-
{{else}}
41-
<a class="ui left open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a>
42-
{{end}}
43-
</div>
44-
<div class="three wide column">
45-
{{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}}
46-
<a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a>
47-
<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>
48-
{{else if $.PageIsOrgSettingsLabels}}
49-
<a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a>
50-
<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>
51-
{{end}}
52-
</div>
33+
<li class="item">
34+
<div class="label-title">
35+
{{RenderLabel $.Context .}}
36+
{{if .Description}}<br><small class="desc">{{.Description | RenderEmoji $.Context}}</small>{{end}}
5337
</div>
54-
</li>
38+
<div class="label-issues">
39+
{{if $.PageIsOrgSettingsLabels}}
40+
<a class="open-issues" href="{{AppSubUrl}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a>
41+
{{else}}
42+
<a class="open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a>
43+
{{end}}
44+
</div>
45+
<div class="label-operation">
46+
{{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}}
47+
<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>
48+
<a class="delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a>
49+
{{else if $.PageIsOrgSettingsLabels}}
50+
<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>
51+
<a class="delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a>
52+
{{end}}
53+
</div>
54+
</li>
5555
{{end}}
56+
5657
{{if and (not .PageIsOrgSettingsLabels) (.OrgLabels)}}
5758
<li class="item">
5859
<div class="ui grid middle aligned">
@@ -64,25 +65,19 @@
6465
</div>
6566
</div>
6667
</li>
67-
{{if (not $.PageIsOrgSettingsLabels)}}
68-
<div class="orglabel">
69-
{{range .OrgLabels}}
70-
<li class="item">
71-
<div class="ui grid middle aligned">
72-
<div class="nine wide column">
73-
{{RenderLabel $.Context .}}
74-
{{if .Description}}<br><small class="desc">{{.Description | RenderEmoji $.Context}}</small>{{end}}
75-
</div>
76-
<div class="four wide column">
77-
<a class="ui left open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}}</a>
78-
</div>
79-
<div class="three wide column">
80-
</div>
81-
</div>
82-
</li>
83-
{{end}}
68+
69+
{{range .OrgLabels}}
70+
<li class="item org-label">
71+
<div class="label-title">
72+
{{RenderLabel $.Context .}}
73+
{{if .Description}}<br><small class="desc">{{.Description | RenderEmoji $.Context}}</small>{{end}}
8474
</div>
75+
<div class="label-issues">
76+
<a class="open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}}</a>
77+
</div>
78+
<div class="label-operation"></div>
79+
</li>
8580
{{end}}
8681
{{end}}
87-
</div>
82+
</ul>
8883
</div>

0 commit comments

Comments
 (0)