From 77ab49b33b2c34070f68968451a2c77ea8bf6746 Mon Sep 17 00:00:00 2001 From: Mike McKiernan Date: Tue, 16 Apr 2024 13:15:30 -0400 Subject: [PATCH 1/2] Add GDPR info to footer Signed-off-by: Mike McKiernan --- docs/source/_static/css/custom.css | 12 ++++++++++++ docs/source/_templates/footer.html | 14 ++++++++++++++ docs/source/conf.py | 12 +++++++++--- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 docs/source/_templates/footer.html diff --git a/docs/source/_static/css/custom.css b/docs/source/_static/css/custom.css index 7287e492..576879bf 100644 --- a/docs/source/_static/css/custom.css +++ b/docs/source/_static/css/custom.css @@ -470,3 +470,15 @@ dd p:first-child { margin-top: 0px; } + +footer div p { + font-size: 80%; +} + +footer div p a { + color: var(--small-font-color); +} + +footer div p a:hover { + color: var(--small-font-color); +} diff --git a/docs/source/_templates/footer.html b/docs/source/_templates/footer.html new file mode 100644 index 00000000..72cae10b --- /dev/null +++ b/docs/source/_templates/footer.html @@ -0,0 +1,14 @@ +{% extends '!footer.html' %} +{% block contentinfo %} +

+Privacy Policy | +Manage My Privacy | +Do Not Sell or Share My Data | +Terms of Service | +Accessibility | +Corporate Policies | +Product Security | +Contact +

+{{ super() }} +{% endblock %} \ No newline at end of file diff --git a/docs/source/conf.py b/docs/source/conf.py index ec358118..128fc8ae 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -14,6 +14,7 @@ import re import subprocess import sys +from datetime import datetime from natsort import natsorted @@ -25,8 +26,13 @@ # -- Project information ----------------------------------------------------- +year_range = "2022" +year_now = str(datetime.now().year) +if year_range != year_now: + year_range = year_range + chr(8211) + year_now + project = "Merlin Systems" -copyright = "2024, NVIDIA" # pylint: disable=W0622 +copyright = year_range + ", NVIDIA" # pylint: disable=W0622 author = "NVIDIA" @@ -84,8 +90,7 @@ html_theme_options = { "repository_url": "https://github.com/NVIDIA-Merlin/systems", "use_repository_button": True, - "footer_content_items": ["copyright.html", "last-updated.html"], - "extra_footer": "", + "footer_content_items": ["copyright.html", "footer.html"], "logo": {"text": "NVIDIA Merlin Systems", "alt_text": "NVIDIA Merlin Systems"}, } html_sidebars = { @@ -101,6 +106,7 @@ html_favicon = "_static/favicon.png" html_copy_source = True html_show_sourcelink = False +html_show_sphinx = False # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, From aa6e34a2286623de12bdc37fa82d4f7b5743a280 Mon Sep 17 00:00:00 2001 From: Oliver Holworthy <1216955+oliverholworthy@users.noreply.github.com> Date: Thu, 25 Apr 2024 14:12:20 +0100 Subject: [PATCH 2/2] match changes from core/models --- docs/source/_static/css/custom.css | 1 + docs/source/_templates/footer.html | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/source/_static/css/custom.css b/docs/source/_static/css/custom.css index 576879bf..11179bfd 100644 --- a/docs/source/_static/css/custom.css +++ b/docs/source/_static/css/custom.css @@ -473,6 +473,7 @@ dd p:first-child footer div p { font-size: 80%; + padding-top: 1em; } footer div p a { diff --git a/docs/source/_templates/footer.html b/docs/source/_templates/footer.html index 72cae10b..7d362978 100644 --- a/docs/source/_templates/footer.html +++ b/docs/source/_templates/footer.html @@ -1,5 +1,3 @@ -{% extends '!footer.html' %} -{% block contentinfo %}

Privacy Policy | Manage My Privacy | @@ -10,5 +8,3 @@ Product Security | Contact

-{{ super() }} -{% endblock %} \ No newline at end of file