Skip to content

Commit e8173c2

Browse files
sillyguodongwxiaoguang
sillyguodong
and
wxiaoguang
authored
Move Rename branch from repo settings page to the page of branches list (#24380)
Co-Author: @wxiaoguang It is more convenient that user just need to enter a new branch name after he selects the branch which he want to rename. So this PR move the function of renaming branch to the page of branches list. This PR also restyle the button of `new branch`, `download`, `delete`.... https://user-images.githubusercontent.com/33891828/235277997-413060bb-759f-430a-b5c4-df5e40ffcd28.mov --------- Co-authored-by: wxiaoguang <[email protected]>
1 parent 3f0651d commit e8173c2

File tree

6 files changed

+89
-46
lines changed

6 files changed

+89
-46
lines changed

‎options/locale/locale_en-US.ini‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2406,10 +2406,13 @@ branch.protected_deletion_failed = Branch "%s" is protected. It cannot be delete
24062406
branch.default_deletion_failed = Branch "%s" is the default branch. It cannot be deleted.
24072407
branch.restore = Restore Branch "%s"
24082408
branch.download = Download Branch "%s"
2409+
branch.rename = Rename Branch "%s"
24092410
branch.included_desc = This branch is part of the default branch
24102411
branch.included = Included
24112412
branch.create_new_branch = Create branch from branch:
24122413
branch.confirm_create_branch = Create branch
2414+
branch.rename_branch_to = Rename "%s" to:
2415+
branch.confirm_rename_branch = Rename branch
24132416
branch.create_branch_operation = Create branch
24142417
branch.new_branch = Create new branch
24152418
branch.new_branch_from = Create new branch from "%s"

‎routers/web/repo/setting_protected_branch.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ func RenameBranchPost(ctx *context.Context) {
343343

344344
if ctx.HasError() {
345345
ctx.Flash.Error(ctx.GetErrMsg())
346-
ctx.Redirect(fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink))
346+
ctx.Redirect(fmt.Sprintf("%s/branches", ctx.Repo.RepoLink))
347347
return
348348
}
349349

@@ -355,16 +355,16 @@ func RenameBranchPost(ctx *context.Context) {
355355

356356
if msg == "target_exist" {
357357
ctx.Flash.Error(ctx.Tr("repo.settings.rename_branch_failed_exist", form.To))
358-
ctx.Redirect(fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink))
358+
ctx.Redirect(fmt.Sprintf("%s/branches", ctx.Repo.RepoLink))
359359
return
360360
}
361361

362362
if msg == "from_not_exist" {
363363
ctx.Flash.Error(ctx.Tr("repo.settings.rename_branch_failed_not_exist", form.From))
364-
ctx.Redirect(fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink))
364+
ctx.Redirect(fmt.Sprintf("%s/branches", ctx.Repo.RepoLink))
365365
return
366366
}
367367

368368
ctx.Flash.Success(ctx.Tr("repo.settings.rename_branch_success", form.From, form.To))
369-
ctx.Redirect(fmt.Sprintf("%s/settings/branches", ctx.Repo.RepoLink))
369+
ctx.Redirect(fmt.Sprintf("%s/branches", ctx.Repo.RepoLink))
370370
}

‎templates/repo/branch/list.tmpl‎

