From ca8ecf7ffcb66381f7a6fae0402a3742b99a6dc5 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 11 Jun 2020 23:06:20 +0200
Subject: [PATCH] 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>
---
 options/locale/locale_en-US.ini               |  1 +
 .../repo/issue/labels/edit_delete_label.tmpl  | 97 +++++++++----------
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 6227ceb2a2..958b70131e 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -71,6 +71,7 @@ issues = Issues
 milestones = Milestones
 
 cancel = Cancel
+save = Save
 add = Add
 add_all = Add All
 remove = Remove
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index 1ddfd39ee4..4ffa20ef17 100644
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -1,59 +1,58 @@
 <div class="ui small basic delete modal">
-		<div class="ui icon header">
-			<i class="trash icon"></i>
-			{{.i18n.Tr "repo.issues.label_deletion"}}
+	<div class="ui icon header">
+		<i class="trash icon"></i>
+		{{.i18n.Tr "repo.issues.label_deletion"}}
+	</div>
+	<div class="content">
+		<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 class="content">
-			<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 class="ui green basic inverted ok button">
-				<i class="checkmark icon"></i>
-				{{.i18n.Tr "modal.yes"}}
-			</div>
+		<div class="ui green basic inverted ok button">
+			<i class="checkmark icon"></i>
+			{{.i18n.Tr "modal.yes"}}
 		</div>
 	</div>
+</div>
 
-	<div class="ui small edit-label modal">
-		<div class="header">
-			{{.i18n.Tr "repo.issues.label_modify"}}
-		</div>
-		<div class="content">
-			<form class="ui edit-label form" action="{{$.Link}}/edit" method="post">
-				{{.CsrfTokenHtml}}
-				<input id="label-modal-id" name="id" type="hidden">
-				<div class="ui grid">
-					<div class="three wide column">
-						<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">
-						</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 class="column precolors">
-						{{template "repo/issue/label_precolors"}}
+<div class="ui small edit-label modal">
+	<div class="header">
+		{{.i18n.Tr "repo.issues.label_modify"}}
+	</div>
+	<div class="content">
+		<form class="ui edit-label form" action="{{$.Link}}/edit" method="post">
+			{{.CsrfTokenHtml}}
+			<input id="label-modal-id" name="id" type="hidden">
+			<div class="ui grid">
+				<div class="three wide column">
+					<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">
 					</div>
 				</div>
-			</form>
+				<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 class="column precolors">
+					{{template "repo/issue/label_precolors"}}
+				</div>
+			</div>
+		</form>
+	</div>
+	<div class="actions">
+		<div class="ui negative button">
+			{{.i18n.Tr "cancel"}}
 		</div>
-		<div class="actions">
-			<div class="ui negative button">
-				{{.i18n.Tr "modal.no"}}
-			</div>
-			<div class="ui positive right labeled icon button">
-				{{.i18n.Tr "modal.modify"}}
-				<i class="checkmark icon"></i>
-			</div>
+		<div class="ui positive button">
+			{{.i18n.Tr "save"}}
 		</div>
 	</div>
-	
+</div>
+