From 599f3fd40aac784c3ddca3811d8e3c7bf72f71b2 Mon Sep 17 00:00:00 2001 From: bytedream Date: Thu, 29 May 2025 01:42:48 +0200 Subject: [PATCH 1/9] show file tree in editor --- templates/repo/editor/edit.tmpl | 108 ++++++++++++--------- templates/repo/view_file_tree.tmpl | 1 + web_src/css/editor/fileeditor.css | 2 +- web_src/js/components/ViewFileTree.vue | 6 ++ web_src/js/features/codeeditor.ts | 1 - web_src/js/features/repo-view-file-tree.ts | 1 + 6 files changed, 69 insertions(+), 50 deletions(-) diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index ae8a60c20c116..3efd092f696c7 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -1,60 +1,72 @@ {{template "base/head" .}}
{{template "repo/header" .}} -
- {{template "base/alert" .}} -
- {{.CsrfTokenHtml}} - - -
-
- {{.Repository.Name}} - {{$n := len .TreeNames}} - {{$l := Eval $n "-" 1}} - {{range $i, $v := .TreeNames}} -
/
- {{if eq $i $l}} - - {{svg "octicon-info"}} - {{else}} - {{$v}} - {{end}} - {{end}} - {{ctx.Locale.Tr "repo.editor.or"}} {{ctx.Locale.Tr "repo.editor.cancel_lower"}} - -
-
-
-
-
- {{svg "octicon-code"}} {{if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.new_file"}}{{else}}{{ctx.Locale.Tr "repo.editor.edit_file"}}{{end}} - {{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}} - {{if not .IsNewFile}} - {{svg "octicon-diff"}} {{ctx.Locale.Tr "repo.editor.preview_changes"}} +
+ {{template "base/alert" .}} +
+ {{template "repo/view_file_tree" .}} +
+
+ + {{.CsrfTokenHtml}} + + +
+ +
+ {{.Repository.Name}} + {{$n := len .TreeNames}} + {{$l := Eval $n "-" 1}} + {{range $i, $v := .TreeNames}} +
/
+ {{if eq $i $l}} + + {{svg "octicon-info"}} + {{else}} + {{$v}} + {{end}} {{end}} + {{ctx.Locale.Tr "repo.editor.or"}} {{ctx.Locale.Tr "repo.editor.cancel_lower"}} +
-
-
- -
-
-
- {{ctx.Locale.Tr "loading"}} +
+
+
+ {{svg "octicon-code"}} {{if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.new_file"}}{{else}}{{ctx.Locale.Tr "repo.editor.edit_file"}}{{end}} + {{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}} + {{if not .IsNewFile}} + {{svg "octicon-diff"}} {{ctx.Locale.Tr "repo.editor.preview_changes"}} + {{end}} +
-
-
+
+
+ +
+
+
+ {{ctx.Locale.Tr "loading"}} +
+
+
+
-
- {{template "repo/editor/commit_form" .}} - + {{template "repo/editor/commit_form" .}} + +
{{template "base/footer" .}} diff --git a/templates/repo/view_file_tree.tmpl b/templates/repo/view_file_tree.tmpl index 8aed05f346940..a48c326bf1f77 100644 --- a/templates/repo/view_file_tree.tmpl +++ b/templates/repo/view_file_tree.tmpl @@ -12,4 +12,5 @@ data-repo-link="{{.RepoLink}}" data-tree-path="{{$.TreePath}}" data-current-ref-name-sub-url="{{.RefTypeNameSubURL}}" + data-is-edit="{{.PageIsEdit}}" >
diff --git a/web_src/css/editor/fileeditor.css b/web_src/css/editor/fileeditor.css index 698efffc9925e..4885af6072774 100644 --- a/web_src/css/editor/fileeditor.css +++ b/web_src/css/editor/fileeditor.css @@ -14,7 +14,7 @@ .repo-editor-header { display: flex; - margin: 1rem 0; + margin: 4px 0; padding: 3px 0; } diff --git a/web_src/js/components/ViewFileTree.vue b/web_src/js/components/ViewFileTree.vue index c692142792754..80b94a3f4bff1 100644 --- a/web_src/js/components/ViewFileTree.vue +++ b/web_src/js/components/ViewFileTree.vue @@ -11,6 +11,7 @@ const props = defineProps({ repoLink: {type: String, required: true}, treePath: {type: String, required: true}, currentRefNameSubURL: {type: String, required: true}, + isEdit: {type: Boolean, required: false}, }); const files = ref([]); @@ -39,6 +40,11 @@ async function loadViewContent(url: string) { async function navigateTreeView(treePath: string) { const url = `${props.repoLink}/src/${props.currentRefNameSubURL}/${pathEscapeSegments(treePath)}`; + // do full page reload to show confirmation dialog if editor has unsaved changed + if (props.isEdit) { + window.location.href = url; + return; + } window.history.pushState({treePath, url}, null, url); selectedItem.value = treePath; await loadViewContent(url); diff --git a/web_src/js/features/codeeditor.ts b/web_src/js/features/codeeditor.ts index af9830a4db232..c3cc59bfe4cfa 100644 --- a/web_src/js/features/codeeditor.ts +++ b/web_src/js/features/codeeditor.ts @@ -37,7 +37,6 @@ const baseOptions: MonacoOpts = { rulers: [], scrollbar: {horizontalScrollbarSize: 6, verticalScrollbarSize: 6}, scrollBeyondLastLine: false, - automaticLayout: true, }; function getEditorconfig(input: HTMLInputElement): EditorConfig | null { diff --git a/web_src/js/features/repo-view-file-tree.ts b/web_src/js/features/repo-view-file-tree.ts index f52b64cc51d19..cc6d959a431ec 100644 --- a/web_src/js/features/repo-view-file-tree.ts +++ b/web_src/js/features/repo-view-file-tree.ts @@ -33,5 +33,6 @@ export async function initRepoViewFileTree() { repoLink: fileTree.getAttribute('data-repo-link'), treePath: fileTree.getAttribute('data-tree-path'), currentRefNameSubURL: fileTree.getAttribute('data-current-ref-name-sub-url'), + isEdit: fileTree.getAttribute('data-is-edit'), }).mount(fileTree); } From 87e1ce7deedbdd8c80e522f1d042d5446e26da46 Mon Sep 17 00:00:00 2001 From: bytedream Date: Thu, 7 Aug 2025 10:24:18 +0200 Subject: [PATCH 2/9] update --- routers/web/repo/blame.go | 2 +- routers/web/repo/editor.go | 2 + routers/web/repo/view.go | 14 +++ routers/web/repo/view_home.go | 17 +-- templates/repo/editor/edit.tmpl | 118 ++++++++++++--------- templates/repo/view_file_tree.tmpl | 2 +- web_src/css/editor/fileeditor.css | 1 + web_src/js/components/ViewFileTree.vue | 2 +- web_src/js/components/ViewFileTreeItem.vue | 7 +- web_src/js/components/ViewFileTreeStore.ts | 8 +- web_src/js/features/codeeditor.ts | 1 + web_src/js/features/repo-view-file-tree.ts | 2 +- 12 files changed, 95 insertions(+), 81 deletions(-) diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go index e304633f95238..7e104db9ed2fb 100644 --- a/routers/web/repo/blame.go +++ b/routers/web/repo/blame.go @@ -74,7 +74,7 @@ func RefBlame(ctx *context.Context) { tplName := tplRepoViewContent if !ctx.FormBool("only_content") { - prepareHomeTreeSideBarSwitch(ctx) + prepareTreeSideBarSwitch(ctx) tplName = tplRepoView } diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index 2a5ac102824d9..b213fda857fad 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -280,6 +280,8 @@ func EditFile(ctx *context.Context) { return } + prepareTreeSideBarSwitch(ctx) + // on the "New File" page, we should add an empty path field to make end users could input a new name prepareTreePathFieldsAndPaths(ctx, util.Iif(isNewFile, ctx.Repo.TreePath+"/", ctx.Repo.TreePath)) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index e47bc56d081a6..7892cb0ed6d78 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -13,6 +13,7 @@ import ( "net/http" "net/url" "path" + "strconv" "strings" "time" @@ -257,6 +258,19 @@ func LastCommit(ctx *context.Context) { ctx.HTML(http.StatusOK, tplRepoViewList) } +func prepareTreeSideBarSwitch(ctx *context.Context) { + showFileTree := true + if ctx.Doer != nil { + v, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyCodeViewShowFileTree, "true") + if err != nil { + log.Error("GetUserSetting: %v", err) + } else { + showFileTree, _ = strconv.ParseBool(v) + } + } + ctx.Data["UserSettingCodeViewShowFileTree"] = showFileTree +} + func prepareDirectoryFileIcons(ctx *context.Context, files []git.CommitInfo) { renderedIconPool := fileicon.NewRenderedIconPool() fileIcons := map[string]template.HTML{} diff --git a/routers/web/repo/view_home.go b/routers/web/repo/view_home.go index f475e93f60489..1b59d217fefe8 100644 --- a/routers/web/repo/view_home.go +++ b/routers/web/repo/view_home.go @@ -9,7 +9,6 @@ import ( "html/template" "net/http" "path" - "strconv" "strings" "time" @@ -17,7 +16,6 @@ import ( git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" unit_model "code.gitea.io/gitea/models/unit" - user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/gitrepo" "code.gitea.io/gitea/modules/htmlutil" @@ -318,19 +316,6 @@ func handleRepoHomeFeed(ctx *context.Context) bool { return true } -func prepareHomeTreeSideBarSwitch(ctx *context.Context) { - showFileTree := true - if ctx.Doer != nil { - v, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyCodeViewShowFileTree, "true") - if err != nil { - log.Error("GetUserSetting: %v", err) - } else { - showFileTree, _ = strconv.ParseBool(v) - } - } - ctx.Data["UserSettingCodeViewShowFileTree"] = showFileTree -} - func redirectSrcToRaw(ctx *context.Context) bool { // GitHub redirects a tree path with "?raw=1" to the raw path // It is useful to embed some raw contents into Markdown files, @@ -386,7 +371,7 @@ func Home(ctx *context.Context) { return } - prepareHomeTreeSideBarSwitch(ctx) + prepareTreeSideBarSwitch(ctx) // get the current git entry which doer user is currently looking at. entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx.Repo.TreePath) diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 6454997523662..987365d032926 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -1,63 +1,77 @@ {{template "base/head" .}}
{{template "repo/header" .}} -
+
{{template "base/alert" .}} -
- {{template "repo/view_file_tree" .}} -
-
-
- {{.CsrfTokenHtml}} - {{template "repo/editor/common_top" .}} -
- - {{template "repo/editor/common_breadcrumb" .}} -
- {{if not .NotEditableReason}} -
-
-
- {{svg "octicon-code"}} {{if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.new_file"}}{{else}}{{ctx.Locale.Tr "repo.editor.edit_file"}}{{end}} - {{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}} - {{if not .IsNewFile}} - {{svg "octicon-diff"}} {{ctx.Locale.Tr "repo.editor.preview_changes"}} - {{end}} -
-
-
-
- -
-
-
- {{ctx.Locale.Tr "loading"}} +
+
+ {{template "repo/view_file_tree" .}} +
+
+ + {{.CsrfTokenHtml}} + {{template "repo/editor/common_top" .}} +
+ + {{template "repo/editor/common_breadcrumb" .}} +
+ {{if not .NotEditableReason}} +
+
+
+ + {{svg "octicon-code"}} {{if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.new_file"}}{{else}}{{ctx.Locale.Tr "repo.editor.edit_file"}}{{end}} + + + {{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}} + {{if not .IsNewFile}} + + {{svg "octicon-diff"}} {{ctx.Locale.Tr "repo.editor.preview_changes"}} + + {{end}} +
-
-
+
+
+ +
+
+
+ {{ctx.Locale.Tr "loading"}} +
+
+
+
-
- {{else}} -
-
-

{{.NotEditableReason}}

-

{{ctx.Locale.Tr "repo.editor.file_not_editable_hint"}}

+ {{else}} +
+
+

{{.NotEditableReason}}

+

{{ctx.Locale.Tr "repo.editor.file_not_editable_hint"}}

+
-
- {{end}} - {{template "repo/editor/commit_form" .}} - + {{end}} + {{template "repo/editor/commit_form" .}} + +
diff --git a/templates/repo/view_file_tree.tmpl b/templates/repo/view_file_tree.tmpl index a48c326bf1f77..b50d1e6e1aef7 100644 --- a/templates/repo/view_file_tree.tmpl +++ b/templates/repo/view_file_tree.tmpl @@ -12,5 +12,5 @@ data-repo-link="{{.RepoLink}}" data-tree-path="{{$.TreePath}}" data-current-ref-name-sub-url="{{.RefTypeNameSubURL}}" - data-is-edit="{{.PageIsEdit}}" + data-page-is-edit="{{not .PageIsViewCode}}" >
diff --git a/web_src/css/editor/fileeditor.css b/web_src/css/editor/fileeditor.css index 4885af6072774..df1b387ac689d 100644 --- a/web_src/css/editor/fileeditor.css +++ b/web_src/css/editor/fileeditor.css @@ -16,6 +16,7 @@ display: flex; margin: 4px 0; padding: 3px 0; + gap: 0.5rem } .editor-toolbar { diff --git a/web_src/js/components/ViewFileTree.vue b/web_src/js/components/ViewFileTree.vue index 6497cb814bff8..eabd64476cea4 100644 --- a/web_src/js/components/ViewFileTree.vue +++ b/web_src/js/components/ViewFileTree.vue @@ -9,7 +9,7 @@ const props = defineProps({ repoLink: {type: String, required: true}, treePath: {type: String, required: true}, currentRefNameSubURL: {type: String, required: true}, - isEdit: {type: Boolean, required: false}, + pageIsEdit: {type: Boolean, required: true}, }); const store = createViewFileTreeStore(props); diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue index 5173c7eb46c19..b0edb9fbcc36c 100644 --- a/web_src/js/components/ViewFileTreeItem.vue +++ b/web_src/js/components/ViewFileTreeItem.vue @@ -37,9 +37,10 @@ const doLoadChildren = async () => { }; const onItemClick = (e: MouseEvent) => { - // only handle the click event with page partial reloading if the user didn't press any special key - // let browsers handle special keys like "Ctrl+Click" - if (!isPlainClick(e)) return; + // only handle the click event with partial page reloading if + // - the user didn't press any special key let browsers handle special keys like "Ctrl+Click" + // - the user doesn't edit the file (a full page reload shows a confirmation dialog if the editor has unsaved changed) + if (!isPlainClick(e) || props.store.pageIsEdit) return; e.preventDefault(); if (props.item.entryMode === 'tree') doLoadChildren(); store.navigateTreeView(props.item.fullPath); diff --git a/web_src/js/components/ViewFileTreeStore.ts b/web_src/js/components/ViewFileTreeStore.ts index 98b69f61b0a94..f1a1b59bad68b 100644 --- a/web_src/js/components/ViewFileTreeStore.ts +++ b/web_src/js/components/ViewFileTreeStore.ts @@ -4,10 +4,11 @@ import {pathEscapeSegments} from '../utils/url.ts'; import {createElementFromHTML} from '../utils/dom.ts'; import {html} from '../utils/html.ts'; -export function createViewFileTreeStore(props: { repoLink: string, treePath: string, currentRefNameSubURL: string, isEdit?: boolean }) { +export function createViewFileTreeStore(props: { repoLink: string, treePath: string, currentRefNameSubURL: string, pageIsEdit: boolean }) { const store = reactive({ rootFiles: [], selectedItem: props.treePath, + pageIsEdit: props.pageIsEdit, async loadChildren(treePath: string, subPath: string = '') { const response = await GET(`${props.repoLink}/tree-view/${props.currentRefNameSubURL}/${pathEscapeSegments(treePath)}?sub_path=${encodeURIComponent(subPath)}`); @@ -32,11 +33,6 @@ export function createViewFileTreeStore(props: { repoLink: string, treePath: str async navigateTreeView(treePath: string) { const url = store.buildTreePathWebUrl(treePath); - // do full page reload to show confirmation dialog if editor has unsaved changed - if (props.isEdit) { - window.location.href = url; - return; - } window.history.pushState({treePath, url}, null, url); store.selectedItem = treePath; await store.loadViewContent(url); diff --git a/web_src/js/features/codeeditor.ts b/web_src/js/features/codeeditor.ts index c3cc59bfe4cfa..af9830a4db232 100644 --- a/web_src/js/features/codeeditor.ts +++ b/web_src/js/features/codeeditor.ts @@ -37,6 +37,7 @@ const baseOptions: MonacoOpts = { rulers: [], scrollbar: {horizontalScrollbarSize: 6, verticalScrollbarSize: 6}, scrollBeyondLastLine: false, + automaticLayout: true, }; function getEditorconfig(input: HTMLInputElement): EditorConfig | null { diff --git a/web_src/js/features/repo-view-file-tree.ts b/web_src/js/features/repo-view-file-tree.ts index cc6d959a431ec..34cc5e650b8b6 100644 --- a/web_src/js/features/repo-view-file-tree.ts +++ b/web_src/js/features/repo-view-file-tree.ts @@ -33,6 +33,6 @@ export async function initRepoViewFileTree() { repoLink: fileTree.getAttribute('data-repo-link'), treePath: fileTree.getAttribute('data-tree-path'), currentRefNameSubURL: fileTree.getAttribute('data-current-ref-name-sub-url'), - isEdit: fileTree.getAttribute('data-is-edit'), + pageIsEdit: fileTree.getAttribute('data-page-is-edit') === 'true', }).mount(fileTree); } From 0a73fe4b3cf4b0bc42995c410e2beffdc0f9b432 Mon Sep 17 00:00:00 2001 From: bytedream Date: Fri, 15 Aug 2025 08:53:48 +0200 Subject: [PATCH 3/9] update --- routers/web/repo/editor.go | 3 +++ routers/web/repo/editor_apply_patch.go | 1 + templates/repo/editor/common_breadcrumb.tmpl | 4 ++- templates/repo/editor/delete.tmpl | 27 +++++++++++++++----- templates/repo/editor/edit.tmpl | 15 ++++------- templates/repo/editor/file_tree_toggle.tmpl | 6 +++++ templates/repo/editor/fork.tmpl | 27 ++++++++++++-------- templates/repo/view_file_tree.tmpl | 2 +- web_src/js/components/ViewFileTreeItem.vue | 2 +- 9 files changed, 58 insertions(+), 29 deletions(-) create mode 100644 templates/repo/editor/file_tree_toggle.tmpl diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index b213fda857fad..2b24db52b0f0f 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -263,6 +263,7 @@ func editFileOpenExisting(ctx *context.Context) (prefetch []byte, dataRc io.Read func EditFile(ctx *context.Context) { editorAction := ctx.PathParam("editor_action") isNewFile := editorAction == "_new" + ctx.Data["PageIsEdit"] = true ctx.Data["IsNewFile"] = isNewFile // Check if the filename (and additional path) is specified in the querystring @@ -378,6 +379,8 @@ func EditFilePost(ctx *context.Context) { // DeleteFile render delete file page func DeleteFile(ctx *context.Context) { + prepareTreePathFieldsAndPaths(ctx, ctx.Repo.TreePath) + prepareTreeSideBarSwitch(ctx) prepareEditorCommitFormOptions(ctx, "_delete") if ctx.Written() { return diff --git a/routers/web/repo/editor_apply_patch.go b/routers/web/repo/editor_apply_patch.go index bd2811cc5f01d..98ef2e5327505 100644 --- a/routers/web/repo/editor_apply_patch.go +++ b/routers/web/repo/editor_apply_patch.go @@ -14,6 +14,7 @@ import ( ) func NewDiffPatch(ctx *context.Context) { + prepareTreeSideBarSwitch(ctx) prepareEditorCommitFormOptions(ctx, "_diffpatch") if ctx.Written() { return diff --git a/templates/repo/editor/common_breadcrumb.tmpl b/templates/repo/editor/common_breadcrumb.tmpl index 8cfbe09d3eef5..39696285dc1ee 100644 --- a/templates/repo/editor/common_breadcrumb.tmpl +++ b/templates/repo/editor/common_breadcrumb.tmpl @@ -5,7 +5,9 @@ {{range $i, $v := .TreeNames}}
/
{{if eq $i $l}} - + {{svg "octicon-info"}} {{else}} {{$v}} diff --git a/templates/repo/editor/delete.tmpl b/templates/repo/editor/delete.tmpl index bf6143f1cb91a..cad7562c74049 100644 --- a/templates/repo/editor/delete.tmpl +++ b/templates/repo/editor/delete.tmpl @@ -1,13 +1,28 @@ {{template "base/head" .}}
{{template "repo/header" .}} -
+
{{template "base/alert" .}} -
- {{.CsrfTokenHtml}} - {{template "repo/editor/common_top" .}} - {{template "repo/editor/commit_form" .}} -
+ {{template "repo/editor/common_top" .}} +
+
+ {{template "repo/view_file_tree" .}} +
+
+
+
+ {{template "repo/editor/file_tree_toggle" .}} + {{template "repo/editor/common_breadcrumb" .}} +
+
+
+
+ {{.CsrfTokenHtml}} + {{template "repo/editor/commit_form" .}} +
+
+
+
{{template "base/footer" .}} diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 987365d032926..1c26c361102fe 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -3,24 +3,19 @@ {{template "repo/header" .}}
{{template "base/alert" .}} + {{template "repo/editor/common_top" .}}
-
- {{template "repo/view_file_tree" .}} -
+
+ {{template "repo/view_file_tree" .}} +
{{.CsrfTokenHtml}} - {{template "repo/editor/common_top" .}}
- + {{template "repo/editor/file_tree_toggle" .}} {{template "repo/editor/common_breadcrumb" .}}
{{if not .NotEditableReason}} diff --git a/templates/repo/editor/file_tree_toggle.tmpl b/templates/repo/editor/file_tree_toggle.tmpl new file mode 100644 index 0000000000000..e8e01bdae83f7 --- /dev/null +++ b/templates/repo/editor/file_tree_toggle.tmpl @@ -0,0 +1,6 @@ + diff --git a/templates/repo/editor/fork.tmpl b/templates/repo/editor/fork.tmpl index e28b2ba7a26c7..e39b8e5d9856a 100644 --- a/templates/repo/editor/fork.tmpl +++ b/templates/repo/editor/fork.tmpl @@ -1,18 +1,25 @@ {{template "base/head" .}}
{{template "repo/header" .}} -
+
{{template "base/alert" .}} - - {{.CsrfTokenHtml}} -
-
-

{{ctx.Locale.Tr "repo.editor.fork_create"}}

-

{{ctx.Locale.Tr "repo.editor.fork_create_description"}}

-
- +
+
+ {{template "repo/view_file_tree" .}}
- +
+
+ {{.CsrfTokenHtml}} +
+
+

{{ctx.Locale.Tr "repo.editor.fork_create"}}

+

{{ctx.Locale.Tr "repo.editor.fork_create_description"}}

+
+ +
+
+
+
{{template "base/footer" .}} diff --git a/templates/repo/view_file_tree.tmpl b/templates/repo/view_file_tree.tmpl index b50d1e6e1aef7..74b0a5555fef3 100644 --- a/templates/repo/view_file_tree.tmpl +++ b/templates/repo/view_file_tree.tmpl @@ -12,5 +12,5 @@ data-repo-link="{{.RepoLink}}" data-tree-path="{{$.TreePath}}" data-current-ref-name-sub-url="{{.RefTypeNameSubURL}}" - data-page-is-edit="{{not .PageIsViewCode}}" + data-page-is-edit="{{or .PageIsEdit .PageIsDelete}}" >
diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue index b0edb9fbcc36c..bef7af49f0eae 100644 --- a/web_src/js/components/ViewFileTreeItem.vue +++ b/web_src/js/components/ViewFileTreeItem.vue @@ -39,7 +39,7 @@ const doLoadChildren = async () => { const onItemClick = (e: MouseEvent) => { // only handle the click event with partial page reloading if // - the user didn't press any special key let browsers handle special keys like "Ctrl+Click" - // - the user doesn't edit the file (a full page reload shows a confirmation dialog if the editor has unsaved changed) + // - the user doesn't edit the file (a full page reload shows a confirmation dialog if the editor or commit dialog have unsaved changed) if (!isPlainClick(e) || props.store.pageIsEdit) return; e.preventDefault(); if (props.item.entryMode === 'tree') doLoadChildren(); From a12962ce9247a121303030bc0b7c0a2f299a31b1 Mon Sep 17 00:00:00 2001 From: bytedream Date: Fri, 15 Aug 2025 09:03:26 +0200 Subject: [PATCH 4/9] typo --- web_src/js/components/ViewFileTreeItem.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue index bef7af49f0eae..96a0b85a0b5c4 100644 --- a/web_src/js/components/ViewFileTreeItem.vue +++ b/web_src/js/components/ViewFileTreeItem.vue @@ -39,7 +39,7 @@ const doLoadChildren = async () => { const onItemClick = (e: MouseEvent) => { // only handle the click event with partial page reloading if // - the user didn't press any special key let browsers handle special keys like "Ctrl+Click" - // - the user doesn't edit the file (a full page reload shows a confirmation dialog if the editor or commit dialog have unsaved changed) + // - the user doesn't edit the file (a full page reload shows a confirmation dialog if the editor or commit dialog have unsaved changes) if (!isPlainClick(e) || props.store.pageIsEdit) return; e.preventDefault(); if (props.item.entryMode === 'tree') doLoadChildren(); From 6bf1166740a62fdc56a9f857f1cbf88767f98a20 Mon Sep 17 00:00:00 2001 From: bytedream Date: Fri, 15 Aug 2025 09:26:08 +0200 Subject: [PATCH 5/9] fix filename being editable even if it shouldn't --- routers/web/repo/editor.go | 2 +- templates/repo/editor/common_breadcrumb.tmpl | 4 ++-- templates/repo/editor/fork.tmpl | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index 2b24db52b0f0f..47e560f06a4e6 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -263,7 +263,6 @@ func editFileOpenExisting(ctx *context.Context) (prefetch []byte, dataRc io.Read func EditFile(ctx *context.Context) { editorAction := ctx.PathParam("editor_action") isNewFile := editorAction == "_new" - ctx.Data["PageIsEdit"] = true ctx.Data["IsNewFile"] = isNewFile // Check if the filename (and additional path) is specified in the querystring @@ -323,6 +322,7 @@ func EditFile(ctx *context.Context) { } } + ctx.Data["PageIsEdit"] = true ctx.Data["EditorconfigJson"] = getContextRepoEditorConfig(ctx, ctx.Repo.TreePath) ctx.HTML(http.StatusOK, tplEditFile) } diff --git a/templates/repo/editor/common_breadcrumb.tmpl b/templates/repo/editor/common_breadcrumb.tmpl index 39696285dc1ee..ff4efd8ab513d 100644 --- a/templates/repo/editor/common_breadcrumb.tmpl +++ b/templates/repo/editor/common_breadcrumb.tmpl @@ -5,9 +5,9 @@ {{range $i, $v := .TreeNames}}
/
{{if eq $i $l}} - + data-editorconfig="{{$.EditorconfigJson}}" {{Iif $.PageIsUpload "required"}} {{Iif $.PageIsEdit "autofocus" "disabled"}}> {{svg "octicon-info"}} {{else}} {{$v}} diff --git a/templates/repo/editor/fork.tmpl b/templates/repo/editor/fork.tmpl index e39b8e5d9856a..db774d6170c47 100644 --- a/templates/repo/editor/fork.tmpl +++ b/templates/repo/editor/fork.tmpl @@ -10,6 +10,10 @@
{{.CsrfTokenHtml}} +
+ {{template "repo/editor/file_tree_toggle" .}} + {{template "repo/editor/common_breadcrumb" .}} +

{{ctx.Locale.Tr "repo.editor.fork_create"}}

From b7f6688008bf4b331e80f78b8c9632c41550b8b0 Mon Sep 17 00:00:00 2001 From: bytedream Date: Fri, 15 Aug 2025 09:58:05 +0200 Subject: [PATCH 6/9] fix action buttons css --- templates/repo/view.tmpl | 2 +- web_src/css/repo.css | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/templates/repo/view.tmpl b/templates/repo/view.tmpl index f99fe2f57ab37..aff067e1cfc20 100644 --- a/templates/repo/view.tmpl +++ b/templates/repo/view.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
{{template "base/alert" .}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 9f4fa518819a7..25a504698e661 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -150,58 +150,58 @@ td .commit-summary { } } -.repository.file.list .non-diff-file-content .header .icon { +.repository .non-diff-file-content .header .icon { font-size: 1em; } -.repository.file.list .non-diff-file-content .header .small.icon { +.repository .non-diff-file-content .header .small.icon { font-size: 0.75em; } -.repository.file.list .non-diff-file-content .header .tiny.icon { +.repository .non-diff-file-content .header .tiny.icon { font-size: 0.5em; } -.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon { +.repository .non-diff-file-content .header .file-actions .btn-octicon { line-height: var(--line-height-default); padding: 8px; vertical-align: middle; color: var(--color-text); } -.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon:hover { +.repository .non-diff-file-content .header .file-actions .btn-octicon:hover { color: var(--color-primary); } -.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon-danger:hover { +.repository .non-diff-file-content .header .file-actions .btn-octicon-danger:hover { color: var(--color-red); } -.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon.disabled { +.repository .non-diff-file-content .header .file-actions .btn-octicon.disabled { color: inherit; opacity: var(--opacity-disabled); cursor: default; } -.repository.file.list .non-diff-file-content .plain-text { +.repository .non-diff-file-content .plain-text { padding: 1em 2em; } -.repository.file.list .non-diff-file-content .plain-text pre { +.repository .non-diff-file-content .plain-text pre { overflow-wrap: anywhere; white-space: pre-wrap; } -.repository.file.list .non-diff-file-content .csv { +.repository .non-diff-file-content .csv { overflow-x: auto; padding: 0 !important; } -.repository.file.list .non-diff-file-content pre { +.repository .non-diff-file-content pre { overflow: auto; } -.repository.file.list .non-diff-file-content .asciicast { +.repository .non-diff-file-content .asciicast { padding: 0 !important; } From 49ddf5b44da7c91e49a33ef12dfd468085f96548 Mon Sep 17 00:00:00 2001 From: bytedream Date: Fri, 15 Aug 2025 13:19:24 +0200 Subject: [PATCH 7/9] update comment --- web_src/js/components/ViewFileTreeItem.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/components/ViewFileTreeItem.vue b/web_src/js/components/ViewFileTreeItem.vue index 96a0b85a0b5c4..4fde8ed876368 100644 --- a/web_src/js/components/ViewFileTreeItem.vue +++ b/web_src/js/components/ViewFileTreeItem.vue @@ -37,7 +37,7 @@ const doLoadChildren = async () => { }; const onItemClick = (e: MouseEvent) => { - // only handle the click event with partial page reloading if + // only handle the click event with partial page reloading if either // - the user didn't press any special key let browsers handle special keys like "Ctrl+Click" // - the user doesn't edit the file (a full page reload shows a confirmation dialog if the editor or commit dialog have unsaved changes) if (!isPlainClick(e) || props.store.pageIsEdit) return; From ede5047fae325bde273b699d9b81e8269cd81938 Mon Sep 17 00:00:00 2001 From: bytedream Date: Fri, 15 Aug 2025 13:27:51 +0200 Subject: [PATCH 8/9] only relax css rules on icons --- templates/repo/view.tmpl | 2 +- web_src/css/repo.css | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/repo/view.tmpl b/templates/repo/view.tmpl index aff067e1cfc20..f99fe2f57ab37 100644 --- a/templates/repo/view.tmpl +++ b/templates/repo/view.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
{{template "base/alert" .}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 25a504698e661..32630de219195 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -183,25 +183,25 @@ td .commit-summary { cursor: default; } -.repository .non-diff-file-content .plain-text { +.repository.file.list .non-diff-file-content .plain-text { padding: 1em 2em; } -.repository .non-diff-file-content .plain-text pre { +.repository.file.list .non-diff-file-content .plain-text pre { overflow-wrap: anywhere; white-space: pre-wrap; } -.repository .non-diff-file-content .csv { +.repository.file.list .non-diff-file-content .csv { overflow-x: auto; padding: 0 !important; } -.repository .non-diff-file-content pre { +.repository.file.list .non-diff-file-content pre { overflow: auto; } -.repository .non-diff-file-content .asciicast { +.repository.file.list .non-diff-file-content .asciicast { padding: 0 !important; } From fb160d14b25cdd1e6a89770e672ac1f20f12ec63 Mon Sep 17 00:00:00 2001 From: bytedream Date: Fri, 15 Aug 2025 16:00:07 +0200 Subject: [PATCH 9/9] lint --- templates/repo/editor/delete.tmpl | 4 ++-- templates/repo/editor/edit.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/editor/delete.tmpl b/templates/repo/editor/delete.tmpl index cad7562c74049..bb260c6e5e4da 100644 --- a/templates/repo/editor/delete.tmpl +++ b/templates/repo/editor/delete.tmpl @@ -6,8 +6,8 @@ {{template "repo/editor/common_top" .}}
- {{template "repo/view_file_tree" .}} -
+ {{template "repo/view_file_tree" .}} +
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 1c26c361102fe..e70de3391b4d0 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -6,8 +6,8 @@ {{template "repo/editor/common_top" .}}
- {{template "repo/view_file_tree" .}} -
+ {{template "repo/view_file_tree" .}} +