Fix inconsistent user profile layout across tabs #25625

puni9869 · 2023-07-02T08:13:39Z

Fix ::User Profile Page Project Tab Have Inconsistent Layout and Style
Added the big_avator for consistency in the all header_items tabs.
Fixes: #24871

Description

in the user profile page the Packages and Projects tab have small icons for user but other tabs have bigger profile picture with user info:

Screenshots

For Packages And Projects:

For Other Tabs:

Before

After changes

Project View

Packages View

Org view for projects page

Org view for packages page

Big Profile avatar is implemented. Org profile avatar is separated out from profile avater file. Org layout for code, project, packages and package_versions pages is simplified.

puni9869 · 2023-07-02T08:18:43Z

I tried my best to not use if-else based check in templates. 💯
As mentioned here #25108 (comment) by @wxiaoguang (thanks a ton for the suggestions @wxiaoguang)
tagging @delvh @lunny @silverwind

puni9869 · 2023-07-02T12:48:55Z

@denyskon Please tag this pr to v1.21 milestone

denyskon · 2023-07-02T12:49:57Z

I don't have the permission to assign to milestone

wxiaoguang · 2023-07-02T13:59:09Z

Some problems:

The shared/user.PrepareContextForProfileBigAvatar(ctx *context.Context) duplicates a lot code of web/user.Profile(ctx *context.Context)
- if the "shared" functions does the right thing, the web/user.Profile should also use it.
The layout seems not right. There should be only one <div main page-content>

puni9869 · 2023-07-02T19:00:29Z

Some problems:

The shared/user.PrepareContextForProfileBigAvatar(ctx *context.Context) duplicates a lot code of web/user.Profile(ctx *context.Context)

if the "shared" functions does the right thing, the web/user.Profile should also use it.

Yes, I agree with your point. But with profile page the code is shared between followers, followings, stars, activity and in repository tabs. The impact radius is large so I don't want to touch that code. We need a complete restructure of Profile Page in repo mode.

The layout seems not right. There should be only one <div main page-content>

Fixed.

wxiaoguang · 2023-07-03T02:38:17Z

What are the <div class="page-content"> and <div class="ui repository packages"> used for in 8eb033e ? I do not think they make sense.

The "page-content" means a whole page's main content in Gitea's templates, so only one for each page. Mixing them would cause unintentional style/selector conflicts.

puni9869 · 2023-07-03T05:52:53Z

ui repository packages

There was a previous style tagged to below code. That was creating the problem.

Can you test versionlist page. I don't have any package in local.

wxiaoguang · 2023-07-03T06:12:44Z

You can use "curl" to push a generic package.

https://docs.gitea.com/packages/usage/packages/generic

wxiaoguang · 2023-07-05T11:34:43Z

Almost done from my side.

Now the "nav menu" has consistent layouts, and a lot of duplicate code has been merged.

There might be still some problems in code, but I think it's easier to fix any problem in the future after this PR.

silverwind · 2023-07-06T16:36:48Z

I like this +411 −349 better :)

silverwind · 2023-07-06T18:32:12Z

Gave it another quick test, still working fine. Pushed one small indendation fix.

puni9869 · 2023-07-06T18:42:32Z

Gave it another quick test, still working fine. Pushed one small indendation fix.

Looks good. Tested.

