@ -13,7 +13,7 @@
{{ avatar .User }}
{{ avatar .User }}
</a>
</a>
{{ end }}
{{ end }}
<span class="text grey" >
<span>
{{ if .User }}
{{ if .User }}
<a href=" {{ .User .HomeLink }} "> {{ .User .GetDisplayName }} </a>
<a href=" {{ .User .HomeLink }} "> {{ .User .GetDisplayName }} </a>
{{ else if .Team }}
{{ else if .Team }}
@ -39,7 +39,7 @@
</span>
</span>
{{ end }}
{{ end }}
{{ if ( and $ .Permission .IsAdmin ( or ( eq .Review .Type 1 ) ( eq .Review .Type 3 ) ) ( not $ .Issue .IsClosed ) ) }}
{{ if ( and $ .Permission .IsAdmin ( or ( eq .Review .Type 1 ) ( eq .Review .Type 3 ) ) ( not $ .Issue .IsClosed ) ) }}
<a href="#" class="ui grey poping up icon dismiss-review-btn" data-review-id="dismiss-review- {{ .Review .ID }} " data-content=" {{ $ .i18n .Tr "repo.issues.dismiss_review" }} ">
<a href="#" class="ui muted poping up icon dismiss-review-btn" data-review-id="dismiss-review- {{ .Review .ID }} " data-content=" {{ $ .i18n .Tr "repo.issues.dismiss_review" }} ">
{{ svg "octicon-x" 1 6 }}
{{ svg "octicon-x" 1 6 }}
</a>
</a>
<div class="ui small modal" id="dismiss-review-modal">
<div class="ui small modal" id="dismiss-review-modal">
@ -172,9 +172,18 @@
{{ $ .i18n .Tr "repo.pulls.data_broken" }}
{{ $ .i18n .Tr "repo.pulls.data_broken" }}
</div>
</div>
{{ else if .IsPullWorkInProgress }}
{{ else if .IsPullWorkInProgress }}
<div class="item">
<div class="item toggle-wip df ac sb" data-title=" {{ .Issue .Title }} " data-wip-prefix=" {{ ( .WorkInProgressPrefix | Escape ) }} " data-update-url=" {{ $ .RepoLink }} /issues/ {{ .Issue .Index }} /title">
<i class="icon icon-octicon"> {{ svg "octicon-x" }} </i>
<div>
{{ $ .i18n .Tr "repo.pulls.cannot_merge_work_in_progress" ( .WorkInProgressPrefix | Escape ) | Str2html }}
<i class="icon icon-octicon"> {{ svg "octicon-x" }} </i>
{{ $ .i18n .Tr "repo.pulls.cannot_merge_work_in_progress" }}
</div>
<div>
{{ if or .HasIssuesOrPullsWritePermission .IsIssuePoster }}
<button class="ui compact button">
{{ $ .i18n .Tr "repo.pulls.remove_prefix" ( .WorkInProgressPrefix | Escape ) | Safe }}
</button>
{{ end }}
</div>
</div>
</div>
{{ else if .Issue .PullRequest .IsChecking }}
{{ else if .Issue .PullRequest .IsChecking }}
<div class="item">
<div class="item">
@ -182,7 +191,7 @@
{{ $ .i18n .Tr "repo.pulls.is_checking" }}
{{ $ .i18n .Tr "repo.pulls.is_checking" }}
</div>
</div>
{{ else if .Issue .PullRequest .IsEmpty }}
{{ else if .Issue .PullRequest .IsEmpty }}
<div class="item text grey ">
<div class="item">
<i class="icon icon-octicon"> {{ svg "octicon-alert" 1 6 }} </i>
<i class="icon icon-octicon"> {{ svg "octicon-alert" 1 6 }} </i>
{{ $ .i18n .Tr "repo.pulls.is_empty" }}
{{ $ .i18n .Tr "repo.pulls.is_empty" }}
</div>
</div>
@ -443,14 +452,14 @@
{{ svg "octicon-x" }}
{{ svg "octicon-x" }}
{{ $ .i18n .Tr "repo.pulls.no_merge_desc" }}
{{ $ .i18n .Tr "repo.pulls.no_merge_desc" }}
</div>
</div>
<div class="item text grey ">
<div class="item">
{{ svg "octicon-info" }}
{{ svg "octicon-info" }}
{{ $ .i18n .Tr "repo.pulls.no_merge_helper" }}
{{ $ .i18n .Tr "repo.pulls.no_merge_helper" }}
</div>
</div>
{{ end }}
{{ end }}
{{ else }}
{{ else }}
<div class="ui divider"></div>
<div class="ui divider"></div>
<div class="item text grey ">
<div class="item">
{{ svg "octicon-info" }}
{{ svg "octicon-info" }}
{{ $ .i18n .Tr "repo.pulls.no_merge_access" }}
{{ $ .i18n .Tr "repo.pulls.no_merge_access" }}
</div>
</div>
@ -503,7 +512,7 @@
{{ svg "octicon-x" }}
{{ svg "octicon-x" }}
{{ $ .i18n .Tr "repo.pulls.cannot_auto_merge_desc" }}
{{ $ .i18n .Tr "repo.pulls.cannot_auto_merge_desc" }}
</div>
</div>
<div class="item text grey ">
<div class="item">
{{ svg "octicon-info" }}
{{ svg "octicon-info" }}
{{ $ .i18n .Tr "repo.pulls.cannot_auto_merge_helper" }}
{{ $ .i18n .Tr "repo.pulls.cannot_auto_merge_helper" }}
</div>
</div>
@ -511,17 +520,21 @@
{{ end }}
{{ end }}
{{ if and ( gt .Issue .PullRequest .CommitsBehind 0 ) ( not .Issue .IsClosed ) ( not .Issue .PullRequest .IsChecking ) ( not .IsPullFilesConflicted ) ( not .IsPullRequestBroken ) ( not $ canAutoMerge ) }}
{{ if and ( gt .Issue .PullRequest .CommitsBehind 0 ) ( not .Issue .IsClosed ) ( not .Issue .PullRequest .IsChecking ) ( not .IsPullFilesConflicted ) ( not .IsPullRequestBroken ) ( not $ canAutoMerge ) }}
<div class="item text grey">
<div class="item df ac sb">
<i class="icon icon-octicon"> {{ svg "octicon-alert" }} </i>
<div>
{{ $ .i18n .Tr "repo.pulls.outdated_with_base_branch" }}
<i class="icon icon-octicon"> {{ svg "octicon-alert" }} </i>
{{ if .UpdateAllowed }}
{{ $ .i18n .Tr "repo.pulls.outdated_with_base_branch" }}
<form action=" {{ .Link }} /update" method="post" class="ui floating right">
</div>
{{ .CsrfTokenHtml }}
<div>
<button class="ui compact button" data-do="update">
{{ if .UpdateAllowed }}
<span class="ui text"> {{ $ .i18n .Tr "repo.pulls.update_branch" }} </span>
<form action=" {{ .Link }} /update" method="post">
</button>
{{ .CsrfTokenHtml }}
</form>
<button class="ui compact button" data-do="update">
{{ end }}
<span class="ui text"> {{ $ .i18n .Tr "repo.pulls.update_branch" }} </span>
</button>
</form>
{{ end }}
</div>
</div>
</div>
{{ end }}
{{ end }}