Merge "Change theme to 'oslosphinx' for fuel docs"

conf.py

@@ -13,8 +13,7 @@
 
 import os
 import sys
-import subprocess
-import openstackdocstheme
+import oslosphinx
 
 sys.path.insert(0, os.path.join(os.path.abspath('.')))
 
@@ -35,14 +34,12 @@ autodoc_member_order = 'bysource'
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     'sphinx.ext.autodoc',
+    'oslosphinx',
     'rst2pdf.pdfbuilder'
 #    'sphinxcontrib.plantuml'
 ]
 #plantuml = ['java', '-jar', 'plantuml.jar']
 
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['devdocs/_templates']
-
 # The suffix of source filenames.
 source_suffix = '.rst'
 
@@ -105,14 +102,14 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'openstackdocs'
+#html_theme = 'oslosphinx'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # documentation.
 #html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = [openstackdocstheme.get_html_theme_path()]
+#html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
@@ -258,20 +255,6 @@ texinfo_documents = [(
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
 #texinfo_show_urls = 'footnote'
 # -- Additional Settings ------------------------------------------------------
-# The variables to make "Log a bug" link send
-# metadata for the project where the docs reside:
-
-# We ask git for the SHA checksum
-# The git SHA checksum is used by "log-a-bug"
-git_cmd = ["/usr/bin/git", "rev-parse", "HEAD"]
-gitsha = subprocess.Popen(git_cmd, stdout=subprocess.PIPE).communicate()[0].strip('\n')
-# tag that reported bugs will be tagged with
-bug_tag = ""
-# source tree
-pwd = os.getcwd()
-# html_context allows us to pass arbitrary values into the html template
-html_context = {"pwd": pwd, "gitsha": gitsha}
-# Must set this variable to include year, month, day, hours, and minutes.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
+oslosphinx_cgit_link = 'https://github.com/openstack/fuel-docs'
 
 execfile('./common_conf.py')

requirements.txt

@@ -9,4 +9,4 @@ sphinxcontrib-seqdiag
 sphinxcontrib-nwdiag
 sphinxcontrib-plantuml
 beautifulsoup4==4.4.0
-openstackdocstheme
+oslosphinx