Merge branch 'main' into fix/cran_archived_packaged

go-gitea · Dec 11, 2024 · 6e37863 · 6e37863
2 parents 8eb017c + 4814f43
commit 6e37863
Show file tree

Hide file tree

Showing 11 changed files with 441 additions and 559 deletions.
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
@@ -102,8 +102,7 @@
 						{{end}}
 					</div>
 
-					{{/* by default, the row-right flex grows, but on non-root tree path, it should not because the row-left might contain a long path */}}
-					<div class="repo-button-row-right {{if not $isTreePathRoot}}tw-flex-grow-0{{end}}">
+					<div class="repo-button-row-right">
 						<!-- Only show clone panel in repository home page -->
 						{{if $isTreePathRoot}}
 							{{template "repo/clone_panel" .}}
@@ -124,6 +123,9 @@
 						{{template "repo/code/upstream_diverging_info" .}}
 					{{end}}
 					{{template "repo/view_list" .}}
+					{{if and .ReadmeExist (or .IsMarkup .IsPlainText)}}
+						{{template "repo/view_file" .}}
+					{{end}}
 				{{end}}
 			</div>
 

diff --git a/templates/repo/latest_commit.tmpl b/templates/repo/latest_commit.tmpl
@@ -1,5 +1,5 @@
 {{if not .LatestCommit}}
-	<div class="ui active tiny slow centered inline">…</div>
+	…
 {{else}}
 	{{if .LatestCommitUser}}
 		{{ctx.AvatarUtils.Avatar .LatestCommitUser 24 "tw-mr-1"}}

diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
@@ -1,73 +1,57 @@
-<table id="repo-files-table" class="ui single line fixed table tw-mt-0" {{if .HasFilesWithoutLatestCommit}}hx-indicator="tr.notready td.message span" hx-trigger="load" hx-swap="morph" hx-post="{{.LastCommitLoaderURL}}"{{end}}>
-	<thead>
-		<tr class="commit-list">
-			<th class="tw-overflow-hidden" colspan="2">
-				<div class="tw-flex">
-					<div class="latest-commit">
-						{{template "repo/latest_commit" .}}
-					</div>
-				</div>
-			</th>
-			<th class="text grey right age">{{if .LatestCommit}}{{if .LatestCommit.Committer}}{{DateUtils.TimeSince .LatestCommit.Committer.When}}{{end}}{{end}}</th>
-		</tr>
-	</thead>
-	<tbody>
-		{{if .HasParentPath}}
-			<tr class="has-parent">
-				<td colspan="3">{{svg "octicon-reply"}}<a class="muted" href="{{.BranchLink}}{{if .ParentPath}}{{PathEscapeSegments .ParentPath}}{{end}}">..</a></td>
-			</tr>
-		{{end}}
-		{{range $item := .Files}}
+{{/* use grid layout, still use the old ID because there are many other CSS styles depending on this ID */}}
+<div id="repo-files-table" {{if .HasFilesWithoutLatestCommit}}hx-indicator="#repo-files-table .repo-file-cell.message" hx-trigger="load" hx-swap="morph" hx-post="{{.LastCommitLoaderURL}}"{{end}}>
+	<div class="repo-file-line">
+		<div class="latest-commit">{{template "repo/latest_commit" .}}</div>
+		<div>{{if and .LatestCommit .LatestCommit.Committer}}{{DateUtils.TimeSince .LatestCommit.Committer.When}}{{end}}</div>
+	</div>
+	{{if .HasParentPath}}
+	<div class="repo-file-line">
+		{{svg "octicon-reply"}} <a class="muted" href="{{.BranchLink}}{{if .ParentPath}}{{PathEscapeSegments .ParentPath}}{{end}}">..</a>
+	</div>
+	{{end}}
+	{{range $item := .Files}}
+		<div class="repo-file-item">
 			{{$entry := $item.Entry}}
 			{{$commit := $item.Commit}}
 			{{$subModuleFile := $item.SubModuleFile}}
