From eb09616e1d310eebddac4a1af29842b276d96f79 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Mon, 17 May 2021 10:45:05 +0800 Subject: [PATCH 01/15] 1 --- templates/explore/repo_list.tmpl | 99 ++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) mode change 100644 => 100755 templates/explore/repo_list.tmpl diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl old mode 100644 new mode 100755 index b10a860aec..f6463f20af --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -24,6 +24,105 @@
+
+ + +

+ {{.i18n.Tr "home.my_repos"}} ${reposTotalCount} + {{if or (not .ContextUser.IsOrganization) .IsOrganizationOwner}} +
+ + + {{.i18n.Tr "new_repo"}} + +
+ {{end}} +

+
+
+ + +
+ +
+
+ +
+ + +
+
+ + +
+
+ + +
+ +
+
+ +
+ + +
+
+ + +
+
+ + +
+ +
+
+
+
+
+ + {{.i18n.Tr "all"}} +
${repoTypeCount}
+ + + {{.i18n.Tr "sources"}} +
${repoTypeCount}
+ + + {{.i18n.Tr "forks"}} +
${repoTypeCount}
+ + + {{.i18n.Tr "mirrors"}} +
${repoTypeCount}
+ + + {{.i18n.Tr "collaborative"}} +
${repoTypeCount}
+ +
+ +
+ +
{{range .Repos}} -- 2.34.1 From 11d6cb1b89ded5be1c865c745d378f5fa1e5afac Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 18 May 2021 15:23:48 +0800 Subject: [PATCH 02/15] mod dashboard --- routers/user/home.go | 2 +- routers/user/profile.go | 2 + templates/base/head_navbar.tmpl | 8 +- templates/explore/repo_list.tmpl | 243 +++++++++++++------------------ 4 files changed, 105 insertions(+), 150 deletions(-) mode change 100644 => 100755 routers/user/home.go mode change 100644 => 100755 routers/user/profile.go diff --git a/routers/user/home.go b/routers/user/home.go old mode 100644 new mode 100755 index 2fc0c60aad..9421ee7d14 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -156,7 +156,7 @@ func Dashboard(ctx *context.Context) { if ctx.Written() { return } - ctx.HTML(200, tplDashboard) + //ctx.HTML(200, tplDashboard) } // Milestones render the user milestones page diff --git a/routers/user/profile.go b/routers/user/profile.go old mode 100644 new mode 100755 index 0e29b61174..0fcc6453ab --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -261,6 +261,8 @@ func Profile(ctx *context.Context) { ctx.Data["ShowUserEmail"] = len(ctxUser.Email) > 0 && ctx.IsSigned && (!ctxUser.KeepEmailPrivate || ctxUser.ID == ctx.User.ID) + Dashboard(ctx) + ctx.HTML(200, tplProfile) } diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 1eada0a01b..fd6634a7d1 100755 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -9,7 +9,7 @@
{{if .IsSigned}} - {{.i18n.Tr "dashboard"}} + {{.i18n.Tr "dashboard"}} {{.i18n.Tr "custom.head.openi"}} {{if not .UnitIssuesGlobalDisabled}} {{.i18n.Tr "issues"}} @@ -109,13 +109,9 @@
- - {{svg "octicon-info" 16}} - {{.i18n.Tr "your_dashboard"}} - {{svg "octicon-person" 16}} - {{.i18n.Tr "your_profile"}} + {{.i18n.Tr "your_dashboard"}} {{svg "octicon-star" 16}} diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index f6463f20af..89be6fc746 100755 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -1,31 +1,9 @@

{{.i18n.Tr "explore.repos"}}

-
- -
- - {{.i18n.Tr "repo.issues.filter_sort"}} - - -
- {{.i18n.Tr "repo.issues.filter_sort.latest"}} - {{.i18n.Tr "repo.issues.filter_sort.oldest"}} - {{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}} - {{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.moststars"}} - {{.i18n.Tr "repo.issues.filter_sort.feweststars"}} - {{.i18n.Tr "repo.issues.filter_sort.mostforks"}} - {{.i18n.Tr "repo.issues.filter_sort.fewestforks"}} -
-
-
-
- - -

- {{.i18n.Tr "home.my_repos"}} ${reposTotalCount} - {{if or (not .ContextUser.IsOrganization) .IsOrganizationOwner}} -
- - - {{.i18n.Tr "new_repo"}} - -
- {{end}} -

-
-
- - -
- -
-
- -
- - -
-
- - -
- - -
- {{range .Repos}} -
-
- {{if .RelAvatarLink}} - - {{end}} - - {{if or $.PageIsExplore $.PageIsProfileStarList }}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} - {{if .IsArchived}}{{end}} - - {{if .IsPrivate}} - {{svg "octicon-lock" 16}} - {{else if .IsFork}} - {{svg "octicon-repo-forked" 16}} - {{else if .IsMirror}} - {{svg "octicon-repo-clone" 16}} - {{else if .Owner}} - {{if .Owner.Visibility.IsPrivate}} - {{svg "octicon-lock" 16}} - {{end}} - {{end}} -
- {{if .PrimaryLanguage }} - {{ .PrimaryLanguage.Language }} - {{end}} - {{svg "octicon-star" 16}} {{.NumStars}} - {{svg "octicon-git-branch" 16}} {{.NumForks}} -
-
-
- {{if .DescriptionHTML}}

{{.DescriptionHTML}}

{{end}} - {{if .Topics }} -
- {{range .Topics}} - {{if ne . "" }}
{{.}}
{{end}} - {{end}} -
- {{end}} -

{{$.i18n.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.i18n.Lang}}

+
+
- {{else}} -
- {{$.i18n.Tr "explore.repo_no_results"}}
- {{end}} +
-- 2.34.1 From 91aeafc5eeb81cb403969c0f7d9a65631dd66d50 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 18 May 2021 17:22:57 +0800 Subject: [PATCH 03/15] add tmpl --- templates/explore/repo_list_dashboard.tmpl | 131 +++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100755 templates/explore/repo_list_dashboard.tmpl diff --git a/templates/explore/repo_list_dashboard.tmpl b/templates/explore/repo_list_dashboard.tmpl new file mode 100755 index 0000000000..89be6fc746 --- /dev/null +++ b/templates/explore/repo_list_dashboard.tmpl @@ -0,0 +1,131 @@ +

+ {{.i18n.Tr "explore.repos"}} +

+
+ -- 2.34.1 From 54fcbfa26e5c6efbe1917fd7cc9fc63f156b5990 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Tue, 18 May 2021 18:00:55 +0800 Subject: [PATCH 04/15] explore_repo --- templates/explore/repo_list.tmpl | 186 ++++++------------ .../dashboard}/repo_list_dashboard.tmpl | 0 templates/user/profile.tmpl | 2 +- 3 files changed, 66 insertions(+), 122 deletions(-) rename templates/{explore => user/dashboard}/repo_list_dashboard.tmpl (100%) mode change 100644 => 100755 templates/user/profile.tmpl diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 89be6fc746..b10a860aec 100755 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -1,131 +1,75 @@

{{.i18n.Tr "explore.repos"}}

+
+ +
+ + {{.i18n.Tr "repo.issues.filter_sort"}} + + +
+ {{.i18n.Tr "repo.issues.filter_sort.latest"}} + {{.i18n.Tr "repo.issues.filter_sort.oldest"}} + {{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}} + {{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} + {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.moststars"}} + {{.i18n.Tr "repo.issues.filter_sort.feweststars"}} + {{.i18n.Tr "repo.issues.filter_sort.mostforks"}} + {{.i18n.Tr "repo.issues.filter_sort.fewestforks"}} +
+
+
+
-
- -
-
-
-
- - -
- -
-
- -
- - -
-
- - -
-
- - -
- -
-
- -
- - -
-
- - -
-
- - -
- -
-
-
-
-
- - {{.i18n.Tr "all"}} -
${repoTypeCount}
- - - {{.i18n.Tr "sources"}} -
${repoTypeCount}
- - - {{.i18n.Tr "forks"}} -
${repoTypeCount}
- - - {{.i18n.Tr "mirrors"}} -
${repoTypeCount}
- - - {{.i18n.Tr "collaborative"}} -
${repoTypeCount}
- + +
+ {{range .Repos}} +
+
+ {{if .RelAvatarLink}} + + {{end}} + + {{if or $.PageIsExplore $.PageIsProfileStarList }}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} + {{if .IsArchived}}{{end}} + + {{if .IsPrivate}} + {{svg "octicon-lock" 16}} + {{else if .IsFork}} + {{svg "octicon-repo-forked" 16}} + {{else if .IsMirror}} + {{svg "octicon-repo-clone" 16}} + {{else if .Owner}} + {{if .Owner.Visibility.IsPrivate}} + {{svg "octicon-lock" 16}} + {{end}} + {{end}} +
+ {{if .PrimaryLanguage }} + {{ .PrimaryLanguage.Language }} + {{end}} + {{svg "octicon-star" 16}} {{.NumStars}} + {{svg "octicon-git-branch" 16}} {{.NumForks}}
-
- +
+ {{if .DescriptionHTML}}

{{.DescriptionHTML}}

{{end}} + {{if .Topics }} +
+ {{range .Topics}} + {{if ne . "" }}
{{.}}
{{end}} + {{end}} +
+ {{end}} +

{{$.i18n.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.i18n.Lang}}

+ {{else}} +
+ {{$.i18n.Tr "explore.repo_no_results"}}
- + {{end}}
diff --git a/templates/explore/repo_list_dashboard.tmpl b/templates/user/dashboard/repo_list_dashboard.tmpl similarity index 100% rename from templates/explore/repo_list_dashboard.tmpl rename to templates/user/dashboard/repo_list_dashboard.tmpl diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl old mode 100644 new mode 100755 index 58f6cc471a..8967ab566a --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -136,7 +136,7 @@ {{template "base/paginate" .}} {{else}} {{template "explore/repo_search" .}} - {{template "explore/repo_list" .}} + {{template "user/dashboard/repo_list_dashboard" .}} {{template "base/paginate" .}} {{end}}
-- 2.34.1 From 4948af26af24b04fec8257ecde990e67ab58bd48 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Fri, 21 May 2021 10:39:03 +0800 Subject: [PATCH 05/15] delete search --- templates/user/profile.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 8967ab566a..108761c6d1 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -135,7 +135,6 @@ {{template "explore/dataset_list" .}} {{template "base/paginate" .}} {{else}} - {{template "explore/repo_search" .}} {{template "user/dashboard/repo_list_dashboard" .}} {{template "base/paginate" .}} {{end}} -- 2.34.1 From 721814008079e06d589ed48d0aa68e945f0a757c Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 10:45:47 +0800 Subject: [PATCH 06/15] add activity filter --- templates/user/profile.tmpl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 108761c6d1..14e723b1b0 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -89,7 +89,7 @@ {{svg "octicon-inbox" 16}} {{.i18n.Tr "user.datasets"}} - + {{svg "octicon-rss" 16}} {{.i18n.Tr "user.activity"}} @@ -117,6 +117,10 @@
{{end}} +
{{template "user/dashboard/feeds" .}}
-- 2.34.1 From 7d1c8e4f4e11c2a997cec7def1b1782b2eb39d2d Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 10:49:54 +0800 Subject: [PATCH 07/15] adjust filter style --- templates/user/profile.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 14e723b1b0..02a049f74a 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -117,7 +117,7 @@
{{end}} -
+ -- 2.34.1 From 79c506feb075b07867a0f92a0ad7395c45cdaf7c Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Fri, 21 May 2021 11:01:13 +0800 Subject: [PATCH 08/15] add type for activity --- routers/user/home.go | 14 +++++++------- routers/user/profile.go | 8 +++++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/routers/user/home.go b/routers/user/home.go index 9421ee7d14..7d1f247eaa 100755 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -145,13 +145,13 @@ func Dashboard(ctx *context.Context) { ctx.Data["MirrorCount"] = len(mirrors) ctx.Data["Mirrors"] = mirrors - retrieveFeeds(ctx, models.GetFeedsOptions{ - RequestedUser: ctxUser, - Actor: ctx.User, - IncludePrivate: true, - OnlyPerformedBy: false, - IncludeDeleted: false, - }) + //retrieveFeeds(ctx, models.GetFeedsOptions{ + // RequestedUser: ctxUser, + // Actor: ctx.User, + // IncludePrivate: true, + // OnlyPerformedBy: false, + // IncludeDeleted: false, + //}) if ctx.Written() { return diff --git a/routers/user/profile.go b/routers/user/profile.go index 0fcc6453ab..062adf0f7b 100755 --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -178,10 +178,16 @@ func Profile(ctx *context.Context) { total = ctxUser.NumFollowing case "activity": + typeQuery := ctx.Query("type") + onlyPerformedBy := true + if typeQuery == "all" { + onlyPerformedBy = false + } + retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser, Actor: ctx.User, IncludePrivate: showPrivate, - OnlyPerformedBy: true, + OnlyPerformedBy: onlyPerformedBy, IncludeDeleted: false, }) if ctx.Written() { -- 2.34.1 From f9de4a2d375637c4371ce3ea40e50b92965995d4 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 11:01:24 +0800 Subject: [PATCH 09/15] adjust filter style --- templates/user/profile.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 02a049f74a..0190590380 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -118,8 +118,8 @@
{{end}}
{{template "user/dashboard/feeds" .}} -- 2.34.1 From 0af18b8c83b693f5e06be0103ae36e19fef82ed0 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 11:23:25 +0800 Subject: [PATCH 10/15] adjust filter style --- templates/user/profile.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 0190590380..bbcdcaf031 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -117,9 +117,9 @@
{{end}} -
- 个人 - 所有 +
{{template "user/dashboard/feeds" .}} -- 2.34.1 From 750a22560f9517bca4330574d95a0d024a01586f Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 11:37:38 +0800 Subject: [PATCH 11/15] adjust activity filter --- templates/user/profile.tmpl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index bbcdcaf031..0a33389121 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -121,6 +121,16 @@ 个人 所有
+
+
+ + {{.i18n.Tr "all"}} + + + {{.i18n.Tr "sources"}} + +
+
{{template "user/dashboard/feeds" .}}
-- 2.34.1 From dde04ca37417aab5d7367b039ff099b0cf3e9846 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 12:09:28 +0800 Subject: [PATCH 12/15] adjust activity filter style --- options/locale/locale_en-US.ini | 3 ++- options/locale/locale_zh-CN.ini | 3 ++- templates/user/profile.tmpl | 16 ++++------------ 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 110c2a2090..c4956c65f1 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -391,7 +391,8 @@ follow = Follow unfollow = Unfollow heatmap.loading = Loading Heatmap… user_bio = Biography - +own = Own +all = All form.name_reserved = The username '%s' is reserved. form.name_pattern_not_allowed = The pattern '%s' is not allowed in a username. form.name_chars_not_allowed = User name '%s' contains invalid characters. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 751aea64ba..1eb590c176 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -391,7 +391,8 @@ follow=关注 unfollow=取消关注 heatmap.loading=正在加载热图... user_bio=简历 - +own = 个人 +all = 所有 form.name_reserved='%s' 用户名被保留。 form.name_pattern_not_allowed=用户名中不允许使用 "%s"。 form.name_chars_not_allowed=用户名 '%s' 包含无效字符。 diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 0a33389121..91b6618362 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -118,18 +118,10 @@
{{end}}
- 个人 - 所有 -
-
-
- - {{.i18n.Tr "all"}} - - - {{.i18n.Tr "sources"}} - -
+ + {{svg "octicon-person" 16}} {{.i18n.Tr "user.own"}} + + {{svg "octicon-people" 16}} {{.i18n.Tr "user.all"}}
{{template "user/dashboard/feeds" .}} -- 2.34.1 From ad2579ea50c0228935c8f9578b479acfadfee060 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 14:49:17 +0800 Subject: [PATCH 13/15] adjust activity filter style --- templates/user/profile.tmpl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 91b6618362..919d8ea012 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -123,6 +123,12 @@ {{svg "octicon-people" 16}} {{.i18n.Tr "user.all"}}
+
+ + {{svg "octicon-person" 16}} {{.i18n.Tr "user.own"}} + + {{svg "octicon-people" 16}} {{.i18n.Tr "user.all"}} +
{{template "user/dashboard/feeds" .}}
-- 2.34.1 From a159d31eadec80c8c9d8c8bc6a039666ae15b1db Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Fri, 21 May 2021 15:17:37 +0800 Subject: [PATCH 14/15] organization --- templates/user/profile.tmpl | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 919d8ea012..bf5ed67d7d 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -117,17 +117,11 @@
{{end}} -
{{svg "octicon-person" 16}} {{.i18n.Tr "user.own"}} - {{svg "octicon-people" 16}} {{.i18n.Tr "user.all"}} + {{svg "octicon-organization" 16}} {{.i18n.Tr "user.all"}}
{{template "user/dashboard/feeds" .}} -- 2.34.1 From 2dcd50fb157a278ae5bfcc8ee0d55a939b851778 Mon Sep 17 00:00:00 2001 From: Gitea Date: Fri, 21 May 2021 15:25:24 +0800 Subject: [PATCH 15/15] set activity tab style according to filter value --- routers/user/profile.go | 1 + templates/user/profile.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/routers/user/profile.go b/routers/user/profile.go index 062adf0f7b..063b269148 100755 --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -179,6 +179,7 @@ func Profile(ctx *context.Context) { total = ctxUser.NumFollowing case "activity": typeQuery := ctx.Query("type") + ctx.Data["ActTabName"] = typeQuery onlyPerformedBy := true if typeQuery == "all" { onlyPerformedBy = false diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index bf5ed67d7d..4b1619f0c8 100755 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -118,9 +118,9 @@
{{end}}
- + {{svg "octicon-person" 16}} {{.i18n.Tr "user.own"}} - + {{svg "octicon-organization" 16}} {{.i18n.Tr "user.all"}}
-- 2.34.1