Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 27, 2019
Merged

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

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02f098e
delet protectin symbol on "action column"
6543 Jul 26, 2019
1bde687
Merge branch 'master' into branch-view-protection-symbole
6543 Jul 26, 2019
1dac49b
Merge branch 'master' into branch-view-protection-symbole
6543 Jul 26, 2019
6b8ac00
code format
6543 Jul 26, 2019
e90a8c4
Merge branch 'master' into branch-view-protection-symbole
6543 Jul 27, 2019
5fc382d
Merge branch 'master' into branch-view-protection-symbole
lafriks Jul 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions templates/repo/branch/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand All @@ -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>
Expand Down