-			<tr data-entryname="{{$entry.Name}}" data-ready="{{if $commit}}true{{else}}false{{end}}" class="{{if not $commit}}not{{end}}ready entry">
-				<td class="name four wide">
-					<span class="truncate">
-						{{if $entry.IsSubModule}}
-							{{svg "octicon-file-submodule"}}
-							{{$refURL := $subModuleFile.RefURL AppUrl $.Repository.FullName $.SSHDomain}} {{/* FIXME: the usage of AppUrl seems incorrect, it would be fixed in the future, use AppSubUrl instead */}}
-							{{if $refURL}}
-								<a class="muted" href="{{$refURL}}">{{$entry.Name}}</a><span class="at">@</span><a href="{{$refURL}}/commit/{{PathEscape $subModuleFile.RefID}}">{{ShortSha $subModuleFile.RefID}}</a>
+			<div class="repo-file-cell name {{if not $commit}}notready{{end}}">
+				{{if $entry.IsSubModule}}
+					{{svg "octicon-file-submodule"}}
+					{{$refURL := $subModuleFile.RefURL AppUrl $.Repository.FullName $.SSHDomain}} {{/* FIXME: the usage of AppUrl seems incorrect, it would be fixed in the future, use AppSubUrl instead */}}
+					{{if $refURL}}
+						<a class="muted" href="{{$refURL}}">{{$entry.Name}}</a><span class="at">@</span><a href="{{$refURL}}/commit/{{PathEscape $subModuleFile.RefID}}">{{ShortSha $subModuleFile.RefID}}</a>
+					{{else}}
+						{{$entry.Name}}<span class="at">@</span>{{ShortSha $subModuleFile.RefID}}
+					{{end}}
+				{{else}}
+					{{if $entry.IsDir}}
+						{{$subJumpablePathName := $entry.GetSubJumpablePathName}}
+						{{svg "octicon-file-directory-fill"}}
+						<a class="muted" href="{{$.TreeLink}}/{{PathEscapeSegments $subJumpablePathName}}" title="{{$subJumpablePathName}}">
+							{{$subJumpablePathFields := StringUtils.Split $subJumpablePathName "/"}}
+							{{$subJumpablePathFieldLast := (Eval (len $subJumpablePathFields) "-" 1)}}
+							{{if eq $subJumpablePathFieldLast 0}}
+								{{$subJumpablePathName}}
 							{{else}}
-								{{$entry.Name}}<span class="at">@</span>{{ShortSha $subModuleFile.RefID}}
+								{{$subJumpablePathPrefixes := slice $subJumpablePathFields 0 $subJumpablePathFieldLast}}
+								<span class="text light-2">{{StringUtils.Join $subJumpablePathPrefixes "/"}}</span>/{{index $subJumpablePathFields $subJumpablePathFieldLast}}
 							{{end}}
-						{{else}}
-							{{if $entry.IsDir}}
-								{{$subJumpablePathName := $entry.GetSubJumpablePathName}}
-								{{svg "octicon-file-directory-fill"}}
-								<a class="muted" href="{{$.TreeLink}}/{{PathEscapeSegments $subJumpablePathName}}" title="{{$subJumpablePathName}}">
-									{{$subJumpablePathFields := StringUtils.Split $subJumpablePathName "/"}}
-									{{$subJumpablePathFieldLast := (Eval (len $subJumpablePathFields) "-" 1)}}
-									{{if eq $subJumpablePathFieldLast 0}}
-										{{$subJumpablePathName}}
-									{{else}}
-										{{$subJumpablePathPrefixes := slice $subJumpablePathFields 0 $subJumpablePathFieldLast}}
-										<span class="text light-2">{{StringUtils.Join $subJumpablePathPrefixes "/"}}</span>/{{index $subJumpablePathFields $subJumpablePathFieldLast}}
-									{{end}}
-								</a>
-							{{else}}
-								{{svg (printf "octicon-%s" (EntryIcon $entry))}}
-								<a class="muted" href="{{$.TreeLink}}/{{PathEscapeSegments $entry.Name}}" title="{{$entry.Name}}">{{$entry.Name}}</a>
-							{{end}}
-						{{end}}
-					</span>
-				</td>
-				<td class="message nine wide">
-					<span class="truncate">
-						{{if $commit}}
-							{{$commitLink := printf "%s/commit/%s" $.RepoLink (PathEscape $commit.ID.String)}}
-							{{ctx.RenderUtils.RenderCommitMessageLinkSubject $commit.Message $commitLink ($.Repository.ComposeMetas ctx)}}
-						{{else}}
-							<div class="ui active tiny slow centered inline"></div>
-						{{end}}
-					</span>
-				</td>
-				<td class="text right age three wide">{{if $commit}}{{DateUtils.TimeSince $commit.Committer.When}}{{end}}</td>
-			</tr>
-		{{end}}
-	</tbody>
-</table>
-{{if and .ReadmeExist (or .IsMarkup .IsPlainText)}}
-	{{template "repo/view_file" .}}
-{{end}}
+						</a>
+					{{else}}
+						{{svg (printf "octicon-%s" (EntryIcon $entry))}}
+						<a class="muted" href="{{$.TreeLink}}/{{PathEscapeSegments $entry.Name}}" title="{{$entry.Name}}">{{$entry.Name}}</a>
+					{{end}}
+				{{end}}
+			</div>
+			<div class="repo-file-cell message loading-icon-2px">
+				{{if $commit}}
+					{{$commitLink := printf "%s/commit/%s" $.RepoLink (PathEscape $commit.ID.String)}}
+					{{ctx.RenderUtils.RenderCommitMessageLinkSubject $commit.Message $commitLink ($.Repository.ComposeMetas ctx)}}
+				{{else}}
+					… {{/* will be loaded again by LastCommitLoaderURL */}}
+				{{end}}
+			</div>
+			<div class="repo-file-cell age">{{if $commit}}{{DateUtils.TimeSince $commit.Committer.When}}{{end}}</div>
+		</div>
+	{{end}}
+</div>
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
@@ -4,7 +4,7 @@
 	{{$title := .title}}
 	<div class="ui container">
 		<div class="repo-button-row">
