aboutsummaryrefslogtreecommitdiffstats
path: root/web_src/js/features
diff options
context:
space:
mode:
authorHester Gong <hestergong@gmail.com>2023-04-23 17:24:19 +0800
committerGitHub <noreply@github.com>2023-04-23 17:24:19 +0800
commit476a043a5fb2b472e2aaced450ac2a0c9102854e (patch)
treefcbc301d7fca09eee292cdd039a6980a88aefa63 /web_src/js/features
parent5e389228f61844c0d59d5bc5974483dae0aa1b8b (diff)
downloadgitea-476a043a5fb2b472e2aaced450ac2a0c9102854e.tar.gz
gitea-476a043a5fb2b472e2aaced450ac2a0c9102854e.zip
Refactor delete_modal_actions template and use it for project column related actions (#24097)
Co-Author: @wxiaoguang This PR is to fix https://github.com/go-gitea/gitea/issues/23318#issuecomment-1506275446 . The way to fix this in this PR is to use `delete_modal_actions.tmpl` here both to fix this issue and keep ui consistency (as suggested by [TODO here](https://github.com/go-gitea/gitea/blob/4299c3b7db61f8741eca0ba3d663bb65745a4acc/templates/projects/view.tmpl#L161)) And this PR also refactors `delete_modal_actions.tmpl` and its related styles, and use the template for more modal actions: 1. Added template attributes: * locale * ModalButtonStyle: "yes" (default) or "confirm" * ModalButtonCancelText * ModalButtonOkText 2. Rename `delete_modal_actions.tmpl` template to `modal_actions_confirm.tmpl` because it is not only used for action modals deletion now. 3. Refactored css related to modals into `web_src/css/modules/modal.css` and improved the styles. 4. Also use the template for PR deletion modal and remove issue dependency modal. 5. Some modals should also use the template, but not sure how to open them, so mark these modal actions by `{{/* TODO: Convert to base/modal_actions_confirm */}}` After (Also tested on arc green): Hovering on the left buttons <img width="711" alt="Screen Shot 2023-04-23 at 15 17 12" src="https://user-images.githubusercontent.com/17645053/233825650-76307e65-9255-44bb-80e8-7062f58ead1b.png"> <img width="786" alt="Screen Shot 2023-04-23 at 15 17 21" src="https://user-images.githubusercontent.com/17645053/233825652-4dc6f7d1-a180-49fb-a468-d60950eaee0d.png"> Test for functionalities: https://user-images.githubusercontent.com/17645053/233826857-76376fda-022c-42d0-b0f3-339c17ca4e59.mov --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'web_src/js/features')
-rw-r--r--web_src/js/features/repo-projects.js17
1 files changed, 8 insertions, 9 deletions
diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js
index 953671b41d..5d40096220 100644
--- a/web_src/js/features/repo-projects.js
+++ b/web_src/js/features/repo-projects.js
@@ -129,12 +129,7 @@ export function initRepoProject() {
$('.default-project-board-modal').each(function () {
const boardColumn = $(this).closest('.board-column');
const showButton = $(boardColumn).find('.default-project-board-show');
- const commitButton = $(this).find('.default-project-board-button');
-
- if ($(showButton).data('type') === 'unset_default') {
- $(commitButton).removeClass('primary');
- $(commitButton).addClass('red');
- }
+ const commitButton = $(this).find('.actions > .ok.button');
$(commitButton).on('click', (e) => {
e.preventDefault();
@@ -152,12 +147,16 @@ export function initRepoProject() {
});
});
- $('.delete-project-board').each(function () {
- $(this).on('click', function (e) {
+ $('.show-delete-column-modal').each(function () {
+ const deleteColumnModal = $(`${$(this).attr('data-modal')}`);
+ const deleteColumnButton = deleteColumnModal.find('.actions > .ok.button');
+ const deleteUrl = $(this).attr('data-url');
+
+ deleteColumnButton.on('click', (e) => {
e.preventDefault();
$.ajax({
- url: $(this).data('url'),
+ url: deleteUrl,
headers: {
'X-Csrf-Token': csrfToken,
},