Merge pull request #4065 from learningequality/0.14.x

0.14.x into develop
learningequality · Jul 14, 2015 · 05ef1f3 · 05ef1f3
2 parents d16da9f + 5a65d03
commit 05ef1f3
Show file tree

Hide file tree

Showing 122 changed files with 953 additions and 543 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,8 +41,8 @@ dist-packages/
 *.zip
 
 # Documentation
-sphinx-docs/_build
-sphinx-docs/images/*
+docs/_build
+docs/images/*
 
 # oh-my-zsh convention for automatically
 # switching on a venv

diff --git a/docs/.screenshot_dump/004ee879e2bb47d49377b861bf6659aa.png b/docs/.screenshot_dump/004ee879e2bb47d49377b861bf6659aa.png
diff --git a/docs/.screenshot_dump/05afc3b8ab0477e93ca931f29641c7b9.png b/docs/.screenshot_dump/05afc3b8ab0477e93ca931f29641c7b9.png
diff --git a/docs/.screenshot_dump/10e2b5ae7e7e48b9b1771dd25d5b03cb.png b/docs/.screenshot_dump/10e2b5ae7e7e48b9b1771dd25d5b03cb.png
diff --git a/docs/.screenshot_dump/1c47c76890be4305230319aa52b48c83.png b/docs/.screenshot_dump/1c47c76890be4305230319aa52b48c83.png
diff --git a/docs/.screenshot_dump/1ee1db3614fa0bd03ef5111cd09c42df.png b/docs/.screenshot_dump/1ee1db3614fa0bd03ef5111cd09c42df.png
diff --git a/docs/.screenshot_dump/25c999a5541d5c27dc621d372f0f4f97.png b/docs/.screenshot_dump/25c999a5541d5c27dc621d372f0f4f97.png
diff --git a/docs/.screenshot_dump/260c9ea74c87287fcac5dbef612d34d8.png b/docs/.screenshot_dump/260c9ea74c87287fcac5dbef612d34d8.png
diff --git a/docs/.screenshot_dump/2d2b70f0ca91897ef5793a62f0723998.png b/docs/.screenshot_dump/2d2b70f0ca91897ef5793a62f0723998.png
diff --git a/docs/.screenshot_dump/2eeb2ed1e0731f6cc77bdc8189e58967.png b/docs/.screenshot_dump/2eeb2ed1e0731f6cc77bdc8189e58967.png
diff --git a/docs/.screenshot_dump/395adb4a9e527724905f27c80ef81dcb.png b/docs/.screenshot_dump/395adb4a9e527724905f27c80ef81dcb.png
diff --git a/docs/.screenshot_dump/45f197e49bdfbe3958a5da76510f96fd.png b/docs/.screenshot_dump/45f197e49bdfbe3958a5da76510f96fd.png
diff --git a/docs/.screenshot_dump/57327a1a82d4572b4ed4d742a29c81aa.png b/docs/.screenshot_dump/57327a1a82d4572b4ed4d742a29c81aa.png
diff --git a/docs/.screenshot_dump/6a4db825f084e8a0b3bd7fbbfa0ce381.png b/docs/.screenshot_dump/6a4db825f084e8a0b3bd7fbbfa0ce381.png
diff --git a/docs/.screenshot_dump/6ba892db1327a8645f88684c6ad58b46.png b/docs/.screenshot_dump/6ba892db1327a8645f88684c6ad58b46.png
diff --git a/docs/.screenshot_dump/6bfeab25adee7e88d404ab59a81f27cb.png b/docs/.screenshot_dump/6bfeab25adee7e88d404ab59a81f27cb.png
diff --git a/docs/.screenshot_dump/6cc6c77686357e3e815f6b79df1254a3.png b/docs/.screenshot_dump/6cc6c77686357e3e815f6b79df1254a3.png
diff --git a/docs/.screenshot_dump/6debd4ad4a281d125e290ddc3f720865.png b/docs/.screenshot_dump/6debd4ad4a281d125e290ddc3f720865.png
diff --git a/docs/.screenshot_dump/770a546fd59fbd2faa4d98abff3cdbab.png b/docs/.screenshot_dump/770a546fd59fbd2faa4d98abff3cdbab.png
diff --git a/docs/.screenshot_dump/841d9b24f9eabd51ce5c44882aa802eb.png b/docs/.screenshot_dump/841d9b24f9eabd51ce5c44882aa802eb.png
diff --git a/docs/.screenshot_dump/a56c8dbd40323113f2fdf500e5952021.png b/docs/.screenshot_dump/a56c8dbd40323113f2fdf500e5952021.png
diff --git a/docs/.screenshot_dump/b1751d2f19bf6b100a0ae8d0cde7a0a6.png b/docs/.screenshot_dump/b1751d2f19bf6b100a0ae8d0cde7a0a6.png
diff --git a/docs/.screenshot_dump/b92d2586fa6b5390fed3aef07edfd80d.png b/docs/.screenshot_dump/b92d2586fa6b5390fed3aef07edfd80d.png
diff --git a/docs/.screenshot_dump/c1c3a7830a61d95b64d010153f7faebd.png b/docs/.screenshot_dump/c1c3a7830a61d95b64d010153f7faebd.png
diff --git a/docs/.screenshot_dump/d316a315f5696daca0319be2cf63c9e0.png b/docs/.screenshot_dump/d316a315f5696daca0319be2cf63c9e0.png
diff --git a/docs/.screenshot_dump/d387de512f503a2a935160284a0d9c85.png b/docs/.screenshot_dump/d387de512f503a2a935160284a0d9c85.png
diff --git a/docs/.screenshot_dump/d6bafd7626f3cf05aefbf657ef763784.png b/docs/.screenshot_dump/d6bafd7626f3cf05aefbf657ef763784.png
diff --git a/docs/.screenshot_dump/d704d56a51eb4d7f08be3d37fb99cfe0.png b/docs/.screenshot_dump/d704d56a51eb4d7f08be3d37fb99cfe0.png
diff --git a/docs/.screenshot_dump/d97f4caebe88701d9be1f0bad77f9b8a.png b/docs/.screenshot_dump/d97f4caebe88701d9be1f0bad77f9b8a.png
diff --git a/docs/.screenshot_dump/db31c62dc408c5221706a9d447a39cf8.png b/docs/.screenshot_dump/db31c62dc408c5221706a9d447a39cf8.png
diff --git a/docs/.screenshot_dump/f5bd601dd8e28c0239d3d110cf153283.png b/docs/.screenshot_dump/f5bd601dd8e28c0239d3d110cf153283.png
diff --git a/docs/.screenshot_dump/f6556d5cc4a3c6724a52cf8b5920dda0.png b/docs/.screenshot_dump/f6556d5cc4a3c6724a52cf8b5920dda0.png
diff --git a/docs/.screenshot_dump/fdfbbe6e30092722388be3414b20a0ac.png b/docs/.screenshot_dump/fdfbbe6e30092722388be3414b20a0ac.png
diff --git a/sphinx-docs/Makefile → docs/Makefile b/sphinx-docs/Makefile → docs/Makefile
diff --git a/sphinx-docs/README.md → docs/README.md b/sphinx-docs/README.md → docs/README.md
diff --git a/sphinx-docs/SCREENSHOT_USAGE.MD → docs/SCREENSHOT_USAGE.MD b/sphinx-docs/SCREENSHOT_USAGE.MD → docs/SCREENSHOT_USAGE.MD
diff --git a/sphinx-docs/_static/default.css_t → docs/_static/default.css_t b/sphinx-docs/_static/default.css_t → docs/_static/default.css_t
diff --git a/sphinx-docs/_static/sidebar.js_t → docs/_static/sidebar.js_t b/sphinx-docs/_static/sidebar.js_t → docs/_static/sidebar.js_t
diff --git a/sphinx-docs/conf.py → docs/conf.py b/sphinx-docs/conf.py → docs/conf.py
@@ -69,7 +69,7 @@
 # The short X.Y version.
 version = V.SHORTVERSION
 # The full version, including alpha/beta/rc tags.
-release = V.PATCH_VERSION
+release = V.SHORTVERSION
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -111,23 +111,26 @@
 
 
 # -- Options for HTML output ----------------------------------------------
+import os
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'kalite-theme'
+if not on_rtd:  # only import and set the theme if we're building docs locally
+    import sphinx_rtd_theme
+    # html_theme = 'sphinx_rtd_theme'
+    html_theme = 'kalite-theme'
+    html_theme_path = ['.', sphinx_rtd_theme.get_html_theme_path()]
 
-# 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 = {
+# 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,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
 
-  #Make the sidebar "fixed" so that it doesn't scroll out of view
-  'stickysidebar': True,
-  'nosidebar': False,
-}
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'KALitedoc'
 
-# Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = ["."]
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+html_last_updated_fmt = "%a, %d %b %Y %H:%M:%S %z"
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
@@ -145,20 +148,12 @@
 # pixels large.
 #html_favicon = None
 
-# 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,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
 #html_extra_path = []
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = "%a, %d %b %Y %H:%M:%S %z"
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #html_use_smartypants = True
@@ -200,11 +195,6 @@
 # This is the file name suffix for HTML files (e.g. ".xhtml").
 #html_file_suffix = None
 
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'KALitedoc'
-
-html_style = "kalite.css"
-
 
 # -- Options for LaTeX output ---------------------------------------------
 

diff --git a/sphinx-docs/contact.rst → docs/contact.rst b/sphinx-docs/contact.rst → docs/contact.rst
diff --git a/sphinx-docs/developer_docs/I18N.md → docs/developer_docs/I18N.md b/sphinx-docs/developer_docs/I18N.md → docs/developer_docs/I18N.md
diff --git a/...nx-docs/developer_docs/behave_testing.rst → docs/developer_docs/behave_testing.rst b/...nx-docs/developer_docs/behave_testing.rst → docs/developer_docs/behave_testing.rst
diff --git a/sphinx-docs/developer_docs/contributing.rst → docs/developer_docs/contributing.rst b/sphinx-docs/developer_docs/contributing.rst → docs/developer_docs/contributing.rst
diff --git a/sphinx-docs/developer_docs/documentation.rst → docs/developer_docs/documentation.rst b/sphinx-docs/developer_docs/documentation.rst → docs/developer_docs/documentation.rst
diff --git a/...nx-docs/developer_docs/front_end_code.rst → docs/developer_docs/front_end_code.rst b/...nx-docs/developer_docs/front_end_code.rst → docs/developer_docs/front_end_code.rst
diff --git a/sphinx-docs/developer_docs/index.rst → docs/developer_docs/index.rst b/sphinx-docs/developer_docs/index.rst → docs/developer_docs/index.rst
diff --git a/...ocs/developer_docs/javascript_testing.rst → docs/developer_docs/javascript_testing.rst b/...ocs/developer_docs/javascript_testing.rst → docs/developer_docs/javascript_testing.rst
diff --git a/sphinx-docs/developer_docs/logging.rst → docs/developer_docs/logging.rst b/sphinx-docs/developer_docs/logging.rst → docs/developer_docs/logging.rst
diff --git a/sphinx-docs/developer_docs/profiling.rst → docs/developer_docs/profiling.rst b/sphinx-docs/developer_docs/profiling.rst → docs/developer_docs/profiling.rst
diff --git a/sphinx-docs/developer_docs/screenshots.md → docs/developer_docs/screenshots.md b/sphinx-docs/developer_docs/screenshots.md → docs/developer_docs/screenshots.md
diff --git a/sphinx-docs/developer_docs/utility.rst → docs/developer_docs/utility.rst b/sphinx-docs/developer_docs/utility.rst → docs/developer_docs/utility.rst
diff --git a/sphinx-docs/errors.py → docs/errors.py b/sphinx-docs/errors.py → docs/errors.py
diff --git a/sphinx-docs/faq.rst → docs/faq.rst b/sphinx-docs/faq.rst → docs/faq.rst
diff --git a/sphinx-docs/index.rst → docs/index.rst b/sphinx-docs/index.rst → docs/index.rst