mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-30 19:08:37 +00:00 
			
		
		
		
	Remove RequireHighlightJS field, update plantuml example. (#19615)
				
					
				
			This commit is contained in:
		| @@ -132,15 +132,18 @@ copy javascript files from https://gitea.com/davidsvantesson/plantuml-code-highl | ||||
| `$GITEA_CUSTOM/public` folder. Then add the following to `custom/footer.tmpl`: | ||||
|  | ||||
| ```html | ||||
| {{if .RequireHighlightJS}} | ||||
| <script src="https://your-server.com/deflate.js"></script> | ||||
| <script src="https://your-server.com/encode.js"></script> | ||||
| <script src="https://your-server.com/plantuml_codeblock_parse.js"></script> | ||||
| <script> | ||||
|   <!-- Replace call with address to your plantuml server--> | ||||
|   parsePlantumlCodeBlocks("http://www.plantuml.com/plantuml"); | ||||
|   $(async () => { | ||||
|     if (!$('.language-plantuml').length) return; | ||||
|     await Promise.all([ | ||||
|       $.getScript('https://your-server.com/deflate.js'),  | ||||
|       $.getScript('https://your-server.com/encode.js'), | ||||
|       $.getScript('https://your-server.com/plantuml_codeblock_parse.js'), | ||||
|     ]); | ||||
|     // Replace call with address to your plantuml server | ||||
|     parsePlantumlCodeBlocks("https://www.plantuml.com/plantuml"); | ||||
|   }); | ||||
| </script> | ||||
| {{end}} | ||||
| ``` | ||||
|  | ||||
| You can then add blocks like the following to your markdown: | ||||
|   | ||||
| @@ -138,7 +138,6 @@ func Code(ctx *context.Context) { | ||||
| 	ctx.Data["queryType"] = queryType | ||||
| 	ctx.Data["SearchResults"] = searchResults | ||||
| 	ctx.Data["SearchResultLanguages"] = searchResultLanguages | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
| 	ctx.Data["PageIsViewCode"] = true | ||||
|  | ||||
| 	pager := context.NewPagination(total, setting.UI.RepoSearchPagingNum, page, 5) | ||||
|   | ||||
| @@ -47,8 +47,6 @@ func CherryPick(ctx *context.Context) { | ||||
| 		ctx.Data["commit_message"] = splits[1] | ||||
| 	} | ||||
|  | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
|  | ||||
| 	canCommit := renderCommitRights(ctx) | ||||
| 	ctx.Data["TreePath"] = "" | ||||
|  | ||||
| @@ -77,7 +75,6 @@ func CherryPickPost(ctx *context.Context) { | ||||
| 		ctx.Data["CherryPickType"] = "cherry-pick" | ||||
| 	} | ||||
|  | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
| 	canCommit := renderCommitRights(ctx) | ||||
| 	branchName := ctx.Repo.BranchName | ||||
| 	if form.CommitChoice == frmCommitChoiceNewBranch { | ||||
|   | ||||
| @@ -253,7 +253,6 @@ func FileHistory(ctx *context.Context) { | ||||
| // Diff show different from current commit to previous commit | ||||
| func Diff(ctx *context.Context) { | ||||
| 	ctx.Data["PageIsDiff"] = true | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
| 	ctx.Data["RequireTribute"] = true | ||||
|  | ||||
| 	userName := ctx.Repo.Owner.Name | ||||
|   | ||||
| @@ -67,7 +67,6 @@ func getParentTreeFields(treePath string) (treeNames, treePaths []string) { | ||||
| func editFile(ctx *context.Context, isNewFile bool) { | ||||
| 	ctx.Data["PageIsEdit"] = true | ||||
| 	ctx.Data["IsNewFile"] = isNewFile | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
| 	canCommit := renderCommitRights(ctx) | ||||
|  | ||||
| 	treePath := cleanUploadFileName(ctx.Repo.TreePath) | ||||
| @@ -197,7 +196,6 @@ func editFilePost(ctx *context.Context, form forms.EditRepoFileForm, isNewFile b | ||||
| 	ctx.Data["PageIsEdit"] = true | ||||
| 	ctx.Data["PageHasPosted"] = true | ||||
| 	ctx.Data["IsNewFile"] = isNewFile | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
| 	ctx.Data["TreePath"] = form.TreePath | ||||
| 	ctx.Data["TreeNames"] = treeNames | ||||
| 	ctx.Data["TreePaths"] = treePaths | ||||
|   | ||||
| @@ -794,7 +794,6 @@ func NewIssue(ctx *context.Context) { | ||||
| 	ctx.Data["Title"] = ctx.Tr("repo.issues.new") | ||||
| 	ctx.Data["PageIsIssueList"] = true | ||||
| 	ctx.Data["NewIssueChooseTemplate"] = len(ctx.IssueTemplatesFromDefaultBranch()) > 0 | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
| 	ctx.Data["RequireTribute"] = true | ||||
| 	ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes | ||||
| 	title := ctx.FormString("title") | ||||
| @@ -988,7 +987,6 @@ func NewIssuePost(ctx *context.Context) { | ||||
| 	ctx.Data["Title"] = ctx.Tr("repo.issues.new") | ||||
| 	ctx.Data["PageIsIssueList"] = true | ||||
| 	ctx.Data["NewIssueChooseTemplate"] = len(ctx.IssueTemplatesFromDefaultBranch()) > 0 | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
| 	ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes | ||||
| 	ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled | ||||
| 	upload.AddUploadContext(ctx, "comment") | ||||
| @@ -1177,7 +1175,6 @@ func ViewIssue(ctx *context.Context) { | ||||
| 		ctx.Data["IssueType"] = "all" | ||||
| 	} | ||||
|  | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
| 	ctx.Data["RequireTribute"] = true | ||||
| 	ctx.Data["IsProjectsEnabled"] = ctx.Repo.CanRead(unit.TypeProjects) | ||||
| 	ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled | ||||
|   | ||||
| @@ -24,8 +24,6 @@ const ( | ||||
|  | ||||
| // NewDiffPatch render create patch page | ||||
| func NewDiffPatch(ctx *context.Context) { | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
|  | ||||
| 	canCommit := renderCommitRights(ctx) | ||||
|  | ||||
| 	ctx.Data["TreePath"] = "" | ||||
| @@ -54,7 +52,6 @@ func NewDiffPatchPost(ctx *context.Context) { | ||||
| 	if form.CommitChoice == frmCommitChoiceNewBranch { | ||||
| 		branchName = form.NewBranchName | ||||
| 	} | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
| 	ctx.Data["TreePath"] = "" | ||||
| 	ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL() | ||||
| 	ctx.Data["FileContent"] = form.Content | ||||
|   | ||||
| @@ -743,7 +743,6 @@ func ViewPullFiles(ctx *context.Context) { | ||||
|  | ||||
| 	setCompareContext(ctx, baseCommit, commit, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name) | ||||
|  | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
| 	ctx.Data["RequireTribute"] = true | ||||
| 	if ctx.Data["Assignees"], err = models.GetRepoAssignees(ctx.Repo.Repository); err != nil { | ||||
| 		ctx.ServerError("GetAssignees", err) | ||||
| @@ -1050,7 +1049,6 @@ func CompareAndPullRequestPost(ctx *context.Context) { | ||||
| 	ctx.Data["IsDiffCompare"] = true | ||||
| 	ctx.Data["IsRepoToolbarCommits"] = true | ||||
| 	ctx.Data["RequireTribute"] = true | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
| 	ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes | ||||
| 	ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled | ||||
| 	upload.AddUploadContext(ctx, "comment") | ||||
|   | ||||
| @@ -47,7 +47,6 @@ func Search(ctx *context.Context) { | ||||
| 	ctx.Data["SourcePath"] = ctx.Repo.Repository.HTMLURL() | ||||
| 	ctx.Data["SearchResults"] = searchResults | ||||
| 	ctx.Data["SearchResultLanguages"] = searchResultLanguages | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
| 	ctx.Data["PageIsViewCode"] = true | ||||
|  | ||||
| 	pager := context.NewPagination(total, setting.UI.RepoSearchPagingNum, page, 5) | ||||
|   | ||||
| @@ -735,8 +735,6 @@ func PackagistHooksNewPost(ctx *context.Context) { | ||||
| } | ||||
|  | ||||
| func checkWebhook(ctx *context.Context) (*orgRepoCtx, *webhook.Webhook) { | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
|  | ||||
| 	orCtx, err := getOrgRepoCtx(ctx) | ||||
| 	if err != nil { | ||||
| 		ctx.ServerError("getOrgRepoCtx", err) | ||||
|   | ||||
| @@ -189,7 +189,6 @@ func renderViewPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) { | ||||
| 	ctx.Data["old_title"] = pageName | ||||
| 	ctx.Data["Title"] = pageName | ||||
| 	ctx.Data["title"] = pageName | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
|  | ||||
| 	isSideBar := pageName == "_Sidebar" | ||||
| 	isFooter := pageName == "_Footer" | ||||
| @@ -308,7 +307,6 @@ func renderRevisionPage(ctx *context.Context) (*git.Repository, *git.TreeEntry) | ||||
| 	ctx.Data["old_title"] = pageName | ||||
| 	ctx.Data["Title"] = pageName | ||||
| 	ctx.Data["title"] = pageName | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
| 	ctx.Data["Username"] = ctx.Repo.Owner.Name | ||||
| 	ctx.Data["Reponame"] = ctx.Repo.Repository.Name | ||||
|  | ||||
| @@ -384,7 +382,6 @@ func renderEditPage(ctx *context.Context) { | ||||
| 	ctx.Data["old_title"] = pageName | ||||
| 	ctx.Data["Title"] = pageName | ||||
| 	ctx.Data["title"] = pageName | ||||
| 	ctx.Data["RequireHighlightJS"] = true | ||||
|  | ||||
| 	// lookup filename in wiki - get filecontent, gitTree entry , real filename | ||||
| 	data, entry, _, noEntry := wikiContentsByName(ctx, commit, pageName) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user