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.

Sign up for GitHub

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

Jump to bottom

Issue and Pulls lists rework #13594

Merged
merged 16 commits into from
Nov 25, 2020
Merged

Issue and Pulls lists rework #13594

merged 16 commits into from
Nov 25, 2020

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Nov 16, 2020 •
edited
Loading

Reorganized and restyled the issue and pull request lists.

image

image

image

image

@mrsdizzie mrsdizzie added type/enhancement An improvement of existing functionality topic/ui Change the appearance of the Gitea UI labels Nov 16, 2020
@mrsdizzie mrsdizzie added this to the 1.14.0 milestone Nov 16, 2020
@mrsdizzie
Copy link
Member

This looks great could these be incorporated into https://github.com/go-gitea/gitea/blob/master/templates/user/dashboard/issues.tmpl too?

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 17, 2020
@silverwind
Copy link
Member Author

silverwind commented Nov 17, 2020 •
edited
Loading

@mrsdizzie did just that. It took a few if clauses because the pages did get slightly different template contexts.

Screen Shot 2020-11-17 at 19 40 10

Screen Shot 2020-11-17 at 19 40 20

@lunny
Copy link
Member

lunny commented Nov 20, 2020

The link for issue creator is not differ from other texts?

@silverwind
Copy link
Member Author

silverwind commented Nov 20, 2020 •
edited
Loading

It's following GitHub design where those links are also not colored unless hovered, I guess in an effort to focus the viewer on the issue title. I guess we could diverge from that design a bit as I generally think links should be distinguishable. Will think about it.

BTW I haven't really tested all the labels that can appear on the second line, but they are mostly copies from the old template (repo issue, not dashboard issue).

@6543
Copy link
Member

6543 commented Nov 24, 2020 •
edited
Loading

what about using different octicons on pulls, so you know if it's a pull or an issue?

@silverwind
Copy link
Member Author

silverwind commented Nov 24, 2020 •
edited
Loading

what about using different octicons on pulls, so you know if it's a pull or an issue?

That should already be the case, see:

https://github.com/go-gitea/gitea/pull/13594/files#diff-511ca3487e2c8c1cb1c144ad5cfe6189bceb0da2ee7ae47d7ae578fa92e12cc3R13-R29

Edit: Add PR list sample to OP.

@silverwind
Copy link
Member Author

@lunny I think it's fine if we not color those links for aesthetic reason and to draw the attention to the title instead.

@6543

This comment has been minimized.

Sign in to view
@silverwind
Copy link
Member Author

Milestone list fixed as well:

image

@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 Nov 24, 2020
@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 Nov 24, 2020
@silverwind
Copy link
Member Author

silverwind commented Nov 24, 2020 •
edited
Loading

While diffing the milestone list I found two differences to issue lists:

  1. Milestones don't render below issue title on milestone list
  2. The link on labels does not include the milestone=id query

I fixed those differences now by introducing a new merge template helper which is basically a superiour version of the dict helper which preserves the root "dict" and merges additional passed pairs into it. This will allow us to more easily consolidate slightly differing templates into the future.

@6543 6543 added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Nov 24, 2020
@lafriks
Copy link
Member

lafriks commented Nov 25, 2020

🚀

@lafriks lafriks merged commit 6d93a3a into go-gitea:master Nov 25, 2020
@silverwind silverwind deleted the issuelist branch November 25, 2020 11:26
@silverwind silverwind mentioned this pull request Nov 25, 2020
Merged
Closed
4 tasks
jpraet added a commit to jpraet/gitea that referenced this pull request Dec 20, 2020
@jpraet
Add repo name label again on dashboard issue / pulls page
7e4b9fc 
The label got removed in PR go-gitea#13594
@jpraet jpraet mentioned this pull request Dec 20, 2020
Merged
techknowlogick added a commit that referenced this pull request Dec 20, 2020
@jpraet @lunny @techknowlogick
Add repo name label again on dashboard issue / pulls page (#14073)
14ac3e6 
The label got removed in PR #13594

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
@go-gitea go-gitea locked and limited conversation to collaborators Jan 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

@mrsdizzie mrsdizzie mrsdizzie approved these changes

@6543 6543 6543 approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI type/enhancement An improvement of existing functionality type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.
6 participants
@silverwind @mrsdizzie @lunny @6543 @lafriks @GiteaBot