mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-19 03:21:05 +00:00
1. Fix ugly commit form "warning" message 2. Use JSONError for "Update PR Branch" response 3. Remove useless "timeline" class 4. Make timeline review default to "comment" to avoid icon missing 5. Align PR's "command line instructions" UI 6. Simply "Update PR branch" button logic And then some TODOs are fixed. --------- Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>
88 lines
4.9 KiB
Handlebars
88 lines
4.9 KiB
Handlebars
<div class="commit-form-wrapper">
|
|
{{ctx.AvatarUtils.Avatar .SignedUser 40 "commit-avatar"}}
|
|
<div class="commit-form avatar-content-left-arrow">
|
|
<h3>
|
|
{{- if .CommitFormOptions.WillSign}}
|
|
<span data-tooltip-content="{{ctx.Locale.Tr "repo.signing.will_sign" .CommitFormOptions.SigningKeyFormDisplay}}">{{svg "octicon-lock" 24}}</span>
|
|
{{ctx.Locale.Tr "repo.editor.commit_signed_changes"}}
|
|
{{- else}}
|
|
<span title="{{ctx.Locale.Tr (printf "repo.signing.wont_sign.%s" .CommitFormOptions.WontSignReason)}}">{{svg "octicon-unlock" 24}}</span>
|
|
{{ctx.Locale.Tr "repo.editor.commit_changes"}}
|
|
{{- end}}
|
|
</h3>
|
|
<div class="field">
|
|
<input name="commit_summary" maxlength="100" placeholder="{{if .PageIsDelete}}{{ctx.Locale.Tr "repo.editor.delete" .TreePath}}{{else if .PageIsUpload}}{{ctx.Locale.Tr "repo.editor.upload_files_to_dir" .TreePath}}{{else if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.add_tmpl"}}{{else if .PageIsPatch}}{{ctx.Locale.Tr "repo.editor.patch"}}{{else}}{{ctx.Locale.Tr "repo.editor.update" .TreePath}}{{end}}" value="{{.commit_summary}}">
|
|
</div>
|
|
<div class="field">
|
|
<textarea name="commit_message" placeholder="{{ctx.Locale.Tr "repo.editor.commit_message_desc"}}" rows="5">{{.commit_message}}</textarea>
|
|
</div>
|
|
<div class="inline field">
|
|
<div class="ui checkbox">
|
|
<input name="signoff" type="checkbox">
|
|
<label>{{ctx.Locale.Tr "repo.editor.signoff_desc"}}</label>
|
|
</div>
|
|
</div>
|
|
<div class="field quick-pull-choice js-quick-pull-choice">
|
|
<div class="field">
|
|
<div class="ui radio checkbox {{if not .CommitFormOptions.CanCommitToBranch}}disabled{{end}}">
|
|
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" data-button-text="{{ctx.Locale.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "direct"}}checked{{end}}>
|
|
<label>
|
|
{{svg "octicon-git-commit"}}
|
|
{{ctx.Locale.Tr "repo.editor.commit_directly_to_this_branch" .BranchName}}
|
|
{{if not .CommitFormOptions.CanCommitToBranch}}
|
|
<div class="tw-mt-2">
|
|
{{ctx.Locale.Tr "repo.editor.no_commit_to_branch"}}
|
|
<ul class="tw-mb-0">
|
|
{{if not .CommitFormOptions.UserCanPush}}<li>{{ctx.Locale.Tr "repo.editor.user_no_push_to_branch"}}</li>{{end}}
|
|
{{if and .CommitFormOptions.RequireSigned (not .CommitFormOptions.WillSign)}}<li>{{ctx.Locale.Tr "repo.editor.require_signed_commit"}}</li>{{end}}
|
|
</ul>
|
|
</div>
|
|
{{end}}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
{{if and (not .Repository.IsEmpty) (not .IsEditingFileOnly)}}
|
|
<div class="field">
|
|
<div class="ui radio checkbox">
|
|
{{if .CommitFormOptions.CanCreatePullRequest}}
|
|
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" data-button-text="{{ctx.Locale.Tr "repo.editor.propose_file_change"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
|
|
{{else}}
|
|
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" data-button-text="{{ctx.Locale.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
|
|
{{end}}
|
|
<label>
|
|
{{svg "octicon-git-pull-request"}}
|
|
{{if .CommitFormOptions.CanCreatePullRequest}}
|
|
{{ctx.Locale.Tr "repo.editor.create_new_branch"}}
|
|
{{else}}
|
|
{{ctx.Locale.Tr "repo.editor.create_new_branch_np"}}
|
|
{{end}}
|
|
</label>
|
|
</div>
|
|
</div>
|
|
<div class="quick-pull-branch-name {{if not (eq .commit_choice "commit-to-new-branch")}}tw-hidden{{end}}">
|
|
<div class="new-branch-name-input field">
|
|
{{svg "octicon-git-branch"}}
|
|
<input type="text" name="new_branch_name" maxlength="100" value="{{.new_branch_name}}" class="input-contrast tw-mr-1 js-quick-pull-new-branch-name" placeholder="{{ctx.Locale.Tr "repo.editor.new_branch_name_desc"}}" {{if eq .commit_choice "commit-to-new-branch"}}required{{end}} title="{{ctx.Locale.Tr "repo.editor.new_branch_name"}}">
|
|
<span class="text-muted js-quick-pull-normalization-info"></span>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{if and .CommitCandidateEmails (gt (len .CommitCandidateEmails) 1)}}
|
|
<div class="field">
|
|
<label>{{ctx.Locale.Tr "repo.editor.commit_email"}}</label>
|
|
<select class="ui selection dropdown" name="commit_email">
|
|
{{- range $email := .CommitCandidateEmails -}}
|
|
<option {{if eq $email $.CommitDefaultEmail}}selected{{end}} value="{{$email}}">{{$email}}</option>
|
|
{{- end -}}
|
|
</select>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
<input type="hidden" name="last_commit" value="{{.last_commit}}">
|
|
<button id="commit-button" type="submit" class="ui primary button">
|
|
{{if eq .commit_choice "commit-to-new-branch"}}{{ctx.Locale.Tr "repo.editor.propose_file_change"}}{{else}}{{ctx.Locale.Tr "repo.editor.commit_changes"}}{{end}}
|
|
</button>
|
|
<a class="ui button red" href="{{if .ReturnURI}}{{.ReturnURI}}{{else}}{{$.BranchLink}}/{{PathEscapeSegments .TreePath}}{{end}}">{{ctx.Locale.Tr "repo.editor.cancel"}}</a>
|
|
</div>
|