From 6a7c07eddc59bec7ba0028ae041adac7577b7f70 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Fri, 3 Aug 2018 05:16:43 -0700 Subject: [PATCH] Minor improvements to the IPInfo widget display --- clocks/display.go | 2 +- ipaddresses/ipinfo/widget.go | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/clocks/display.go b/clocks/display.go index baad6dac..d59e243a 100644 --- a/clocks/display.go +++ b/clocks/display.go @@ -12,7 +12,7 @@ func (widget *Widget) display(clocks []Clock) { return } - str := "\n" + str := "" for idx, clock := range clocks { str = str + fmt.Sprintf( " [%s]%-12s %-10s %7s[white]\n", diff --git a/ipaddresses/ipinfo/widget.go b/ipaddresses/ipinfo/widget.go index 170983b7..925eee16 100644 --- a/ipaddresses/ipinfo/widget.go +++ b/ipaddresses/ipinfo/widget.go @@ -78,21 +78,19 @@ func (widget *Widget) ipinfo() { // read module configs func (widget *Widget) config() { - nameColor, valueColor := wtf.Config.UString("wtf.mods.ipinfo.colors.name", "red"), wtf.Config.UString("wtf.mods.ipinfo.colors.value", "white") - widget.colors.name = nameColor - widget.colors.value = valueColor + widget.colors.name = wtf.Config.UString("wtf.mods.ipinfo.colors.name", "white") + widget.colors.value = wtf.Config.UString("wtf.mods.ipinfo.colors.value", "white") } func (widget *Widget) setResult(info *ipinfo) { resultTemplate, _ := template.New("ipinfo_result").Parse( - formatableText("IP Address", "Ip") + + formatableText("IP", "Ip") + formatableText("Hostname", "Hostname") + formatableText("City", "City") + formatableText("Region", "Region") + formatableText("Country", "Country") + - formatableText("Coordinates", "Coordinates") + - formatableText("Postal Code", "PostalCode") + - formatableText("Organization", "Organization"), + formatableText("Coords", "Coordinates") + + formatableText("Org", "Organization"), ) resultBuffer := new(bytes.Buffer) @@ -114,5 +112,5 @@ func (widget *Widget) setResult(info *ipinfo) { } func formatableText(key, value string) string { - return fmt.Sprintf(" [{{.nameColor}}]%s: [{{.valueColor}}]{{.%s}}\n", key, value) + return fmt.Sprintf(" [{{.nameColor}}]%8s: [{{.valueColor}}]{{.%s}}\n", key, value) }