Improve label edit buttons labels (#11841)

* Improve label edit buttons labels

Previously when editing the buttons in the "Edit Label" modal were a
strange "Update" and "No". Improved them to "Save" and "Cancel".

Also fixed indentation in the template file, recommended to view changes
with the "Hide whitespace changes" option enabled on GitHub.

* remove unnecessary button icon

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
tokarchuk/v1.17
silverwind 5 years ago committed by GitHub
parent b9e281265e
commit ca8ecf7ffc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      options/locale/locale_en-US.ini
  2. 95
      templates/repo/issue/labels/edit_delete_label.tmpl

@ -71,6 +71,7 @@ issues = Issues
milestones = Milestones milestones = Milestones
cancel = Cancel cancel = Cancel
save = Save
add = Add add = Add
add_all = Add All add_all = Add All
remove = Remove remove = Remove

@ -1,59 +1,58 @@
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> <i class="trash icon"></i>
{{.i18n.Tr "repo.issues.label_deletion"}} {{.i18n.Tr "repo.issues.label_deletion"}}
</div> </div>
<div class="content"> <div class="content">
<p>{{.i18n.Tr "repo.issues.label_deletion_desc"}}</p> <p>{{.i18n.Tr "repo.issues.label_deletion_desc"}}</p>
</div>
<div class="actions">
<div class="ui red basic inverted cancel button">
<i class="remove icon"></i>
{{.i18n.Tr "modal.no"}}
</div> </div>
<div class="actions"> <div class="ui green basic inverted ok button">
<div class="ui red basic inverted cancel button"> <i class="checkmark icon"></i>
<i class="remove icon"></i> {{.i18n.Tr "modal.yes"}}
{{.i18n.Tr "modal.no"}}
</div>
<div class="ui green basic inverted ok button">
<i class="checkmark icon"></i>
{{.i18n.Tr "modal.yes"}}
</div>
</div> </div>
</div> </div>
</div>
<div class="ui small edit-label modal"> <div class="ui small edit-label modal">
<div class="header"> <div class="header">
{{.i18n.Tr "repo.issues.label_modify"}} {{.i18n.Tr "repo.issues.label_modify"}}
</div> </div>
<div class="content"> <div class="content">
<form class="ui edit-label form" action="{{$.Link}}/edit" method="post"> <form class="ui edit-label form" action="{{$.Link}}/edit" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<input id="label-modal-id" name="id" type="hidden"> <input id="label-modal-id" name="id" type="hidden">
<div class="ui grid"> <div class="ui grid">
<div class="three wide column"> <div class="three wide column">
<div class="ui small input"> <div class="ui small input">
<input class="new-label-input emoji-input" name="title" placeholder="{{.i18n.Tr "repo.issues.new_label_placeholder"}}" autofocus required maxlength="50"> <input class="new-label-input emoji-input" name="title" placeholder="{{.i18n.Tr "repo.issues.new_label_placeholder"}}" autofocus required maxlength="50">
</div>
</div>
<div class="five wide column">
<div class="ui small fluid input">
<input class="new-label-desc-input" name="description" placeholder="{{.i18n.Tr "repo.issues.new_label_desc_placeholder"}}" maxlength="200">
</div>
</div>
<div class="color picker column">
<input class="color-picker" name="color" value="#70c24a" required maxlength="7">
</div> </div>
<div class="column precolors"> </div>
{{template "repo/issue/label_precolors"}} <div class="five wide column">
<div class="ui small fluid input">
<input class="new-label-desc-input" name="description" placeholder="{{.i18n.Tr "repo.issues.new_label_desc_placeholder"}}" maxlength="200">
</div> </div>
</div> </div>
</form> <div class="color picker column">
</div> <input class="color-picker" name="color" value="#70c24a" required maxlength="7">
<div class="actions"> </div>
<div class="ui negative button"> <div class="column precolors">
{{.i18n.Tr "modal.no"}} {{template "repo/issue/label_precolors"}}
</div> </div>
<div class="ui positive right labeled icon button">
{{.i18n.Tr "modal.modify"}}
<i class="checkmark icon"></i>
</div> </div>
</form>
</div>
<div class="actions">
<div class="ui negative button">
{{.i18n.Tr "cancel"}}
</div>
<div class="ui positive button">
{{.i18n.Tr "save"}}
</div> </div>
</div> </div>
</div>

Loading…
Cancel
Save