diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json index c7eee41adb..29c60db3e4 100644 --- a/options/locale/locale_en-US.json +++ b/options/locale/locale_en-US.json @@ -3815,5 +3815,7 @@ "user.pinned_repos_empty_desc": "Pin repositories to showcase your best work. Visit a repository and use the Pin dropdown.", "settings.show_heatmap_on_profile": "Show activity heatmap on profile", "settings.show_heatmap_on_profile_popup": "Display your contribution heatmap on your profile overview page", - "user.activity_heatmap": "Activity Heatmap" + "user.activity_heatmap": "Activity Heatmap", + "org.stats": "Stats", + "org.recent_activity": "Recent Activity" } \ No newline at end of file diff --git a/routers/web/org/home.go b/routers/web/org/home.go index 9a529427e1..e713c2ff8f 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -105,6 +105,23 @@ func home(ctx *context.Context, viewRepositories bool) { ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0 ctx.Data["IsOrganizationMember"] = ctx.Org.IsMember + // Load recently updated repositories for activity section + recentRepos, _, err := repo_model.SearchRepository(ctx, repo_model.SearchRepoOptions{ + ListOptions: db.ListOptions{ + PageSize: 10, + Page: 1, + }, + OwnerID: org.ID, + OrderBy: db.SearchOrderByRecentUpdated, + Private: ctx.IsSigned, + Actor: ctx.Doer, + }) + if err != nil { + log.Error("SearchRepository for recent repos: %v", err) + } else { + ctx.Data["RecentRepos"] = recentRepos + } + prepareResult, err := shared_user.RenderUserOrgHeader(ctx) if err != nil { ctx.ServerError("RenderUserOrgHeader", err) diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 3c09a9cfab..1b3df3569f 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -31,12 +31,16 @@ {{if .Repo}}
-
- {{if .Repo.IsPrivate}}{{svg "octicon-lock" 16}}{{else if .Repo.IsFork}}{{svg "octicon-repo-forked" 16}}{{else if .Repo.IsMirror}}{{svg "octicon-mirror" 16}}{{else}}{{svg "octicon-repo" 16}}{{end}} - {{.Repo.Name}} +
+ {{if .Repo.Avatar}} + + {{else}} + {{if .Repo.IsPrivate}}{{svg "octicon-lock" 16}}{{else if .Repo.IsFork}}{{svg "octicon-repo-forked" 16}}{{else if .Repo.IsMirror}}{{svg "octicon-mirror" 16}}{{else}}{{svg "octicon-repo" 16}}{{end}} + {{end}} + {{.Repo.Name}}
{{if .Repo.Description}} -
{{.Repo.Description}}
+
{{.Repo.Description}}
{{end}}
@@ -72,12 +76,16 @@ {{if .Repo}}
-
- {{if .Repo.IsPrivate}}{{svg "octicon-lock" 16}}{{else if .Repo.IsFork}}{{svg "octicon-repo-forked" 16}}{{else if .Repo.IsMirror}}{{svg "octicon-mirror" 16}}{{else}}{{svg "octicon-repo" 16}}{{end}} - {{.Repo.Name}} +
+ {{if .Repo.Avatar}} + + {{else}} + {{if .Repo.IsPrivate}}{{svg "octicon-lock" 16}}{{else if .Repo.IsFork}}{{svg "octicon-repo-forked" 16}}{{else if .Repo.IsMirror}}{{svg "octicon-mirror" 16}}{{else}}{{svg "octicon-repo" 16}}{{end}} + {{end}} + {{.Repo.Name}}
{{if .Repo.Description}} -
{{.Repo.Description}}
+
{{.Repo.Description}}
{{end}}
@@ -145,6 +153,45 @@
{{end}} + + {{/* Recent Activity Section */}} + {{if .RecentRepos}} +
+

+ {{svg "octicon-pulse" 16}} {{ctx.Locale.Tr "org.recent_activity"}} +

+
+ {{range .RecentRepos}} +
+
+ {{if .Avatar}} + + {{else}} +
+ {{if .IsPrivate}}{{svg "octicon-lock" 20}}{{else if .IsFork}}{{svg "octicon-repo-forked" 20}}{{else if .IsMirror}}{{svg "octicon-mirror" 20}}{{else}}{{svg "octicon-repo" 20}}{{end}} +
+ {{end}} +
+ {{.Name}} + {{if .Description}} +

{{.Description}}

+ {{end}} +
+
+ {{if .PrimaryLanguage}} + + + {{.PrimaryLanguage.Language}} + + {{end}} + {{TimeSince .UpdatedUnix ctx.Locale}} +
+
+
+ {{end}} +
+
+ {{end}} {{end}} {{/* Repositories Tab Content */}} @@ -190,25 +237,25 @@ {{/* Organization Stats - Sidebar Card */}} {{if .OrgStats}}
- {{svg "octicon-graph" 16}} {{ctx.Locale.Tr "org.activity"}} + {{svg "octicon-graph" 16}} {{ctx.Locale.Tr "org.stats"}}
-
-
-
{{.OrgStats.TotalRepos}}
-
{{ctx.Locale.Tr "org.repositories"}}
+
+
+
{{.OrgStats.TotalRepos}}
+
{{ctx.Locale.Tr "org.repositories"}}
-
-
{{.OrgStats.TotalMembers}}
-
{{ctx.Locale.Tr "org.members"}}
+
+
{{.OrgStats.TotalMembers}}
+
{{ctx.Locale.Tr "org.members"}}
-
-
{{.OrgStats.TotalTeams}}
-
{{ctx.Locale.Tr "org.teams"}}
+
+
{{.OrgStats.TotalTeams}}
+
{{ctx.Locale.Tr "org.teams"}}
-
-
{{.OrgStats.TotalStars}}
-
{{ctx.Locale.Tr "repo.stars"}}
+
+
{{.OrgStats.TotalStars}}
+
{{ctx.Locale.Tr "repo.stars"}}