Skip to content

Conversation

wxiaoguang
Copy link
Contributor

No description provided.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 1, 2025
@wxiaoguang
Copy link
Contributor Author

image

@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files modifies/frontend labels Jul 1, 2025
@wxiaoguang wxiaoguang changed the title Refactor headnav bar icons Refactor head navbar icons Jul 1, 2025
@silverwind
Copy link
Member

silverwind commented Jul 1, 2025

Would swap position with the "+" icon.

@wxiaoguang
Copy link
Contributor Author

Would swap position with the "+" icon.

That's very difficult by current layout. Feel free to propose changes and edit this PR directly.

@silverwind
Copy link
Member

I see, we have this complexity with the mobile layout.

@silverwind
Copy link
Member

silverwind commented Jul 1, 2025

We should probably remove this button in the user menu now, given that it's duplicate?

image

@silverwind
Copy link
Member

Found a bug, opening /notifications gives this 500:

Render failed, failed to render template: user/notification/notification, error: template error: builtin(static):user/notification/notification_div:3:32 : executing "user/notification/notification_div" at <call .NotificationUnreadCount ctx>: error calling call: call of nil
----------------------------------------------------------------------
		{{$notificationUnreadCount := call .NotificationUnreadCount ctx}}

@wxiaoguang
Copy link
Contributor Author

We should probably remove this button in the user menu now, given that it's duplicate?

Removed in 127274d

Found a bug, opening /notifications gives this 500:

Hmm, the page was covered by tests in links_test.go, but the tests were wrong and didn't really test. Fixed together in 127274d

@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 Jul 2, 2025
@silverwind
Copy link
Member

silverwind commented Jul 2, 2025

One minor related thing: The admin page currently says this on top left:

image

But we call this page "Site Administration" on this button, so I'd prefer if we change this title to the same translation string.

@wxiaoguang
Copy link
Contributor Author

so I'd prefer if we change this title to the same translation string.

I am not sure which one is better. Feel free to pick one to replace the other.

@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 2, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 3, 2025
@lunny lunny added this to the 1.25.0 milestone Jul 3, 2025
@silverwind
Copy link
Member

so I'd prefer if we change this title to the same translation string.

I am not sure which one is better. Feel free to pick one to replace the other.

Can do that later.

@silverwind silverwind merged commit 71e151c into go-gitea:main Jul 4, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 4, 2025
@wxiaoguang wxiaoguang deleted the fix-navbar-icon branch July 4, 2025 12:14
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 7, 2025
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Rerun job only when run is done (go-gitea#34970)
  Enable gocritic `equalFold` and fix issues (go-gitea#34952)
  Fixed minor typos in two files #HSFDPMUW (go-gitea#34944)
  Improve project & label color picker and image scroll (go-gitea#34971)
  Refactor webhook and fix feishu/lark secret (go-gitea#34961)
  Improve OAuth2 provider (correct Issuer, respect ENABLED) (go-gitea#34966)
  Merge index.js (go-gitea#34963)
  [skip ci] Updated translations via Crowdin
  Mark old reviews as stale on agit pr updates (go-gitea#34933)
  Refactor "delete-button" to "link-action" (go-gitea#34962)
  Refactor frontend unique id & comment (go-gitea#34958)
  Refactor some trivial problems (go-gitea#34959)
  Upgrade security public key (go-gitea#34956)
  Fix git graph page (go-gitea#34948)
  Update JS dependencies (go-gitea#34951)
  Refactor head navbar icons (go-gitea#34922)

# Conflicts:
#	templates/base/head_navbar.tmpl
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/frontend modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants