diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 187347deb..ae89c39b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,9 +45,6 @@ build_centos_7: script: - rm -f /etc/yum.repos.d/CentOS-Sources.repo - yum -y install epel-release - - yum -y install python-pip - - pip install -U pip - - pip install sphinx==1.8.5 sphinx-rtd_theme==0.4.3 - make rpm-dist - ci-build-pkg artifacts: diff --git a/Makefile b/Makefile index 9ddc868e6..ca1ebbaf5 100644 --- a/Makefile +++ b/Makefile @@ -1152,12 +1152,12 @@ documentation: echo "Skipped documentation building" ;\ else \ sphinx-build -b html -d /tmp/doctrees \ - -Dhtml_theme_path=. -Dhtml_theme=manager_doc_theme \ + -Dhtml_theme=bootstrap\ doc/sources/admin/ doc/pages/documentation/current/ ;\ fi website_documentation: - sphinx-build -b html -d /tmp/doctrees \ + LLNGSPHINXWEBSITE=1 sphinx-build -b html -d /tmp/doctrees \ doc/sources/admin/ "$(WEBSITE_DIR)" test-diff: diff --git a/debian/control b/debian/control index 34f1e0fa5..1e3105d26 100644 --- a/debian/control +++ b/debian/control @@ -53,7 +53,7 @@ Build-Depends-Indep: libapache-session-perl , libxml-libxslt-perl , libxml-simple-perl , python3-sphinx, - python3-sphinx-rtd-theme, + python3-sphinx-bootstrap-theme, perl Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/lemonldap-ng diff --git a/doc/sources/admin/conf.py b/doc/sources/admin/conf.py index 9e132635e..4ea0add2e 100644 --- a/doc/sources/admin/conf.py +++ b/doc/sources/admin/conf.py @@ -19,6 +19,8 @@ # import os # import sys # sys.path.insert(0, os.path.abspath('.')) +import sphinx_bootstrap_theme +import os # -- General configuration ------------------------------------------------ @@ -118,20 +120,25 @@ todo_include_todos = False # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -#html_theme_path = [ '.' ] +html_theme_path = sphinx_bootstrap_theme.get_html_theme_path() # For website -html_theme = 'sphinx_rtd_theme' +html_theme = 'bootstrap' -# For embedded doc -#html_theme = 'my_theme' +html_theme_options = { + 'globaltoc_includehidden': False, + 'navbar_sidebarrel': False, + 'navbar_pagenav': False, + 'globaltoc_depth': 0, + 'navbar_fixed_top': "false", + 'navbar_class': "hidden", + } +if 'LLNGSPHINXWEBSITE' in os.environ: + import sphinx_rtd_theme + html_theme = 'sphinx_rtd_theme' + html_theme_options = {} -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -# -# html_theme_options = {} # html_theme_options = {} diff --git a/doc/sources/admin/manager_doc_theme/breadcrumbs.html b/doc/sources/admin/manager_doc_theme/breadcrumbs.html deleted file mode 100644 index 5578b619c..000000000 --- a/doc/sources/admin/manager_doc_theme/breadcrumbs.html +++ /dev/null @@ -1,82 +0,0 @@ -{# Support for Sphinx 1.3+ page_source_suffix, but don't break old builds. #} - -{% if page_source_suffix %} -{% set suffix = page_source_suffix %} -{% else %} -{% set suffix = source_suffix %} -{% endif %} - -{% if meta is defined and meta is not none %} -{% set check_meta = True %} -{% else %} -{% set check_meta = False %} -{% endif %} - -{% if check_meta and 'github_url' in meta %} -{% set display_github = True %} -{% endif %} - -{% if check_meta and 'bitbucket_url' in meta %} -{% set display_bitbucket = True %} -{% endif %} - -{% if check_meta and 'gitlab_url' in meta %} -{% set display_gitlab = True %} -{% endif %} - -
diff --git a/doc/sources/admin/manager_doc_theme/footer.html b/doc/sources/admin/manager_doc_theme/footer.html deleted file mode 100644 index 80815bd94..000000000 --- a/doc/sources/admin/manager_doc_theme/footer.html +++ /dev/null @@ -1,54 +0,0 @@ - - diff --git a/doc/sources/admin/manager_doc_theme/layout.html b/doc/sources/admin/manager_doc_theme/layout.html deleted file mode 100644 index 2b0faa5d7..000000000 --- a/doc/sources/admin/manager_doc_theme/layout.html +++ /dev/null @@ -1,113 +0,0 @@ -{# TEMPLATE VAR SETTINGS #} -{%- set url_root = pathto('', 1) %} -{%- if url_root == '#' %}{% set url_root = '' %}{% endif %} -{%- if not embedded and docstitle %} - {%- set titlesuffix = " — "|safe + docstitle|e %} -{%- else %} - {%- set titlesuffix = "" %} -{%- endif %} -{%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %} - - - - - - - {{ metatags }} - - {% block htmltitle %} -{{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}
- {% endif %} - {% endif %} -{{ context|e }}
-