2016-08-28 08:41:44 +00:00
|
|
|
<div class="commit-form-wrapper">
|
2023-08-10 03:19:39 +00:00
|
|
|
{{ctx.AvatarUtils.Avatar .SignedUser 48 "commit-avatar"}}
|
2016-08-28 08:41:44 +00:00
|
|
|
<div class="commit-form">
|
2020-01-15 08:32:57 +00:00
|
|
|
<h3>{{- if .CanCommitToBranch.WillSign}}
|
2023-09-25 08:56:50 +00:00
|
|
|
<span title="{{ctx.Locale.Tr "repo.signing.will_sign" .CanCommitToBranch.SigningKey}}">{{svg "octicon-lock" 24}}</span>
|
|
|
|
{{ctx.Locale.Tr "repo.editor.commit_signed_changes"}}
|
2020-01-15 08:32:57 +00:00
|
|
|
{{- else}}
|
2023-09-25 08:56:50 +00:00
|
|
|
<span title="{{ctx.Locale.Tr (printf "repo.signing.wont_sign.%s" .CanCommitToBranch.WontSignReason)}}">{{svg "octicon-unlock" 24}}</span>
|
|
|
|
{{ctx.Locale.Tr "repo.editor.commit_changes"}}
|
2020-01-15 08:32:57 +00:00
|
|
|
{{- end}}</h3>
|
2016-08-28 08:41:44 +00:00
|
|
|
<div class="field">
|
2024-04-16 10:37:32 +00:00
|
|
|
<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.TrString "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}}" autofocus>
|
2016-08-28 08:41:44 +00:00
|
|
|
</div>
|
|
|
|
<div class="field">
|
2023-09-25 08:56:50 +00:00
|
|
|
<textarea name="commit_message" placeholder="{{ctx.Locale.Tr "repo.editor.commit_message_desc"}}" rows="5">{{.commit_message}}</textarea>
|
2016-08-28 08:41:44 +00:00
|
|
|
</div>
|
2021-01-29 08:57:45 +00:00
|
|
|
<div class="inline field">
|
|
|
|
<div class="ui checkbox">
|
2023-08-26 02:44:00 +00:00
|
|
|
<input name="signoff" type="checkbox">
|
2023-09-25 08:56:50 +00:00
|
|
|
<label>{{ctx.Locale.Tr "repo.editor.signoff_desc"}}</label>
|
2021-01-29 08:57:45 +00:00
|
|
|
</div>
|
|
|
|
</div>
|
2016-08-28 08:41:44 +00:00
|
|
|
<div class="quick-pull-choice js-quick-pull-choice">
|
|
|
|
<div class="field">
|
2020-01-15 08:32:57 +00:00
|
|
|
<div class="ui radio checkbox {{if not .CanCommitToBranch.CanCommitToBranch}}disabled{{end}}">
|
2023-09-25 08:56:50 +00:00
|
|
|
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" button_text="{{ctx.Locale.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "direct"}}checked{{end}}>
|
2016-08-28 08:41:44 +00:00
|
|
|
<label>
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-git-commit"}}
|
2024-10-30 15:59:48 +00:00
|
|
|
{{ctx.Locale.Tr "repo.editor.commit_directly_to_this_branch" .BranchName "branch-name"}}
|
2020-01-15 08:32:57 +00:00
|
|
|
{{if not .CanCommitToBranch.CanCommitToBranch}}
|
|
|
|
<div class="ui visible small warning message">
|
2023-09-25 08:56:50 +00:00
|
|
|
{{ctx.Locale.Tr "repo.editor.no_commit_to_branch"}}
|
2020-01-15 08:32:57 +00:00
|
|
|
<ul>
|
2023-09-25 08:56:50 +00:00
|
|
|
{{if not .CanCommitToBranch.UserCanPush}}<li>{{ctx.Locale.Tr "repo.editor.user_no_push_to_branch"}}</li>{{end}}
|
|
|
|
{{if and .CanCommitToBranch.RequireSigned (not .CanCommitToBranch.WillSign)}}<li>{{ctx.Locale.Tr "repo.editor.require_signed_commit"}}</li>{{end}}
|
2020-01-15 08:32:57 +00:00
|
|
|
</ul>
|
|
|
|
</div>
|
|
|
|
{{end}}
|
2016-08-28 08:41:44 +00:00
|
|
|
</label>
|
|
|
|
</div>
|
|
|
|
</div>
|
2023-04-19 13:40:42 +00:00
|
|
|
{{if not .Repository.IsEmpty}}
|
2016-08-28 08:41:44 +00:00
|
|
|
<div class="field">
|
|
|
|
<div class="ui radio checkbox">
|
2023-05-24 21:36:02 +00:00
|
|
|
{{if .CanCreatePullRequest}}
|
2023-09-25 08:56:50 +00:00
|
|
|
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{ctx.Locale.Tr "repo.editor.propose_file_change"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
|
2019-10-05 02:09:19 +00:00
|
|
|
{{else}}
|
2023-09-25 08:56:50 +00:00
|
|
|
<input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{ctx.Locale.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}>
|
2019-10-05 02:09:19 +00:00
|
|
|
{{end}}
|
2016-08-28 08:41:44 +00:00
|
|
|
<label>
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-git-pull-request"}}
|
2023-05-24 21:36:02 +00:00
|
|
|
{{if .CanCreatePullRequest}}
|
2024-02-22 17:02:33 +00:00
|
|
|
{{ctx.Locale.Tr "repo.editor.create_new_branch"}}
|
2019-10-05 02:09:19 +00:00
|
|
|
{{else}}
|
2024-02-22 17:02:33 +00:00
|
|
|
{{ctx.Locale.Tr "repo.editor.create_new_branch_np"}}
|
2019-10-05 02:09:19 +00:00
|
|
|
{{end}}
|
2016-08-28 08:41:44 +00:00
|
|
|
</label>
|
|
|
|
</div>
|
|
|
|
</div>
|
2024-03-24 18:23:38 +00:00
|
|
|
<div class="quick-pull-branch-name {{if not (eq .commit_choice "commit-to-new-branch")}}tw-hidden{{end}}">
|
2016-08-28 08:41:44 +00:00
|
|
|
<div class="new-branch-name-input field {{if .Err_NewBranchName}}error{{end}}">
|
2020-09-11 20:19:00 +00:00
|
|
|
{{svg "octicon-git-branch"}}
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 16:42:49 +00:00
|
|
|
<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"}}">
|
2016-08-28 08:41:44 +00:00
|
|
|
<span class="text-muted js-quick-pull-normalization-info"></span>
|
|
|
|
</div>
|
|
|
|
</div>
|
2023-04-19 13:40:42 +00:00
|
|
|
{{end}}
|
2016-08-28 08:41:44 +00:00
|
|
|
</div>
|
2023-11-16 23:17:40 +00:00
|
|
|
<div class="field {{if .Err_CommitMailID}}error{{end}}">
|
|
|
|
<label for="commit_mail_id">Commit email</label>
|
|
|
|
<select class="ui selection dropdown" name="commit_mail_id">
|
|
|
|
{{range .CommitMails}}
|
|
|
|
<option{{if eq $.DefaultCommitMail .Email}} selected="selected"{{end}} value="{{.ID}}">{{.Email}}</option>
|
|
|
|
{{end}}
|
|
|
|
</select>
|
|
|
|
</div>
|
2016-08-28 08:41:44 +00:00
|
|
|
</div>
|
2023-09-18 22:05:31 +00:00
|
|
|
<button id="commit-button" type="submit" class="ui primary button">
|
2023-09-25 12:42:40 +00:00
|
|
|
{{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}}
|
2016-08-28 08:41:44 +00:00
|
|
|
</button>
|
2023-09-25 08:56:50 +00:00
|
|
|
<a class="ui button red" href="{{$.BranchLink}}/{{PathEscapeSegments .TreePath}}">{{ctx.Locale.Tr "repo.editor.cancel"}}</a>
|
2017-05-02 00:49:55 +00:00
|
|
|
</div>
|