diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 6ebc5d6ecb..e350f74de9 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -1649,7 +1649,7 @@ func UpdateIssueContent(ctx *context.Context) { ctx.JSON(200, map[string]interface{}{ "content": string(markdown.Render([]byte(issue.Content), ctx.Query("context"), ctx.Repo.Repository.ComposeMetas())), - "attachments": attachmentsHTML(ctx, issue.Attachments), + "attachments": attachmentsHTML(ctx, issue.Attachments, issue.Content), }) } @@ -2065,7 +2065,7 @@ func UpdateCommentContent(ctx *context.Context) { ctx.JSON(200, map[string]interface{}{ "content": string(markdown.Render([]byte(comment.Content), ctx.Query("context"), ctx.Repo.Repository.ComposeMetas())), - "attachments": attachmentsHTML(ctx, comment.Attachments), + "attachments": attachmentsHTML(ctx, comment.Attachments, comment.Content), }) } @@ -2399,10 +2399,11 @@ func updateAttachments(item interface{}, files []string) error { return err } -func attachmentsHTML(ctx *context.Context, attachments []*models.Attachment) string { +func attachmentsHTML(ctx *context.Context, attachments []*models.Attachment, content string) string { attachHTML, err := ctx.HTMLString(string(tplAttachment), map[string]interface{}{ "ctx": ctx.Data, "Attachments": attachments, + "Content": content, }) if err != nil { ctx.ServerError("attachmentsHTML.HTMLString", err) diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 355ba0ea29..37628a74e8 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -66,14 +66,9 @@
{{.Issue.Content}}
- {{if .Issue.Attachments}} -
-
-
- {{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Issue.Attachments}} -
-
- {{end}} + {{if .Issue.Attachments}} + {{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Issue.Attachments "Content" .Issue.RenderedContent}} + {{end}} {{$reactions := .Issue.Reactions.GroupByType}} {{if $reactions}} diff --git a/templates/repo/issue/view_content/attachments.tmpl b/templates/repo/issue/view_content/attachments.tmpl index d76c0bbfa2..16d77847d0 100644 --- a/templates/repo/issue/view_content/attachments.tmpl +++ b/templates/repo/issue/view_content/attachments.tmpl @@ -1,15 +1,42 @@ -{{- range .Attachments -}} -
- - {{if FilenameIsImage .Name}} - {{svg "octicon-file"}} - {{else}} - {{svg "octicon-desktop-download"}} - {{end}} - {{.Name}} - +
+ {{if .Attachments}} +
+ {{end}} +
+ {{$hasThumbnails := false}} + {{- range .Attachments -}} +
+ + {{if FilenameIsImage .Name}} + {{if not (containGeneric $.Content .UUID)}} + {{$hasThumbnails = true}} + {{end}} + {{svg "octicon-file"}} + {{else}} + {{svg "octicon-desktop-download"}} + {{end}} + {{.Name}} + +
+
+ {{.Size | FileSize}} +
+ {{end -}} +
+ + {{if $hasThumbnails}} +
+
+ {{- range .Attachments -}} + {{if FilenameIsImage .Name}} + {{if not (containGeneric $.Content .UUID)}} + + + + {{end}} + {{end}} + {{end -}} +
+ {{end}} +
-
- {{.Size | FileSize}} -
-{{end -}} diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 698e4698d0..2c413b3c46 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -72,14 +72,9 @@
{{.Content}}
- {{if .Attachments}} -
-
-
- {{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Attachments}} -
-
- {{end}} + {{if .Attachments}} + {{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Attachments "Content" .RenderedContent}} + {{end}} {{$reactions := .Reactions.GroupByType}} {{if $reactions}} diff --git a/web_src/js/index.js b/web_src/js/index.js index 55cf08cb61..d4928a01a3 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1048,17 +1048,14 @@ async function initRepository() { if (data.attachments !== '') { $content.append(`
-
-
-
`); - $content.find('.dropzone-attachments .grid').html(data.attachments); + $content.find('.dropzone-attachments').replaceWith(data.attachments); } } else if (data.attachments === '') { $content.find('.dropzone-attachments').remove(); } else { - $content.find('.dropzone-attachments .grid').html(data.attachments); + $content.find('.dropzone-attachments').replaceWith(data.attachments); } if (dz) { dz.emit('submit'); diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 8876dcdcb0..b35718c29d 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -1016,50 +1016,10 @@ font-style: italic; } - > .bottom.segment { - background: var(--color-box-body); - - .ui.images::after { - clear: both; - content: ' '; - display: block; - } - - a { - display: block; - float: left; - margin: 5px; - padding: 5px; - height: 150px; - border: solid 1px var(--color-secondary); - border-radius: 3px; - max-width: 150px; - background-color: var(--color-body); - - &::before { - content: ' '; - display: inline-block; - height: 100%; - vertical-align: middle; - } - } - - .ui.image { - max-height: 100%; - width: auto; - margin: 0; - vertical-align: middle; - } - - span.ui.image { - font-size: 128px; - color: var(--color-text); - } - - span.ui.image:hover { - color: var(--color-text); - } + .dropzone-attachments .thumbnails .ui.image { + max-height: 150px; } + } .ui.form {