Merge branch 'master' into branch-view-delete-table-header

go-gitea · Jul 26, 2019 · fbae417 · fbae417
2 parents 49803f6 + bebc6a3
commit fbae417
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -1407,6 +1407,7 @@ branch.deleted_by = Deleted by %s
 branch.restore_success = Branch '%s' has been restored.
 branch.restore_failed = Failed to restore branch '%s'.
 branch.protected_deletion_failed = Branch '%s' is protected. It cannot be deleted.
+branch.restore = Restore Branch '%s'
 
 topic.manage_topics = Manage Topics
 topic.done = Done

diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
@@ -87,9 +87,9 @@
 										{{if .IsProtected}}
 											<i class="octicon octicon-shield"></i>
 										{{else if .IsDeleted}}
-											<a class="undo-button" href data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID | urlquery}}&name={{.DeletedBranch.Name | urlquery}}"><i class="octicon octicon-reply"></i></a>
+											<a class="ui basic jump button icon poping up undo-button" href data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID | urlquery}}&name={{.DeletedBranch.Name | urlquery}}" data-content="{{$.i18n.Tr "repo.branch.restore" (.Name | EscapePound)}}" data-variation="tiny inverted" data-position="top right"><i class="octicon octicon-reply text blue"></i></a>
 										{{else}}
-											<a class="delete-branch-button" href data-url="{{$.Link}}/delete?name={{.Name | urlquery}}" data-name="{{.Name}}"><i class="trash icon text red"></i></a>
+											<a class="ui basic jump button icon poping up delete-branch-button" href data-url="{{$.Link}}/delete?name={{.Name | urlquery}}" data-content="{{$.i18n.Tr "repo.branch.delete" (.Name | EscapePound)}}" data-variation="tiny inverted" data-position="top right" data-name="{{.Name}}"><i class="trash icon text red"></i></a>
 										{{end}}
 										</td>
 									{{end}}