Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix and clean up ConfirmModal #31283

Merged
merged 10 commits into from
Jun 7, 2024
Merged

Fix and clean up ConfirmModal #31283

merged 10 commits into from
Jun 7, 2024

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Jun 7, 2024

Bug: orange button color was removed in #30475, replaced with red
Bug: translation text was not html-escaped
Refactor: Replaced as much jQuery as possible, added useful createElementFromHTML
Refactor: Remove colors checks that don't exist on .link-action

image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 7, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 7, 2024
@silverwind silverwind added the backport/v1.22 This PR should be backported to Gitea 1.22 label Jun 7, 2024
@silverwind
Copy link
Member Author

Changed function signature to make it more clear:

confirmModal(content, {confirmButtonColor = 'primary'} = {})

Content is required, and confirmButtonColor makes it clear for which button the color is.

@silverwind
Copy link
Member Author

BTW i think some of these link-action are broken, for example projects list close should show one but I don't see it, page immediately reloads on link click. But I guess topic for another time.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jun 7, 2024
web_src/js/utils/dom.js Show resolved Hide resolved
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jun 7, 2024
Co-authored-by: delvh <dev.lh@web.de>
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 7, 2024
@silverwind silverwind enabled auto-merge (squash) June 7, 2024 13:37
@silverwind silverwind merged commit 291a00d into go-gitea:main Jun 7, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Jun 7, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jun 7, 2024
Bug: orange button color was removed in
go-gitea#30475, replaced with red
Bug: translation text was not html-escaped
Refactor: Replaced as much jQuery as possible, added useful
`createElementFromHTML`
Refactor: Remove colors checks that don't exist on `.link-action`

<img width="381" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/5900bf6a-8a86-4a86-b368-0559cbfea66e">

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jun 7, 2024
silverwind added a commit that referenced this pull request Jun 7, 2024
Backport #31283 by @silverwind

Bug: orange button color was removed in
#30475, replaced with red
Bug: translation text was not html-escaped
Refactor: Replaced as much jQuery as possible, added useful
`createElementFromHTML`
Refactor: Remove colors checks that don't exist on `.link-action`

<img width="381" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/5900bf6a-8a86-4a86-b368-0559cbfea66e">

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 7, 2024
* giteaofficial/main:
  Fix and clean up `ConfirmModal` (go-gitea#31283)
  Enable poetry non-package mode (go-gitea#31282)
  fixed the dropdown menu for the top New button to expand to the left (go-gitea#31273)
  Optimize repo-list layout to enhance visual experience (go-gitea#31272)
  Allow including `Reviewed-on`/`Reviewed-by` lines for custom merge messages (go-gitea#31211)
  Add `MAX_ROWS` option for CSV rendering (go-gitea#30268)
  Update `golang.org/x/net` (go-gitea#31260)
  Add replacement module for `mholt/archiver` (go-gitea#31267)
  Fix Activity Page Contributors dropdown (go-gitea#31264)
DennisRasey pushed a commit to DennisRasey/forgejo that referenced this pull request Jul 29, 2024
…tea#31684)

Tested it, path segment creation works just like before.

---

Conflict resolution: trivial, also ported code from
go-gitea/gitea#31283
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/js size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants