Skip to content

Commit c6f0bfb

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent eaf551b commit c6f0bfb

File tree

11 files changed

+93
-158
lines changed

11 files changed

+93
-158
lines changed

‎templates/admin/user/edit.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186

187187
<div class="field">
188188
<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
189-
<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>{{/* TODO: Convert links without href to buttons for a11y */}}
189+
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete" data-redirect="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
190190
</div>
191191
</form>
192192
</div>

‎templates/base/head_script.tmpl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly.
3232
mermaidMaxSourceCharacters: {{MermaidMaxSourceCharacters}},
3333
{{/* this global i18n object should only contain general texts. for specialized texts, it should be provided inside the related modules by: (1) API response (2) HTML data-attribute (3) PageData */}}
3434
i18n: {
35-
copy_success: '{{.locale.Tr "copy_success"}}',
36-
copy_error: '{{.locale.Tr "copy_error"}}',
37-
error_occurred: '{{.locale.Tr "error.occurred"}}',
38-
network_error: '{{.locale.Tr "error.network_error"}}',
39-
remove_label_str: '{{.locale.Tr "remove_label_str"}}',
35+
copy_success: {{.locale.Tr "copy_success"}},
36+
copy_error: {{.locale.Tr "copy_error"}},
37+
error_occurred: {{.locale.Tr "error.occurred"}},
38+
network_error: {{.locale.Tr "error.network_error"}},
39+
remove_label_str: {{.locale.Tr "remove_label_str"}},
40+
modal_confirm: {{.locale.Tr "modal.confirm"}},
41+
modal_cancel: {{.locale.Tr "modal.cancel"}},
4042
},
4143
};
4244
{{/* in case some pages don't render the pageData, we make sure it is an object to prevent null access */}}

‎templates/org/settings/options.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090

9191
<div class="field">
9292
<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
93-
<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>
93+
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete" data-redirect="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
9494
</div>
9595
</form>
9696
</div>

‎templates/org/team/members.tmpl

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@
99
{{template "org/team/navbar" .}}
1010
{{if .IsOrganizationOwner}}
1111
<div class="ui attached segment">
12-
<form class="ui form ignore-dirty" id="add-member-form" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/add" method="post">
12+
<form class="ui form ignore-dirty gt-df" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/add" method="post">
1313
{{.CsrfTokenHtml}}
1414
<input type="hidden" name="uid" value="{{.SignedUser.ID}}">
15-
<div class="inline field ui left">
16-
<div id="search-user-box" class="ui search"{{if .IsEmailInviteEnabled}} data-allow-email="true" data-allow-email-description="{{.locale.Tr "org.teams.invite_team_member" $.Team.Name}}"{{end}}>
17-
<div class="ui input">
18-
<input class="prompt" name="uname" placeholder="{{.locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" required>
19-
</div>
15+
<div id="search-user-box" class="ui search"{{if .IsEmailInviteEnabled}} data-allow-email="true" data-allow-email-description="{{.locale.Tr "org.teams.invite_team_member" $.Team.Name}}"{{end}}>
16+
<div class="ui input">
17+
<input class="prompt" name="uname" placeholder="{{.locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" required>
2018
</div>
2119
</div>
22-
<button class="ui green button">{{.locale.Tr "org.teams.add_team_member"}}</button>
20+
<button class="ui green button gt-ml-3">{{.locale.Tr "org.teams.add_team_member"}}</button>
2321
</form>
2422
</div>
2523
{{end}}

‎templates/org/team/repositories.tmpl

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,19 @@
99
{{template "org/team/navbar" .}}
1010
{{$canAddRemove := and $.IsOrganizationOwner (not $.Team.IncludesAllRepositories)}}
1111
{{if $canAddRemove}}
12-
<div class="ui attached segment" id="repo-top-segment">
13-
<div class="inline ui field left">
14-
<form class="ui form ignore-dirty" id="add-repo-form" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/add" method="post">
15-
{{.CsrfTokenHtml}}
16-
<div class="inline field ui left">
17-
<div id="search-repo-box" data-uid="{{.Org.ID}}" class="ui search">
18-
<div class="ui input">
19-
<input class="prompt" name="repo_name" placeholder="{{.locale.Tr "org.teams.search_repo_placeholder"}}" autocomplete="off" required>
20-
</div>
21-
</div>
12+
<div class="ui attached segment gt-df">
13+
<form class="ui form ignore-dirty gt-f1 gt-dif" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/add" method="post">
14+
{{.CsrfTokenHtml}}
15+
<div id="search-repo-box" data-uid="{{.Org.ID}}" class="ui search">
16+
<div class="ui input">
17+
<input class="prompt" name="repo_name" placeholder="{{.locale.Tr "org.teams.search_repo_placeholder"}}" autocomplete="off" required>
2218
</div>
23-
<button class="ui green button">{{.locale.Tr "add"}}</button>
24-
</form>
25-
</div>
26-
<div class="inline ui field right">
27-
<form class="ui form" id="repo-multiple-form" action="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/repositories" method="post">
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>
30-
</form>
19+
</div>
20+
<button class="ui green button gt-ml-3">{{.locale.Tr "add"}}</button>
21+
</form>
22+
<div class="gt-dib">
23+
<button class="ui green button link-action" data-modal-confirm="{{.locale.Tr "org.teams.add_all_repos_desc"}}" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/addall">{{.locale.Tr "add_all"}}</button>
24+
<button class="ui red button link-action" data-modal-confirm="{{.locale.Tr "org.teams.remove_all_repos_desc"}}" data-url="{{$.OrgLink}}/teams/{{$.Team.LowerName | PathEscape}}/action/repo/removeall">{{.locale.Tr "remove_all"}}</button>
3125
</div>
3226
</div>
3327
{{end}}
@@ -64,26 +58,4 @@
6458
</div>
6559
</div>
6660

