github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-03-13 11:31:28 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

[PR #3900] [MERGED] Refactor User Settings #17135

New Issue
Closed
opened 2025-11-02 12:27:09 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-02 12:27:09 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/go-gitea/gitea/pull/3900
Author: @daviian
Created: 5/5/2018
Status: ✅ Merged
Merged: 5/15/2018
Merged by: @lafriks

Base: master ← Head: settings-menu-refactoring

📝 Commits (10+)

  • 7392584 moved avatar to profile page
  • 47faa79 combined password change, email and account deletion into account settings page
  • 8107662 combined totp, access tokens, linked accounts and openid into security settings page
  • 6f11a3e move access tokens to applications settings page
  • 8c89367 small change to restart drone build
  • 1f90d56 fix change avatar url on profile page
  • e4601ce redirect old settings urls to new ones
  • d7fbc1b enforce only one autofocus attribute on settings pages
  • 7c3cf08 set correct redirect status code
  • dc8307d Merge branch 'master' into settings-menu-refactoring

📊 Changes

25 files changed (+582 additions, -688 deletions)

View changed files

📝 integrations/delete_user_test.go (+4 -4)
📝 integrations/links_test.go (+2 -5)
📝 options/locale/locale_en-US.ini (+2 -1)
📝 routers/routes/routes.go (+43 -23)
📝 routers/user/setting.go (+182 -197)
📝 routers/user/setting_openid.go (+11 -36)
📝 routers/user/setting_test.go (+1 -1)
📝 templates/user/profile.tmpl (+1 -1)
➕ templates/user/settings/account.tmpl (+135 -0)
➖ templates/user/settings/account_link.tmpl (+0 -44)
📝 templates/user/settings/applications.tmpl (+17 -16)
➖ templates/user/settings/avatar.tmpl (+0 -46)
➖ templates/user/settings/delete.tmpl (+0 -41)
➖ templates/user/settings/email.tmpl (+0 -66)
📝 templates/user/settings/navbar.tmpl (+4 -18)
➖ templates/user/settings/openid.tmpl (+0 -71)
📝 templates/user/settings/organization.tmpl (+1 -1)
📝 templates/user/settings/profile.tmpl (+37 -0)
📝 templates/user/settings/repos.tmpl (+1 -1)
📝 templates/user/settings/security.tmpl (+6 -71)

...and 5 more files

📄 Description

Targets https://github.com/go-gitea/gitea/issues/2271 and reduces amount of menu items by combining contextual settings.

I've already prepared a followup PR refactoring the affected code to be more maintainable.

UI before PR:
old-menu

UI after PR:

  • Profile
    profile

  • Account
    account

  • Security
    security

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/go-gitea/gitea/pull/3900 **Author:** [@daviian](https://github.com/daviian) **Created:** 5/5/2018 **Status:** ✅ Merged **Merged:** 5/15/2018 **Merged by:** [@lafriks](https://github.com/lafriks) **Base:** `master` ← **Head:** `settings-menu-refactoring` --- ### 📝 Commits (10+) - [`7392584`](https://github.com/go-gitea/gitea/commit/73925841a3e87410fb52a044682e6bfa33c59dca) moved avatar to profile page - [`47faa79`](https://github.com/go-gitea/gitea/commit/47faa79e9bea9b59981ed4017a586f759a3c96ee) combined password change, email and account deletion into account settings page - [`8107662`](https://github.com/go-gitea/gitea/commit/81076622ea628fa73695b0ad08168cba17419008) combined totp, access tokens, linked accounts and openid into security settings page - [`6f11a3e`](https://github.com/go-gitea/gitea/commit/6f11a3e74a04dcb14dbfeeed32c9ebf634af7938) move access tokens to applications settings page - [`8c89367`](https://github.com/go-gitea/gitea/commit/8c893674c83e9abcb06bffe6580520aad8fd1730) small change to restart drone build - [`1f90d56`](https://github.com/go-gitea/gitea/commit/1f90d564c8165c90a4ccb5e6e60c28b8f37df610) fix change avatar url on profile page - [`e4601ce`](https://github.com/go-gitea/gitea/commit/e4601ce32bf144640b991c4c4fe62c5b42614862) redirect old settings urls to new ones - [`d7fbc1b`](https://github.com/go-gitea/gitea/commit/d7fbc1b57ee4374973122e584a9127dbb102defc) enforce only one autofocus attribute on settings pages - [`7c3cf08`](https://github.com/go-gitea/gitea/commit/7c3cf08fc5993815ca0bccec5104bd1059337ae3) set correct redirect status code - [`dc8307d`](https://github.com/go-gitea/gitea/commit/dc8307daddab8f74326bca35eb90fe1cc5fc6b96) Merge branch 'master' into settings-menu-refactoring ### 📊 Changes **25 files changed** (+582 additions, -688 deletions) <details> <summary>View changed files</summary> 📝 `integrations/delete_user_test.go` (+4 -4) 📝 `integrations/links_test.go` (+2 -5) 📝 `options/locale/locale_en-US.ini` (+2 -1) 📝 `routers/routes/routes.go` (+43 -23) 📝 `routers/user/setting.go` (+182 -197) 📝 `routers/user/setting_openid.go` (+11 -36) 📝 `routers/user/setting_test.go` (+1 -1) 📝 `templates/user/profile.tmpl` (+1 -1) ➕ `templates/user/settings/account.tmpl` (+135 -0) ➖ `templates/user/settings/account_link.tmpl` (+0 -44) 📝 `templates/user/settings/applications.tmpl` (+17 -16) ➖ `templates/user/settings/avatar.tmpl` (+0 -46) ➖ `templates/user/settings/delete.tmpl` (+0 -41) ➖ `templates/user/settings/email.tmpl` (+0 -66) 📝 `templates/user/settings/navbar.tmpl` (+4 -18) ➖ `templates/user/settings/openid.tmpl` (+0 -71) 📝 `templates/user/settings/organization.tmpl` (+1 -1) 📝 `templates/user/settings/profile.tmpl` (+37 -0) 📝 `templates/user/settings/repos.tmpl` (+1 -1) 📝 `templates/user/settings/security.tmpl` (+6 -71) _...and 5 more files_ </details> ### 📄 Description Targets https://github.com/go-gitea/gitea/issues/2271 and reduces amount of menu items by combining contextual settings. I've already prepared a followup PR refactoring the affected code to be more maintainable. UI before PR: <img width="1380" alt="old-menu" src="https://user-images.githubusercontent.com/5477981/39665159-114a8842-5090-11e8-8a63-6295f0545ceb.png"> UI after PR: * Profile <img width="1454" alt="profile" src="https://user-images.githubusercontent.com/5477981/39665165-1dd06eec-5090-11e8-8324-829d02ab5d1c.png"> * Account <img width="1242" alt="account" src="https://user-images.githubusercontent.com/5477981/39665169-22aeab36-5090-11e8-950e-b8446322f866.png"> * Security <img width="1218" alt="security" src="https://user-images.githubusercontent.com/5477981/39665171-283b573e-5090-11e8-83dd-21e55549222a.png"> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-02 12:27:09 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#17135
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?