diff --git a/netbox/netbox/configuration.example.py b/netbox/netbox/configuration.example.py index 60eceaf28..aba0eb3f5 100644 --- a/netbox/netbox/configuration.example.py +++ b/netbox/netbox/configuration.example.py @@ -73,5 +73,8 @@ TIME_FORMAT = 'g:i a' SHORT_TIME_FORMAT = 'H:i:s' DATETIME_FORMAT = 'N j, Y g:i a' SHORT_DATETIME_FORMAT = 'Y-m-d H:i' + +# Optionally display a persistent banner at the top and/or bottom of every page. To display the same content in both +# banners, define BANNER_TOP and set BANNER_BOTTOM = BANNER_TOP. BANNER_TOP = '' BANNER_BOTTOM = '' diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index c08110dbd..c34b93833 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -38,9 +38,9 @@ TIME_FORMAT = getattr(configuration, 'TIME_FORMAT', 'g:i a') SHORT_TIME_FORMAT = getattr(configuration, 'SHORT_TIME_FORMAT', 'H:i:s') DATETIME_FORMAT = getattr(configuration, 'DATETIME_FORMAT', 'N j, Y g:i a') SHORT_DATETIME_FORMAT = getattr(configuration, 'SHORT_DATETIME_FORMAT', 'Y-m-d H:i') -CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS BANNER_TOP = getattr(configuration, 'BANNER_TOP', False) BANNER_BOTTOM = getattr(configuration, 'BANNER_BOTTOM', False) +CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS # Attempt to import LDAP configuration if it has been defined LDAP_IGNORE_CERT_ERRORS = False diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css index 0dc9d7efa..b1a9e88c3 100644 --- a/netbox/project-static/css/base.css +++ b/netbox/project-static/css/base.css @@ -295,6 +295,9 @@ ul.rack_near_face li.empty:hover a { .dark_gray:hover { background-color: #2c3e50; } /* Misc */ +.banner-bottom { + margin-bottom: 50px; +} .panel table { margin-bottom: 0; } diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html index dfbba6f9f..71f67aea0 100644 --- a/netbox/templates/_base.html +++ b/netbox/templates/_base.html @@ -227,8 +227,8 @@ {% if settings.BANNER_TOP %}