From 43fc430c078d61cf7ab428c3cf0e07eeebd0445e Mon Sep 17 00:00:00 2001
From: Jonas Franz <info@jonasfranz.software>
Date: Mon, 19 Mar 2018 17:06:00 +0100
Subject: [PATCH] Improve release page UI (#3693)
* Improve release page ui by adding size
Signed-off-by: Jonas Franz <info@jonasfranz.software>
* Add documentation to a.MustSize()
Signed-off-by: Jonas Franz <info@jonasfranz.software>
---
models/attachment.go | 11 +++++++++++
templates/repo/release/list.tmpl | 7 ++++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/models/attachment.go b/models/attachment.go
index ffe2eea80c..47c76990bc 100644
--- a/models/attachment.go
+++ b/models/attachment.go
@@ -11,6 +11,7 @@ import (
"os"
"path"
+ "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
api "code.gitea.io/sdk/gitea"
@@ -75,6 +76,16 @@ func (a *Attachment) Size() (int64, error) {
return fi.Size(), nil
}
+// MustSize returns the result of a.Size() by ignoring errors
+func (a *Attachment) MustSize() int64 {
+ size, err := a.Size()
+ if err != nil {
+ log.Error(4, "size: %v", err)
+ return 0
+ }
+ return size
+}
+
// DownloadURL returns the download url of the attached file
func (a *Attachment) DownloadURL() string {
return fmt.Sprintf("%sattachments/%s", setting.AppURL, a.UUID)
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index dd220b6a84..73e4a86821 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -68,17 +68,18 @@
<ul class="list">
{{if $.Repository.UnitEnabled $.UnitTypeCode}}
<li>
- <a href="{{$.RepoLink}}/archive/{{.TagName}}.zip" rel="nofollow"><i class="octicon octicon-file-zip"></i> {{$.i18n.Tr "repo.release.source_code"}} (ZIP)</a>
+ <a href="{{$.RepoLink}}/archive/{{.TagName}}.zip" rel="nofollow"><strong><i class="octicon octicon-file-zip"></i> {{$.i18n.Tr "repo.release.source_code"}} (ZIP)</strong></a>
</li>
<li>
- <a href="{{$.RepoLink}}/archive/{{.TagName}}.tar.gz"><i class="octicon octicon-file-zip"></i> {{$.i18n.Tr "repo.release.source_code"}} (TAR.GZ)</a>
+ <a href="{{$.RepoLink}}/archive/{{.TagName}}.tar.gz"><strong><i class="octicon octicon-file-zip"></i> {{$.i18n.Tr "repo.release.source_code"}} (TAR.GZ)</strong></a>
</li>
{{end}}
{{if .Attachments}}
{{range .Attachments}}
<li>
<a target="_blank" rel="noopener" href="{{AppSubUrl}}/attachments/{{.UUID}}">
- <span class="ui image octicon octicon-desktop-download" title='{{.Name}}'></span> {{.Name}}
+ <strong><span class="ui image octicon octicon-package" title='{{.Name}}'></span> {{.Name}}</strong>
+ <span class="ui text grey right">{{.MustSize | FileSize}}</span>
</a>
</li>
{{end}}