mirror of
https://github.com/go-gitea/gitea.git
synced 2024-10-31 08:37:35 -04:00
b92c142c97
Clean up a few cases where avatar dimensions were overwritten via CSS, which were no longer needed or were possible to set via HTML width. Also included are two small fixes: - Fix one more case of incorrect avatar offset on review timeline - Vertically center avatars in review sidebar There is more to be done here, but some of the work depends on Fomantic `comment` module removal, or in the case of org member lists, a refactor of the `avatarlink` template to accept a size. <img width="371" alt="image" src="https://github.com/go-gitea/gitea/assets/115237/9c5902fb-2b89-4a7d-a152-60e74c3b2c56"> <img width="306" alt="image" src="https://github.com/go-gitea/gitea/assets/115237/c8d92e2a-91c9-4f4a-a7de-6ae1a6bc0479"> --------- Co-authored-by: Giteabot <teabot@gitea.io>
203 lines
8.3 KiB
Handlebars
203 lines
8.3 KiB
Handlebars
<div class="ui stackable grid">
|
|
<!-- I know, there is probably a better way to do this (moved from sidebar.tmpl, original author: 6543 @ 2021-02-28) -->
|
|
<!-- Agree, there should be a better way, eg: introduce window.config.pageData (original author: wxiaoguang @ 2021-09-05) -->
|
|
<input type="hidden" id="repolink" value="{{$.RepoRelPath}}">
|
|
<input type="hidden" id="repoId" value="{{.Repository.ID}}">
|
|
<input type="hidden" id="issueIndex" value="{{.Issue.Index}}">
|
|
<input type="hidden" id="type" value="{{.IssueType}}">
|
|
|
|
{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}}
|
|
<div class="twelve wide column comment-list prevent-before-timeline">
|
|
<div class="ui timeline">
|
|
<div id="{{.Issue.HashTag}}" class="timeline-item comment first">
|
|
{{if .Issue.OriginalAuthor}}
|
|
<span class="timeline-avatar">
|
|
<img src="{{AppSubUrl}}/assets/img/avatar_default.png" width="40" height="40">
|
|
</span>
|
|
{{else}}
|
|
<a class="timeline-avatar" {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>
|
|
{{avatar $.Context .Issue.Poster 40}}
|
|
</a>
|
|
{{end}}
|
|
<div class="content comment-container">
|
|
<div class="ui top attached header comment-header gt-df gt-ac gt-sb" role="heading" aria-level="3">
|
|
<div class="comment-header-left gt-df gt-ac">
|
|
{{if .Issue.OriginalAuthor}}
|
|
<span class="text black gt-bold">
|
|
{{svg (MigrationIcon .Repository.GetOriginalURLHostname)}}
|
|
{{.Issue.OriginalAuthor}}
|
|
</span>
|
|
<span class="text grey">
|
|
{{.locale.Tr "repo.issues.commented_at" (.Issue.HashTag|Escape) $createdStr | Safe}}
|
|
</span>
|
|
<span class="text migrate">
|
|
{{if .Repository.OriginalURL}} ({{$.locale.Tr "repo.migrated_from" (.Repository.OriginalURL|Escape) (.Repository.GetOriginalURLHostname|Escape) | Safe}}){{end}}
|
|
</span>
|
|
{{else}}
|
|
<a class="inline-timeline-avatar" href="{{.Issue.Poster.HomeLink}}">
|
|
{{avatar $.Context .Issue.Poster 24}}
|
|
</a>
|
|
<span class="text grey">
|
|
{{template "shared/user/authorlink" .Issue.Poster}}
|
|
{{.locale.Tr "repo.issues.commented_at" (.Issue.HashTag|Escape) $createdStr | Safe}}
|
|
</span>
|
|
{{end}}
|
|
</div>
|
|
<div class="comment-header-right actions gt-df gt-ac">
|
|
{{if gt .Issue.ShowRole 0}}
|
|
{{if (.Issue.ShowRole.HasRole "Writer")}}
|
|
<div class="ui basic label role-label">
|
|
{{$.locale.Tr "repo.issues.collaborator"}}
|
|
</div>
|
|
{{end}}
|
|
{{if (.Issue.ShowRole.HasRole "Owner")}}
|
|
<div class="ui basic label role-label">
|
|
{{$.locale.Tr "repo.issues.owner"}}
|
|
</div>
|
|
{{end}}
|
|
{{end}}
|
|
{{if not $.Repository.IsArchived}}
|
|
{{template "repo/issue/view_content/add_reaction" dict "ctxData" $ "ActionURL" (printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index)}}
|
|
{{template "repo/issue/view_content/context_menu" dict "ctxData" $ "item" .Issue "delete" false "issue" true "diff" false "IsCommentPoster" $.IsIssuePoster}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
<div class="ui attached segment comment-body" role="article">
|
|
<div class="render-content markup" {{if or $.Permission.IsAdmin $.HasIssuesOrPullsWritePermission $.IsIssuePoster}}data-can-edit="true"{{end}}>
|
|
{{if .Issue.RenderedContent}}
|
|
{{.Issue.RenderedContent|Str2html}}
|
|
{{else}}
|
|
<span class="no-content">{{.locale.Tr "repo.issues.no_content"}}</span>
|
|
{{end}}
|
|
</div>
|
|
<div id="issue-{{.Issue.ID}}-raw" class="raw-content gt-hidden">{{.Issue.Content}}</div>
|
|
<div class="edit-content-zone gt-hidden" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/content" data-context="{{.RepoLink}}" data-attachment-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/attachments" data-view-attachment-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/view-attachments"></div>
|
|
{{if .Issue.Attachments}}
|
|
{{template "repo/issue/view_content/attachments" dict "ctxData" $ "Attachments" .Issue.Attachments "Content" .Issue.RenderedContent}}
|
|
{{end}}
|
|
</div>
|
|
{{$reactions := .Issue.Reactions.GroupByType}}
|
|
{{if $reactions}}
|
|
<div class="ui attached segment reactions" role="note">
|
|
{{template "repo/issue/view_content/reactions" dict "ctxData" $ "ActionURL" (printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index) "Reactions" $reactions}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
|
|
{{template "repo/issue/view_content/comments" .}}
|
|
|
|
{{if and .Issue.IsPull (not $.Repository.IsArchived)}}
|
|
{{template "repo/issue/view_content/pull".}}
|
|
{{end}}
|
|
|
|
{{if .IsSigned}}
|
|
{{if and (or .IsRepoAdmin .HasIssuesOrPullsWritePermission (not .Issue.IsLocked)) (not .Repository.IsArchived)}}
|
|
<div class="timeline-item comment form">
|
|
<a class="timeline-avatar" href="{{.SignedUser.HomeLink}}">
|
|
{{avatar $.Context .SignedUser 40}}
|
|
</a>
|
|
<div class="content">
|
|
<form class="ui segment form" id="comment-form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/comments" method="post">
|
|
{{template "repo/issue/comment_tab" .}}
|
|
{{.CsrfTokenHtml}}
|
|
<input id="status" name="status" type="hidden">
|
|
<div class="field footer">
|
|
<div class="text right">
|
|
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}}
|
|
{{if .Issue.IsClosed}}
|
|
<button id="status-button" class="ui green basic button" tabindex="6" data-status="{{.locale.Tr "repo.issues.reopen_issue"}}" data-status-and-comment="{{.locale.Tr "repo.issues.reopen_comment_issue"}}" data-status-val="reopen">
|
|
{{.locale.Tr "repo.issues.reopen_issue"}}
|
|
</button>
|
|
{{else}}
|
|
{{$closeTranslationKey := "repo.issues.close"}}
|
|
{{if .Issue.IsPull}}
|
|
{{$closeTranslationKey = "repo.pulls.close"}}
|
|
{{end}}
|
|
<button id="status-button" class="ui red basic button" tabindex="6" data-status="{{.locale.Tr $closeTranslationKey}}" data-status-and-comment="{{.locale.Tr "repo.issues.close_comment_issue"}}" data-status-val="close">
|
|
{{.locale.Tr $closeTranslationKey}}
|
|
</button>
|
|
{{end}}
|
|
{{end}}
|
|
<button class="ui green button loading-button" tabindex="5">
|
|
{{.locale.Tr "repo.issues.create_comment"}}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
{{else if .Repository.IsArchived}}
|
|
<div class="ui warning message">
|
|
{{if .Issue.IsPull}}
|
|
{{.locale.Tr "repo.archive.pull.nocomment"}}
|
|
{{else}}
|
|
{{.locale.Tr "repo.archive.issue.nocomment"}}
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
{{else}} {{/* not .IsSigned */}}
|
|
{{if .Repository.IsArchived}}
|
|
<div class="ui warning message">
|
|
{{if .Issue.IsPull}}
|
|
{{.locale.Tr "repo.archive.pull.nocomment"}}
|
|
{{else}}
|
|
{{.locale.Tr "repo.archive.issue.nocomment"}}
|
|
{{end}}
|
|
</div>
|
|
{{else}}
|
|
<div class="ui warning message">
|
|
{{.locale.Tr "repo.issues.sign_in_require_desc" (.SignInLink|Escape) | Safe}}
|
|
</div>
|
|
{{end}}
|
|
{{end}}{{/* end if: .IsSigned */}}
|
|
</div>
|
|
</div>
|
|
|
|
{{template "repo/issue/view_content/sidebar" .}}
|
|
</div>
|
|
|
|
<template id="issue-comment-editor-template">
|
|
<div class="ui comment form">
|
|
<div class="field">
|
|
{{template "shared/combomarkdowneditor" (dict
|
|
"locale" $.locale
|
|
"MarkdownPreviewUrl" (print .Repository.Link "/markup")
|
|
"MarkdownPreviewContext" .RepoLink
|
|
"TextareaName" "content"
|
|
"DropzoneParentContainer" ".ui.form"
|
|
)}}
|
|
</div>
|
|
|
|
{{if .IsAttachmentEnabled}}
|
|
<div class="field">
|
|
{{template "repo/upload" .}}
|
|
</div>
|
|
{{end}}
|
|
|
|
<div class="field">
|
|
<div class="text right edit">
|
|
<button class="ui basic secondary cancel button" tabindex="3">{{.locale.Tr "repo.issues.cancel"}}</button>
|
|
<button class="ui primary save button" tabindex="2">{{.locale.Tr "repo.issues.save"}}</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
{{template "repo/issue/view_content/reference_issue_dialog" .}}
|
|
|
|
<div class="gt-hidden" id="no-content">
|
|
<span class="no-content">{{.locale.Tr "repo.issues.no_content"}}</span>
|
|
</div>
|
|
|
|
<div class="ui g-modal-confirm delete modal">
|
|
<div class="header">
|
|
{{svg "octicon-trash"}}
|
|
{{.locale.Tr "repo.branch.delete" .HeadTarget}}
|
|
</div>
|
|
<div class="content">
|
|
<p>{{.locale.Tr "repo.branch.delete_desc" | Str2html}}</p>
|
|
</div>
|
|
{{template "base/modal_actions_confirm" .}}
|
|
</div>
|