medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50 from jonesrussell/rej_shownavigation 

bugfix: Rename "HideNavigation" to "ShowNavigation"
This commit is contained in:
James Read 2022-03-23 15:44:00 +00:00 committed by GitHub
parent 51112aa2f4 24b8857165
commit bb96072682
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration-tests/configs/config.hiddenNav.yaml
View File

@ -4,7 +4,7 @@
listenAddressSingleHTTPFrontend: 0.0.0.0:1337 listenAddressSingleHTTPFrontend: 0.0.0.0:1337
hideNavigation: true showNavigation: false
checkForUpdates: false checkForUpdates: false
# Actions (buttons) to show up on the WebUI: # Actions (buttons) to show up on the WebUI:

10
internal/config/config.go
View File

@ -60,8 +60,6 @@ type UserGroup struct {
type Config struct { type Config struct {
UseSingleHTTPFrontend bool UseSingleHTTPFrontend bool
ThemeName string ThemeName string
HideNavigation bool
ShowFooter bool
ListenAddressSingleHTTPFrontend string ListenAddressSingleHTTPFrontend string
ListenAddressWebUI string ListenAddressWebUI string
ListenAddressRestActions string ListenAddressRestActions string
@ -71,6 +69,8 @@ type Config struct {
Actions []Action `mapstructure:"actions"` Actions []Action `mapstructure:"actions"`
Entities []Entity `mapstructure:"entities"` Entities []Entity `mapstructure:"entities"`
CheckForUpdates bool CheckForUpdates bool
ShowFooter bool
ShowNavigation bool
ShowNewVersions bool ShowNewVersions bool
Usergroups []UserGroup Usergroups []UserGroup
DefaultPermissions DefaultPermissions DefaultPermissions DefaultPermissions
@ -80,15 +80,15 @@ type Config struct {
func DefaultConfig() *Config { func DefaultConfig() *Config {
config := Config{} config := Config{}
config.UseSingleHTTPFrontend = true config.UseSingleHTTPFrontend = true
config.HideNavigation = false config.ShowFooter = true
config.ShowFooter = true config.ShowNavigation = true
config.ShowNewVersions = true
config.ListenAddressSingleHTTPFrontend = "0.0.0.0:1337" config.ListenAddressSingleHTTPFrontend = "0.0.0.0:1337"
config.ListenAddressRestActions = "localhost:1338" config.ListenAddressRestActions = "localhost:1338"
config.ListenAddressGrpcActions = "localhost:1339" config.ListenAddressGrpcActions = "localhost:1339"
config.ListenAddressWebUI = "localhost:1340" config.ListenAddressWebUI = "localhost:1340"
config.LogLevel = "INFO" config.LogLevel = "INFO"
config.CheckForUpdates = true config.CheckForUpdates = true
config.ShowNewVersions = true
config.DefaultPermissions.Exec = true config.DefaultPermissions.Exec = true
config.DefaultPermissions.View = true config.DefaultPermissions.View = true

13
internal/httpservers/webuiServer.go
View File

@ -14,11 +14,11 @@ import (
type webUISettings struct { type webUISettings struct {
Rest string Rest string
ThemeName string ThemeName string
HideNavigation bool ShowFooter bool
ShowFooter bool ShowNavigation bool
ShowNewVersions bool
AvailableVersion string AvailableVersion string
CurrentVersion string CurrentVersion string
ShowNewVersions bool
} }
func findWebuiDir() string { func findWebuiDir() string {
@ -53,11 +53,12 @@ func generateWebUISettings(w http.ResponseWriter, r *http.Request) {
jsonRet, _ := json.Marshal(webUISettings{ jsonRet, _ := json.Marshal(webUISettings{
Rest: restAddress + "/api/", Rest: restAddress + "/api/",
ThemeName: cfg.ThemeName, ThemeName: cfg.ThemeName,
HideNavigation: cfg.HideNavigation, ShowFooter: cfg.ShowFooter,
ShowFooter: cfg.ShowFooter, ShowNavigation: cfg.ShowNavigation,
ShowNewVersions: cfg.ShowNewVersions,
AvailableVersion: updatecheck.AvailableVersion, AvailableVersion: updatecheck.AvailableVersion,
CurrentVersion: updatecheck.CurrentVersion, CurrentVersion: updatecheck.CurrentVersion,
ShowNewVersions: cfg.ShowNewVersions,
}) })
_, err := w.Write([]byte(jsonRet)) _, err := w.Write([]byte(jsonRet))

2
webui/main.js
View File

@ -62,7 +62,7 @@ function processWebuiSettingsJson (settings) {
document.querySelector('#available-version').hidden = false document.querySelector('#available-version').hidden = false
} }
document.querySelector('#section-switcher').hidden = settings.HideNavigation document.querySelector('#section-switcher').hidden = !settings.ShowNavigation
document.querySelector('footer[title="footer"]').hidden = !settings.ShowFooter document.querySelector('footer[title="footer"]').hidden = !settings.ShowFooter
} }