From f42967bdc7029e5c892811d84c7dfeb39a9b9f47 Mon Sep 17 00:00:00 2001
From: Anne Gentle <anne@openstack.org>
Date: Fri, 29 Oct 2010 11:53:09 -0500
Subject: Updated location of layout.html and change conf.py to use a build
 variable.

---
 doc/source/_ga/layout.html        |  17 +++++++++++++++++
 doc/source/_templates/.DS_Store   | Bin 0 -> 6148 bytes
 doc/source/_templates/layout.html |  17 -----------------
 3 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 doc/source/_ga/layout.html
 create mode 100644 doc/source/_templates/.DS_Store
 delete mode 100644 doc/source/_templates/layout.html

(limited to 'doc/source')

diff --git a/doc/source/_ga/layout.html b/doc/source/_ga/layout.html
new file mode 100644
index 000000000..0b72a77ac
--- /dev/null
+++ b/doc/source/_ga/layout.html
@@ -0,0 +1,17 @@
+{% extends "!layout.html" %}
+
+{% block footer %}
+{{ super() }}
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+try {
+var pageTracker = _gat._getTracker("UA-17511903-1");
+pageTracker._setDomainName("none");
+pageTracker._setAllowLinker(true);
+pageTracker._trackPageview();
+} catch(err) {}</script>
+{% endblock %}
+
diff --git a/doc/source/_templates/.DS_Store b/doc/source/_templates/.DS_Store
new file mode 100644
index 000000000..5008ddfcf
Binary files /dev/null and b/doc/source/_templates/.DS_Store differ
diff --git a/doc/source/_templates/layout.html b/doc/source/_templates/layout.html
deleted file mode 100644
index 0b72a77ac..000000000
--- a/doc/source/_templates/layout.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "!layout.html" %}
-
-{% block footer %}
-{{ super() }}
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-17511903-1");
-pageTracker._setDomainName("none");
-pageTracker._setAllowLinker(true);
-pageTracker._trackPageview();
-} catch(err) {}</script>
-{% endblock %}
-
-- 
cgit 


From 75a0182e9a9a3cb6732e68eb3c9965b8033e1ce1 Mon Sep 17 00:00:00 2001
From: Anne Gentle <anne@openstack.org>
Date: Fri, 29 Oct 2010 12:27:30 -0500
Subject: Changes to conf.py

---
 doc/source/conf.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'doc/source')

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 505771ff8..e137e728a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -27,7 +27,13 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx.ext.todo',
 todo_include_todos = True
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+# Changing the path so that the Hudson build output contains GA code and the source
+# docs do not contain the code so local, offline sphinx builds are "clean."
+templates_path = []
+if os.getenv('HUDSON_PUBLISH_DOCS'):
+  templates_path = ['_ga', '_templates']
+else:
+  templates_path = ['_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
-- 
cgit