-			<div class="tw-flex tw-items-center">
+			<div class="flex-text-block tw-flex-1">
 				<div class="ui floating filter dropdown" data-no-results="{{ctx.Locale.Tr "no_results_found"}}">
 					<div class="ui basic small button">
 						<span class="text">
@@ -42,7 +42,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="flex-text-block tw-flex-wrap tw-justify-end">
+				<div class="repo-button-row">
 					{{if .EscapeStatus.Escaped}}
 						<a class="ui small button unescape-button tw-m-0 tw-hidden">{{ctx.Locale.Tr "repo.unescape_control_characters"}}</a>
 						<a class="ui small button escape-button tw-m-0">{{ctx.Locale.Tr "repo.escape_control_characters"}}</a>

diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go
@@ -49,7 +49,7 @@ func testViewRepo(t *testing.T) {
 	resp := session.MakeRequest(t, req, http.StatusOK)
 
 	htmlDoc := NewHTMLParser(t, resp.Body)
-	files := htmlDoc.doc.Find("#repo-files-table  > TBODY > TR")
+	files := htmlDoc.doc.Find("#repo-files-table .repo-file-item")
 
 	type file struct {
 		fileName   string
@@ -61,7 +61,7 @@ func testViewRepo(t *testing.T) {
 	var items []file
 
 	files.Each(func(i int, s *goquery.Selection) {
-		tds := s.Find("td")
+		tds := s.Find(".repo-file-cell")
 		var f file
 		tds.Each(func(i int, s *goquery.Selection) {
 			if i == 0 {
@@ -161,7 +161,7 @@ func TestViewRepoWithSymlinks(t *testing.T) {
 	resp := session.MakeRequest(t, req, http.StatusOK)
 
 	htmlDoc := NewHTMLParser(t, resp.Body)
-	files := htmlDoc.doc.Find("#repo-files-table > TBODY > TR > TD.name > SPAN.truncate")
+	files := htmlDoc.doc.Find("#repo-files-table .repo-file-cell.name")
 	items := files.Map(func(i int, s *goquery.Selection) string {
 		cls, _ := s.Find("SVG").Attr("class")
 		file := strings.Trim(s.Find("A").Text(), " \t\n")

diff --git a/web_src/css/index.css b/web_src/css/index.css
@@ -66,8 +66,10 @@
 @import "./repo/wiki.css";
 @import "./repo/header.css";
 @import "./repo/home.css";
+@import "./repo/home-file-list.css";
 @import "./repo/reactions.css";
 @import "./repo/clone.css";
+@import "./repo/commit-sign.css";
 
 @import "./editor/fileeditor.css";
 @import "./editor/combomarkdowneditor.css";