From e6f95c9367f25b4775bfe5a10fae246945411129 Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sat, 28 Jan 2017 17:27:50 -0800 Subject: [PATCH] Make @inbucket prompt configurable, closes #31 --- CHANGELOG.md | 1 + config/config.go | 2 ++ etc/devel.conf | 4 ++++ etc/docker/defaults/inbucket.conf | 4 ++++ etc/homebrew/inbucket.conf | 4 ++++ etc/inbucket.conf | 4 ++++ etc/unix-sample.conf | 4 ++++ etc/win-sample.conf | 4 ++++ themes/bootstrap/templates/_base.html | 4 +++- 9 files changed, 30 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d831809..c9d2aef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Go client for REST API - Monitor feature: lists messages as they arrive, regardless of their destination mailbox +- Make `@inbucket` mailbox prompt configurable ### Fixed - No longer run out of file handles when dealing with a large number of diff --git a/config/config.go b/config/config.go index f444a68..01e909e 100644 --- a/config/config.go +++ b/config/config.go @@ -39,6 +39,7 @@ type WebConfig struct { TemplateCache bool PublicDir string GreetingFile string + MailboxPrompt string CookieAuthKey string MonitorVisible bool MonitorHistory int @@ -139,6 +140,7 @@ func LoadConfig(filename string) error { {"web", "template.dir", &webConfig.TemplateDir, true}, {"web", "public.dir", &webConfig.PublicDir, true}, {"web", "greeting.file", &webConfig.GreetingFile, true}, + {"web", "mailbox.prompt", &webConfig.MailboxPrompt, false}, {"web", "cookie.auth.key", &webConfig.CookieAuthKey, false}, {"datastore", "path", &dataStoreConfig.Path, true}, } diff --git a/etc/devel.conf b/etc/devel.conf index 5e7e536..1e765d4 100644 --- a/etc/devel.conf +++ b/etc/devel.conf @@ -73,6 +73,10 @@ ip4.port=9000 # Name of web theme to use theme=bootstrap +# Prompt displayed between the mailbox entry field and View button. Leave +# empty or comment out to hide the prompt. +mailbox.prompt=@inbucket + # Path to the selected themes template files template.dir=%(install.dir)s/themes/%(theme)s/templates diff --git a/etc/docker/defaults/inbucket.conf b/etc/docker/defaults/inbucket.conf index a7aafed..8825e87 100644 --- a/etc/docker/defaults/inbucket.conf +++ b/etc/docker/defaults/inbucket.conf @@ -75,6 +75,10 @@ ip4.port=10080 # Name of web theme to use theme=bootstrap +# Prompt displayed between the mailbox entry field and View button. Leave +# empty or comment out to hide the prompt. +mailbox.prompt=@inbucket + # Path to the selected themes template files template.dir=%(install.dir)s/themes/%(theme)s/templates diff --git a/etc/homebrew/inbucket.conf b/etc/homebrew/inbucket.conf index dd09fef..bebd42a 100644 --- a/etc/homebrew/inbucket.conf +++ b/etc/homebrew/inbucket.conf @@ -75,6 +75,10 @@ ip4.port=9000 # Name of web theme to use theme=bootstrap +# Prompt displayed between the mailbox entry field and View button. Leave +# empty or comment out to hide the prompt. +mailbox.prompt=@inbucket + # Path to the selected themes template files template.dir=%(themes.dir)s/%(theme)s/templates diff --git a/etc/inbucket.conf b/etc/inbucket.conf index 6918d9e..e8e16d4 100644 --- a/etc/inbucket.conf +++ b/etc/inbucket.conf @@ -73,6 +73,10 @@ ip4.port=9000 # Name of web theme to use theme=bootstrap +# Prompt displayed between the mailbox entry field and View button. Leave +# empty or comment out to hide the prompt. +mailbox.prompt=@inbucket + # Path to the selected themes template files template.dir=%(install.dir)s/themes/%(theme)s/templates diff --git a/etc/unix-sample.conf b/etc/unix-sample.conf index cdb21c3..240923f 100644 --- a/etc/unix-sample.conf +++ b/etc/unix-sample.conf @@ -73,6 +73,10 @@ ip4.port=80 # Name of web theme to use theme=bootstrap +# Prompt displayed between the mailbox entry field and View button. Leave +# empty or comment out to hide the prompt. +mailbox.prompt=@inbucket + # Path to the selected themes template files template.dir=%(install.dir)s/themes/%(theme)s/templates diff --git a/etc/win-sample.conf b/etc/win-sample.conf index 0227176..398dbd0 100644 --- a/etc/win-sample.conf +++ b/etc/win-sample.conf @@ -73,6 +73,10 @@ ip4.port=9000 # Name of web theme to use theme=bootstrap +# Prompt displayed between the mailbox entry field and View button. Leave +# empty or comment out to hide the prompt. +mailbox.prompt=@inbucket + # Path to the selected themes template files template.dir=%(install.dir)s\themes\%(theme)s\templates diff --git a/themes/bootstrap/templates/_base.html b/themes/bootstrap/templates/_base.html index 114e1ec..066e76e 100644 --- a/themes/bootstrap/templates/_base.html +++ b/themes/bootstrap/templates/_base.html @@ -61,7 +61,9 @@ placeholder="mailbox" class="form-control" aria-describedby="at-inbucket-addon"/> - @inbucket + {{with .ctx.WebConfig.MailboxPrompt}} + {{.}} + {{end}}