 9057100182
			
		
	
	
	9057100182
	
	
	
		
			
			Extend API MarkupOptions to contain branch path.
The `api.MarkupOptions{}`  to have `BranchPath` which contains the
current branch. The `RenderMarkup` function utilizes a struct since there
are too many variables passed as arguments and that is not a good sign
for readability.
And `repo-editor.js` will contain a new form data which is `branch-path`
which will then be utilized by `edit.tmpl` as `data-branch-path`.
Closes: #4510
## Checklist
The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org).
### Tests
- I added test coverage for Go changes...
  - [ ] in their respective `*_test.go` for unit tests.
  - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server.
- I added test coverage for JavaScript changes...
  - [ ] in `web_src/js/*.test.js` if it can be unit tested.
  - [x] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)).
### Documentation
- [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change.
- [ ] I did not document these changes and I do not expect someone else to do it.
### Release notes
- [ ] I do not want this change to show in the release notes.
- [x] I want the title to show in the release notes with a link to this pull request.
- [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title.
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5781
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Nirmal Kumar R <tildezero@gmail.com>
Co-committed-by: Nirmal Kumar R <tildezero@gmail.com>
		
	
			
		
			
				
	
	
		
			74 lines
		
	
	
	
		
			3.8 KiB
		
	
	
	
		
			Go HTML Template
		
	
	
	
	
	
			
		
		
	
	
			74 lines
		
	
	
	
		
			3.8 KiB
		
	
	
	
		
			Go HTML Template
		
	
	
	
	
	
| {{template "base/head" .}}
 | |
| <div role="main" aria-label="{{.Title}}" class="page-content repository file editor edit">
 | |
| 	{{template "repo/header" .}}
 | |
| 	<div class="ui container">
 | |
| 		{{template "base/alert" .}}
 | |
| 		<form class="ui edit form" method="post">
 | |
| 			{{.CsrfTokenHtml}}
 | |
| 			<input type="hidden" name="last_commit" value="{{.last_commit}}">
 | |
| 			<input type="hidden" name="page_has_posted" value="{{.PageHasPosted}}">
 | |
| 			<div class="repo-editor-header">
 | |
| 				<div class="ui breadcrumb field{{if .Err_TreePath}} error{{end}}">
 | |
| 					<a class="section" href="{{$.BranchLink}}">{{.Repository.Name}}</a>
 | |
| 					{{$n := len .TreeNames}}
 | |
| 					{{$l := Eval $n "-" 1}}
 | |
| 					{{range $i, $v := .TreeNames}}
 | |
| 						<div class="breadcrumb-divider">/</div>
 | |
| 						{{if eq $i $l}}
 | |
| 							<input id="file-name" maxlength="255" value="{{$v}}" placeholder="{{ctx.Locale.Tr "repo.editor.name_your_file"}}" data-editorconfig="{{$.EditorconfigJson}}" required autofocus>
 | |
| 							<span data-tooltip-content="{{ctx.Locale.Tr "repo.editor.filename_help"}}">{{svg "octicon-info"}}</span>
 | |
| 						{{else}}
 | |
| 							<span class="section"><a href="{{$.BranchLink}}/{{index $.TreePaths $i | PathEscapeSegments}}">{{$v}}</a></span>
 | |
| 						{{end}}
 | |
| 					{{end}}
 | |
| 					<span>{{ctx.Locale.Tr "repo.editor.or"}} <a href="{{$.BranchLink}}{{if not .IsNewFile}}/{{PathEscapeSegments .TreePath}}{{end}}">{{ctx.Locale.Tr "repo.editor.cancel_lower"}}</a></span>
 | |
| 					<input type="hidden" id="tree_path" name="tree_path" value="{{.TreePath}}" required>
 | |
| 				</div>
 | |
| 			</div>
 | |
| 			<div class="field">
 | |
| 				<div class="ui top attached tabular menu" data-write="write" data-preview="preview" data-diff="diff">
 | |
| 					<a class="active item" data-tab="write">{{svg "octicon-code"}} {{if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.new_file"}}{{else}}{{ctx.Locale.Tr "repo.editor.edit_file"}}{{end}}</a>
 | |
| 					<a class="item" data-tab="preview" data-url="{{.Repository.Link}}/markup" data-context="{{.RepoLink}}" data-branch-path="{{.BranchNameSubURL}}" data-markup-mode="file">{{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}}</a>
 | |
| 					{{if not .IsNewFile}}
 | |
| 					<a class="item" data-tab="diff" hx-params="context,content" hx-vals='{"context":"{{.BranchLink}}"}' hx-include="#edit_area" hx-swap="innerHTML" hx-target=".tab[data-tab='diff']" hx-indicator=".tab[data-tab='diff']" hx-post="{{.RepoLink}}/_preview/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">{{svg "octicon-diff"}} {{ctx.Locale.Tr "repo.editor.preview_changes"}}</a>
 | |
| 					{{end}}
 | |
| 				</div>
 | |
| 				<div class="ui bottom attached active tab segment" data-tab="write">
 | |
| 					<textarea id="edit_area" name="content" class="tw-hidden" data-id="repo-{{.Repository.Name}}-{{.TreePath}}"
 | |
| 						data-url="{{.Repository.Link}}/markup"
 | |
| 						data-context="{{.RepoLink}}"
 | |
| 						data-previewable-extensions="{{.PreviewableExtensions}}"
 | |
| 						data-line-wrap-extensions="{{.LineWrapExtensions}}">{{.FileContent}}</textarea>
 | |
| 					<div class="editor-loading is-loading"></div>
 | |
| 				</div>
 | |
| 				<div class="ui bottom attached tab segment markup" data-tab="preview">
 | |
| 					{{ctx.Locale.Tr "loading"}}
 | |
| 				</div>
 | |
| 				<div class="ui bottom attached tab segment diff edit-diff" data-tab="diff">
 | |
| 					<div class="tw-p-16"></div>
 | |
| 				</div>
 | |
| 			</div>
 | |
| 			{{template "repo/editor/commit_form" .}}
 | |
| 		</form>
 | |
| 	</div>
 | |
| 	<div class="ui g-modal-confirm modal" id="edit-empty-content-modal">
 | |
| 		<div class="header">
 | |
| 			{{svg "octicon-file"}}
 | |
| 			{{ctx.Locale.Tr "repo.editor.commit_empty_file_header"}}
 | |
| 		</div>
 | |
| 		<div class="center content">
 | |
| 			<p>{{ctx.Locale.Tr "repo.editor.commit_empty_file_text"}}</p>
 | |
| 		</div>
 | |
| 		<div class="actions">
 | |
| 			<button class="ui cancel button">
 | |
| 				{{svg "octicon-x"}}
 | |
| 				{{ctx.Locale.Tr "repo.editor.cancel"}}
 | |
| 			</button>
 | |
| 			<button class="ui primary ok button">
 | |
| 				{{svg "fontawesome-save"}}
 | |
| 				{{ctx.Locale.Tr "repo.editor.commit_changes"}}
 | |
| 			</button>
 | |
| 		</div>
 | |
| 	</div>
 | |
| </div>
 | |
| {{template "base/footer" .}}
 |