diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index d81884ec62deb..0c5ebbee1450c 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -16,6 +16,7 @@ import ( const ( // tplExploreCode explore code page template tplExploreCode base.TplName = "explore/code" + tplSearchBody base.TplName = "code/search_body" ) // Code render explore code page @@ -42,8 +43,15 @@ func Code(ctx *context.Context) { ctx.Data["queryType"] = queryType ctx.Data["PageIsViewCode"] = true + isHtmxRequest := len(ctx.Req.Header.Values("HX-Request")) > 0 + + template := tplExploreCode + if isHtmxRequest { + template = tplSearchBody + } + if keyword == "" { - ctx.HTML(http.StatusOK, tplExploreCode) + ctx.HTML(http.StatusOK, template) return } @@ -131,5 +139,5 @@ func Code(ctx *context.Context) { pager.AddParam(ctx, "l", "Language") ctx.Data["Page"] = pager - ctx.HTML(http.StatusOK, tplExploreCode) + ctx.HTML(http.StatusOK, template) } diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go index 3c0fa4bc00ea0..fab9d2277a5ce 100644 --- a/routers/web/repo/search.go +++ b/routers/web/repo/search.go @@ -12,7 +12,10 @@ import ( "code.gitea.io/gitea/modules/setting" ) -const tplSearch base.TplName = "repo/search" +const ( + tplSearch base.TplName = "repo/search" + tplSearchResult base.TplName = "repo/search_result" +) // Search render repository search page func Search(ctx *context.Context) { @@ -32,8 +35,15 @@ func Search(ctx *context.Context) { ctx.Data["queryType"] = queryType ctx.Data["PageIsViewCode"] = true + isHtmxRequest := len(ctx.Req.Header.Values("HX-Request")) > 0 + + template := tplSearch + if isHtmxRequest { + template = tplSearchResult + } + if keyword == "" { - ctx.HTML(http.StatusOK, tplSearch) + ctx.HTML(http.StatusOK, template) return } @@ -63,5 +73,5 @@ func Search(ctx *context.Context) { pager.AddParam(ctx, "l", "Language") ctx.Data["Page"] = pager - ctx.HTML(http.StatusOK, tplSearch) + ctx.HTML(http.StatusOK, template) } diff --git a/routers/web/user/code.go b/routers/web/user/code.go index ee514a7cfe535..dfd27ff4c38bf 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -15,7 +15,8 @@ import ( ) const ( - tplUserCode base.TplName = "user/code" + tplUserCode base.TplName = "user/code" + tplSearchBody base.TplName = "code/search_body" ) // CodeSearch render user/organization code search page @@ -47,8 +48,15 @@ func CodeSearch(ctx *context.Context) { ctx.Data["queryType"] = queryType ctx.Data["IsCodePage"] = true + isHtmxRequest := len(ctx.Req.Header.Values("HX-Request")) > 0 + + template := tplUserCode + if isHtmxRequest { + template = tplSearchBody + } + if keyword == "" { - ctx.HTML(http.StatusOK, tplUserCode) + ctx.HTML(http.StatusOK, template) return } @@ -116,5 +124,5 @@ func CodeSearch(ctx *context.Context) { pager.AddParam(ctx, "l", "Language") ctx.Data["Page"] = pager - ctx.HTML(http.StatusOK, tplUserCode) + ctx.HTML(http.StatusOK, template) } diff --git a/templates/code/search_body.tmpl b/templates/code/search_body.tmpl new file mode 100644 index 0000000000000..c9c94aeef37a6 --- /dev/null +++ b/templates/code/search_body.tmpl @@ -0,0 +1,12 @@ +
+
+ {{if .CodeIndexerUnavailable}} +
+

{{ctx.Locale.Tr "explore.code_search_unavailable"}}

+
+ {{else}} + {{template "code/searchresults" .}} + {{end}} +
+ {{template "base/paginate" .}} +
diff --git a/templates/code/searchcombo.tmpl b/templates/code/searchcombo.tmpl index 48dc13b47be74..cb3fff3442a4a 100644 --- a/templates/code/searchcombo.tmpl +++ b/templates/code/searchcombo.tmpl @@ -1,17 +1,3 @@ {{template "code/searchform" .}}
-
- {{if .CodeIndexerUnavailable}} -
-

{{ctx.Locale.Tr "explore.code_search_unavailable"}}

-
- {{else if .SearchResults}} -

- {{ctx.Locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} -

- {{template "code/searchresults" .}} - {{else if .Keyword}} -
{{ctx.Locale.Tr "explore.code_no_results"}}
- {{end}} -
-{{template "base/paginate" .}} +{{template "code/search_body" .}} diff --git a/templates/code/searchform.tmpl b/templates/code/searchform.tmpl index fae1340046838..8b77f4f2ad920 100644 --- a/templates/code/searchform.tmpl +++ b/templates/code/searchform.tmpl @@ -1,4 +1,4 @@ -
+
{{template "shared/searchinput" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable}}
diff --git a/templates/code/searchresults.tmpl b/templates/code/searchresults.tmpl index bb21a5e0dcadf..6169294c60a05 100644 --- a/templates/code/searchresults.tmpl +++ b/templates/code/searchresults.tmpl @@ -1,3 +1,7 @@ +{{if .SearchResults}} +

+ {{ctx.Locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} +

{{range $term := .SearchResultLanguages}} @@ -10,8 +14,9 @@
{{range $result := .SearchResults}} {{$repo := (index $.RepoMaps .RepoID)}} -
+

+ {{$repo.FullName}} {{if $repo.IsArchived}} @@ -21,23 +26,28 @@ {{ctx.Locale.Tr "repo.diff.view_file"}}

-
-
- - - - - - - -
- {{range .LineNumbers}} - {{.}} - {{end}} - {{.FormattedLines}}
+
+
+
+ + + + + + + +
+ {{range .LineNumbers}} + {{.}} + {{end}} + {{.FormattedLines}}
+
+ {{template "shared/searchbottom" dict "root" $ "result" .}}
- {{template "shared/searchbottom" dict "root" $ "result" .}}
{{end}}
+{{else if .Keyword}} +
{{ctx.Locale.Tr "explore.code_no_results"}}
+{{end}} diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index be7c7e80f2bf8..597382b9ed12d 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -109,10 +109,10 @@ {{$showFileViewToggle := or $isImage (and (not $file.IsIncomplete) $isCsv)}} {{$isExpandable := or (gt $file.Addition 0) (gt $file.Deletion 0) $file.IsBin}} {{$isReviewFile := and $.IsSigned $.PageIsPullFiles (not $.IsArchived) $.IsShowingAllCommits}} -
+

-

-
+
{{if or $file.IsIncomplete $file.IsBin}}
diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl index b616b4de32312..e60aa6c53ee0d 100644 --- a/templates/repo/search.tmpl +++ b/templates/repo/search.tmpl @@ -3,7 +3,7 @@ {{template "repo/header" .}}
- +
@@ -18,56 +18,16 @@
- {{if .CodeIndexerUnavailable}} -
-

{{ctx.Locale.Tr "repo.search.code_search_unavailable"}}

-
- {{else if .Keyword}} -

- {{ctx.Locale.Tr "repo.search.results" (.Keyword|Escape) (.RepoLink|Escape) (.RepoName|Escape) | Str2html}} -

- {{if .SearchResults}} -
- {{range $term := .SearchResultLanguages}} - - - {{$term.Language}} -
{{$term.Count}}
- - {{end}} +
+
+ {{if .CodeIndexerUnavailable}} +
+

{{ctx.Locale.Tr "repo.search.code_search_unavailable"}}

-
- {{range $result := .SearchResults}} -
-

- {{.Filename}} - {{ctx.Locale.Tr "repo.diff.view_file"}} -

-
-
- - - - - - - -
- {{range .LineNumbers}} - {{.}} - {{end}} - {{.FormattedLines}}
-
-
- {{template "shared/searchbottom" dict "root" $ "result" .}} -
- {{end}} -
- {{template "base/paginate" .}} {{else}} -
{{ctx.Locale.Tr "repo.search.code_no_results"}}
+ {{template "repo/search_result" .}} {{end}} - {{end}} +
{{template "base/footer" .}} diff --git a/templates/repo/search_result.tmpl b/templates/repo/search_result.tmpl new file mode 100644 index 0000000000000..176b63bdb69f5 --- /dev/null +++ b/templates/repo/search_result.tmpl @@ -0,0 +1,49 @@ +{{if .Keyword}} +

+ {{ctx.Locale.Tr "repo.search.results" (.Keyword|Escape) (.RepoLink|Escape) (.RepoName|Escape) | Str2html}} +

+ {{if .SearchResults}} +
+ {{range $term := .SearchResultLanguages}} + + + {{$term.Language}} +
{{$term.Count}}
+ + {{end}} +
+
+ {{range $result := .SearchResults}} +
+

+ + {{.Filename}} + {{ctx.Locale.Tr "repo.diff.view_file"}} +

+
+
+
+ + + + + + + +
+ {{range .LineNumbers}} + {{.}} + {{end}} + {{.FormattedLines}}
+
+
+ {{template "shared/searchbottom" dict "root" $ "result" .}} +
+
+ {{end}} +
+ {{template "base/paginate" .}} + {{else}} +
{{ctx.Locale.Tr "repo.search.code_no_results"}}
+ {{end}} +{{end}} diff --git a/web_src/css/base.css b/web_src/css/base.css index ea32aac6f7770..df312175f94d3 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2055,3 +2055,11 @@ table th[data-sortt-desc] .svg { align-items: center; gap: .25rem; } + +.fold-container[data-folded="true"] .fold-body { + display: none; +} + +.fold-container[data-folded="true"] .ui.header { + border-radius: var(--border-radius); +} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 610c3fcb5596c..e3f713546e511 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2706,14 +2706,6 @@ tbody.commit-list { padding: 5px 8px !important; } -.diff-file-box[data-folded="true"] .diff-file-body { - display: none; -} - -.diff-file-box[data-folded="true"] .diff-file-header { - border-radius: var(--border-radius) !important; -} - .ui.attached.header.diff-file-header.sticky-2nd-row { position: sticky; top: 44px; /* match .repository .diff-detail-box */ diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index e8b546970fcbc..e4f7cd61dec05 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -13,6 +13,7 @@ import {confirmModal} from './comp/ConfirmModal.js'; import {showErrorToast} from '../modules/toast.js'; import {request, POST} from '../modules/fetch.js'; import '../htmx.js'; +import {invertFileFolding} from './file-fold.js'; const {appUrl, appSubUrl, csrfToken, i18n} = window.config; @@ -443,3 +444,24 @@ export function checkAppUrl() { showGlobalErrorMessage(`Your ROOT_URL in app.ini is "${appUrl}", it's unlikely matching the site you are visiting. Mismatched ROOT_URL config causes wrong URL links for web UI/mail content/webhook notification/OAuth2 sign-in.`); } + +/** + * Allows to fold anywhere with the correct classes + * + * @example + * ```html + *
+ *
+ * + *
+ *
+ * Show foldable content + *
+ *
+ * ``` + */ +export function initGlobalFolding() { + $(document).on('click', '.fold-container .fold-button', ({currentTarget}) => { + invertFileFolding(currentTarget.closest('.fold-container'), currentTarget); + }); +} diff --git a/web_src/js/features/repo-code.js b/web_src/js/features/repo-code.js index 306f38829fad2..dabe6b830b6fa 100644 --- a/web_src/js/features/repo-code.js +++ b/web_src/js/features/repo-code.js @@ -1,6 +1,5 @@ import $ from 'jquery'; import {svg} from '../svg.js'; -import {invertFileFolding} from './file-fold.js'; import {createTippy} from '../modules/tippy.js'; import {clippie} from 'clippie'; import {toAbsoluteUrl} from '../utils.js'; @@ -183,9 +182,6 @@ export function initRepoCodeView() { } }).trigger('hashchange'); } - $(document).on('click', '.fold-file', ({currentTarget}) => { - invertFileFolding(currentTarget.closest('.file-content'), currentTarget); - }); $(document).on('click', '.code-expander-button', async ({currentTarget}) => { const url = currentTarget.getAttribute('data-url'); const query = currentTarget.getAttribute('data-query'); diff --git a/web_src/js/index.js b/web_src/js/index.js index 4713618506b0c..7a52dc29c418a 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -45,6 +45,7 @@ import { initGlobalCommon, initGlobalDropzone, initGlobalEnterQuickSubmit, + initGlobalFolding, initGlobalFormDirtyLeaveConfirm, initGlobalLinkActions, initHeadNavbarContentToggle, @@ -101,6 +102,7 @@ onDomReady(() => { initGlobalEnterQuickSubmit(); initGlobalFormDirtyLeaveConfirm(); initGlobalLinkActions(); + initGlobalFolding(); initCommonOrganization(); initCommonIssueListQuickGoto();