Fix merge conflicts

1 files changed, 19 insertions, 9 deletions

diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 3f9b2e476..5089cf5a2 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -41,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'CodeIgniter'
-copyright = u'2014, EllisLab, Inc.'
+copyright = u'2014, British Columbia Institute of Technology'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -92,12 +92,22 @@ highlight_language = 'ci'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'eldocs'
+#
+# Reverting to default sphinx theme, to remove dependency on EllisLab corporate style
+#html_theme = 'eldocs'
+html_theme = 'default'
 
 # 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 = {}
+#
+# Specifying a few options; just a starting point & we can play with it.
+html_theme_options = {
+   "collapsiblesidebar" : "true",
+   "sidebarbgcolor" : "#4b7eb0",
+   "codebgcolor": "#fffded",
+   "headbgcolor": "#ffeebd"
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
 html_theme_path = ["./_themes"]
@@ -116,7 +126,7 @@ html_theme_path = ["./_themes"]
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+html_favicon = 'images/ci-icon.ico'
 
 # 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,
@@ -181,7 +191,7 @@ html_copy_source = False
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('index', 'CodeIgniter.tex', u'CodeIgniter Documentation',
-   u'EllisLab, Inc.', 'manual'),
+   u'British Columbia Institute of Technology', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -214,7 +224,7 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'codeigniter', u'CodeIgniter Documentation',
-     [u'EllisLab, Inc.'], 1)
+     [u'British Columbia Institute of Technology'], 1)
 ]
 
 
@@ -222,9 +232,9 @@ man_pages = [
 
 # Bibliographic Dublin Core info.
 epub_title = u'CodeIgniter'
-epub_author = u'EllisLab, Inc.'
-epub_publisher = u'EllisLab, Inc.'
-epub_copyright = u'2014, EllisLab, Inc.'
+epub_author = u'British Columbia Institute of Technology'
+epub_publisher = u'British Columbia Institute of Technology'
+epub_copyright = u'2014, British Columbia Institute of Technology'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.