diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2023-07-07 23:27:12 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-07 17:27:12 +0200 |
commit | 128d77a3a05c3bde86d5e1f2ac299dbd9c434e2d (patch) | |
tree | 563f7826ae0fc541b990000112932bd9f8733afe /templates/org | |
parent | a6a9389c702abcb003cbd4a304ec3650345fc14f (diff) | |
download | gitea-128d77a3a05c3bde86d5e1f2ac299dbd9c434e2d.tar.gz gitea-128d77a3a05c3bde86d5e1f2ac299dbd9c434e2d.zip |
Following up fixes for "Fix inconsistent user profile layout across tabs" (#25739)
Follow
https://github.com/go-gitea/gitea/pull/25625#issuecomment-1621577816
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 <teabot@gitea.io>
Diffstat (limited to 'templates/org')
-rw-r--r-- | templates/org/home.tmpl | 17 | ||||
-rw-r--r-- | templates/org/projects/view.tmpl | 2 |
2 files changed, 8 insertions, 11 deletions
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 7f52b8cc6d..967b31e7a8 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -20,16 +20,13 @@ </div> </div> <div class="right menu"> - <form method="post" action="{{.Link}}?action={{if $.IsFollowing}}unfollow{{else}}follow{{end}}&redirect_to={{$.Link}}"> - {{$.CsrfTokenHtml}} - <button type="submit" class="ui basic button gt-mr-0"> - {{if $.IsFollowing}} - {{.locale.Tr "user.unfollow"}} - {{else}} - {{.locale.Tr "user.follow"}} - {{end}} - </button> - </form> + <button class="link-action ui basic button gt-mr-0" data-url="{{.Org.HomeLink}}?action={{if $.IsFollowing}}unfollow{{else}}follow{{end}}"> + {{if $.IsFollowing}} + {{.locale.Tr "user.unfollow"}} + {{else}} + {{.locale.Tr "user.follow"}} + {{end}} + </button> </div> </div> diff --git a/templates/org/projects/view.tmpl b/templates/org/projects/view.tmpl index ef8ec24225..33346b6154 100644 --- a/templates/org/projects/view.tmpl +++ b/templates/org/projects/view.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -<div role="main" aria-label="{{.Title}}" class="page-content repository packages"> +<div role="main" aria-label="{{.Title}}" class="page-content repository projects view-project"> {{template "shared/user/org_profile_avatar" .}} <div class="ui container"> {{template "user/overview/header" .}} |