67-
<div class="ui g-modal-confirm delete modal" id="org-team-remove-all-repo">
68-
<div class="header">
69-
{{svg "octicon-trash"}}
70-
{{.locale.Tr "org.teams.remove_all_repos_title"}}
71-
</div>
72-
<div class="content">
73-
<p>{{.locale.Tr "org.teams.remove_all_repos_desc"}}</p>
74-
</div>
75-
{{template "base/modal_actions_confirm" .}}
76-
</div>
77-
78-
<div class="ui g-modal-confirm addall modal" id="org-team-add-all-repo">
79-
<div class="header">
80-
{{svg "octicon-globe"}}
81-
{{.locale.Tr "org.teams.add_all_repos_title"}}
82-
</div>
83-
<div class="content">
84-
<p>{{.locale.Tr "org.teams.add_all_repos_desc"}}</p>
85-
</div>
86-
{{template "base/modal_actions_confirm" .}}
87-
</div>
88-
8961
{{template "base/footer" .}}

‎templates/repo/branch/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
{{end}}
166166
{{if and $.IsWriter (not $.IsMirror) (not $.Repository.IsArchived) (not .IsProtected)}}
167167
{{if .IsDeleted}}
168-
<button class="btn interact-bg gt-p-3 undo-button" data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID}}&name={{.DeletedBranch.Name}}&page={{$.Page.Paginater.Current}}" data-tooltip-content="{{$.locale.Tr "repo.branch.restore" (.Name)}}">
168+
<button class="btn interact-bg gt-p-3 link-action restore-branch-button" data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID}}&name={{.DeletedBranch.Name}}&page={{$.Page.Paginater.Current}}" data-tooltip-content="{{$.locale.Tr "repo.branch.restore" (.Name)}}">
169169
<span class="text blue">
170170
{{svg "octicon-reply"}}
171171
</span>

‎templates/repo/settings/options.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
<div class="field">
6363
<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
64-
<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>
64+
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete" data-redirect="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
6565
</div>
6666
</form>
6767

‎templates/user/settings/profile.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125

126126
<div class="field">
127127
<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
128-
<button class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
128+
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete" data-redirect="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
129129
</div>
130130
</form>
131131
</div>

‎tests/integration/branches_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestDeleteBranch(t *testing.T) {
3434
func TestUndoDeleteBranch(t *testing.T) {
3535
onGiteaRun(t, func(t *testing.T, u *url.URL) {
3636
deleteBranch(t)
37-
htmlDoc, name := branchAction(t, ".undo-button")
37+
htmlDoc, name := branchAction(t, ".restore-branch-button")
3838
assert.Contains(t,
3939
htmlDoc.doc.Find(".ui.positive.message").Text(),
4040
translation.NewLocale("en-US").Tr("repo.branch.restore_success", name),

‎web_src/css/org.css

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -205,29 +205,6 @@
205205
margin: 0;
206206
}
207207

208-
.organization.teams #add-repo-form input,
209-
.organization.teams #repo-multiple-form input,
210-
.organization.teams #add-member-form input {
211-
margin-left: 0;
212-
}
213-
214-
.organization.teams #add-repo-form .ui.button,
215-
.organization.teams #repo-multiple-form .ui.button,
216-
.organization.teams #add-member-form .ui.button {
217-
margin-left: 5px;
218-
margin-top: -3px;
219-
}
220-
221-
.organization.teams #repo-top-segment {
222-
height: 60px;
223-
}
224-
225-
@media (max-width: 767.98px) {
226-
.organization.teams #repo-top-segment {
227-
height: 100px;
228-
}
229-
}
230-
231208
.org-team-navbar .active.item {
232209
background: var(--color-box-body) !important;
233210
}

0 commit comments

Comments
 (0)