From 84daddc2fa74393cdc13371b0cc44f0444cfdae0 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 24 Mar 2023 07:12:23 +0100 Subject: [PATCH 01/23] Editor preview support for external renderers (#23333) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove `[repository.editor] PREVIEWABLE_FILE_MODES` setting that seemed like it was intended to support this but did not work. Instead, whenever viewing a file shows a preview, also have a Preview tab in the file editor. Add new `/markup` web and API endpoints with `comment`, `gfm`, `markdown` and new `file` mode that uses a file path to determine the renderer. Remove `/markdown` web endpoint but keep the API for backwards and GitHub compatibility. ## ⚠️ BREAKING ⚠️ The `[repository.editor] PREVIEWABLE_FILE_MODES` setting was removed. This setting served no practical purpose and was not working correctly. Instead a preview tab is always shown in the file editor when supported. --------- Co-authored-by: zeripath Co-authored-by: Lunny Xiao --- custom/conf/app.example.ini | 4 - modules/markup/renderer.go | 13 +++ modules/setting/repository.go | 9 +- modules/structs/miscellaneous.go | 30 ++++- routers/api/v1/api.go | 2 + .../api/v1/misc/{markdown.go => markup.go} | 87 ++++++-------- .../misc/{markdown_test.go => markup_test.go} | 108 +++++++++++++----- routers/api/v1/swagger/options.go | 2 + routers/common/markup.go | 92 +++++++++++++++ routers/web/misc/markdown.go | 98 ---------------- routers/web/misc/markup.go | 44 +++++++ routers/web/repo/editor.go | 7 +- routers/web/web.go | 2 +- templates/repo/diff/box.tmpl | 2 +- templates/repo/diff/comment_form.tmpl | 2 +- templates/repo/editor/edit.tmpl | 6 +- templates/repo/issue/comment_tab.tmpl | 4 +- templates/repo/issue/view_content.tmpl | 2 +- templates/repo/release/new.tmpl | 2 +- templates/repo/wiki/new.tmpl | 4 +- templates/swagger/v1_json.tmpl | 67 ++++++++++- web_src/js/features/codeeditor.js | 10 +- web_src/js/features/repo-editor.js | 7 +- 23 files changed, 389 insertions(+), 215 deletions(-) rename routers/api/v1/misc/{markdown.go => markup.go} (56%) rename routers/api/v1/misc/{markdown_test.go => markup_test.go} (71%) create mode 100644 routers/common/markup.go delete mode 100644 routers/web/misc/markdown.go create mode 100644 routers/web/misc/markup.go diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 131fb3401eec2..d1cfcd70e5850 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -993,10 +993,6 @@ ROUTER = console ;; List of file extensions for which lines should be wrapped in the Monaco editor ;; Separate extensions with a comma. To line wrap files without an extension, just put a comma ;LINE_WRAP_EXTENSIONS = .txt,.md,.markdown,.mdown,.mkd, -;; -;; Valid file modes that have a preview API associated with them, such as api/v1/markdown -;; Separate the values by commas. The preview tab in edit mode won't be displayed if the file extension doesn't match -;PREVIEWABLE_FILE_MODES = markdown ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/modules/markup/renderer.go b/modules/markup/renderer.go index df2c9ebfc6156..e934aed925e3e 100644 --- a/modules/markup/renderer.go +++ b/modules/markup/renderer.go @@ -283,6 +283,11 @@ type ErrUnsupportedRenderExtension struct { Extension string } +func IsErrUnsupportedRenderExtension(err error) bool { + _, ok := err.(ErrUnsupportedRenderExtension) + return ok +} + func (err ErrUnsupportedRenderExtension) Error() string { return fmt.Sprintf("Unsupported render extension: %s", err.Extension) } @@ -317,3 +322,11 @@ func IsMarkupFile(name, markup string) bool { } return false } + +func PreviewableExtensions() []string { + extensions := make([]string, 0, len(extRenderers)) + for extension := range extRenderers { + extensions = append(extensions, extension) + } + return extensions +} diff --git a/modules/setting/repository.go b/modules/setting/repository.go index 4964704dbad12..bae3c658a4855 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -53,8 +53,7 @@ var ( // Repository editor settings Editor struct { - LineWrapExtensions []string - PreviewableFileModes []string + LineWrapExtensions []string } `ini:"-"` // Repository upload settings @@ -167,11 +166,9 @@ var ( // Repository editor settings Editor: struct { - LineWrapExtensions []string - PreviewableFileModes []string + LineWrapExtensions []string }{ - LineWrapExtensions: strings.Split(".txt,.md,.markdown,.mdown,.mkd,", ","), - PreviewableFileModes: []string{"markdown"}, + LineWrapExtensions: strings.Split(".txt,.md,.markdown,.mdown,.mkd,", ","), }, // Repository upload settings diff --git a/modules/structs/miscellaneous.go b/modules/structs/miscellaneous.go index 596a551e0d485..8acea84d6cc17 100644 --- a/modules/structs/miscellaneous.go +++ b/modules/structs/miscellaneous.go @@ -15,13 +15,41 @@ type SearchError struct { Error string `json:"error"` } +// MarkupOption markup options +type MarkupOption struct { + // Text markup to render + // + // in: body + Text string + // Mode to render (comment, gfm, markdown, file) + // + // in: body + Mode string + // Context to render + // + // in: body + Context string + // Is it a wiki page ? + // + // in: body + Wiki bool + // File path for detecting extension in file mode + // + // in: body + FilePath string +} + +// MarkupRender is a rendered markup document +// swagger:response MarkupRender +type MarkupRender string + // MarkdownOption markdown options type MarkdownOption struct { // Text markdown to render // // in: body Text string - // Mode to render + // Mode to render (comment, gfm, markdown) // // in: body Mode string diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index c3a875e737b6b..8fd824640ff7f 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -711,6 +711,7 @@ func Routes(ctx gocontext.Context) *web.Route { }) } m.Get("/signing-key.gpg", misc.SigningKey) + m.Post("/markup", bind(api.MarkupOption{}), misc.Markup) m.Post("/markdown", bind(api.MarkdownOption{}), misc.Markdown) m.Post("/markdown/raw", misc.MarkdownRaw) m.Group("/settings", func() { @@ -1034,6 +1035,7 @@ func Routes(ctx gocontext.Context) *web.Route { Patch(reqToken(auth_model.AccessTokenScopeRepo), reqRepoWriter(unit.TypeIssues, unit.TypePullRequests), bind(api.EditLabelOption{}), repo.EditLabel). Delete(reqToken(auth_model.AccessTokenScopeRepo), reqRepoWriter(unit.TypeIssues, unit.TypePullRequests), repo.DeleteLabel) }) + m.Post("/markup", reqToken(auth_model.AccessTokenScopeRepo), bind(api.MarkupOption{}), misc.Markup) m.Post("/markdown", reqToken(auth_model.AccessTokenScopeRepo), bind(api.MarkdownOption{}), misc.Markdown) m.Post("/markdown/raw", reqToken(auth_model.AccessTokenScopeRepo), misc.MarkdownRaw) m.Group("/milestones", func() { diff --git a/routers/api/v1/misc/markdown.go b/routers/api/v1/misc/markup.go similarity index 56% rename from routers/api/v1/misc/markdown.go rename to routers/api/v1/misc/markup.go index 3ff42f08d6828..93d5754444440 100644 --- a/routers/api/v1/misc/markdown.go +++ b/routers/api/v1/misc/markup.go @@ -5,19 +5,45 @@ package misc import ( "net/http" - "strings" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web" - - "mvdan.cc/xurls/v2" + "code.gitea.io/gitea/routers/common" ) +// Markup render markup document to HTML +func Markup(ctx *context.APIContext) { + // swagger:operation POST /markup miscellaneous renderMarkup + // --- + // summary: Render a markup document as HTML + // parameters: + // - name: body + // in: body + // schema: + // "$ref": "#/definitions/MarkupOption" + // consumes: + // - application/json + // produces: + // - text/html + // responses: + // "200": + // "$ref": "#/responses/MarkupRender" + // "422": + // "$ref": "#/responses/validationError" + + form := web.GetForm(ctx).(*api.MarkupOption) + + if ctx.HasAPIError() { + ctx.Error(http.StatusUnprocessableEntity, "", ctx.GetErrMsg()) + return + } + + common.RenderMarkup(ctx.Context, form.Mode, form.Text, form.Context, form.FilePath, form.Wiki) +} + // Markdown render markdown document to HTML func Markdown(ctx *context.APIContext) { // swagger:operation POST /markdown miscellaneous renderMarkdown @@ -45,55 +71,12 @@ func Markdown(ctx *context.APIContext) { return } - if len(form.Text) == 0 { - _, _ = ctx.Write([]byte("")) - return + mode := "markdown" + if form.Mode == "comment" || form.Mode == "gfm" { + mode = form.Mode } - switch form.Mode { - case "comment": - fallthrough - case "gfm": - urlPrefix := form.Context - meta := map[string]string{} - if !strings.HasPrefix(setting.AppSubURL+"/", urlPrefix) { - // check if urlPrefix is already set to a URL - linkRegex, _ := xurls.StrictMatchingScheme("https?://") - m := linkRegex.FindStringIndex(urlPrefix) - if m == nil { - urlPrefix = util.URLJoin(setting.AppURL, form.Context) - } - } - if ctx.Repo != nil && ctx.Repo.Repository != nil { - // "gfm" = Github Flavored Markdown - set this to render as a document - if form.Mode == "gfm" { - meta = ctx.Repo.Repository.ComposeDocumentMetas() - } else { - meta = ctx.Repo.Repository.ComposeMetas() - } - } - if form.Mode == "gfm" { - meta["mode"] = "document" - } - - if err := markdown.Render(&markup.RenderContext{ - Ctx: ctx, - URLPrefix: urlPrefix, - Metas: meta, - IsWiki: form.Wiki, - }, strings.NewReader(form.Text), ctx.Resp); err != nil { - ctx.InternalServerError(err) - return - } - default: - if err := markdown.RenderRaw(&markup.RenderContext{ - Ctx: ctx, - URLPrefix: form.Context, - }, strings.NewReader(form.Text), ctx.Resp); err != nil { - ctx.InternalServerError(err) - return - } - } + common.RenderMarkup(ctx.Context, mode, form.Text, form.Context, "", form.Wiki) } // MarkdownRaw render raw markdown HTML diff --git a/routers/api/v1/misc/markdown_test.go b/routers/api/v1/misc/markup_test.go similarity index 71% rename from routers/api/v1/misc/markdown_test.go rename to routers/api/v1/misc/markup_test.go index 025f2f44b0118..301f51eea2fe1 100644 --- a/routers/api/v1/misc/markdown_test.go +++ b/routers/api/v1/misc/markup_test.go @@ -49,16 +49,37 @@ func wrap(ctx *context.Context) *context.APIContext { } } -func TestAPI_RenderGFM(t *testing.T) { +func testRenderMarkup(t *testing.T, mode, filePath, text, responseBody string, responseCode int) { + setting.AppURL = AppURL + + options := api.MarkupOption{ + Mode: mode, + Text: "", + Context: Repo, + Wiki: true, + FilePath: filePath, + } + requrl, _ := url.Parse(util.URLJoin(AppURL, "api", "v1", "markup")) + req := &http.Request{ + Method: "POST", + URL: requrl, + } + m, resp := createContext(req) + ctx := wrap(m) + + options.Text = text + web.SetForm(ctx, &options) + Markup(ctx) + assert.Equal(t, responseBody, resp.Body.String()) + assert.Equal(t, responseCode, resp.Code) + resp.Body.Reset() +} + +func testRenderMarkdown(t *testing.T, mode, text, responseBody string, responseCode int) { setting.AppURL = AppURL - markup.Init(&markup.ProcessorHelper{ - IsUsernameMentionable: func(ctx go_context.Context, username string) bool { - return username == "r-lyeh" - }, - }) options := api.MarkdownOption{ - Mode: "gfm", + Mode: mode, Text: "", Context: Repo, Wiki: true, @@ -71,7 +92,22 @@ func TestAPI_RenderGFM(t *testing.T) { m, resp := createContext(req) ctx := wrap(m) - testCases := []string{ + options.Text = text + web.SetForm(ctx, &options) + Markdown(ctx) + assert.Equal(t, responseBody, resp.Body.String()) + assert.Equal(t, responseCode, resp.Code) + resp.Body.Reset() +} + +func TestAPI_RenderGFM(t *testing.T) { + markup.Init(&markup.ProcessorHelper{ + IsUsernameMentionable: func(ctx go_context.Context, username string) bool { + return username == "r-lyeh" + }, + }) + + testCasesCommon := []string{ // dear imgui wiki markdown extract: special wiki syntax `Wiki! Enjoy :) - [[Links, Language bindings, Engine bindings|Links]] @@ -85,6 +121,23 @@ func TestAPI_RenderGFM(t *testing.T) {
  • Bezier widget (by @r-lyeh) https://github.com/ocornut/imgui/issues/786
    • `, + // Guard wiki sidebar: special syntax + `[[Guardfile-DSL / Configuring-Guard|Guardfile-DSL---Configuring-Guard]]`, + // rendered + `

    Guardfile-DSL / Configuring-Guard

    +`, + // special syntax + `[[Name|Link]]`, + // rendered + `

    Name

    +`, + // empty + ``, + // rendered + ``, + } + + testCasesDocument := []string{ // wine-staging wiki home extract: special wiki syntax, images `## What is Wine Staging? **Wine Staging** on website [wine-staging.com](http://wine-staging.com). @@ -103,29 +156,28 @@ Here are some links to the most important topics. You can find the full list of

    Configuration images/icon-bug.png

    `, - // Guard wiki sidebar: special syntax - `[[Guardfile-DSL / Configuring-Guard|Guardfile-DSL---Configuring-Guard]]`, - // rendered - `

    Guardfile-DSL / Configuring-Guard

    -`, - // special syntax - `[[Name|Link]]`, - // rendered - `

    Name

    -`, - // empty - ``, - // rendered - ``, } - for i := 0; i < len(testCases); i += 2 { - options.Text = testCases[i] - web.SetForm(ctx, &options) - Markdown(ctx) - assert.Equal(t, testCases[i+1], resp.Body.String()) - resp.Body.Reset() + for i := 0; i < len(testCasesCommon); i += 2 { + text := testCasesCommon[i] + response := testCasesCommon[i+1] + testRenderMarkdown(t, "gfm", text, response, http.StatusOK) + testRenderMarkup(t, "gfm", "", text, response, http.StatusOK) + testRenderMarkdown(t, "comment", text, response, http.StatusOK) + testRenderMarkup(t, "comment", "", text, response, http.StatusOK) + testRenderMarkup(t, "file", "path/test.md", text, response, http.StatusOK) } + + for i := 0; i < len(testCasesDocument); i += 2 { + text := testCasesDocument[i] + response := testCasesDocument[i+1] + testRenderMarkdown(t, "gfm", text, response, http.StatusOK) + testRenderMarkup(t, "gfm", "", text, response, http.StatusOK) + testRenderMarkup(t, "file", "path/test.md", text, response, http.StatusOK) + } + + testRenderMarkup(t, "file", "path/test.unknown", "## Test", "Unsupported render extension: .unknown\n", http.StatusUnprocessableEntity) + testRenderMarkup(t, "unknown", "", "## Test", "Unknown mode: unknown\n", http.StatusUnprocessableEntity) } var simpleCases = []string{ diff --git a/routers/api/v1/swagger/options.go b/routers/api/v1/swagger/options.go index 0c8d3d353feca..1ddc93c383d64 100644 --- a/routers/api/v1/swagger/options.go +++ b/routers/api/v1/swagger/options.go @@ -56,6 +56,8 @@ type swaggerParameterBodies struct { // in:body EditLabelOption api.EditLabelOption + // in:body + MarkupOption api.MarkupOption // in:body MarkdownOption api.MarkdownOption diff --git a/routers/common/markup.go b/routers/common/markup.go new file mode 100644 index 0000000000000..89f24e00075cc --- /dev/null +++ b/routers/common/markup.go @@ -0,0 +1,92 @@ +// Copyright 2014 The Gogs Authors. All rights reserved. +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package common + +import ( + "fmt" + "net/http" + "strings" + + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/markup" + "code.gitea.io/gitea/modules/markup/markdown" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" + + "mvdan.cc/xurls/v2" +) + +// RenderMarkup renders markup text for the /markup and /markdown endpoints +func RenderMarkup(ctx *context.Context, mode, text, urlPrefix, filePath string, wiki bool) { + markupType := "" + relativePath := "" + + if len(text) == 0 { + _, _ = ctx.Write([]byte("")) + return + } + + switch mode { + case "markdown": + // Raw markdown + if err := markdown.RenderRaw(&markup.RenderContext{ + Ctx: ctx, + URLPrefix: urlPrefix, + }, strings.NewReader(text), ctx.Resp); err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + } + return + case "comment": + // Comment as markdown + markupType = markdown.MarkupName + case "gfm": + // Github Flavored Markdown as document + markupType = markdown.MarkupName + case "file": + // File as document based on file extension + markupType = "" + relativePath = filePath + default: + ctx.Error(http.StatusUnprocessableEntity, fmt.Sprintf("Unknown mode: %s", mode)) + return + } + + if !strings.HasPrefix(setting.AppSubURL+"/", urlPrefix) { + // check if urlPrefix is already set to a URL + linkRegex, _ := xurls.StrictMatchingScheme("https?://") + m := linkRegex.FindStringIndex(urlPrefix) + if m == nil { + urlPrefix = util.URLJoin(setting.AppURL, urlPrefix) + } + } + + meta := map[string]string{} + if ctx.Repo != nil && ctx.Repo.Repository != nil { + if mode == "comment" { + meta = ctx.Repo.Repository.ComposeMetas() + } else { + meta = ctx.Repo.Repository.ComposeDocumentMetas() + } + } + if mode != "comment" { + meta["mode"] = "document" + } + + if err := markup.Render(&markup.RenderContext{ + Ctx: ctx, + URLPrefix: urlPrefix, + Metas: meta, + IsWiki: wiki, + Type: markupType, + RelativePath: relativePath, + }, strings.NewReader(text), ctx.Resp); err != nil { + if markup.IsErrUnsupportedRenderExtension(err) { + ctx.Error(http.StatusUnprocessableEntity, err.Error()) + } else { + ctx.Error(http.StatusInternalServerError, err.Error()) + } + return + } +} diff --git a/routers/web/misc/markdown.go b/routers/web/misc/markdown.go deleted file mode 100644 index aaa3ed0781f7c..0000000000000 --- a/routers/web/misc/markdown.go +++ /dev/null @@ -1,98 +0,0 @@ -// Copyright 2014 The Gogs Authors. All rights reserved. -// Copyright 2022 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package misc - -import ( - "net/http" - "strings" - - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/util" - "code.gitea.io/gitea/modules/web" - - "mvdan.cc/xurls/v2" -) - -// Markdown render markdown document to HTML -func Markdown(ctx *context.Context) { - // swagger:operation POST /markdown miscellaneous renderMarkdown - // --- - // summary: Render a markdown document as HTML - // parameters: - // - name: body - // in: body - // schema: - // "$ref": "#/definitions/MarkdownOption" - // consumes: - // - application/json - // produces: - // - text/html - // responses: - // "200": - // "$ref": "#/responses/MarkdownRender" - // "422": - // "$ref": "#/responses/validationError" - - form := web.GetForm(ctx).(*api.MarkdownOption) - - if ctx.HasAPIError() { - ctx.Error(http.StatusUnprocessableEntity, "", ctx.GetErrMsg()) - return - } - - if len(form.Text) == 0 { - _, _ = ctx.Write([]byte("")) - return - } - - switch form.Mode { - case "comment": - fallthrough - case "gfm": - urlPrefix := form.Context - meta := map[string]string{} - if !strings.HasPrefix(setting.AppSubURL+"/", urlPrefix) { - // check if urlPrefix is already set to a URL - linkRegex, _ := xurls.StrictMatchingScheme("https?://") - m := linkRegex.FindStringIndex(urlPrefix) - if m == nil { - urlPrefix = util.URLJoin(setting.AppURL, form.Context) - } - } - if ctx.Repo != nil && ctx.Repo.Repository != nil { - // "gfm" = Github Flavored Markdown - set this to render as a document - if form.Mode == "gfm" { - meta = ctx.Repo.Repository.ComposeDocumentMetas() - } else { - meta = ctx.Repo.Repository.ComposeMetas() - } - } - if form.Mode == "gfm" { - meta["mode"] = "document" - } - - if err := markdown.Render(&markup.RenderContext{ - Ctx: ctx, - URLPrefix: urlPrefix, - Metas: meta, - IsWiki: form.Wiki, - }, strings.NewReader(form.Text), ctx.Resp); err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - default: - if err := markdown.RenderRaw(&markup.RenderContext{ - Ctx: ctx, - URLPrefix: form.Context, - }, strings.NewReader(form.Text), ctx.Resp); err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - } -} diff --git a/routers/web/misc/markup.go b/routers/web/misc/markup.go new file mode 100644 index 0000000000000..f678316f4429f --- /dev/null +++ b/routers/web/misc/markup.go @@ -0,0 +1,44 @@ +// Copyright 2014 The Gogs Authors. All rights reserved. +// Copyright 2022 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package misc + +import ( + "net/http" + + "code.gitea.io/gitea/modules/context" + api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/web" + "code.gitea.io/gitea/routers/common" +) + +// Markup render markup document to HTML +func Markup(ctx *context.Context) { + // swagger:operation POST /markup miscellaneous renderMarkup + // --- + // summary: Render a markup document as HTML + // parameters: + // - name: body + // in: body + // schema: + // "$ref": "#/definitions/MarkupOption" + // consumes: + // - application/json + // produces: + // - text/html + // responses: + // "200": + // "$ref": "#/responses/MarkupRender" + // "422": + // "$ref": "#/responses/validationError" + + form := web.GetForm(ctx).(*api.MarkupOption) + + if ctx.HasAPIError() { + ctx.Error(http.StatusUnprocessableEntity, "", ctx.GetErrMsg()) + return + } + + common.RenderMarkup(ctx, form.Mode, form.Text, form.Context, form.FilePath, form.Wiki) +} diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index 07241b88700fb..2b66be22aeb96 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -20,6 +20,7 @@ import ( "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/typesniffer" "code.gitea.io/gitea/modules/upload" @@ -155,9 +156,8 @@ func editFile(ctx *context.Context, isNewFile bool) { } ctx.Data["new_branch_name"] = GetUniquePatchBranchName(ctx) ctx.Data["last_commit"] = ctx.Repo.CommitID - ctx.Data["MarkdownFileExts"] = strings.Join(setting.Markdown.FileExtensions, ",") + ctx.Data["PreviewableExtensions"] = strings.Join(markup.PreviewableExtensions(), ",") ctx.Data["LineWrapExtensions"] = strings.Join(setting.Repository.Editor.LineWrapExtensions, ",") - ctx.Data["PreviewableFileModes"] = strings.Join(setting.Repository.Editor.PreviewableFileModes, ",") ctx.Data["Editorconfig"] = GetEditorConfig(ctx, treePath) ctx.HTML(http.StatusOK, tplEditFile) @@ -207,9 +207,8 @@ func editFilePost(ctx *context.Context, form forms.EditRepoFileForm, isNewFile b ctx.Data["commit_choice"] = form.CommitChoice ctx.Data["new_branch_name"] = form.NewBranchName ctx.Data["last_commit"] = ctx.Repo.CommitID - ctx.Data["MarkdownFileExts"] = strings.Join(setting.Markdown.FileExtensions, ",") + ctx.Data["PreviewableExtensions"] = strings.Join(markup.PreviewableExtensions(), ",") ctx.Data["LineWrapExtensions"] = strings.Join(setting.Repository.Editor.LineWrapExtensions, ",") - ctx.Data["PreviewableFileModes"] = strings.Join(setting.Repository.Editor.PreviewableFileModes, ",") ctx.Data["Editorconfig"] = GetEditorConfig(ctx, form.TreePath) if ctx.HasError() { diff --git a/routers/web/web.go b/routers/web/web.go index 292268dc8055a..4bd2f76c571f1 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1115,7 +1115,7 @@ func RegisterRoutes(m *web.Route) { m.Group("/comments/{id}", func() { m.Get("/attachments", repo.GetCommentAttachments) }) - m.Post("/markdown", web.Bind(structs.MarkdownOption{}), misc.Markdown) + m.Post("/markup", web.Bind(structs.MarkupOption{}), misc.Markup) m.Group("/labels", func() { m.Post("/new", web.Bind(forms.CreateLabelForm{}), repo.NewLabel) m.Post("/edit", web.Bind(forms.CreateLabelForm{}), repo.UpdateLabel) diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 6dafe6f896203..8926c518aecb4 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -192,7 +192,7 @@
    {{$.locale.Tr "write"}} - {{$.locale.Tr "preview"}} + {{$.locale.Tr "preview"}}
    diff --git a/templates/repo/diff/comment_form.tmpl b/templates/repo/diff/comment_form.tmpl index 225e40f7f01d6..deea6baffb038 100644 --- a/templates/repo/diff/comment_form.tmpl +++ b/templates/repo/diff/comment_form.tmpl @@ -11,7 +11,7 @@
    {{$.root.locale.Tr "write"}} - {{$.root.locale.Tr "preview"}} + {{$.root.locale.Tr "preview"}}
    diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 19c5cb007a900..737027f59006b 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -31,15 +31,15 @@
    {{svg "octicon-code"}} {{if .IsNewFile}}{{.locale.Tr "repo.editor.new_file"}}{{else}}{{.locale.Tr "repo.editor.edit_file"}}{{end}} {{if not .IsNewFile}} - {{svg "octicon-eye"}} {{.locale.Tr "preview"}} + {{svg "octicon-eye"}} {{.locale.Tr "preview"}} {{svg "octicon-diff"}} {{.locale.Tr "repo.editor.preview_changes"}} {{end}}
    diff --git a/templates/repo/issue/comment_tab.tmpl b/templates/repo/issue/comment_tab.tmpl index b8e8d2d9aa403..47d6ca9587687 100644 --- a/templates/repo/issue/comment_tab.tmpl +++ b/templates/repo/issue/comment_tab.tmpl @@ -1,10 +1,10 @@
    {{.locale.Tr "write"}} - {{.locale.Tr "preview"}} + {{.locale.Tr "preview"}}
    -
    diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 3e43701b63517..8a55d4e30ee7b 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -168,7 +168,7 @@
    {{$.locale.Tr "write"}} - {{$.locale.Tr "preview"}} + {{$.locale.Tr "preview"}}
    diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 8c4df98d19114..692a373dc62ce 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -53,7 +53,7 @@
    {{$.locale.Tr "write"}} - {{$.locale.Tr "preview"}} + {{$.locale.Tr "preview"}}
    diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 9e9de99022245..085af4cbc9f1d 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -21,11 +21,11 @@
    {{.locale.Tr "write"}} - {{$.locale.Tr "preview"}} + {{$.locale.Tr "preview"}}
    - +
    diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index ddcdc94b81c54..0f7e60c598bf8 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -951,6 +951,38 @@ } } }, + "/markup": { + "post": { + "consumes": [ + "application/json" + ], + "produces": [ + "text/html" + ], + "tags": [ + "miscellaneous" + ], + "summary": "Render a markup document as HTML", + "operationId": "renderMarkup", + "parameters": [ + { + "name": "body", + "in": "body", + "schema": { + "$ref": "#/definitions/MarkupOption" + } + } + ], + "responses": { + "200": { + "$ref": "#/responses/MarkupRender" + }, + "422": { + "$ref": "#/responses/validationError" + } + } + } + }, "/nodeinfo": { "get": { "produces": [ @@ -17991,7 +18023,7 @@ "type": "string" }, "Mode": { - "description": "Mode to render\n\nin: body", + "description": "Mode to render (comment, gfm, markdown)\n\nin: body", "type": "string" }, "Text": { @@ -18005,6 +18037,33 @@ }, "x-go-package": "code.gitea.io/gitea/modules/structs" }, + "MarkupOption": { + "description": "MarkupOption markup options", + "type": "object", + "properties": { + "Context": { + "description": "Context to render\n\nin: body", + "type": "string" + }, + "FilePath": { + "description": "File path for detecting extension in file mode\n\nin: body", + "type": "string" + }, + "Mode": { + "description": "Mode to render (comment, gfm, markdown, file)\n\nin: body", + "type": "string" + }, + "Text": { + "description": "Text markup to render\n\nin: body", + "type": "string" + }, + "Wiki": { + "description": "Is it a wiki page ?\n\nin: body", + "type": "boolean" + } + }, + "x-go-package": "code.gitea.io/gitea/modules/structs" + }, "MergePullRequestOption": { "description": "MergePullRequestForm form for merging Pull Request", "type": "object", @@ -20835,6 +20894,12 @@ "type": "string" } }, + "MarkupRender": { + "description": "MarkupRender is a rendered markup document", + "schema": { + "type": "string" + } + }, "Milestone": { "description": "Milestone", "schema": { diff --git a/web_src/js/features/codeeditor.js b/web_src/js/features/codeeditor.js index 23a26ba2b0d80..4f5ea317b4767 100644 --- a/web_src/js/features/codeeditor.js +++ b/web_src/js/features/codeeditor.js @@ -130,17 +130,17 @@ function getFileBasedOptions(filename, lineWrapExts) { }; } -export async function createCodeEditor(textarea, filenameInput, previewFileModes) { +export async function createCodeEditor(textarea, filenameInput) { const filename = basename(filenameInput.value); const previewLink = document.querySelector('a[data-tab=preview]'); - const markdownExts = (textarea.getAttribute('data-markdown-file-exts') || '').split(','); + const previewableExts = (textarea.getAttribute('data-previewable-extensions') || '').split(','); const lineWrapExts = (textarea.getAttribute('data-line-wrap-extensions') || '').split(','); - const isMarkdown = markdownExts.includes(extname(filename)); + const previewable = previewableExts.includes(extname(filename)); const editorConfig = getEditorconfig(filenameInput); if (previewLink) { - if (isMarkdown && (previewFileModes || []).includes('markdown')) { - const newUrl = (previewLink.getAttribute('data-url') || '').replace(/(.*)\/.*/i, `$1/markdown`); + if (previewable) { + const newUrl = (previewLink.getAttribute('data-url') || '').replace(/(.*)\/.*/i, `$1/markup`); previewLink.setAttribute('data-url', newUrl); previewLink.style.display = ''; } else { diff --git a/web_src/js/features/repo-editor.js b/web_src/js/features/repo-editor.js index b3e9b65f21672..a7c59fb039561 100644 --- a/web_src/js/features/repo-editor.js +++ b/web_src/js/features/repo-editor.js @@ -5,18 +5,16 @@ import {createCodeEditor} from './codeeditor.js'; import {hideElem, showElem} from '../utils/dom.js'; const {csrfToken} = window.config; -let previewFileModes; function initEditPreviewTab($form) { const $tabMenu = $form.find('.tabular.menu'); $tabMenu.find('.item').tab(); const $previewTab = $tabMenu.find(`.item[data-tab="${$tabMenu.data('preview')}"]`); if ($previewTab.length) { - previewFileModes = $previewTab.data('preview-file-modes').split(','); $previewTab.on('click', function () { const $this = $(this); let context = `${$this.data('context')}/`; - const mode = $this.data('markdown-mode') || 'comment'; + const mode = $this.data('markup-mode') || 'comment'; const treePathEl = $form.find('input#tree_path'); if (treePathEl.length > 0) { context += treePathEl.val(); @@ -27,6 +25,7 @@ function initEditPreviewTab($form) { mode, context, text: $form.find(`.tab[data-tab="${$tabMenu.data('write')}"] textarea`).val(), + file_path: treePathEl.val(), }, (data) => { const $previewPanel = $form.find(`.tab[data-tab="${$tabMenu.data('preview')}"]`); $previewPanel.html(data); @@ -147,7 +146,7 @@ export function initRepoEditor() { if (!$editArea.length) return; (async () => { - const editor = await createCodeEditor($editArea[0], $editFilename[0], previewFileModes); + const editor = await createCodeEditor($editArea[0], $editFilename[0]); // Using events from https://github.com/codedance/jquery.AreYouSure#advanced-usage // to enable or disable the commit button From a9cceb0597105fab89a145e55b0e5c7f8f1330f4 Mon Sep 17 00:00:00 2001 From: Hester Gong Date: Fri, 24 Mar 2023 15:11:23 +0800 Subject: [PATCH 02/23] Fix long project name display in issue list and in related dropdown (#23653) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR is to fix the second problem mentioned in #23625, along with the long texts problem in `issue-item-bottom-row` of `issuelist.tmpl` Main changes are: 1. Add `max-width` to the search dropdowns in issue list and make the possible long texts inside to show ellipsis if texts are long 2. Adjust the conditions in [issuelist.tmpl](https://github.com/go-gitea/gitea/blob/1d35fa0e784dffcadacb2322a3d7ac3ec2ff89b2/templates/shared/issuelist.tmpl#L146-L167) to fix the problem as mentioned by the [comment](https://github.com/go-gitea/gitea/issues/23625#issuecomment-1479281060) 3. Use `word-break: break-word;` in `issue-item-bottom-row` to break the possible long texts. After the PR issuelist in repo (similar for pr list): 截屏2023-03-23 17 42 40 dropdowns with long name (Here take reference from github to deal with the long names cases: show ellipsis with no title, because all these options are clickable, and it might not be necessary to add titles to them ): 截屏2023-03-23 17 43 50 截屏2023-03-23 17 43 56 issue page (similar for pr page): 截屏2023-03-23 17 45 37 on PC: 截屏2023-03-23 17 47 20 截屏2023-03-23 17 46 40 --- templates/repo/issue/list.tmpl | 8 ++++---- templates/repo/search_name.tmpl | 2 +- templates/shared/issuelist.tmpl | 18 +++++++++++------- web_src/css/helpers.css | 1 + web_src/css/repository.css | 3 ++- web_src/css/shared/issuelist.css | 1 + 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 726ef25cfe8ad..38ed3873ba4c8 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -99,8 +99,8 @@ {{.locale.Tr "repo.issues.new.open_projects"}}
    {{range .OpenProjects}} - - {{svg .IconName 18 "gt-mr-3"}}{{.Title}} + + {{svg .IconName 18 "gt-mr-3 gt-shrink-0"}}{{.Title}} {{end}} {{end}} @@ -131,7 +131,7 @@
    {{.locale.Tr "repo.issues.filter_poster_no_select"}} {{range .Posters}} - + {{avatar $.Context .}}{{template "repo/search_name" .}} {{end}} @@ -151,7 +151,7 @@
    {{.locale.Tr "repo.issues.filter_assginee_no_select"}} {{range .Assignees}} - + {{avatar $.Context .}}{{template "repo/search_name" .}} {{end}} diff --git a/templates/repo/search_name.tmpl b/templates/repo/search_name.tmpl index 468f6c394cd83..5a481761cc8f4 100644 --- a/templates/repo/search_name.tmpl +++ b/templates/repo/search_name.tmpl @@ -1 +1 @@ -{{.Name}}{{if IsShowFullName}} {{.FullName}}{{end}} +{{.Name}}{{if IsShowFullName}} {{.FullName}}{{end}} diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 40ddb4dab03a5..2720f7e26b2a6 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -143,13 +143,15 @@ {{end}}
    + {{if or .TotalTrackedTime .Assignees .NumComments}}
    + {{if .TotalTrackedTime}}
    - {{if .TotalTrackedTime}} {{svg "octicon-clock" 16 "gt-mr-2"}} {{.TotalTrackedTime | Sec2Time}} - {{end}}
    + {{end}} + {{if .Assignees}}
    {{range .Assignees}} @@ -157,14 +159,16 @@ {{end}}
    + {{end}} + {{if .NumComments}}
    - {{if .NumComments}} - - {{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}} - - {{end}} + + {{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}} +
    + {{end}}
    + {{end}} {{end}} {{if .IssueIndexerUnavailable}} diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index 4756d31becff8..7c7d576db95e4 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -197,6 +197,7 @@ .gt-content-center { align-content: center !important; } +.gt-shrink-0 { flex-shrink: 0 !important; } .gt-whitespace-nowrap { white-space: nowrap !important; } @media (max-width: 767px) { diff --git a/web_src/css/repository.css b/web_src/css/repository.css index eb555abec8443..34c76b15c9b2d 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -143,7 +143,8 @@ .repository .filter.menu .menu { max-height: 500px; - overflow-x: auto; + max-width: 300px; + overflow-x: hidden; right: 0 !important; left: auto !important; } diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index 6e2cc737e7d90..ebb1ca989b87f 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -84,6 +84,7 @@ .issue.list > .item .desc a { color: inherit; + word-break: break-word; } .issue.list > .item .desc .time-since, From d02e83a2c3e0bd1bc1150c4ed976928d967ac3f5 Mon Sep 17 00:00:00 2001 From: sillyguodong <33891828+sillyguodong@users.noreply.github.com> Date: Fri, 24 Mar 2023 16:37:56 +0800 Subject: [PATCH 03/23] Fix cancel button in the page of project edit not work (#23655) Before, in project edit page, the cancel button is not work. https://user-images.githubusercontent.com/33891828/227182731-6478e29f-0e52-48c4-beb0-6a7d1dda6a1d.mov 1. The wrong classname `cancel` was added to the `` tag. That classname caused the default click event of `` tag to be cancelled. Because we have the following settings in the global. So I remove the classname `cancel`. https://github.com/go-gitea/gitea/blob/9be90a58754061171bbd5025d85d2b891364efd3/web_src/js/features/common-global.js#L325-L327 2. Another change is that page will redirect to the previous page. https://user-images.githubusercontent.com/33891828/227187326-c653c6d6-9715-440f-a732-ba0a6f012c81.mov --- routers/web/org/projects.go | 2 ++ routers/web/repo/projects.go | 1 + templates/projects/new.tmpl | 2 +- templates/repo/projects/new.tmpl | 2 +- web_src/js/features/common-global.js | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index df16d0a4c7623..5d8005781d415 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -245,9 +245,11 @@ func EditProject(ctx *context.Context) { return } + ctx.Data["projectID"] = p.ID ctx.Data["title"] = p.Title ctx.Data["content"] = p.Description ctx.Data["redirect"] = ctx.FormString("redirect") + ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() ctx.HTML(http.StatusOK, tplProjectsNew) } diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index e15f548a38dc3..91e17dee295f4 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -232,6 +232,7 @@ func EditProject(ctx *context.Context) { return } + ctx.Data["projectID"] = p.ID ctx.Data["title"] = p.Title ctx.Data["content"] = p.Description ctx.Data["card_type"] = p.CardType diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index 826869ac5daac..e7927221a8104 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -50,7 +50,7 @@
    {{if .PageIsEditProjects}} - + {{.locale.Tr "repo.milestones.cancel"}}
    -
    +
    diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index 2bf1d0ace582d..3f25c30c8b5d8 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -39,11 +39,11 @@
    {{range $mode := .AllowedUserVisibilityModes}} {{if $mode.IsPublic}} -
    {{$.locale.Tr "settings.visibility.public"}}
    +
    {{$.locale.Tr "settings.visibility.public"}}
    {{else if $mode.IsLimited}} -
    {{$.locale.Tr "settings.visibility.limited"}}
    +
    {{$.locale.Tr "settings.visibility.limited"}}
    {{else if $mode.IsPrivate}} -
    {{$.locale.Tr "settings.visibility.private"}}
    +
    {{$.locale.Tr "settings.visibility.private"}}
    {{end}} {{end}}
    diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 24b4e18fbff2e..a61c623964028 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -9,7 +9,7 @@
    {{if .IsSigned}} - + {{svg "octicon-bell"}} @@ -57,7 +57,7 @@ {{if and .IsSigned .MustChangePassword}}
    -
    +
    {{avatar $.Context .SignedUser 24 "tiny"}} {{.locale.Tr "user_profile_and_more"}} @@ -100,25 +100,23 @@ {{.CsrfTokenHtml}}
    {{.CsrfTokenHtml}}
    {{end}} -     + {{svg "octicon-bell"}} @@ -127,7 +125,7 @@ -
    +
    {{svg "octicon-plus"}} {{.locale.Tr "create_new"}} @@ -150,7 +148,7 @@
    -
    +
    {{avatar $.Context .SignedUser 24 "tiny"}} {{.locale.Tr "user_profile_and_more"}} diff --git a/templates/code/searchform.tmpl b/templates/code/searchform.tmpl index c4d05cd597d48..dfe7bc5b103c7 100644 --- a/templates/code/searchform.tmpl +++ b/templates/code/searchform.tmpl @@ -1,12 +1,12 @@
    -
    +
    {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    {{.locale.Tr (printf "explore.search.%s" (or .queryType "fuzzy"))}}
    -
    {{.locale.Tr "explore.search.fuzzy"}}
    -
    {{.locale.Tr "explore.search.match"}}
    +
    {{.locale.Tr "explore.search.fuzzy"}}
    +
    {{.locale.Tr "explore.search.match"}}
    diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 288313c7d4521..b311472b43ed2 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -32,9 +32,9 @@ {{end}} {{end}} {{if .IsFork}} - {{svg "octicon-repo-forked"}} + {{svg "octicon-repo-forked"}} {{else if .IsMirror}} - {{svg "octicon-mirror"}} + {{svg "octicon-mirror"}} {{end}}
    diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl index 57acd861e9eb1..59d63b19d4439 100644 --- a/templates/explore/repo_search.tmpl +++ b/templates/explore/repo_search.tmpl @@ -31,7 +31,7 @@
    {{if .OnlyShowRelevant}}
    - {{.locale.Tr "explore.relevant_repositories" ((printf "%s%s" $.Link "?no_filter=1")|Escape) | Safe}} + {{.locale.Tr "explore.relevant_repositories" ((printf "%s%s" $.Link "?no_filter=1")|Escape) | Safe}}
    {{end}}
    diff --git a/templates/install.tmpl b/templates/install.tmpl index 2e10b006b2563..497004005f69d 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -221,73 +221,73 @@
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index e1adaf1c1b163..78728c5173feb 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -6,7 +6,7 @@
    {{.Org.DisplayName}} {{if .EnableFeed}} - {{svg "octicon-rss" 36}} + {{svg "octicon-rss" 36}} {{end}} {{if .Org.Visibility.IsLimited}}
    {{.locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} @@ -43,9 +43,7 @@ {{end}}

    {{.locale.Tr "org.members"}} -
    - {{.MembersTotal}} {{svg "octicon-chevron-right"}} -
    + {{.MembersTotal}} {{svg "octicon-chevron-right"}}

    {{$isMember := .IsOrganizationMember}} @@ -61,9 +59,7 @@ {{if .IsOrganizationMember}}
    {{.locale.Tr "org.teams"}} -
    - {{.Org.NumTeams}} {{svg "octicon-chevron-right"}} -
    + {{.Org.NumTeams}} {{svg "octicon-chevron-right"}}
    {{range .Teams}} diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index a9fed40c5ec9e..195f8bdcd69d9 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -78,11 +78,11 @@ {{.locale.Tr "units.unit"}} {{.locale.Tr "org.teams.none_access"}} - {{svg "octicon-question" 16 "gt-ml-2"}} + {{svg "octicon-question" 16 "gt-ml-2"}} {{.locale.Tr "org.teams.read_access"}} - {{svg "octicon-question" 16 "gt-ml-2"}} + {{svg "octicon-question" 16 "gt-ml-2"}} {{.locale.Tr "org.teams.write_access"}} - {{svg "octicon-question" 16 "gt-ml-2"}} + {{svg "octicon-question" 16 "gt-ml-2"}} @@ -90,8 +90,8 @@ {{if ge $unit.MaxPerm 2}} -
    -
    +
    +
    {{$.locale.Tr $unit.DescKey}}
    @@ -119,7 +119,7 @@ {{range $t, $unit := $.Units}} {{if lt $unit.MaxPerm 2}} -
    +
    diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index b778e0a242d67..20c95c82789a6 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -85,7 +85,7 @@ {{.Title}}
    {{if and $.CanWriteProjects (ne .ID 0)}} -
    +
    {{svg "octicon-kebab-horizontal"}}
    @@ -238,7 +238,7 @@ {{end}}
    {{range .Assignees}} - {{avatar $.Context . 28 "mini gt-mr-3"}} + {{avatar $.Context . 28 "mini gt-mr-3"}} {{end}}
    diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index 5e8313fa5e362..b0e513cfb2314 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -11,11 +11,11 @@ {{range .workflows}} {{.Entry.Name}} {{if .IsInvalid}} - + {{else}} - + {{end}} diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index 70f47aeb9ca14..c3e2d56af3986 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -41,7 +41,7 @@ {{if $row.PreviousSha}} - + {{svg "octicon-versions"}} {{end}} diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 898be4d6bb987..162fa18764019 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -22,12 +22,12 @@ {{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}} - {{end}} {{if not $.DisableDownloadSourceArchives}} - {{end}} {{if and (not .IsDeleted) (not $.DisableDownloadSourceArchives)}} - {{else}} - {{end}} diff --git a/templates/repo/cite/cite_buttons.tmpl b/templates/repo/cite/cite_buttons.tmpl index 0f4fb43484642..6f9315249a9e8 100644 --- a/templates/repo/cite/cite_buttons.tmpl +++ b/templates/repo/cite/cite_buttons.tmpl @@ -6,6 +6,6 @@ BibTeX - diff --git a/templates/repo/cite/cite_modal.tmpl b/templates/repo/cite/cite_modal.tmpl index f00bab8859e4e..8f69f7d0ede8b 100644 --- a/templates/repo/cite/cite_modal.tmpl +++ b/templates/repo/cite/cite_modal.tmpl @@ -7,7 +7,7 @@
    {{template "repo/cite/cite_buttons" .}} - + {{svg "octicon-file-moved"}}
    diff --git a/templates/repo/clone_buttons.tmpl b/templates/repo/clone_buttons.tmpl index a10f18b9dc159..278ae3a9259cf 100644 --- a/templates/repo/clone_buttons.tmpl +++ b/templates/repo/clone_buttons.tmpl @@ -10,6 +10,6 @@ {{end}} - diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index b01532db48fb2..c50aa5eae885a 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -21,7 +21,7 @@

    {{RenderCommitMessage $.Context .Commit.Message $.RepoLink $.Repository.ComposeMetas}}{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses "root" $}}

    {{if not $.PageIsWiki}} -
    +
    {{.locale.Tr "repo.diff.browse_source"}} @@ -32,14 +32,14 @@
    {{.locale.Tr "repo.commit.operations"}}
    {{.locale.Tr "repo.branch.create_branch_operation"}}
    {{.locale.Tr "repo.commits.ssh_key_fingerprint"}}: + {{.locale.Tr "repo.commits.ssh_key_fingerprint"}}: {{.Verification.SigningSSHKey.Fingerprint}} {{else}} - {{.locale.Tr "repo.commits.gpg_key_id"}}: + {{.locale.Tr "repo.commits.gpg_key_id"}}: {{.Verification.SigningKey.PaddedKeyID}} {{end}} {{end}} diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 03fbbdfdc03f4..eeb50a219ce3f 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -19,7 +19,7 @@
    - + {{else if .IsDiffCompare}} {{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 3887706c27df7..27e3a74c1b75a 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -80,7 +80,7 @@
    -
    +
    diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 8926c518aecb4..4a5fc4b7cf13f 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -107,8 +107,8 @@
    {{if $showFileViewToggle}}
    - - + +
    {{end}} {{if $file.IsProtected}} diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index f28a3c5b5dc25..c14b145a379b4 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -33,7 +33,7 @@
    {{if and .Review}} {{if eq .Review.Type 0}} -
    +
    {{$.root.locale.Tr "repo.issues.review.pending"}}
    {{else}} diff --git a/templates/repo/diff/new_review.tmpl b/templates/repo/diff/new_review.tmpl index b4254bc397020..6ec1835515023 100644 --- a/templates/repo/diff/new_review.tmpl +++ b/templates/repo/diff/new_review.tmpl @@ -24,7 +24,7 @@
    {{$showSelfTooltip := (and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID))}} {{if $showSelfTooltip}} - + {{else}} @@ -32,7 +32,7 @@ {{end}} {{if $showSelfTooltip}} - + {{else}} diff --git a/templates/repo/diff/options_dropdown.tmpl b/templates/repo/diff/options_dropdown.tmpl index 2cb5abcb36d4f..8bb92c45fe028 100644 --- a/templates/repo/diff/options_dropdown.tmpl +++ b/templates/repo/diff/options_dropdown.tmpl @@ -1,4 +1,4 @@ -
    +
    {{svg "octicon-kebab-horizontal"}}
    {{.locale.Tr "repo.diff.show_diff_stats"}} diff --git a/templates/repo/diff/stats.tmpl b/templates/repo/diff/stats.tmpl index ac6e45a7e44b6..1e62fa6d6abd6 100644 --- a/templates/repo/diff/stats.tmpl +++ b/templates/repo/diff/stats.tmpl @@ -1,4 +1,4 @@ {{Add .file.Addition .file.Deletion}} - +
    diff --git a/templates/repo/diff/whitespace_dropdown.tmpl b/templates/repo/diff/whitespace_dropdown.tmpl index cacfb20a27ff7..790bcfef5ad79 100644 --- a/templates/repo/diff/whitespace_dropdown.tmpl +++ b/templates/repo/diff/whitespace_dropdown.tmpl @@ -1,4 +1,4 @@ -
    +
    {{svg "gitea-whitespace"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    @@ -28,4 +28,4 @@
    -{{if .IsSplitStyle}}{{svg "gitea-join"}}{{else}}{{svg "gitea-split"}}{{end}} +{{if .IsSplitStyle}}{{svg "gitea-join"}}{{else}}{{svg "gitea-split"}}{{end}} diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 737027f59006b..2a3c404d1a6f2 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -17,7 +17,7 @@
    /
    {{if eq $i $l}} - {{svg "octicon-info"}} + {{svg "octicon-info"}} {{else}} {{$v}} {{end}} diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl index 211859113f78f..426d53db7a360 100644 --- a/templates/repo/editor/upload.tmpl +++ b/templates/repo/editor/upload.tmpl @@ -15,7 +15,7 @@
    /
    {{if eq $i $l}} - {{svg "octicon-info"}} + {{svg "octicon-info"}} {{else}} {{$v}} {{end}} diff --git a/templates/repo/file_info.tmpl b/templates/repo/file_info.tmpl index 8de65bffa4a27..580966d35c051 100644 --- a/templates/repo/file_info.tmpl +++ b/templates/repo/file_info.tmpl @@ -15,7 +15,7 @@
    {{end}} {{if .LFSLock}} -
    +
    {{svg "octicon-lock" 16 "gt-mr-2"}} {{.LFSLockOwner}}
    diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index beea89399e99f..ef2549eb7cc02 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -14,7 +14,7 @@
    /
    {{.Name}} {{if $.EnableFeed}} - {{svg "octicon-rss" 18}} + {{svg "octicon-rss" 18}} {{end}}
    {{if .IsTemplate}} @@ -51,7 +51,7 @@ {{if $.RepoTransfer}}
    {{$.CsrfTokenHtml}} -
    +
    @@ -59,7 +59,7 @@
    {{$.CsrfTokenHtml}} -
    +
    @@ -68,7 +68,7 @@ {{end}} {{$.CsrfTokenHtml}} -
    +
    @@ -80,7 +80,7 @@ {{if not $.DisableStars}} {{$.CsrfTokenHtml}} -
    +
    @@ -93,14 +93,14 @@ {{if and (not .IsEmpty) ($.Permission.CanRead $.UnitTypeCode)}}
    + >
    -
    +
    {{if .CodeIndexerUnavailable}} {{svg "octicon-alert"}} @@ -71,7 +71,7 @@ {{if eq $n 0}} {{if and .CanCompareOrPull .IsViewBranch (not .Repository.IsArchived)}} - + {{end}} {{.locale.Tr "repo.find_file.go_to_file"}} @@ -113,7 +113,7 @@ {{if eq $n 0}}
    {{template "repo/clone_buttons" .}} -
    diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl index b79b7ae2be09c..a0d6b0ea05747 100644 --- a/templates/repo/issue/view_content/comments_delete_time.tmpl +++ b/templates/repo/issue/view_content/comments_delete_time.tmpl @@ -9,7 +9,7 @@
    {{.ctxData.locale.Tr "repo.issues.del_time"}}
    {{template "base/delete_modal_actions" .}}
    - diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 30345b0138bfa..4d5d6ee493271 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -34,12 +34,12 @@
    {{if .Review.Stale}} - + {{svg "octicon-hourglass" 16 "icon"}} {{end}} {{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed))}} - + {{svg "octicon-x" 16}}