From 7a248ec7e55b499fedada176d0ec4c3f2885ba1b Mon Sep 17 00:00:00 2001 From: David Fischer Date: Fri, 6 Apr 2018 17:06:15 -0700 Subject: [PATCH] Enable ads on the readthedocs mkdocs theme --- .../core/static-src/core/js/doc-embed/constants.js | 3 ++- readthedocs/core/static-src/core/js/doc-embed/rtd-data.js | 8 +++++++- .../core/static-src/core/js/doc-embed/sponsorship.js | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/readthedocs/core/static-src/core/js/doc-embed/constants.js b/readthedocs/core/static-src/core/js/doc-embed/constants.js index bf7a780e92f..67dafcac4c5 100644 --- a/readthedocs/core/static-src/core/js/doc-embed/constants.js +++ b/readthedocs/core/static-src/core/js/doc-embed/constants.js @@ -3,7 +3,8 @@ var exports = { THEME_RTD: 'sphinx_rtd_theme', THEME_ALABASTER: 'alabaster', - THEME_CELERY: 'sphinx_celery' + THEME_CELERY: 'sphinx_celery', + THEME_MKDOCS_RTD: 'readthedocs' }; exports.PROMO_SUPPORTED_THEMES = [ diff --git a/readthedocs/core/static-src/core/js/doc-embed/rtd-data.js b/readthedocs/core/static-src/core/js/doc-embed/rtd-data.js index 2fdf08edd2f..6336d7f55ed 100644 --- a/readthedocs/core/static-src/core/js/doc-embed/rtd-data.js +++ b/readthedocs/core/static-src/core/js/doc-embed/rtd-data.js @@ -19,10 +19,17 @@ var configMethods = { return (!('builder' in this) || this.builder !== 'mkdocs'); }, + is_mkdocs_builder: function () { + return (!('builder' in this) || this.builder === 'mkdocs'); + }, + get_theme_name: function () { // Crappy heuristic, but people change the theme name on us. So we have to // do some duck typing. if (this.theme !== constants.THEME_RTD) { + if (this.theme === constants.THEME_MKDOCS_RTD) { + return constants.THEME_RTD; + } if ($('div.rst-other-versions').length === 1) { return constants.THEME_RTD; } @@ -33,7 +40,6 @@ var configMethods = { show_promo: function () { return ( this.api_host !== 'https://readthedocs.com' && - this.is_sphinx_builder() && this.theme_supports_promo()); } }; diff --git a/readthedocs/core/static-src/core/js/doc-embed/sponsorship.js b/readthedocs/core/static-src/core/js/doc-embed/sponsorship.js index 01e59ae1705..e5d10961df6 100644 --- a/readthedocs/core/static-src/core/js/doc-embed/sponsorship.js +++ b/readthedocs/core/static-src/core/js/doc-embed/sponsorship.js @@ -16,7 +16,10 @@ function create_sidebar_placement() { var selector = null; var class_name; // Used for theme specific CSS customizations - if (rtd.is_rtd_theme()) { + if (rtd.is_mkdocs_builder() && rtd.is_rtd_theme()) { + selector = 'nav.wy-nav-side'; + class_name = 'ethical-rtd'; + } else if (rtd.is_rtd_theme()) { selector = 'nav.wy-nav-side > div.wy-side-scroll'; class_name = 'ethical-rtd'; } else if (rtd.get_theme_name() === constants.THEME_ALABASTER ||