diff --git a/templates/repo/actions/workflow_dispatch.tmpl b/templates/repo/actions/workflow_dispatch.tmpl index c615541b3b..32117df4b2 100644 --- a/templates/repo/actions/workflow_dispatch.tmpl +++ b/templates/repo/actions/workflow_dispatch.tmpl @@ -6,39 +6,52 @@
{{.CsrfTokenHtml}} -
+
-
+
{{svg "octicon-git-branch"}} - {{index .Branches 0}} + {{index .Branches 0}}
-
+
{{svg "octicon-search" 16 "search icon"}}
-
-
- {{svg "octicon-git-branch"}} - {{ctx.Locale.Tr "repo.branches"}} +
+
+
+ + + {{svg "octicon-git-branch" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.branches"}} + + + + + {{svg "octicon-tag" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.tags"}} + + +
- {{range $key, $item := .Branches}} -
{{.}}
+
+
+ +
-
{{range $key, $item := .WorkflowDispatchConfig.Inputs}}
{{if eq .Type "choice"}} diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index ed0d58cf27..946aba2cb7 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -5,15 +5,15 @@ {{$.CsrfTokenHtml}} {{/* TODO: share this branch selector dropdown with the same in repo page */}} -
+
{{if .Reference}}{{$.RefEndName}}{{else}}{{ctx.Locale.Tr "repo.issues.no_ref"}}{{end}} {{if .HasIssuesOrPullsWritePermission}}{{svg "octicon-triangle-down" 14 "dropdown icon"}}{{end}}
- {{svg "octicon-filter" 16}} - + {{svg "octicon-search" 16 "search icon"}} +
diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 62a72abaf9..121490cec0 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2810,14 +2810,14 @@ tbody.commit-list { } /* Branch tag selector - TODO: Merge this into the same selector on repo page */ -.repository .issue-content .issue-content-right .ui.grid .column.row { +.select-branch .ui.grid .column.row { padding: 10px; padding-bottom: 0; } -.repository .issue-content .issue-content-right .ui.grid .column.muted { +.select-branch .ui.grid .column.muted { padding: 0; } -.repository .issue-content .issue-content-right .ui.grid .column.muted .text { +.select-branch .ui.grid .column.muted .text { display: inline-block; padding: 10px; width: 100%; @@ -2825,16 +2825,16 @@ tbody.commit-list { border: 1px solid transparent; border-bottom: none; } -.repository .issue-content .issue-content-right .ui.grid .column.muted .text.black { +.select-branch .ui.grid .column.muted .text.black { border-color: var(--color-secondary); background: var(--color-menu); border-top-left-radius: var(--border-radius); border-top-right-radius: var(--border-radius); } -.repository .issue-content .issue-content-right .ui.dropdown .scrolling.menu { - border-top: none; +.select-branch .scrolling.menu { + border-top: none !important; } -.repository .issue-content .issue-content-right .branch-tag-divider { +.select-branch .branch-tag-divider { margin-top: -1px; border-top: 1px solid var(--color-secondary); } diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index 18d98c891d..c15e54a16b 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -43,6 +43,50 @@ function reloadConfirmDraftComment() { window.location.reload(); } +// code specific to the issue branch selector +export function initBranchSelectorIssue() { + const $selectBranch = $('.ui.issue-select-branch'); + if (!$selectBranch.length) return; + const $branchMenu = $selectBranch.find('.reference-list-menu'); + const $isNewIssue = $branchMenu.hasClass('new-issue'); + $branchMenu.find('.item:not(.no-select)').on('click', async function () { + const selectedValue = $(this).data('id'); + const editMode = $('#editing_mode').val(); + $($(this).data('id-selector')).val(selectedValue); + if ($isNewIssue) { + $selectBranch.find('.ui .branch-name').text($(this).data('name')); + return; + } + + if (editMode === 'true') { + const form = document.getElementById('update_issueref_form'); + const params = new URLSearchParams(); + params.append('ref', selectedValue); + try { + await POST(form.getAttribute('action'), {data: params}); + window.location.reload(); + } catch (error) { + console.error(error); + } + } else if (editMode === '') { + $selectBranch.find('.ui .branch-name').text(selectedValue); + } + }); +} + +// code for all branch selectors +export function initBranchSelectorTabs() { + const $selectBranch = $('.ui.select-branch'); + if (!$selectBranch.length) return; + $selectBranch.find('.reference.column').on('click', function () { + hideElem($selectBranch.find('.scrolling.reference-list-menu')); + $selectBranch.find('.reference .text').removeClass('black'); + showElem($($(this).data('target'))); + $(this).find('.text').addClass('black'); + return false; + }); +} + export function initRepoCommentForm() { const $commentForm = $('.comment.form'); if (!$commentForm.length) return; @@ -55,44 +99,6 @@ export function initRepoCommentForm() { initSingleCommentEditor($commentForm); } - function initBranchSelector() { - const $selectBranch = $('.ui.select-branch'); - const $branchMenu = $selectBranch.find('.reference-list-menu'); - const $isNewIssue = $branchMenu.hasClass('new-issue'); - $branchMenu.find('.item:not(.no-select)').on('click', async function () { - const selectedValue = $(this).data('id'); - const editMode = $('#editing_mode').val(); - $($(this).data('id-selector')).val(selectedValue); - if ($isNewIssue) { - $selectBranch.find('.ui .branch-name').text($(this).data('name')); - return; - } - - if (editMode === 'true') { - const form = document.getElementById('update_issueref_form'); - const params = new URLSearchParams(); - params.append('ref', selectedValue); - try { - await POST(form.getAttribute('action'), {data: params}); - window.location.reload(); - } catch (error) { - console.error(error); - } - } else if (editMode === '') { - $selectBranch.find('.ui .branch-name').text(selectedValue); - } - }); - $selectBranch.find('.reference.column').on('click', function () { - hideElem($selectBranch.find('.scrolling.reference-list-menu')); - $selectBranch.find('.reference .text').removeClass('black'); - showElem($($(this).data('target'))); - $(this).find('.text').addClass('black'); - return false; - }); - } - - initBranchSelector(); - // List submits function initListSubmits(selector, outerSelector) { const $list = $(`.ui.${outerSelector}.list`); diff --git a/web_src/js/index.js b/web_src/js/index.js index fc2f6b9b0b..c622cc7319 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -71,7 +71,12 @@ import {initCompWebHookEditor} from './features/comp/WebHookEditor.js'; import {initRepoBranchButton} from './features/repo-branch.js'; import {initCommonOrganization} from './features/common-organization.js'; import {initRepoWikiForm} from './features/repo-wiki.js'; -import {initRepoCommentForm, initRepository} from './features/repo-legacy.js'; +import { + initRepoCommentForm, + initRepository, + initBranchSelectorIssue, + initBranchSelectorTabs, +} from './features/repo-legacy.js'; import {initCopyContent} from './features/copycontent.js'; import {initCaptcha} from './features/captcha.js'; import {initRepositoryActionView} from './components/RepoActionView.vue'; @@ -146,6 +151,8 @@ onDomReady(() => { initRepoBranchButton(); initRepoCodeView(); initRepoCommentForm(); + initBranchSelectorIssue(); + initBranchSelectorTabs(); initRepoEllipsisButton(); initRepoDiffCommitBranchesAndTags(); initRepoEditor();