go-gitea · hazycora · Sep 19, 2023 · Sep 20, 2023 · Sep 20, 2023 · Sep 20, 2023
diff --git a/routers/web/org/members.go b/routers/web/org/members.go
@@ -73,6 +73,8 @@ func Members(ctx *context.Context) {
 	ctx.Data["MembersIsUserOrgOwner"] = organization.IsUserOrgOwner(ctx, members, org.ID)
 	ctx.Data["MembersTwoFaStatus"] = members.GetTwoFaStatus(ctx)
 
+	shared_user.RenderUserHeader(ctx)
+
 	ctx.HTML(http.StatusOK, tplMembers)
 }
 

diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go
@@ -65,6 +65,7 @@ func Teams(ctx *context.Context) {
 		return
 	}
 
+	shared_user.RenderUserHeader(ctx)
 	ctx.HTML(http.StatusOK, tplTeams)
 }
 
@@ -280,6 +281,7 @@ func NewTeam(ctx *context.Context) {
 		ctx.ServerError("LoadHeaderCount", err)
 		return
 	}
+	shared_user.RenderUserHeader(ctx)
 	ctx.HTML(http.StatusOK, tplTeamNew)
 }
 
@@ -345,6 +347,7 @@ func NewTeamPost(ctx *context.Context) {
 	ctx.Data["PageIsOrgTeamsNew"] = true
 	ctx.Data["Units"] = unit_model.Units
 	ctx.Data["Team"] = t
+	shared_user.RenderUserHeader(ctx)
 
 	if ctx.HasError() {
 		ctx.HTML(http.StatusOK, tplTeamNew)
@@ -395,6 +398,7 @@ func TeamMembers(ctx *context.Context) {
 	ctx.Data["Invites"] = invites
 	ctx.Data["IsEmailInviteEnabled"] = setting.MailService != nil
 
+	shared_user.RenderUserHeader(ctx)
 	ctx.HTML(http.StatusOK, tplTeamMembers)
 }
 
@@ -414,6 +418,7 @@ func TeamRepositories(ctx *context.Context) {
 		return
 	}
 	ctx.Data["Units"] = unit_model.Units
+	shared_user.RenderUserHeader(ctx)
 	ctx.HTML(http.StatusOK, tplTeamRepositories)
 }
 

diff --git a/templates/explore/repo_grid.tmpl b/templates/explore/repo_grid.tmpl
@@ -0,0 +1,79 @@
+<div class="grid-list">
+	{{range .Repos}}
+		<div class="grid-item">
+			<div class="grid-item-main">
+				<div class="grid-item-header">
+					<div class="grid-item-title">
+						{{if $.IsPrivate}}
+							{{svg "octicon-lock" 16}}
+						{{else if $.IsMirror}}
+							{{svg "octicon-mirror" 16}}
+						{{else if $.IsFork}}
+							{{svg "octicon-repo-forked" 16}}
+						{{else}}
+							{{svg "octicon-repo" 16}}
+						{{end}}
+						<a class="text primary name" href="{{.Link}}">
+							{{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}}
+						</a>
+						<span class="label-list">
+							{{if .IsArchived}}
+								<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
+							{{end}}
+							{{if .IsTemplate}}
+								{{if .IsPrivate}}
+									<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private_template"}}</span>
+								{{else}}
+									{{if .Owner.Visibility.IsPrivate}}
+										<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal_template"}}</span>
+									{{end}}
+								{{end}}
+							{{else}}
+								{{if .IsPrivate}}
+									<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
+								{{else}}
+									{{if .Owner.Visibility.IsPrivate}}
+										<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
+									{{end}}
+								{{end}}
+							{{end}}
+						</span>
+						{{if .IsFork}}
+							<span data-tooltip-content="{{ctx.Locale.Tr "repo.fork"}}">{{svg "octicon-repo-forked"}}</span>
+						{{else if .IsMirror}}
+							<span data-tooltip-content="{{ctx.Locale.Tr "mirror"}}">{{svg "octicon-mirror"}}</span>
+						{{end}}
+					</div>
+				</div>
+				{{$description := .DescriptionHTML $.Context}}
+				{{if $description}}
+					<div class="grid-item-body">{{$description}}</div>
+				{{end}}
+				{{if .Topics}}
+					<div class="label-list">
+					{{range $i, $e := .Topics}}
+						{{if and (lt $i 5) (ne $e "")}}<a class="ui label" href="{{AppSubUrl}}/explore/repos?q={{.}}&topic=1">{{.}}</a>{{end}}
+					{{end}}
+					</div>
+				{{end}}
+			</div>
+			<div class="grid-item-footer">
+				<div class="grid-item-trailing">
+					{{if .PrimaryLanguage}}
+						<a class="muted" href="{{$.Link}}?q={{$.Keyword}}&sort={{$.SortType}}&language={{.PrimaryLanguage.Language}}">
+							<span class="flex-text-inline"><i class="color-icon gt-mr-3" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{.PrimaryLanguage.Language}}</span>
+						</a>
+					{{end}}
+					{{if not $.DisableStars}}
+						<a class="text grey flex-text-inline" href="{{.Link}}/stars">{{svg "octicon-star" 16}}{{.NumStars}}</a>
+					{{end}}
+					<a class="text grey flex-text-inline" href="{{.Link}}/forks">{{svg "octicon-git-branch" 16}}{{.NumForks}}</a>
+				</div>
+			</div>
+		</div>
+	{{else}}
+	<div>
+		{{ctx.Locale.Tr "explore.repo_no_results"}}
+	</div>
+	{{end}}
+</div>
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
@@ -40,12 +40,17 @@
 	<div class="ui container">
 		<div class="ui mobile reversed stackable grid">
 			<div class="ui {{if .ShowMemberAndTeamTab}}eleven wide{{end}} column">
