diff options
| author | 6543 <24977596+6543@users.noreply.github.com> | 2019-07-27 16:11:14 +0200 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2019-07-27 22:11:14 +0800 |
| commit | a19138c1d340ee0b4de7afb68b695ed3f2c858bf (patch) | |
| tree | a7f50db080482380644be178fa6666fdd64a79e9 /templates | |
| parent | cbf231a67595feb36fccb68dc00b2bc7607fa882 (diff) | |
| download | gitea-a19138c1d340ee0b4de7afb68b695ed3f2c858bf.tar.gz gitea-a19138c1d340ee0b4de7afb68b695ed3f2c858bf.zip | |
[Branch View] Protection Symbole (delete dublicate) (#7624)
* delet protectin symbol on "action column"
* code format
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/branch/list.tmpl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 13897f088c..ead9f4ba2d 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -59,7 +59,7 @@ </div> <div class="bar-group"> <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> {{end}} @@ -84,11 +84,9 @@ </td> {{if and $.IsWriter (not $.IsMirror)}} <td class="one wide right aligned"> - {{if .IsProtected}} - <i class="octicon octicon-shield"></i> - {{else if .IsDeleted}} + {{if and .IsDeleted (not .IsProtected)}} <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> {{end}} </td> |