Skip to content

Adds title on branch commit counts#34869

Merged
wxiaoguang merged 7 commits into
go-gitea:mainfrom
ajmeese7:feat/commit-count-title
Jul 1, 2025
Merged

Adds title on branch commit counts#34869
wxiaoguang merged 7 commits into
go-gitea:mainfrom
ajmeese7:feat/commit-count-title

Conversation

@ajmeese7
Copy link
Copy Markdown
Contributor

@ajmeese7 ajmeese7 commented Jun 26, 2025

Adds a title to the commit counts when comparing branches, making it easier for novice users to understand what the numbers mean.

Fixes #34867.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 26, 2025
@lunny
Copy link
Copy Markdown
Member

lunny commented Jun 26, 2025

It needs to be translationable.

@silverwind
Copy link
Copy Markdown
Member

silverwind commented Jun 26, 2025

Use data-tooltip-content instead.

lunny
lunny reviewed Jun 30, 2025
View reviewed changes
Comment thread templates/repo/branch/list.tmpl Outdated
@delvh
Copy link
Copy Markdown
Member

delvh commented Jun 30, 2025

Also, wouldn't it make sense to unify both titles into a single title on the parent element?
So it would compare both behind and ahead in the same title.

@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Jun 30, 2025

Also, wouldn't it make sense to unify both titles into a single title on the parent element? So it would compare both behind and ahead in the same title.

My thought is that why duplicate the numbers in the tooltip .... could it simply just show a fixed tool tip like "Commits ahead", and let users read the rendered number on the UI?

@ajmeese7
Copy link
Copy Markdown
Contributor Author

ajmeese7 commented Jun 30, 2025

Also, wouldn't it make sense to unify both titles into a single title on the parent element? So it would compare both behind and ahead in the same title.

My thought is that why duplicate the numbers in the tooltip .... could it simply just show a fixed tool tip like "Commits ahead", and let users read the rendered number on the UI?

That is what GitLab does, that is the behavior I am emulating

@ajmeese7
Copy link
Copy Markdown
Contributor Author

ajmeese7 commented Jun 30, 2025

Also, wouldn't it make sense to unify both titles into a single title on the parent element? So it would compare both behind and ahead in the same title.

Working on this now.

@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 30, 2025
@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Jul 1, 2025

The current texts are not really translatable.

I'd prefer GitHub's wording, so I think we can make it "Behind count: %d, ahead count: %d", then everything can be simplified. Will make some changes.

@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Jul 1, 2025

Sometimes it's not easy to fine tune the i18n resources ... I can understand why GitHub drops their i18n support on the web UI.

Does the new tooltip look good to you?

image

@ajmeese7
Copy link
Copy Markdown
Contributor Author

ajmeese7 commented Jul 1, 2025

Sometimes it's not easy to fine tune the i18n resources ... I can understand why GitHub drops their i18n support on the web UI.

Does the new tooltip look good to you?

image

I think it needs to say "ahead of main" if you want to take this approach

wxiaoguang
wxiaoguang reviewed Jul 1, 2025
View reviewed changes
Comment thread options/locale/locale_en-US.ini Outdated
@wxiaoguang
use "ahead of"
d622da7 
Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>
@wxiaoguang
Copy link
Copy Markdown
Contributor

wxiaoguang commented Jul 1, 2025

Anything else to improve?

@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 Jul 1, 2025
@wxiaoguang wxiaoguang added this to the 1.25.0 milestone Jul 1, 2025
@wxiaoguang wxiaoguang added the type/enhancement An improvement of existing functionality label Jul 1, 2025
@wxiaoguang wxiaoguang merged commit 35f0b5a into go-gitea:main Jul 1, 2025
26 checks passed
@ajmeese7 ajmeese7 deleted the feat/commit-count-title branch July 1, 2025 12:05
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 2, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
87b6f5a 
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Improve html escape (go-gitea#34911)
  Adds tooltip on branch commit counts (go-gitea#34869)
  Fix PR toggle WIP (go-gitea#34920)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 30, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@delvh delvh delvh left review comments

@lunny lunny lunny approved these changes

@wxiaoguang wxiaoguang wxiaoguang 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. type/enhancement An improvement of existing functionality

Projects

None yet

Milestone

1.25.0

Development

Successfully merging this pull request may close these issues.

Tooltip over commit counts for different branches

6 participants

@ajmeese7 @lunny @silverwind @delvh @wxiaoguang @GiteaBot