From 71615cf89dc2e1f10880154510f84bab6e78eac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= Date: Thu, 16 Sep 2021 17:10:15 +0200 Subject: [PATCH 1/2] add ability to specify a menu logo (top left corner) via a config setting --- documentation/changelog.rst | 2 ++ documentation/configuration.rst | 9 +++++++++ flexmeasures/ui/static/css/flexmeasures.css | 5 +++++ flexmeasures/ui/templates/base.html | 10 +++++++++- flexmeasures/ui/utils/view_utils.py | 2 ++ setup.py | 2 +- 6 files changed, 28 insertions(+), 2 deletions(-) diff --git a/documentation/changelog.rst b/documentation/changelog.rst index e5a7054de..92adc830a 100644 --- a/documentation/changelog.rst +++ b/documentation/changelog.rst @@ -9,6 +9,8 @@ v0.7.0 | October XX, 2021 New features ----------- +* Set a logo for the top left corner with the new FLEXMEASURES_MENU_LOGO_PATH setting [see `PR #1XX `_] + Bugfixes ----------- diff --git a/documentation/configuration.rst b/documentation/configuration.rst index c68ca3d15..ed68682e2 100644 --- a/documentation/configuration.rst +++ b/documentation/configuration.rst @@ -106,6 +106,15 @@ For example, ``("MyMDCApp", ["MDC"]), "MyApp"]`` would show the name "MyMDCApp" Default: ``"FlexMeasures"`` +FLEXMEASURES_MENU_LOGO_PATH +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +A URL path to identify an image being used as logo in the upper left corner (replacing some generic text made from platform name and the page title). +The path can be a complete URL or a relative from the app root. + +Default: "" + + FLEXMEASURES_ROOT_VIEW ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/flexmeasures/ui/static/css/flexmeasures.css b/flexmeasures/ui/static/css/flexmeasures.css index 1f8677512..faab9cf98 100644 --- a/flexmeasures/ui/static/css/flexmeasures.css +++ b/flexmeasures/ui/static/css/flexmeasures.css @@ -2,6 +2,11 @@ body { padding-top: 100px; /* This default is overridden by flexmeasures.js to support a fluid navbar */ } +#menu-logo { + height: 50px; + position: fixed; top: 0; left: 0; +} + #alerts { position: absolute; right: 10px; diff --git a/flexmeasures/ui/templates/base.html b/flexmeasures/ui/templates/base.html index bc714d0da..6b184ae9c 100644 --- a/flexmeasures/ui/templates/base.html +++ b/flexmeasures/ui/templates/base.html @@ -63,7 +63,15 @@ - {{ FLEXMEASURES_PLATFORM_NAME }} {% if not "Error" in self.title() %} - {{ self.title() }} {% endif %} + + + {% if menu_logo %} + + {% else %} + {{ FLEXMEASURES_PLATFORM_NAME }} {% if not "Error" in self.title() %} - {{ self.title() }} {% endif %} + {% endif %} + +
diff --git a/flexmeasures/ui/utils/view_utils.py b/flexmeasures/ui/utils/view_utils.py index 934300c8f..7f31ed565 100644 --- a/flexmeasures/ui/utils/view_utils.py +++ b/flexmeasures/ui/utils/view_utils.py @@ -89,6 +89,8 @@ def render_flexmeasures_template(html_filename: str, **variables): ) variables["js_versions"] = current_app.config.get("FLEXMEASURES_JS_VERSIONS") + variables["menu_logo"] = current_app.config.get("FLEXMEASURES_MENU_LOGO_PATH") + return render_template(html_filename, **variables) diff --git a/setup.py b/setup.py index d915519e8..135c9813f 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ def load_requirements(use_case): setup( name="flexmeasures", - description="FlexMeasures - A free platform for real-time optimization of flexible energy.", + description="FlexMeasures - A free platform to build services for real-time optimization of flexible energy.", author="Seita BV", author_email="nicolas@seita.nl", url="https://github.com/seitabv/flexmeasures", From dc06e7e81d834adcd947e90af3f1cb182529630b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20H=C3=B6ning?= Date: Thu, 16 Sep 2021 23:38:59 +0200 Subject: [PATCH 2/2] add PR number --- documentation/changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/changelog.rst b/documentation/changelog.rst index 92adc830a..8f39c30b4 100644 --- a/documentation/changelog.rst +++ b/documentation/changelog.rst @@ -9,7 +9,7 @@ v0.7.0 | October XX, 2021 New features ----------- -* Set a logo for the top left corner with the new FLEXMEASURES_MENU_LOGO_PATH setting [see `PR #1XX `_] +* Set a logo for the top left corner with the new FLEXMEASURES_MENU_LOGO_PATH setting [see `PR #184 `_] Bugfixes