diff options
Diffstat (limited to 'templates/repo/issue/view_content')
-rw-r--r-- | templates/repo/issue/view_content/add_reaction.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/issue/view_content/attachments.tmpl | 4 | ||||
-rw-r--r-- | templates/repo/issue/view_content/comments.tmpl | 70 | ||||
-rw-r--r-- | templates/repo/issue/view_content/context_menu.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 54 | ||||
-rw-r--r-- | templates/repo/issue/view_content/sidebar.tmpl | 46 |
6 files changed, 89 insertions, 89 deletions
diff --git a/templates/repo/issue/view_content/add_reaction.tmpl b/templates/repo/issue/view_content/add_reaction.tmpl index 2873102afb..6d694219ca 100644 --- a/templates/repo/issue/view_content/add_reaction.tmpl +++ b/templates/repo/issue/view_content/add_reaction.tmpl @@ -1,7 +1,7 @@ {{if .ctx.IsSigned}} <div class="item action ui pointing top right select-reaction dropdown" data-action-url="{{ .ActionURL }}"> <a class="add-reaction"> - {{svg "octicon-smiley" 16}} + {{svg "octicon-smiley"}} </a> <div class="menu"> <div class="header">{{ .ctx.i18n.Tr "repo.pick_reaction"}}</div> diff --git a/templates/repo/issue/view_content/attachments.tmpl b/templates/repo/issue/view_content/attachments.tmpl index 3c69dbc2ba..1144b9a77a 100644 --- a/templates/repo/issue/view_content/attachments.tmpl +++ b/templates/repo/issue/view_content/attachments.tmpl @@ -2,9 +2,9 @@ <div class="twelve wide column" style="padding: 6px;"> <a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}" title='{{$.ctx.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'> {{if FilenameIsImage .Name}} - <span class="ui image">{{svg "octicon-file-media" 16}}</span> + <span class="ui image">{{svg "octicon-file-media"}}</span> {{else}} - <span class="ui image">{{svg "octicon-desktop-download" 16}}</span> + <span class="ui image">{{svg "octicon-desktop-download"}}</span> {{end}} <span><strong>{{.Name}}</strong></span> </a> diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index b63c7da7cd..39b932f4bc 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -73,7 +73,7 @@ </div> {{else if eq .Type 1}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-dot-fill" 16}}</span> + <span class="badge">{{svg "octicon-dot-fill"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -88,7 +88,7 @@ </div> {{else if eq .Type 2}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-circle-slash" 16}}</span> + <span class="badge">{{svg "octicon-circle-slash"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -103,7 +103,7 @@ </div> {{else if eq .Type 28}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge purple">{{svg "octicon-git-merge" 16}}</span> + <span class="badge purple">{{svg "octicon-git-merge"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -128,7 +128,7 @@ {{end}} {{ $createdStr:= TimeSinceUnix .CreatedUnix $.Lang }} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-bookmark" 16}}</span> + <span class="badge">{{svg "octicon-bookmark"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -145,7 +145,7 @@ </div> {{else if eq .Type 4}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-bookmark" 16}}</span> + <span class="badge">{{svg "octicon-bookmark"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -154,14 +154,14 @@ {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}} </span> <div class="detail"> - {{svg "octicon-git-commit" 16}} + {{svg "octicon-git-commit"}} <span class="text grey">{{.Content | Str2html}}</span> </div> </div> {{else if eq .Type 7}} {{if .Label}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-tag" 16}}</span> + <span class="badge">{{svg "octicon-tag"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -173,7 +173,7 @@ {{end}} {{else if eq .Type 8}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-milestone" 16}}</span> + <span class="badge">{{svg "octicon-milestone"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -184,7 +184,7 @@ </div> {{else if eq .Type 9}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-person" 16}}</span> + <span class="badge">{{svg "octicon-person"}}</span> {{if gt .AssigneeID 0}} {{if .RemovedAssignee}} <a class="ui avatar image" href="{{.Assignee.HomeLink}}"> @@ -215,7 +215,7 @@ </div> {{else if eq .Type 10}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-pencil" 16}}</span> + <span class="badge">{{svg "octicon-pencil"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -226,7 +226,7 @@ </div> {{else if eq .Type 11}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-git-branch" 16}}</span> + <span class="badge">{{svg "octicon-git-branch"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -237,7 +237,7 @@ </div> {{else if eq .Type 12}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -248,7 +248,7 @@ </div> {{else if eq .Type 13}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -257,13 +257,13 @@ {{$.i18n.Tr "repo.issues.stop_tracking_history" $createdStr | Safe}} </span> <div class="detail"> - {{svg "octicon-clock" 16}} + {{svg "octicon-clock"}} <span class="text grey">{{.Content}}</span> </div> </div> {{else if eq .Type 14}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -272,13 +272,13 @@ {{$.i18n.Tr "repo.issues.add_time_history" $createdStr | Safe}} </span> <div class="detail"> - {{svg "octicon-clock" 16}} + {{svg "octicon-clock"}} <span class="text grey">{{.Content}}</span> </div> </div> {{else if eq .Type 15}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -289,7 +289,7 @@ </div> {{else if eq .Type 16}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -300,7 +300,7 @@ </div> {{else if eq .Type 17}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -311,7 +311,7 @@ </div> {{else if eq .Type 18}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -322,7 +322,7 @@ </div> {{else if eq .Type 19}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-package-dependents" 16}}</span> + <span class="badge">{{svg "octicon-package-dependents"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -332,7 +332,7 @@ </span> {{if .DependentIssue}} <div class="detail"> - {{svg "octicon-plus" 16}} + {{svg "octicon-plus"}} <span class="text grey"> <a href="{{.DependentIssue.HTMLURL}}"> {{if eq .DependentIssue.RepoID .Issue.RepoID}} @@ -347,7 +347,7 @@ </div> {{else if eq .Type 20}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-package-dependents" 16}}</span> + <span class="badge">{{svg "octicon-package-dependents"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -357,7 +357,7 @@ </span> {{if .DependentIssue}} <div class="detail"> - <span class="text grey">{{svg "octicon-trashcan" 16}}</span> + <span class="text grey">{{svg "octicon-trashcan"}}</span> <span class="text grey"> <a href="{{.DependentIssue.HTMLURL}}"> {{if eq .DependentIssue.RepoID .Issue.RepoID}} @@ -382,7 +382,7 @@ <span class="badge {{if eq .Review.Type 1}}green {{- else if eq .Review.Type 2}}grey {{- else if eq .Review.Type 3}}red - {{- else}}grey{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon) 16}}</span> + {{- else}}grey{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon)}}</span> <span class="text grey"> {{if .OriginalAuthor }} <span class="text black"><i class="fa {{MigrationIcon $.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .OriginalAuthor }}</span><span class="text grey"> {{if $.Repository.OriginalURL}}</span><span class="text migrate">({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}}</span> @@ -440,7 +440,7 @@ {{$isNotPending := (not (eq (index $comms 0).Review.Type 0))}} {{if or $invalid $resolved}} <button id="show-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="ui compact right labeled button show-outdated"> - {{svg "octicon-unfold" 16}} + {{svg "octicon-unfold"}} {{if $invalid }} {{$.i18n.Tr "repo.issues.review.show_outdated"}} {{else}} @@ -448,7 +448,7 @@ {{end}} </button> <button id="hide-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="hide ui compact right labeled button hide-outdated"> - {{svg "octicon-fold" 16}} + {{svg "octicon-fold"}} {{if $invalid}} {{$.i18n.Tr "repo.issues.review.hide_outdated"}} {{else}} @@ -532,7 +532,7 @@ </div> {{else if eq .Type 23}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-lock" 16}}</span> + <span class="badge">{{svg "octicon-lock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -550,7 +550,7 @@ </div> {{else if eq .Type 24}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-key" 16}}</span> + <span class="badge">{{svg "octicon-key"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -561,7 +561,7 @@ </div> {{else if eq .Type 25}} <div class="timeline-item event"> - <span class="badge">{{svg "octicon-git-branch" 16}}</span> + <span class="badge">{{svg "octicon-git-branch"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -572,7 +572,7 @@ </div> {{else if eq .Type 26}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-clock" 16}}</span> + <span class="badge">{{svg "octicon-clock"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -581,13 +581,13 @@ {{$.i18n.Tr "repo.issues.del_time_history" $createdStr | Safe}} </span> <div class="detail"> - {{svg "octicon-clock" 16}} + {{svg "octicon-clock"}} <span class="text grey">{{.Content}}</span> </div> </div> {{else if eq .Type 27}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-eye" 16}}</span> + <span class="badge">{{svg "octicon-eye"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> @@ -606,7 +606,7 @@ </div> {{else if and (eq .Type 29) (or (gt .CommitsNum 0) .IsForcePush)}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-repo-push" 16}}</span> + <span class="badge">{{svg "octicon-repo-push"}}</span> <span class="text grey"> <a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> {{ if .IsForcePush }} @@ -622,7 +622,7 @@ {{else if eq .Type 30}} {{if not $.UnitProjectsGlobalDisabled}} <div class="timeline-item event" id="{{.HashTag}}"> - <span class="badge">{{svg "octicon-project" 16}}</span> + <span class="badge">{{svg "octicon-project"}}</span> <a class="ui avatar image" href="{{.Poster.HomeLink}}"> <img src="{{.Poster.RelAvatarLink}}"> </a> diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl index f26dd9e845..7d5cae5bff 100644 --- a/templates/repo/issue/view_content/context_menu.tmpl +++ b/templates/repo/issue/view_content/context_menu.tmpl @@ -1,7 +1,7 @@ {{if .ctx.IsSigned}} <div class="item action ui pointing top right custom dropdown context-dropdown"> <a class="context-menu"> - {{svg "octicon-kebab-horizontal" 16}} + {{svg "octicon-kebab-horizontal"}} </a> <div class="menu"> {{if .diff}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 2a5198f962..9111ab7e86 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -50,10 +50,10 @@ {{if $canChoose }} <a href="#" class="ui poping up icon re-request-review" data-is-checked="{{if eq .Type 4}}true{{else}}false{{end}}" data-issue-id="{{$.Issue.ID}}" data-content="{{ if eq .Type 4 }} {{$.i18n.Tr "repo.issues.remove_request_review"}} {{else}} {{$.i18n.Tr "repo.issues.re_request_review"}} {{end}}" data-id="{{.ReviewerID}}" data-update-url="{{$.RepoLink}}/issues/request_review"> - {{svg "octicon-sync" 16}} + {{svg "octicon-sync"}} </a> {{end}} - {{svg (printf "octicon-%s" .Type.Icon) 16}} + {{svg (printf "octicon-%s" .Type.Icon)}} </span> </div> </div> @@ -112,7 +112,7 @@ {{end}} {{else if .IsPullFilesConflicted}} <div class="item text grey"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.files_conflicted"}} {{range .ConflictedFiles}} <div>{{.}}</div> @@ -120,48 +120,48 @@ </div> {{else if .IsPullRequestBroken}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.data_broken"}} </div> {{else if .IsPullWorkInProgress}} <div class="item text grey"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.cannot_merge_work_in_progress" (.WorkInProgressPrefix|Escape) | Str2html}} </div> {{else if .Issue.PullRequest.IsChecking}} <div class="item text yellow"> - <i class="icon icon-octicon">{{svg "octicon-sync" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-sync"}}</i> {{$.i18n.Tr "repo.pulls.is_checking"}} </div> {{else if .Issue.PullRequest.CanAutoMerge}} {{if .IsBlockedByApprovals}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .Issue.PullRequest.ProtectedBranch.RequiredApprovals}} </div> {{else if .IsBlockedByRejection}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.blocked_by_rejection"}} </div> {{else if .IsBlockedByOutdatedBranch}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.blocked_by_outdated_branch"}} </div> {{else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsError .RequiredStatusCheckState.IsFailure)}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.required_status_check_failed"}} </div> {{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.required_status_check_missing"}} </div> {{else if and .AllowMerge .RequireSigned (not .WillSign)}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.require_signed_wont_sign"}} </div> <div class="item text yellow"> @@ -173,12 +173,12 @@ {{if and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}} {{if $notAllOverridableChecksOk}} <div class="item text yellow"> - <i class="icon icon-octicon">{{svg "octicon-dot-fill" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-dot-fill"}}</i> {{$.i18n.Tr "repo.pulls.required_status_check_administrator"}} </div> {{else}} <div class="item text green"> - <i class="icon icon-octicon">{{svg "octicon-check" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-check"}}</i> {{$.i18n.Tr "repo.pulls.can_auto_merge_desc"}} </div> {{end}} @@ -200,7 +200,7 @@ <div class="ui divider"></div> <div class="item item-section text grey"> <div class="item-section-left"> - <i class="icon icon-octicon">{{svg "octicon-alert" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-alert"}}</i> {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}} </div> <div class="item-section-right"> @@ -294,7 +294,7 @@ {{end}} <div class="ui {{if $notAllOverridableChecksOk}}red{{else}}green{{end}} buttons merge-button"> <button class="ui button" data-do="{{.MergeStyle}}"> - {{svg "octicon-git-merge" 16}} + {{svg "octicon-git-merge"}} <span class="button-text"> {{if eq .MergeStyle "merge"}} {{$.i18n.Tr "repo.pulls.merge_pull_request"}} @@ -331,18 +331,18 @@ {{else}} <div class="ui divider"></div> <div class="item text red"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.no_merge_desc"}} </div> <div class="item text grey"> - {{svg "octicon-info" 16}} + {{svg "octicon-info"}} {{$.i18n.Tr "repo.pulls.no_merge_helper"}} </div> {{end}} {{else}} <div class="ui divider"></div> <div class="item text grey"> - {{svg "octicon-info" 16}} + {{svg "octicon-info"}} {{$.i18n.Tr "repo.pulls.no_merge_access"}} </div> {{end}} @@ -351,36 +351,36 @@ {{/* Merge conflict without specific file. Suggest manual merge, only if all reviews and status checks OK. */}} {{if .IsBlockedByApprovals}} <div class="item text red"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.blocked_by_approvals" .GrantedApprovals .Issue.PullRequest.ProtectedBranch.RequiredApprovals}} </div> {{else if .IsBlockedByRejection}} <div class="item text red"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.blocked_by_rejection"}} </div> {{else if .IsBlockedByOutdatedBranch}} <div class="item text red"> - <i class="icon icon-octicon">{{svg "octicon-x" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-x"}}</i> {{$.i18n.Tr "repo.pulls.blocked_by_outdated_branch"}} </div> {{else if and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess)}} <div class="item text red"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.required_status_check_failed"}} </div> {{else if and .RequireSigned (not .WillSign)}} <div class="item text red"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.require_signed_wont_sign"}} </div> {{else}} <div class="item text red"> - {{svg "octicon-x" 16}} + {{svg "octicon-x"}} {{$.i18n.Tr "repo.pulls.cannot_auto_merge_desc"}} </div> <div class="item text grey"> - {{svg "octicon-info" 16}} + {{svg "octicon-info"}} {{$.i18n.Tr "repo.pulls.cannot_auto_merge_helper"}} </div> {{end}} @@ -388,7 +388,7 @@ {{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"> - <i class="icon icon-octicon">{{svg "octicon-alert" 16}}</i> + <i class="icon icon-octicon">{{svg "octicon-alert"}}</i> {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}} {{if .UpdateAllowed}} <form action="{{.Link}}/update" method="post" class="ui floating right"> diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index d02dedfb81..e47bcbe35c 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -9,7 +9,7 @@ <span class="text"> <strong>{{.i18n.Tr "repo.issues.review.reviewers"}}</strong> {{if and .CanChooseReviewer (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} {{end}} </span> <div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/request_review"> @@ -45,7 +45,7 @@ {{end}} <a class="{{if not $canChoose}}ui poping up{{end}} item {{if $checked}} checked {{end}} {{if not $canChoose}}ban-change{{end}}" href="#" data-id="{{.ID}}" data-id-selector="#review_request_{{.ID}}" {{if not $canChoose}} data-content="{{$.i18n.Tr "repo.issues.remove_request_review_block"}}"{{end}}> - <span class="octicon-check {{if not $checked}}invisible{{end}}">{{svg "octicon-check" 16}}</span> + <span class="octicon-check {{if not $checked}}invisible{{end}}">{{svg "octicon-check"}}</span> <span class="text"> <img class="ui avatar image" src="{{.RelAvatarLink}}"> {{.GetDisplayName}} </span> @@ -79,10 +79,10 @@ {{if $canChoose}} <a href="#" class="ui poping up icon re-request-review" data-is-checked="{{if eq .Type 4}}true{{else}}false{{end}}" data-content="{{ if eq .Type 4 }} {{$.i18n.Tr "repo.issues.remove_request_review"}} {{else}} {{$.i18n.Tr "repo.issues.re_request_review"}} {{end}}" data-issue-id="{{$.Issue.ID}}" data-id="{{.ReviewerID}}" data-update-url="{{$.RepoLink}}/issues/request_review"> - {{svg "octicon-sync" 16}} + {{svg "octicon-sync"}} </a> {{end}} - {{svg (printf "octicon-%s" .Type.Icon) 16}} + {{svg (printf "octicon-%s" .Type.Icon)}} </span> </div> {{end}} @@ -95,7 +95,7 @@ <span class="text"> <strong>{{.i18n.Tr "repo.issues.new.labels"}}</strong> {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} {{end}} </span> <div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/labels"> @@ -109,12 +109,12 @@ <div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_labels"}}</div> {{if or .Labels .OrgLabels}} {{range .Labels}} - <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} + <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check"}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} {{if .Description }}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a> {{end}} <div class="ui divider"></div> {{range .OrgLabels}} - <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check" 16}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} + <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon-check {{if not .IsChecked}}invisible{{end}}">{{svg "octicon-check"}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | RenderEmoji}} {{if .Description }}<br><small class="desc">{{.Description | RenderEmoji}}</small>{{end}}</a> {{end}} {{else}} @@ -143,7 +143,7 @@ <span class="text"> <strong>{{.i18n.Tr "repo.issues.new.milestone"}}</strong> {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} {{end}} </span> <div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/milestone"> @@ -163,7 +163,7 @@ {{if .OpenMilestones}} <div class="divider"></div> <div class="header"> - {{svg "octicon-milestone" 16}} + {{svg "octicon-milestone"}} {{.i18n.Tr "repo.issues.new.open_milestone"}} </div> {{range .OpenMilestones}} @@ -173,7 +173,7 @@ {{if .ClosedMilestones}} <div class="divider"></div> <div class="header"> - {{svg "octicon-milestone" 16}} + {{svg "octicon-milestone"}} {{.i18n.Tr "repo.issues.new.closed_milestone"}} </div> {{range .ClosedMilestones}} @@ -198,28 +198,28 @@ <div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-project dropdown"> <span class="text"> <strong>{{.i18n.Tr "repo.issues.new.projects"}}</strong> - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} </span> <div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/projects"> <div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_projects"}}</div> {{if .OpenProjects}} <div class="divider"></div> <div class="header"> - {{svg "octicon-project" 16}} + {{svg "octicon-project"}} {{.i18n.Tr "repo.issues.new.open_projects"}} </div> {{range .OpenProjects}} - <div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}">{{svg "octicon-project" 16}} {{.Title}}</div> + <div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}">{{svg "octicon-project"}} {{.Title}}</div> {{end}} {{end}} {{if .ClosedProjects}} <div class="divider"></div> <div class="header"> - {{svg "octicon-project" 16}} + {{svg "octicon-project"}} {{.i18n.Tr "repo.issues.new.closed_projects"}} </div> {{range .ClosedProjects}} - <a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}">{{svg "octicon-project" 16}} {{.Title}}</a> + <a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}">{{svg "octicon-project"}} {{.Title}}</a> {{end}} {{end}} </div> @@ -228,7 +228,7 @@ <span class="no-select item {{if .Issue.ProjectID}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_projects"}}</span> <div class="selected"> {{if .Issue.ProjectID}} - <a class="item" href="{{.RepoLink}}/projects/{{.Issue.ProjectID}}">{{svg "octicon-project" 16}} {{.Issue.Project.Title}}</a> + <a class="item" href="{{.RepoLink}}/projects/{{.Issue.ProjectID}}">{{svg "octicon-project"}} {{.Issue.Project.Title}}</a> {{end}} </div> </div> @@ -241,7 +241,7 @@ <span class="text"> <strong>{{.i18n.Tr "repo.issues.new.assignees"}}</strong> {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16}} + {{svg "octicon-gear"}} {{end}} </span> <div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/assignee"> @@ -265,7 +265,7 @@ {{$checked = true}} {{end}} {{end}} - <span class="octicon-check {{if not $checked}}invisible{{end}}">{{svg "octicon-check" 16}}</span> + <span class="octicon-check {{if not $checked}}invisible{{end}}">{{svg "octicon-check"}}</span> <span class="text"> <img class="ui avatar image" src="{{.RelAvatarLink}}"> {{.GetDisplayName}} </span> @@ -308,10 +308,10 @@ {{$.CsrfTokenHtml}} <button class="fluid ui button"> {{if $.IssueWatch.IsWatching}} - {{svg "octicon-mute" 16}} + {{svg "octicon-mute"}} {{.i18n.Tr "repo.issues.unsubscribe"}} {{else}} - {{svg "octicon-unmute" 16}} + {{svg "octicon-unmute"}} {{.i18n.Tr "repo.issues.subscribe"}} {{end}} </button> @@ -396,7 +396,7 @@ </div> {{if ne .Issue.DeadlineUnix 0}} <p> - {{svg "octicon-calendar" 16}} + {{svg "octicon-calendar"}} {{.Issue.DeadlineUnix.FormatDate}} {{if .Issue.IsOverdue}} <span style="color: red;">{{.i18n.Tr "repo.issues.due_date_overdue"}}</span> @@ -522,10 +522,10 @@ <div> <button class="fluid ui show-modal button {{if .Issue.IsLocked }} negative {{ end }}" data-modal="#lock"> {{if .Issue.IsLocked}} - {{svg "octicon-key" 16}} + {{svg "octicon-key"}} {{.i18n.Tr "repo.issues.unlock"}} {{else}} - {{svg "octicon-lock" 16}} + {{svg "octicon-lock"}} {{.i18n.Tr "repo.issues.lock"}} {{end}} </button> |