Lines changed: 62 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,36 @@
2727
</td>
2828
<td class="right aligned overflow-visible">
2929
{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
30-
<button class="ui basic jump button icon show-create-branch-modal" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" ($.DefaultBranch)}}" data-branch-from="{{$.DefaultBranch}}" data-branch-from-urlcomponent="{{PathEscapeSegments $.DefaultBranch}}" data-modal="#create-branch-modal">
30+
<button class="ui tertiary button show-create-branch-modal gt-mx-3"
31+
data-modal="#create-branch-modal"
32+
data-branch-from="{{$.DefaultBranch}}"
33+
data-branch-from-urlcomponent="{{PathEscapeSegments $.DefaultBranch}}"
34+
data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" ($.DefaultBranch)}}"
35+
>
3136
{{svg "octicon-git-branch"}}
3237
</button>
3338
{{end}}
3439
{{if .EnableFeed}}
35-
<a role="button" class="ui basic button icon" href="{{$.FeedURL}}/rss/branch/{{PathEscapeSegments .DefaultBranch}}">
40+
<a role="button" class="ui tertiary button gt-mx-3" href="{{$.FeedURL}}/rss/branch/{{PathEscapeSegments .DefaultBranch}}">
3641
{{svg "octicon-rss"}}
3742
</a>
3843
{{end}}
3944
{{if not $.DisableDownloadSourceArchives}}
40-
<button class="ui basic jump dropdown icon button" data-tooltip-content="{{$.locale.Tr "repo.branch.download" ($.DefaultBranch)}}">
45+
<div class="ui dropdown tertiary button gt-mx-3" data-tooltip-content="{{$.locale.Tr "repo.branch.download" ($.DefaultBranch)}}">
4146
{{svg "octicon-download"}}
4247
<div class="menu">
4348
<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments $.DefaultBranch}}.zip" rel="nofollow">{{svg "octicon-file-zip"}}&nbsp;ZIP</a>
4449
<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments $.DefaultBranch}}.tar.gz" rel="nofollow">{{svg "octicon-file-zip"}}&nbsp;TAR.GZ</a>
4550
</div>
51+
</div>
52+
{{end}}
53+
{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted) (not $.IsMirror)}}
54+
<button class="ui tertiary button show-modal show-rename-branch-modal gt-mx-3"
55+
data-modal="#rename-branch-modal"
56+
data-old-branch-name="{{$.DefaultBranch}}"
57+
data-tooltip-content="{{$.locale.Tr "repo.branch.rename" ($.DefaultBranch)}}"
58+
>
59+
{{svg "octicon-pencil"}}
4660
</button>
4761
{{end}}
4862
</td>
@@ -119,33 +133,47 @@
119133
</td>
120134
<td class="three wide right aligned overflow-visible">
121135
{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
122-
<button class="ui basic jump button icon show-create-branch-modal" data-branch-from="{{.Name}}" data-branch-from-urlcomponent="{{PathEscapeSegments .Name}}" data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" .Name}}" data-modal="#create-branch-modal" data-name="{{.Name}}">
136+
<button class="ui tertiary button show-modal show-create-branch-modal gt-mx-3"
137+
data-branch-from="{{.Name}}"
138+
data-branch-from-urlcomponent="{{PathEscapeSegments .Name}}"
139+
data-tooltip-content="{{$.locale.Tr "repo.branch.new_branch_from" .Name}}"
140+
data-modal="#create-branch-modal" data-name="{{.Name}}"
141+
>
123142
{{svg "octicon-git-branch"}}
124143
</button>
125144
{{end}}
126145
{{if $.EnableFeed}}
127-
<a role="button" class="ui basic button icon" href="{{$.FeedURL}}/rss/branch/{{PathEscapeSegments .Name}}">
146+
<a role="button" class="ui tertiary button gt-mx-3" href="{{$.FeedURL}}/rss/branch/{{PathEscapeSegments .Name}}">
128147
{{svg "octicon-rss"}}
129148
</a>
130149
{{end}}
131150
{{if and (not .IsDeleted) (not $.DisableDownloadSourceArchives)}}
132-
<button class="ui basic jump dropdown icon button" data-tooltip-content="{{$.locale.Tr "repo.branch.download" (.Name)}}">
151+
<div class="ui dropdown tertiary button gt-mx-3" data-tooltip-content="{{$.locale.Tr "repo.branch.download" (.Name)}}">
133152
{{svg "octicon-download"}}
134153
<div class="menu">
135154
<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments .Name}}.zip" rel="nofollow">{{svg "octicon-file-zip"}}&nbsp;ZIP</a>
136155
<a class="item archive-link" href="{{$.RepoLink}}/archive/{{PathEscapeSegments .Name}}.tar.gz" rel="nofollow">{{svg "octicon-file-zip"}}&nbsp;TAR.GZ</a>
137156
</div>
157+
</div>
158+
{{end}}
159+
{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted) (not $.IsMirror)}}
160+
<button class="ui tertiary button show-modal show-rename-branch-modal gt-mx-3"
161+
data-old-branch-name="{{.Name}}"
162+
data-modal="#rename-branch-modal"
163+
data-tooltip-content="{{$.locale.Tr "repo.branch.rename" (.Name)}}"
164+
>
165+
{{svg "octicon-pencil"}}
138166
</button>
139167
{{end}}
140168
{{if and $.IsWriter (not $.IsMirror) (not $.Repository.IsArchived) (not .IsProtected)}}
141169
{{if .IsDeleted}}
142-
<button class="ui basic jump button icon 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)}}">
170+
<button class="ui tertiary button undo-button gt-mx-3" data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID}}&name={{.DeletedBranch.Name}}&page={{$.Page.Paginater.Current}}" data-tooltip-content="{{$.locale.Tr "repo.branch.restore" (.Name)}}">
143171
<span class="text blue">
144172
{{svg "octicon-reply"}}
145173
</span>
146174
</button>
147175
{{else}}
148-
<button class="ui basic jump button icon delete-button delete-branch-button" data-url="{{$.Link}}/delete?name={{.Name}}&page={{$.Page.Paginater.Current}}" data-tooltip-content="{{$.locale.Tr "repo.branch.delete" (.Name)}}" data-name="{{.Name}}">
176+
<button class="ui tertiary button delete-button delete-branch-button gt-mx-3" data-url="{{$.Link}}/delete?name={{.Name}}&page={{$.Page.Paginater.Current}}" data-tooltip-content="{{$.locale.Tr "repo.branch.delete" (.Name)}}" data-name="{{.Name}}">
149177
{{svg "octicon-trash"}}
150178
</button>
151179
{{end}}
@@ -173,29 +201,43 @@
173201
{{template "base/modal_actions_confirm" .}}
174202
</div>
175203

