diff options
Diffstat (limited to 'templates/repo/issue')
| -rw-r--r-- | templates/repo/issue/list.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/add_reaction.tmpl | 10 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/comments.tmpl | 8 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/reactions.tmpl | 12 | ||||
| -rw-r--r-- | templates/repo/issue/view_title.tmpl | 2 |
5 files changed, 13 insertions, 21 deletions
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 4fe0aaa00d..cebcb7da6b 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -211,7 +211,7 @@ </div> {{end}} <div class="ui {{if .IsClosed}}{{if .IsPull}}{{if .PullRequest.HasMerged}}purple{{else}}red{{end}}{{else}}red{{end}}{{else}}{{if .IsRead}}white{{else}}green{{end}}{{end}} label">#{{.Index}}</div> - <a class="title has-emoji" href="{{$.Link}}/{{.Index}}">{{.Title}}</a> + <a class="title" href="{{$.Link}}/{{.Index}}">{{RenderEmoji .Title}}</a> {{if .IsPull }} {{if (index $.CommitStatus .PullRequest.ID)}} diff --git a/templates/repo/issue/view_content/add_reaction.tmpl b/templates/repo/issue/view_content/add_reaction.tmpl index 543f313f0a..e061560138 100644 --- a/templates/repo/issue/view_content/add_reaction.tmpl +++ b/templates/repo/issue/view_content/add_reaction.tmpl @@ -4,17 +4,11 @@ {{svg "octicon-plus-small" 16}} {{svg "octicon-smiley" 16}} </a> - <div class="menu has-emoji"> + <div class="menu"> <div class="header">{{ .ctx.i18n.Tr "repo.pick_reaction"}}</div> <div class="divider"></div> {{range $value := AllowedReactions}} - {{if eq $value "hooray"}} - <div class="item" data-content="hooray">:tada:</div> - {{else if eq $value "laugh"}} - <div class="item" data-content="laugh">:laughing:</div> - {{else}} - <div class="item" data-content="{{$value}}">:{{$value}}:</div> - {{end}} + <div class="item reaction" data-content="{{$value}}">{{ReactionToEmoji $value}}</div> {{end}} </div> </div> diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 635ad50e44..3859f496ec 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -404,8 +404,12 @@ </span> </div> <div class="ui attached segment"> - <div class="detail"> - <span class="text black has-emoji">{{.Content}}</span> + <div class="render-content markdown has-emoji"> + {{if .RenderedContent}} + {{.RenderedContent|Str2html}} + {{else}} + <span class="no-content">{{$.i18n.Tr "repo.issues.no_content"}}</span> + {{end}} </div> </div> </div> diff --git a/templates/repo/issue/view_content/reactions.tmpl b/templates/repo/issue/view_content/reactions.tmpl index b2aa9339d1..4978edf3ff 100644 --- a/templates/repo/issue/view_content/reactions.tmpl +++ b/templates/repo/issue/view_content/reactions.tmpl @@ -1,13 +1,7 @@ {{range $key, $value := .Reactions}} - <a class="ui label basic{{if $value.HasUser $.ctx.SignedUserID}} blue{{end}}{{if not $.ctx.IsSigned}} disabled{{end}} has-emoji" data-title="{{$value.GetFirstUsers}}{{if gt ($value.GetMoreUserCount) 0}} {{ $.ctx.i18n.Tr "repo.reactions_more" $value.GetMoreUserCount}}{{end}}" data-content="{{ $key }}" data-action-url="{{ $.ActionURL }}"> - {{if eq $key "hooray"}} - :tada: - {{else if eq $key "laugh"}} - :laughing: - {{else}} - :{{$key}}: - {{end}} - {{len $value}} + <a class="ui label basic{{if $value.HasUser $.ctx.SignedUserID}} blue{{end}}{{if not $.ctx.IsSigned}} disabled{{end}}" data-title="{{$value.GetFirstUsers}}{{if gt ($value.GetMoreUserCount) 0}} {{ $.ctx.i18n.Tr "repo.reactions_more" $value.GetMoreUserCount}}{{end}}" data-content="{{ $key }}" data-action-url="{{ $.ActionURL }}"> + <span class="reaction">{{ReactionToEmoji $key}}</span> + <span class="reaction-count">{{len $value}}</span> </a> {{end}} {{if AllowedReactions}} diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index db048a119c..74ed1034d7 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -1,7 +1,7 @@ <div class="sixteen wide column title"> <div class="ui grid"> <h1 class="twelve wide column"> - <span class="index">#{{.Issue.Index}}</span> <span id="issue-title" class="has-emoji">{{.Issue.Title}}</span> + <span class="index">#{{.Issue.Index}}</span> <span id="issue-title">{{RenderEmoji .Issue.Title}}</span> <div id="edit-title-input" class="ui input" style="display: none"> <input value="{{.Issue.Title}}" maxlength="255"> </div> |