From f7c8ea2dafc9c007c5363ed33e323344bee18944 Mon Sep 17 00:00:00 2001
From: James L Parry <jim_parry@bcit.ca>
Date: Tue, 28 Oct 2014 15:28:27 -0700
Subject: Revert to default sphinx theme

Remove dependency on EllisLab corporate theme - that is not appropriate for us.
Reverted to default Sphinx theme, with a couple of options, which have the side-effect of adding back document tree navigation (next/previous) and collapsible menu (albeit a sidebar not a top one).

Closes #2605 and closes #2354, for now.
This is not a proper styling - that is a separate issue!
Signed-off-by:James L Parry <jim_parry@bcit.ca>
---
 nbproject/project.properties             |   7 +++++++
 nbproject/project.xml                    |   9 +++++++++
 user_guide_src/source/conf.py            |  16 +++++++++++++---
 user_guide_src/source/images/ci-icon.ico | Bin 0 -> 5430 bytes
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 nbproject/project.properties
 create mode 100644 nbproject/project.xml
 create mode 100644 user_guide_src/source/images/ci-icon.ico

diff --git a/nbproject/project.properties b/nbproject/project.properties
new file mode 100644
index 000000000..d37ef9563
--- /dev/null
+++ b/nbproject/project.properties
@@ -0,0 +1,7 @@
+include.path=${php.global.include.path}
+php.version=PHP_54
+source.encoding=UTF-8
+src.dir=.
+tags.asp=false
+tags.short=false
+web.root=.
diff --git a/nbproject/project.xml b/nbproject/project.xml
new file mode 100644
index 000000000..f22df53c2
--- /dev/null
+++ b/nbproject/project.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.php.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/php-project/1">
+            <name>CodeIgniter</name>
+        </data>
+    </configuration>
+</project>
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 118b2fb87..5089cf5a2 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -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,
diff --git a/user_guide_src/source/images/ci-icon.ico b/user_guide_src/source/images/ci-icon.ico
new file mode 100644
index 000000000..7ecfce214
Binary files /dev/null and b/user_guide_src/source/images/ci-icon.ico differ
-- 
cgit v1.2.3-24-g4f1b


From bc2d3036267d908071ab1b26aea0a6f8e23e9201 Mon Sep 17 00:00:00 2001
From: root <root@new-host-16.(none)>
Date: Tue, 28 Oct 2014 15:43:00 -0700
Subject: [ci skip] Untrack nbproject/

---
 .gitignore                   | 3 ++-
 nbproject/project.properties | 7 -------
 nbproject/project.xml        | 9 ---------
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 nbproject/project.properties
 delete mode 100644 nbproject/project.xml

diff --git a/.gitignore b/.gitignore
index a035c2b27..9edcfca6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,5 @@ user_guide_src/build/*
 user_guide_src/cilexer/build/*
 user_guide_src/cilexer/dist/*
 user_guide_src/cilexer/pycilexer.egg-info/*
-/vendor/
\ No newline at end of file
+/vendor/
+/nbproject/
\ No newline at end of file
diff --git a/nbproject/project.properties b/nbproject/project.properties
deleted file mode 100644
index d37ef9563..000000000
--- a/nbproject/project.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-include.path=${php.global.include.path}
-php.version=PHP_54
-source.encoding=UTF-8
-src.dir=.
-tags.asp=false
-tags.short=false
-web.root=.
diff --git a/nbproject/project.xml b/nbproject/project.xml
deleted file mode 100644
index f22df53c2..000000000
--- a/nbproject/project.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.php.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/php-project/1">
-            <name>CodeIgniter</name>
-        </data>
-    </configuration>
-</project>
-- 
cgit v1.2.3-24-g4f1b