-				{{if .ProfileReadme}}
-					<div id="readme_profile" class="markup">{{.ProfileReadme | Str2html}}</div>
+				{{if eq .TabName "repositories"}}
+					{{template "explore/repo_search" .}}
+					{{template "explore/repo_list" .}}
+					{{template "base/paginate" .}}
+				{{else}}
+					{{if .ProfileReadme}}
+						<div id="readme_profile" class="render-content markup"> {{$.ProfileReadme|Str2html}} </div>
+						<div class="divider"></div>
+					{{end}}
+					{{template "explore/repo_grid" .}}
 				{{end}}
-				{{template "explore/repo_search" .}}
-				{{template "explore/repo_list" .}}
-				{{template "base/paginate" .}}
 			</div>
 
 			{{if .ShowMemberAndTeamTab}}

diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl
@@ -1,6 +1,9 @@
 <div class="ui container">
 	<div class="ui secondary stackable pointing menu">
-		<a class="{{if .PageIsViewRepositories}}active {{end}}item" href="{{$.Org.HomeLink}}">
+		<a class="{{if or (eq .TabName "overview") (and (eq .TabName "") (not .IsPackagesPage) (not .PageIsViewProjects))}}active {{end}}item" href="{{.ContextUser.HomeLink}}?tab=overview">
+			{{svg "octicon-info"}} {{ctx.Locale.Tr "user.overview"}}
+		</a>
+		<a class="{{if or (eq .TabName "repositories") (and (eq .TabName "") (not .PageIsViewRepositories))}}active {{end}}item" href="{{$.Org.HomeLink}}?tab=repositories">
 			{{svg "octicon-repo"}} {{ctx.Locale.Tr "user.repositories"}}
 			{{if .RepoCount}}
 				<div class="ui small label">{{.RepoCount}}</div>

diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl
@@ -1,9 +1,7 @@
 <div class="ui secondary stackable pointing menu">
-	{{if and .HasProfileReadme .ContextUser.IsIndividual}}
 	<a class="{{if eq .TabName "overview"}}active {{end}}item" href="{{.ContextUser.HomeLink}}?tab=overview">
 		{{svg "octicon-info"}} {{ctx.Locale.Tr "user.overview"}}
 	</a>
-	{{end}}
 	<a class="{{if eq .TabName "repositories"}}active {{end}} item" href="{{.ContextUser.HomeLink}}?tab=repositories">
 		{{svg "octicon-repo"}} {{ctx.Locale.Tr "user.repositories"}}
 		{{if .RepoCount}}

diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
@@ -29,7 +29,14 @@
 				{{else if eq .TabName "followers"}}
 					{{template "repo/user_cards" .}}
 				{{else if eq .TabName "overview"}}
-					<div id="readme_profile" class="markup">{{.ProfileReadme | Str2html}}</div>
+					{{if .HasProfileReadme}}
+						<div id="readme_profile" class="markup">{{.ProfileReadme | Str2html}}</div>
+						<div class="divider"></div>
+					{{end}}
+					{{template "explore/repo_grid" .}}
+					<div class="divider"></div>
+					{{template "user/heatmap" .}}
+					{{template "user/dashboard/feeds" .}}
 				{{else}}
 					{{template "explore/repo_search" .}}
 					{{template "explore/repo_list" .}}

diff --git a/web_src/css/index.css b/web_src/css/index.css
@@ -14,6 +14,7 @@
 @import "./modules/flexcontainer.css";
 
 @import "./shared/flex-list.css";
+@import "./shared/grid-list.css";
 @import "./shared/milestone.css";
 @import "./shared/repoorg.css";
 @import "./shared/settings.css";

diff --git a/web_src/css/shared/grid-list.css b/web_src/css/shared/grid-list.css
@@ -0,0 +1,63 @@
+.grid-list {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(18rem, 1fr));
+  gap: 1rem;
+}
+
+.grid-item {
+  border-radius: 0.5rem;
+  padding: 1em;
+  display: grid;
+  gap: 8px;
+  align-items: flex-start;
+  border: 1px solid var(--color-secondary);
+  grid-template-rows: 1fr min-content;
+}
+
+.grid-item .grid-item-main {
+  display: grid;
+  gap: 4px;
+}
+
+.grid-item .grid-item-header {
+  display: flex;
+  gap: 0.25rem;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+
+.grid-item .grid-item-title {
+  display: inline-flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: .25rem;
+  max-width: 100%;
+  color: var(--color-text);
+  font-size: 16px;
+  font-weight: var(--font-weight-semibold);
+  word-break: break-word;
+  min-width: 0;
+}
+
+.grid-item .grid-item-body {
+  font-size: 13px;
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 0.25rem;
+  color: var(--color-text-light-2);
+  word-break: break-word;
+}
+
+.grid-item .grid-item-footer {
+  grid-column: 1 / -1;
+}
+
+.grid-item .grid-item-trailing {
+  display: flex;
+  gap: 0.5rem;
+  align-items: center;
+  flex-grow: 0;
+  flex-wrap: wrap;
+  justify-content: end;
+}