* giteaofficial/main: [skip ci] Updated translations via Crowdin Remove unused code (go-gitea#25734) Fix commits table regression (go-gitea#25710) Fix inconsistent user profile layout across tabs (go-gitea#25625) Simplify the LFS GC logger usage (go-gitea#25717) Allow/fix review (approve/reject) of empty PRs (go-gitea#25690) Correct permissions for `.ssh` and `authorized_keys` (go-gitea#25721) Sync branches when mirroring (go-gitea#25722)

…abs" (#25739) Follow #25625 (comment) 1. Fix the incorrect "project view" layout 2. Fix the "follow/unfollow" link on "packages" and "projects" tab Before: ![image](https://github.com/go-gitea/gitea/assets/2114189/3b071235-c186-4097-8a19-dd90dcb2a344) After: ![image](https://github.com/go-gitea/gitea/assets/2114189/d1d23cd7-28d8-43e3-9f68-03e8a34a9b97) --------- Co-authored-by: Giteabot <[email protected]>

puni9869 added 2 commits July 2, 2023 13:24

Adjusting profile layout for package, project and code page.

519293d

Big Profile avatar is implemented. Org profile avatar is separated out from profile avater file. Org layout for code, project, packages and package_versions pages is simplified.

Templates and go file formatting

aaa5f71

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 2, 2023

pull-request-size bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jul 2, 2023

Merge branch 'main' into punit/ISSUE-24871-user-profile

2fedaf3

denyskon added type/enhancement An improvement of existing functionality topic/ui Change the appearance of the Gitea UI labels Jul 2, 2023

lunny added this to the 1.21.0 milestone Jul 2, 2023

wxiaoguang added 2 commits July 2, 2023 21:24

fix merge

eae7940

fix merge

b0bd1ea

puni9869 added 2 commits July 3, 2023 00:03

Fixing page-content style

8eb033e

Removing page-content to gt-mt-4

907a710

Merge branch 'main' into punit/ISSUE-24871-user-profile

cbd0ca8

puni9869 and others added 3 commits July 3, 2023 09:37

Merge branch 'main' into punit/ISSUE-24871-user-profile

9d6c8cf

Merge branch 'main' into punit/ISSUE-24871-user-profile

bef3289

Fix :: Suggestions Removing page-content

c3f23d1

puni9869 and others added 6 commits July 3, 2023 23:38

Merge branch 'main' into punit/ISSUE-24871-user-profile

110081a

Adding style in package version list

110e50b

Merge branch 'main' into punit/ISSUE-24871-user-profile

8b9a080

Merge branch 'main' into punit/ISSUE-24871-user-profile

656191a

Merge branch 'main' into punit/ISSUE-24871-user-profile

f3ee922

fix style in package/repo

617544c

wxiaoguang added 6 commits July 5, 2023 16:11

revert unnecessary new lines

7ec582b

rewrite

3c5652d

rewrite

fd85288

rewrite

b29bbfa

rewrite

6c93f71

fix

f355415

wxiaoguang approved these changes Jul 5, 2023

View reviewed changes

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 5, 2023

delvh changed the title ~~Fix ::User Profile Page - Project/Packages Tabs Have Inconsistent Layout~~ Fix inconsistent user profile layout across tabs Jul 5, 2023

wxiaoguang and others added 3 commits July 5, 2023 20:02

remove unused code

da7bf21

Merge branch 'main' into punit/ISSUE-24871-user-profile

9046994

Merge branch 'main' into punit/ISSUE-24871-user-profile

deceaf1

lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 6, 2023

GiteaBot added 3 commits July 6, 2023 07:18

Merge branch 'main' into punit/ISSUE-24871-user-profile

ab0ad22

Merge branch 'main' into punit/ISSUE-24871-user-profile

0162ec5

Merge branch 'main' into punit/ISSUE-24871-user-profile

36660f6

GiteaBot and others added 2 commits July 6, 2023 12:52

Merge branch 'main' into punit/ISSUE-24871-user-profile

8e6f3c2

dedent templates/user/overview/header.tmpl

b670669

silverwind enabled auto-merge (squash) July 6, 2023 18:32

silverwind merged commit 2af30f7 into go-gitea:main Jul 6, 2023
24 checks passed

GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 6, 2023

wxiaoguang mentioned this pull request Jul 7, 2023

Following up fixes for "Fix inconsistent user profile layout across tabs" #25739

Merged

go-gitea locked as resolved and limited conversation to collaborators Oct 5, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix inconsistent user profile layout across tabs #25625

Fix inconsistent user profile layout across tabs #25625

puni9869 commented Jul 2, 2023 •

edited

Loading

puni9869 commented Jul 2, 2023 •

edited

Loading

puni9869 commented Jul 2, 2023

denyskon commented Jul 2, 2023

wxiaoguang commented Jul 2, 2023 •

edited

Loading

puni9869 commented Jul 2, 2023 •

edited

Loading

wxiaoguang commented Jul 3, 2023

puni9869 commented Jul 3, 2023 •

edited

Loading

wxiaoguang commented Jul 3, 2023

wxiaoguang commented Jul 5, 2023 •

edited

Loading

silverwind commented Jul 6, 2023

silverwind commented Jul 6, 2023

puni9869 commented Jul 6, 2023

Fix inconsistent user profile layout across tabs #25625

Fix inconsistent user profile layout across tabs #25625

Conversation

puni9869 commented Jul 2, 2023 • edited Loading

Description

Screenshots

For Packages And Projects:

For Other Tabs:

Before

After changes

Org view for projects page

Org view for packages page

puni9869 commented Jul 2, 2023 • edited Loading

puni9869 commented Jul 2, 2023

denyskon commented Jul 2, 2023

wxiaoguang commented Jul 2, 2023 • edited Loading

puni9869 commented Jul 2, 2023 • edited Loading

wxiaoguang commented Jul 3, 2023

puni9869 commented Jul 3, 2023 • edited Loading

wxiaoguang commented Jul 3, 2023

wxiaoguang commented Jul 5, 2023 • edited Loading

silverwind commented Jul 6, 2023

silverwind commented Jul 6, 2023

puni9869 commented Jul 6, 2023

puni9869 commented Jul 2, 2023 •

edited

Loading

puni9869 commented Jul 2, 2023 •

edited

Loading

wxiaoguang commented Jul 2, 2023 •

edited

Loading

puni9869 commented Jul 2, 2023 •

edited

Loading

puni9869 commented Jul 3, 2023 •

edited

Loading

wxiaoguang commented Jul 5, 2023 •

edited

Loading