Skip to content
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

Jump to bottom

Tweak pull request branch delete ui #23951

Merged
merged 14 commits into from
Apr 23, 2023
Merged

Tweak pull request branch delete ui #23951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9ba07c1
Tweak pull request branch delete ui
silverwind Apr 6, 2023
c9a7cb1
fix closing tag
silverwind Apr 6, 2023
f22a03a
handle closed state as well, hide cli when closed
silverwind Apr 6, 2023
5c53324
more alignment
silverwind Apr 6, 2023
294c0e7
revert closed to grey
silverwind Apr 22, 2023
bb9213f
rework merge box
silverwind Apr 22, 2023
e9bb2e8
update delete box as well
silverwind Apr 22, 2023
d131252
Merge branch 'main' into pr-delete
silverwind Apr 22, 2023
5cd6d06
wip
silverwind Apr 23, 2023
69936ef
Revert "wip"
silverwind Apr 23, 2023
e4d2e83
escape HeadTarget
silverwind Apr 23, 2023
cbbe681
Merge branch 'main' into pr-delete
silverwind Apr 23, 2023
0ef3da6
Merge branch 'main' into pr-delete
GiteaBot Apr 23, 2023
314bc97
Merge branch 'main' into pr-delete
GiteaBot Apr 23, 2023
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
6 changes: 3 additions & 3 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1623,11 +1623,11 @@ pulls.tab_files = Files Changed
pulls.reopen_to_merge = Please reopen this pull request to perform a merge.
pulls.cant_reopen_deleted_branch = This pull request cannot be reopened because the branch was deleted.
pulls.merged = Merged
pulls.merged_as = The pull request has been merged as <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
pulls.merged_success = Pull request successfully merged and closed
pulls.closed = Pull request closed
pulls.manually_merged = Manually merged
pulls.manually_merged_as = The pull request has been manually merged as <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
pulls.merged_info_text = The branch %s can now be deleted.
pulls.is_closed = The pull request has been closed.
pulls.has_merged = The pull request has been merged.
pulls.title_wip_desc = `<a href="#">Start the title with <strong>%s</strong></a> to prevent the pull request from being merged accidentally.`
pulls.cannot_merge_work_in_progress = This pull request is marked as a work in progress.
pulls.still_in_progress = Still in progress?
Expand Down
57 changes: 28 additions & 29 deletions templates/repo/issue/view_content/pull.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
</div>
{{end}}
<div class="timeline-item comment merge box">
<a class="timeline-avatar text {{if .Issue.PullRequest.HasMerged}}purple
<a class="timeline-avatar text {{if .Issue.PullRequest.HasMerged}}purple
{{- else if .Issue.IsClosed}}grey
{{- else if .IsPullWorkInProgress}}grey
{{- else if .IsFilesConflicted}}grey
Expand All @@ -131,38 +131,37 @@
{{$showGeneralMergeForm := false}}
<div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header{{end}}">
{{if .Issue.PullRequest.HasMerged}}
<div class="item text">
{{if .Issue.PullRequest.MergedCommitID}}
{{$link := printf "%s/commit/%s" $.Repository.Link (.Issue.PullRequest.MergedCommitID|PathEscape)}}
{{if eq $.Issue.PullRequest.Status 3}}
{{$.locale.Tr "repo.pulls.manually_merged_as" ($link|Escape) (ShortSha .Issue.PullRequest.MergedCommitID) | Safe}}
silverwind marked this conversation as resolved.
Show resolved Hide resolved
{{else}}
{{$.locale.Tr "repo.pulls.merged_as" ($link|Escape) (ShortSha .Issue.PullRequest.MergedCommitID) | Safe}}
{{end}}
{{else}}
{{$.locale.Tr "repo.pulls.has_merged"}}
<div class="item item-section text gt-f1">
<div class="item-section-left">
<h3 class="gt-mb-3">{{$.locale.Tr "repo.pulls.merged_success"}}</h3>
<div class="merge-section-info">
{{$.locale.Tr "repo.pulls.merged_info_text" (printf "<code>%s</code>" (.HeadTarget | Escape)) | Str2html}}
</div>
</div>
{{if .IsPullBranchDeletable}}
<div class="item-section-right">
<button class="delete-button ui button" data-url="{{.DeleteBranchLink}}">{{$.locale.Tr "repo.branch.delete_html"}}</button>
</div>
{{end}}
</div>
{{if .IsPullBranchDeletable}}
<div class="ui divider"></div>
<div>
<a class="delete-button ui red button" href="" data-url="{{.DeleteBranchLink}}">{{$.locale.Tr "repo.branch.delete" .HeadTarget}}</a>
</div>
{{end}}
{{else if .Issue.IsClosed}}
<div class="item text">
{{if .IsPullRequestBroken}}
{{$.locale.Tr "repo.pulls.cant_reopen_deleted_branch"}}
{{else}}
{{$.locale.Tr "repo.pulls.reopen_to_merge"}}
<div class="item item-section text gt-f1">
<div class="item-section-left">
<h3 class="gt-mb-3">{{$.locale.Tr "repo.pulls.closed"}}</h3>
<div class="merge-section-info">
{{if .IsPullRequestBroken}}
{{$.locale.Tr "repo.pulls.cant_reopen_deleted_branch"}}
{{else}}
{{$.locale.Tr "repo.pulls.reopen_to_merge"}}
{{end}}
</div>
</div>
{{if and .IsPullBranchDeletable (not .IsPullRequestBroken)}}
<div class="item-section-right">
<button class="delete-button ui button" data-url="{{.DeleteBranchLink}}">{{$.locale.Tr "repo.branch.delete_html"}}</button>
</div>
{{end}}
</div>
{{if and .IsPullBranchDeletable ( not .IsPullRequestBroken )}}
<div class="ui divider"></div>
<div>
<a class="delete-button ui red button" href="" data-url="{{.DeleteBranchLink}}">{{$.locale.Tr "repo.branch.delete" .HeadTarget}}</a>
</div>
{{end}}
{{else if .IsPullFilesConflicted}}
<div class="item text">
{{svg "octicon-x"}}
Expand Down Expand Up @@ -471,7 +470,7 @@
</div>
{{end}}

{{if and .ShowMergeInstructions .Issue.PullRequest.HeadRepo}}
{{if and .ShowMergeInstructions .Issue.PullRequest.HeadRepo (not .Issue.PullRequest.HasMerged) (not .Issue.IsClosed)}}
{{template "repo/issue/view_content/pull_merge_instruction" (dict "locale" .locale "Issue" .Issue)}}
{{end}}
</div>
Expand Down
13 changes: 10 additions & 3 deletions web_src/css/repository.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,9 +694,9 @@
margin-right: 5px;
}

.repository.view.issue .pull .merge.box .avatar {
margin-left: 10px;
margin-top: 10px;
.repository.view.issue .pull .merge.box .timeline-avatar {
margin-top: 3px;
margin-left: 4px;
}

.repository.view.issue .pull .merge.box .branch-update.grid .row {
Expand Down Expand Up @@ -1036,6 +1036,13 @@
margin-top: -8px;
}

.merge-section-info code {
border: 1px solid var(--color-light-border);
border-radius: 4px;
padding: 2px 4px;
background: var(--color-light);
}

.repository.view.issue .comment-list .comment .markup {
font-size: 14px;
}
Expand Down