From abd0466a42d6b9897ba9e3bcb373b41974e9c46f Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Mon, 5 Jun 2017 12:49:38 -0400 Subject: PLT-3466 E10: Add announcement bar feature (#6509) * E10 - Add announcement bar feature * Updates per feedback * Add component tests and snapshots * Update snapshots * Updating color picker UI (#6543) * Add class to body tag when banner is not dismissable and clean up localstorage items when banner changes * Fixing links (#6544) * Updating UI for fixed error bar (#6552) * Truncating text on fixed banner (#6561) * Plt 3466 - Error bar link states (#6577) * Updating error bar hover state * Updating error bar link states --- utils/config.go | 8 ++++++++ utils/license.go | 1 + 2 files changed, 9 insertions(+) (limited to 'utils') diff --git a/utils/config.go b/utils/config.go index c0771933d..b5a26d298 100644 --- a/utils/config.go +++ b/utils/config.go @@ -538,6 +538,14 @@ func getClientConfig(c *model.Config) map[string]string { props["ElasticSearchEnableIndexing"] = strconv.FormatBool(*c.ElasticSearchSettings.EnableIndexing) props["ElasticSearchEnableSearching"] = strconv.FormatBool(*c.ElasticSearchSettings.EnableSearching) } + + if *License.Features.Announcement { + props["EnableBanner"] = strconv.FormatBool(*c.AnnouncementSettings.EnableBanner) + props["BannerText"] = *c.AnnouncementSettings.BannerText + props["BannerColor"] = *c.AnnouncementSettings.BannerColor + props["BannerTextColor"] = *c.AnnouncementSettings.BannerTextColor + props["AllowBannerDismissal"] = strconv.FormatBool(*c.AnnouncementSettings.AllowBannerDismissal) + } } return props diff --git a/utils/license.go b/utils/license.go index 03a9d7ab3..3647b51cc 100644 --- a/utils/license.go +++ b/utils/license.go @@ -178,6 +178,7 @@ func getClientLicense(l *model.License) map[string]string { props["CustomBrand"] = strconv.FormatBool(*l.Features.CustomBrand) props["MHPNS"] = strconv.FormatBool(*l.Features.MHPNS) props["PasswordRequirements"] = strconv.FormatBool(*l.Features.PasswordRequirements) + props["Announcement"] = strconv.FormatBool(*l.Features.Announcement) props["IssuedAt"] = strconv.FormatInt(l.IssuedAt, 10) props["StartsAt"] = strconv.FormatInt(l.StartsAt, 10) props["ExpiresAt"] = strconv.FormatInt(l.ExpiresAt, 10) -- cgit v1.2.3-1-g7c22