diff --git a/appview/pages/templates/repo/pulls/fragments/pullActions.html b/appview/pages/templates/repo/pulls/fragments/pullActions.html --- a/appview/pages/templates/repo/pulls/fragments/pullActions.html +++ b/appview/pages/templates/repo/pulls/fragments/pullActions.html @@ -22,95 +22,93 @@ {{ $isPullAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Pull.OwnerDid) }} {{ $isLastRound := eq $roundNumber $lastIdx }} {{ $isSameRepoBranch := .Pull.IsBranchBased }} {{ $isUpToDate := .ResubmitCheck.No }} -
-
- - {{ if .BranchDeleteStatus }} - - {{ end }} - {{ if and $isPushAllowed $isOpen $isLastRound }} - {{ $disabled := "" }} - {{ if $isConflicted }} - {{ $disabled = "disabled" }} - {{ end }} - - {{ end }} +
+ + {{ if .BranchDeleteStatus }} + + {{ end }} + {{ if and $isPushAllowed $isOpen $isLastRound }} + {{ $disabled := "" }} + {{ if $isConflicted }} + {{ $disabled = "disabled" }} + {{ end }} + + {{ end }} - {{ if and $isPullAuthor $isOpen $isLastRound }} - {{ $disabled := "" }} - {{ if $isUpToDate }} - {{ $disabled = "disabled" }} + {{ if and $isPullAuthor $isOpen $isLastRound }} + {{ $disabled := "" }} + {{ if $isUpToDate }} + {{ $disabled = "disabled" }} + {{ end }} + - {{ end }} + {{ if $disabled }} + title="Update this branch to resubmit this pull request" + {{ else }} + title="Resubmit this pull request" + {{ end }} + > + {{ i "rotate-ccw" "w-4 h-4" }} + resubmit + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} + + {{ end }} - {{ if and (or $isPullAuthor $isPushAllowed) $isOpen $isLastRound }} - - {{ end }} + {{ if and (or $isPullAuthor $isPushAllowed) $isOpen $isLastRound }} + + {{ end }} - {{ if and (or $isPullAuthor $isPushAllowed) $isClosed $isLastRound }} - - {{ end }} -
+ {{ if and (or $isPullAuthor $isPushAllowed) $isClosed $isLastRound }} + + {{ end }}
{{ end }}