diff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html --- a/appview/pages/templates/repo/pulls/pulls.html +++ b/appview/pages/templates/repo/pulls/pulls.html @@ -83,63 +83,47 @@ {{ template "repo/fragments/time" .Created }} - - targeting - - {{ .TargetBranch }} - - - {{ if not .IsPatchBased }} - from - - {{ if .IsForkBased }} - {{ if .PullSource.Repo }} - {{ $owner }}/{{ .PullSource.Repo.Name }}: - {{- else -}} - [deleted fork] - {{- end -}} - {{- end -}} - {{- .PullSource.Branch -}} - - {{ end }} - - {{ $latestRound := .LastRoundNumber }} - {{ $lastSubmission := index .Submissions $latestRound }} - round - - #{{ .LastRoundNumber }} - - {{ $commentCount := len $lastSubmission.Comments }} - {{ $s := "s" }} - {{ if eq $commentCount 1 }} - {{ $s = "" }} - {{ end }} - {{ if eq $commentCount 0 }} - awaiting comments - {{ else }} - recieved {{ len $lastSubmission.Comments}} comment{{$s}} - {{ end }} + {{ $latestRound := .LastRoundNumber }} + {{ $lastSubmission := index .Submissions $latestRound }} + + + {{ $commentCount := len $lastSubmission.Comments }} + {{ $s := "s" }} + {{ if eq $commentCount 1 }} + {{ $s = "" }} + {{ end }} + + {{ len $lastSubmission.Comments}} comment{{$s}} + + + + round + + #{{ .LastRoundNumber }} +

{{ if .StackId }} {{ $otherPulls := index $.Stacks .StackId }} -
- - {{ $s := "s" }} - {{ if eq (len $otherPulls) 1 }} - {{ $s = "" }} - {{ end }} -
- {{ i "chevrons-up-down" "w-4 h-4" }} expand {{ len $otherPulls }} pull{{$s}} in this stack -
- -
- {{ block "pullList" (list $otherPulls $) }} {{ end }} -
+ {{ if gt (len $otherPulls) 0 }} +
+ + {{ $s := "s" }} + {{ if eq (len $otherPulls) 1 }} + {{ $s = "" }} + {{ end }} +
+ {{ i "chevrons-up-down" "w-4 h-4" }} expand {{ len $otherPulls }} pull{{$s}} in this stack +
+ +
+ {{ block "pullList" (list $otherPulls $) }} {{ end }} +
+ {{ end }} {{ end }} {{ end }}