aboutsummaryrefslogtreecommitdiffstats
path: root/web_src
diff options
context:
space:
mode:
authorsillyguodong <33891828+sillyguodong@users.noreply.github.com>2023-04-30 23:08:51 +0800
committerGitHub <noreply@github.com>2023-04-30 23:08:51 +0800
commite8173c2c33f1dd5b0a2c044255434d414cab62d2 (patch)
tree0a0730d0a19910a4898dba07094424838e900c9c /web_src
parent3f0651d4d61d62a16e1bb672056014ab02db5746 (diff)
downloadgitea-e8173c2c33f1dd5b0a2c044255434d414cab62d2.tar.gz
gitea-e8173c2c33f1dd5b0a2c044255434d414cab62d2.zip
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 <wxiaoguang@gmail.com>
Diffstat (limited to 'web_src')
-rw-r--r--web_src/css/modules/modal.css1
-rw-r--r--web_src/js/features/repo-branch.js19
2 files changed, 20 insertions, 0 deletions
diff --git a/web_src/css/modules/modal.css b/web_src/css/modules/modal.css
index 1bf55ea4cc..3baaaf9ff2 100644
--- a/web_src/css/modules/modal.css
+++ b/web_src/css/modules/modal.css
@@ -30,6 +30,7 @@
.ui.modal > .content,
.ui.modal > form > .content {
background: var(--color-body);
+ padding: 1.5em;
}
.ui.modal > .actions,
diff --git a/web_src/js/features/repo-branch.js b/web_src/js/features/repo-branch.js
index 946f7f90a4..e7c2645dcd 100644
--- a/web_src/js/features/repo-branch.js
+++ b/web_src/js/features/repo-branch.js
@@ -1,6 +1,12 @@
import $ from 'jquery';
export function initRepoBranchButton() {
+ initRepoCreateBranchButton();
+ initRepoRenameBranchButton();
+}
+
+function initRepoCreateBranchButton() {
+ // 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)
$('.show-create-branch-modal').on('click', function () {
let modalFormName = $(this).attr('data-modal-form');
if (!modalFormName) {
@@ -16,3 +22,16 @@ export function initRepoBranchButton() {
$($(this).attr('data-modal')).modal('show');
});
}
+
+function initRepoRenameBranchButton() {
+ $('.show-rename-branch-modal').on('click', function () {
+ const target = $(this).attr('data-modal');
+ const $modal = $(target);
+
+ const oldBranchName = $(this).attr('data-old-branch-name');
+ $modal.find('input[name=from]').val(oldBranchName);
+
+ const $text = $modal.find('[data-rename-branch-to]');
+ $text.text($text.attr('data-rename-branch-to').replace('%s', oldBranchName));
+ });
+}