Improve notification for a new version, show release notes
This commit is contained in:
@@ -34,13 +34,12 @@
|
||||
</div>
|
||||
<div class="top-bar-right">
|
||||
<ul class="menu">
|
||||
{{ if newVersion }}
|
||||
<li>
|
||||
<div><a href="https://github.com/tardisx/linkwallet/releases/tag/{{ newVersion }}">{{ newVersion }} available</a></div>
|
||||
</li>
|
||||
{{ end }}
|
||||
<li class="menu-text">
|
||||
{{ version }}
|
||||
<a href="/releaseinfo">{{ version.Local.Tag }}
|
||||
{{ if version.UpgradeAvailable }}
|
||||
❗
|
||||
{{ end }}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://github.com/tardisx/linkwallet">
|
||||
@@ -64,6 +63,8 @@
|
||||
{{ template "config.html" . }}
|
||||
{{ else if eq .page "edit" }}
|
||||
{{ template "edit.html" . }}
|
||||
{{ else if eq .page "releaseinfo" }}
|
||||
{{ template "release_info.html" . }}
|
||||
{{ end }}
|
||||
{{/* template "foundation_sample.html" . */}}
|
||||
</div>
|
||||
|
||||
23
web/templates/release_info.html
Normal file
23
web/templates/release_info.html
Normal file
@@ -0,0 +1,23 @@
|
||||
<div class="grid-x grid-padding-x">
|
||||
<div class="large-12 cell">
|
||||
|
||||
<h5>Release info</h5>
|
||||
{{ if not version.Remote.Valid }}
|
||||
<p>GitHub version information not yet fetched.</p>
|
||||
{{ else }}
|
||||
{{ if version.UpgradeAvailable }}
|
||||
<p>
|
||||
A new version is available:
|
||||
<a href="https://github.com/tardisx/linkwallet/releases/tag/{{ version.Remote.Tag }}">
|
||||
{{ version.Remote.Tag }}
|
||||
</a>
|
||||
(you have {{ version.Local.Tag }}).
|
||||
</p>
|
||||
|
||||
{{ markdown version.UpgradeReleaseNotes }}
|
||||
|
||||
{{ else }}
|
||||
<p>You are currently running the most recent version.</p>
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
</div>
|
||||
17
web/web.go
17
web/web.go
@@ -16,6 +16,7 @@ import (
|
||||
"github.com/tardisx/linkwallet/entity"
|
||||
"github.com/tardisx/linkwallet/version"
|
||||
|
||||
"github.com/gomarkdown/markdown"
|
||||
"github.com/hako/durafmt"
|
||||
|
||||
"github.com/gin-contrib/gzip"
|
||||
@@ -75,7 +76,14 @@ func Create(bmm *db.BookmarkManager, cmm *db.ConfigManager) *Server {
|
||||
}
|
||||
|
||||
// templ := template.Must(template.New("").Funcs(template.FuncMap{"dict": dictHelper}).ParseFS(templateFiles, "templates/*.html"))
|
||||
templ := template.Must(template.New("").Funcs(template.FuncMap{"nicetime": niceTime, "niceURL": niceURL, "join": strings.Join, "version": version.Is, "newVersion": version.UpgradeAvailableString}).ParseFS(templateFiles, "templates/*.html"))
|
||||
templ := template.Must(template.New("").Funcs(
|
||||
template.FuncMap{
|
||||
"nicetime": niceTime,
|
||||
"niceURL": niceURL,
|
||||
"join": strings.Join,
|
||||
"version": func() *version.Info { return &version.VersionInfo },
|
||||
"markdown": func(s string) template.HTML { return template.HTML(string(markdown.ToHTML([]byte(s), nil, nil))) },
|
||||
}).ParseFS(templateFiles, "templates/*.html"))
|
||||
|
||||
config, err := cmm.LoadConfig()
|
||||
if err != nil {
|
||||
@@ -386,6 +394,13 @@ func Create(bmm *db.BookmarkManager, cmm *db.ConfigManager) *Server {
|
||||
)
|
||||
})
|
||||
|
||||
r.GET("/releaseinfo", func(c *gin.Context) {
|
||||
meta := gin.H{"page": "releaseinfo", "config": config}
|
||||
c.HTML(http.StatusOK,
|
||||
"_layout.html", meta,
|
||||
)
|
||||
})
|
||||
|
||||
return server
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user