Skip to content

Commit 1f7a4d2

Browse files
committed
"Copy branch name" button in pull request
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
1 parent 81295ff commit 1f7a4d2

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

Diff for: options/locale/locale_en-US.ini

+3
Original file line numberDiff line numberDiff line change
@@ -927,6 +927,9 @@ star_guest_user = Sign in to star this repository.
927927
copy_link = Copy
928928
copy_link_success = Link has been copied
929929
copy_link_error = Use ⌘C or Ctrl-C to copy
930+
copy_branch = Copy
931+
copy_branch_success = Branch name has been copied
932+
copy_branch_error = Use ⌘C or Ctrl-C to copy
930933
copied = Copied OK
931934
unwatch = Unwatch
932935
watch = Watch

Diff for: templates/repo/issue/view_title.tmpl

+5-4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
{{if .HeadBranchHTMLURL}}
3535
{{$headHref = printf "<a href=\"%s\">%s</a>" .HeadBranchHTMLURL $headHref}}
3636
{{end}}
37+
{{$headHref = printf "%s <a class=\"poping up\" data-content=\"%s\" data-success=\"%s\" data-error=\"%s\" data-clipboard-text=\"%s\">%s</a>" $headHref (.i18n.Tr "repo.copy_branch") (.i18n.Tr "repo.copy_branch_success") (.i18n.Tr "repo.copy_branch_error") (.HeadTarget | Escape) (svg "octicon-copy" 14)}}
3738
{{$baseHref := .BaseTarget|Escape}}
3839
{{if .BaseBranchHTMLURL}}
3940
{{$baseHref = printf "<a href=\"%s\">%s</a>" .BaseBranchHTMLURL $baseHref}}
@@ -42,18 +43,18 @@
4243
{{ $mergedStr:= TimeSinceUnix .Issue.PullRequest.MergedUnix $.Lang }}
4344
{{if .Issue.OriginalAuthor }}
4445
{{.Issue.OriginalAuthor}}
45-
<span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Str2html}}</span>
46+
<span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}}</span>
4647
{{else}}
4748
<a {{if gt .Issue.PullRequest.Merger.ID 0}}href="{{.Issue.PullRequest.Merger.HomeLink}}"{{end}}>{{.Issue.PullRequest.Merger.GetDisplayName}}</a>
48-
<span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Str2html}}</span>
49+
<span class="pull-desc">{{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits $headHref $baseHref $mergedStr | Safe}}</span>
4950
{{end}}
5051
{{else}}
5152
{{if .Issue.OriginalAuthor }}
52-
<span id="pull-desc" class="pull-desc">{{.Issue.OriginalAuthor}} {{$.i18n.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Str2html}}</span>
53+
<span id="pull-desc" class="pull-desc">{{.Issue.OriginalAuthor}} {{$.i18n.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}}</span>
5354
{{else}}
5455
<span id="pull-desc" class="pull-desc">
5556
<a {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>{{.Issue.Poster.GetDisplayName}}</a>
56-
{{$.i18n.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Str2html}}
57+
{{$.i18n.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref | Safe}}
5758
</span>
5859
{{end}}
5960
<span id="pull-desc-edit" style="display: none">

Diff for: web_src/less/_repository.less

+9
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,15 @@
686686
code {
687687
color: var(--color-primary);
688688
}
689+
a[data-clipboard-text] {
690+
cursor: pointer;
691+
svg {
692+
vertical-align: middle;
693+
position: relative;
694+
top: -2px;
695+
right: 1px;
696+
}
697+
}
689698
}
690699

691700
.pull {

0 commit comments

Comments
 (0)