176-
<div class="ui small modal" id="create-branch-modal">
204+
<div class="ui mini modal" id="create-branch-modal">
177205
<div class="header">
178206
{{.locale.Tr "repo.branch.new_branch"}}
179207
</div>
180-
<div class="content">
181-
<form class="ui form" id="create-branch-form" action="" data-base-action="{{.Link}}/_new/branch/" method="post">
208+
209+
<form class="ui form" id="create-branch-form" action="" data-base-action="{{.Link}}/_new/branch/" method="post">
210+
<div class="content">
182211
{{.CsrfTokenHtml}}
183212
<div class="field">
184-
<label>
185-
{{.locale.Tr "repo.branch.create_new_branch"}}
186-
<span class="text" id="modal-create-branch-from-span"></span>
187-
</label>
213+
{{.locale.Tr "repo.branch.create_new_branch"}}
214+
<span id="modal-create-branch-from-span"></span>
188215
</div>
189216
<div class="required field">
190217
<label for="new_branch_name">{{.locale.Tr "repo.branch.name"}}</label>
191218
<input id="new_branch_name" name="new_branch_name" required>
192219
</div>
220+
</div>
221+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
222+
</form>
223+
</div>
193224

194-
<div class="text right actions">
195-
<button class="ui cancel button">{{.locale.Tr "settings.cancel"}}</button>
196-
<button class="ui green button">{{.locale.Tr "repo.branch.confirm_create_branch"}}</button>
197-
</div>
198-
</form>
225+
<div class="ui mini modal" id="rename-branch-modal">
226+
<div class="header">
227+
{{.locale.Tr "repo.settings.rename_branch"}}
199228
</div>
229+
<form class="ui form" action="{{$.Repository.Link}}/settings/rename_branch" method="post">
230+
<div class="content">
231+
{{.CsrfTokenHtml}}
232+
<div class="field">
233+
<span class="text" data-rename-branch-to="{{.locale.Tr "repo.branch.rename_branch_to"}}"></span>
234+
</div>
235+
<input name="from" type="hidden" required>
236+
<div class="required field">
237+
<input name="to" required>
238+
</div>
239+
</div>
240+
{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
241+
</form>
200242
</div>
201243
{{template "base/footer" .}}

‎templates/repo/settings/branches.tmpl‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,6 @@
6060
</div>
6161
</div>
6262
</div>
63-
64-
{{if $.Repository.CanCreateBranch}}
65-
<h4 class="ui top attached header">
66-
{{.locale.Tr "repo.settings.rename_branch"}}
67-
</h4>
68-
<div class="ui attached segment">
69-
<form class="ui form" action="{{$.Repository.Link}}/settings/rename_branch" method="post">
70-
{{.CsrfTokenHtml}}
71-
<div class="required field">
72-
<label for="from">{{.locale.Tr "repo.settings.rename_branch_from"}}</label>
73-
<input id="from" name="from" required>
74-
</div>
75-
<div class="required field {{if .Err_BranchName}}error{{end}}">
76-
<label for="to">{{.locale.Tr "repo.settings.rename_branch_to"}}</label>
77-
<input id="to" name="to" required>
78-
</div>
79-
<div class="field">
80-
<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
81-
</div>
82-
</form>
83-
</div>
84-
{{end}}
8563
{{end}}
8664
</div>
8765

‎web_src/css/modules/modal.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
.ui.modal > .content,
3131
.ui.modal > form > .content {
3232
background: var(--color-body);
33+
padding: 1.5em;
3334
}
3435

3536
.ui.modal > .actions,

‎web_src/js/features/repo-branch.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import $ from 'jquery';
22

33
export function initRepoBranchButton() {
4+
initRepoCreateBranchButton();
5+
initRepoRenameBranchButton();
6+
}
7+
8+
function initRepoCreateBranchButton() {
9+
// 2 pages share this code, one is the branch list page, the other is the commit view page: create branch/tag from current commit (dirty code)
410
$('.show-create-branch-modal').on('click', function () {
511
let modalFormName = $(this).attr('data-modal-form');
612
if (!modalFormName) {
@@ -16,3 +22,16 @@ export function initRepoBranchButton() {
1622
$($(this).attr('data-modal')).modal('show');
1723
});
1824
}
25+
26+
function initRepoRenameBranchButton() {
27+
$('.show-rename-branch-modal').on('click', function () {
28+
const target = $(this).attr('data-modal');
29+
const $modal = $(target);
30+
31+
const oldBranchName = $(this).attr('data-old-branch-name');
32+
$modal.find('input[name=from]').val(oldBranchName);
33+
34+
const $text = $modal.find('[data-rename-branch-to]');
35+
$text.text($text.attr('data-rename-branch-to').replace('%s', oldBranchName));
36+
});
37+
}

0 commit comments

Comments
 (0)