test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

[Branch View] Protection Symbole (delete dublicate) (#7624) 

* delet protectin symbol on "action column"

* code format
This commit is contained in:
6543 2019-07-27 16:11:14 +02:00 committed by Lunny Xiao
parent cbf231a675
commit a19138c1d3
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/repo/branch/list.tmpl
View File

@ -59,7 +59,7 @@
</div> </div>
<div class="bar-group"> <div class="bar-group">
<div class="count count-ahead">{{.CommitsAhead}}</div> <div class="count count-ahead">{{.CommitsAhead}}</div>
<div class="bar bar-ahead" style="width: {{percentage .CommitsAhead .CommitsBehind .CommitsAhead}}%"></div> <div class="bar bar-ahead" style="width: {{percentage .CommitsAhead .CommitsBehind .CommitsAhead}}%"></div>
</div> </div>
</div> </div>
{{end}} {{end}}
@ -84,11 +84,9 @@
</td> </td>
{{if and $.IsWriter (not $.IsMirror)}} {{if and $.IsWriter (not $.IsMirror)}}
<td class="one wide right aligned"> <td class="one wide right aligned">
{{if .IsProtected}} {{if and .IsDeleted (not .IsProtected)}}
<i class="octicon octicon-shield"></i>
{{else if .IsDeleted}}
<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> <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}} {{else if (not .IsProtected)}}
<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> <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}} {{end}}
</td> </td>