diff options
author | Richard Mahn <richmahn@users.noreply.github.com> | 2019-07-17 14:40:28 -0400 |
---|---|---|
committer | techknowlogick <techknowlogick@gitea.io> | 2019-07-17 14:40:28 -0400 |
commit | 5d3e3518645d707d99c6ea244a195b7240782e74 (patch) | |
tree | a5480b9ae7691917cce11be47218f253d78bc603 /templates | |
parent | 361607d83109014a8dfd40e97c6f95a0e869dca3 (diff) | |
download | gitea-5d3e3518645d707d99c6ea244a195b7240782e74.tar.gz gitea-5d3e3518645d707d99c6ea244a195b7240782e74.zip |
Fixes #7474 - Handles all redirects for Web UI File CRUD (#7478)
* Fixes #7474 - Handles all redirects for Web UI File CRUD
* Fixes lint errors
* Typo fix
* Adds unit tests for a few helper functions
* Fixes per review
* Fix for new branch creation and to unit test
* Fixes the template used for errors on delete
Diffstat (limited to 'templates')
-rw-r--r-- | templates/repo/editor/commit_form.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index 86749623eb..d22cd07b03 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -11,7 +11,7 @@ <div class="quick-pull-choice js-quick-pull-choice"> <div class="field"> <div class="ui radio checkbox {{if not .CanCommitToBranch}}disabled{{end}}"> - <input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" {{if eq .commit_choice "direct"}}checked{{end}}> + <input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="direct" button_text="{{.i18n.Tr "repo.editor.commit_changes"}}" {{if eq .commit_choice "direct"}}checked{{end}}> <label> <i class="octicon octicon-git-commit" height="16" width="14"></i> {{.i18n.Tr "repo.editor.commit_directly_to_this_branch" (.BranchName|Escape) | Safe}} @@ -20,7 +20,7 @@ </div> <div class="field"> <div class="ui radio checkbox"> - <input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}> + <input type="radio" class="js-quick-pull-choice-option" name="commit_choice" value="commit-to-new-branch" button_text="{{.i18n.Tr "repo.editor.propose_file_change"}}" {{if eq .commit_choice "commit-to-new-branch"}}checked{{end}}> <label> <i class="octicon octicon-git-pull-request" height="16" width="12"></i> {{.i18n.Tr "repo.editor.create_new_branch" | Safe}} @@ -36,8 +36,8 @@ </div> </div> </div> - <button type="submit" class="ui green button"> - {{.i18n.Tr "repo.editor.commit_changes"}} + <button id="commit-button" type="submit" class="ui green button"> + {{if eq .commit_choice "commit-to-new-branch"}}{{.i18n.Tr "repo.editor.propose_file_change"}}{{else}}{{.i18n.Tr "repo.editor.commit_changes"}}{{end}} </button> <a class="ui button red" href="{{EscapePound $.BranchLink}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.editor.cancel"}}</a> </div> |