Merge branch 'dev' for a complete new content

rhubinak · Nov 5, 2014 · 1d52d89 · 1d52d89
2 parents dac117f + 96c1def
commit 1d52d89
Show file tree

Hide file tree

Showing 161 changed files with 2,683 additions and 1,446 deletions.
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ clean:
 
 html:
 	mkdir -p _build/html _build/doctrees
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) _build/html
 	@echo
 	@echo "Build finished. The HTML pages are in _build/html."
 

diff --git a/cgdocs/layout.html b/cgdocs/layout.html
@@ -1,41 +1,33 @@
 {% if theme_bootstrap_version == "3" %}
-{% set bootstrap_version, bootstrap_additional_css, navbar_version = "3.0.0", "theme", "" %}
-{% set bs_span_prefix = "col-md-" %}
-{% if theme_bootswatch_theme %}
-{% set css_files = css_files + [
-'//netdna.bootstrapcdn.com/bootswatch/' + bootstrap_version + '/' + theme_bootswatch_theme + '/bootstrap.min.css',
-'_static/bootstrap-sphinx.css'
-]
-%}
-{% else %}
-{% set css_files = [
-'_static/bootstrap-' + bootstrap_version + '/css/bootstrap.min.css'
-] + css_files
-%}
-{% set css_files = css_files + [
-'_static/bootstrap-' + bootstrap_version + '/css/bootstrap-' + bootstrap_additional_css + '.min.css',
-'_static/bootstrap-sphinx.css'
-]
-%}
-{% endif %}
+  {% set bootstrap_version, bootstrap_additional_css, navbar_version = "3.0.0", "theme", "" %}
+  {% set bs_span_prefix = "col-md-" %}
+  {% set css_files = [
+  '_static/bootstrap-' + bootstrap_version + '/css/bootstrap.min.css'
+  ] + css_files
+  %}
+  {% set css_files = css_files + [
+  '_static/bootstrap-' + bootstrap_version + '/css/bootstrap-' + bootstrap_additional_css + '.min.css',
+  '_static/bootstrap-sphinx.css'
+  ]
+  %}
 {% else %}
-{% set bootstrap_version, bootstrap_additional_css, navbar_version = "2.3.2", "responsive", "-2" %}
-{% set bs_span_prefix = "span" %}
-{% set css_files = [
-'_static/bootstrap-' + bootstrap_version + '/css/bootstrap.min.css'
-] + css_files
-%}
-{% if theme_bootswatch_theme %}
-{% set css_files = css_files + [
-'//netdna.bootstrapcdn.com/bootswatch/' + bootstrap_version + '/' + theme_bootswatch_theme + '/bootstrap.min.css'
-]
-%}
-{% endif %}
-{% set css_files = css_files + [
-'_static/bootstrap-' + bootstrap_version + '/css/bootstrap-' + bootstrap_additional_css + '.min.css',
-'_static/bootstrap-sphinx.css'
-]
-%}
+  {% set bootstrap_version, bootstrap_additional_css, navbar_version = "2.3.2", "responsive", "-2" %}
+  {% set bs_span_prefix = "span" %}
+  {% set css_files = [
+  '_static/bootstrap-' + bootstrap_version + '/css/bootstrap.min.css'
+  ] + css_files
+  %}
+  {% if theme_bootswatch_theme %}
+    {% set css_files = css_files + [
+    '//netdna.bootstrapcdn.com/bootswatch/' + bootstrap_version + '/' + theme_bootswatch_theme + '/bootstrap.min.css'
+    ]
+    %}
+  {% endif %}
+  {% set css_files = css_files + [
+  '_static/bootstrap-' + bootstrap_version + '/css/bootstrap-' + bootstrap_additional_css + '.min.css',
+  '_static/bootstrap-sphinx.css'
+  ]
+  %}
 {% endif %}
 {% set css_files =  css_files + [
 '_static/cgdocs.css'

diff --git a/cgdocs/ptoc.html b/cgdocs/ptoc.html
@@ -5,8 +5,10 @@
   <ul class="dropdown-menu globaltoc">
     <li class="toctree-l1 dropdown-submenu parent"><a href="{{ pathto('index') }}">Platform Index</a></li>
     <li class="divider"></li>
-    <li class="toctree-l1 dropdown-submenu parent"><a href="{{ pathto('using-platform/index') }}">Common Tasks</a></li>
-    <li class="toctree-l1 dropdown-submenu parent"><a href="{{ pathto('quick-start-guide/index') }}">Learning</a></li>
-    <li class="toctree-l1 dropdown-submenu parent"><a href="{{ pathto('reference/index') }}">Reference Topics</a></li>
+    <li class="toctree-l1 dropdown-submenu parent"><a href="{{ pathto('overview/index') }}">Overview</a></li>
+    <li class="toctree-l1 dropdown-submenu parent"><a href="{{ pathto('use-platform/index') }}">Using Platform</a></li>
+    <li class="toctree-l1 dropdown-submenu parent"><a href="{{ pathto('toolstacks/drupal/index') }}">Drupal</a></li>
+    <li class="toctree-l1 dropdown-submenu parent"><a href="{{ pathto('toolstacks/symfony/index') }}">Symfony</a></li>
+    <li class="toctree-l1 dropdown-submenu parent"><a href="{{ pathto('reference/index') }}">Reference</a></li>
   </ul>
 </li>