Merge pull request juju#2781 from Caleb-Ellis/devel

Update documentation-builder to 1.6.0

Author: evilnick

package.json

@@ -2,7 +2,7 @@
   "scripts": {
     "clean": "rm -rf node_modules build yarn-error.log css static/css *.log *.sqlite .extra templates",
     "watch": "watch -p './**/*.md' -c 'yarn run build'",
-    "build": "documentation-builder --source-folder src --media-path src/en/media --output-media-path build/en/media --tag-manager-code 'GTM-K92JCQ' --search-domain 'docs.jujucharms.com' --search-url 'https://docs.ubuntu.com/search' --search-placeholder 'Search Juju docs' --no-link-extensions --build-version-branches",
+    "build": "documentation-builder --source-folder src --media-path src/en/media --output-media-path build/en/media --tag-manager-code 'GTM-K92JCQ' --search-domain 'docs.jujucharms.com' --search-url 'https://docs.ubuntu.com/search' --search-placeholder 'Search Juju docs' --no-link-extensions --build-version-branches --site-root https://jujucharms.com/",
     "test": "",
     "serve": "cd dist && FLASK_DEBUG=true FLASK_APP=app.py flask run -h 0.0.0.0 -p $PORT"
   },

requirements.txt

@@ -2,4 +2,4 @@ Flask==0.12.2
 PyYAML==3.12
 pycountry==17.9.23
 yamlordereddictloader==0.4.0
-ubuntudesign.documentation-builder==1.5.1
+ubuntudesign.documentation-builder==1.6.0

src/metadata.yaml

@@ -1,2 +1,45 @@
 site_title: Juju documentation
-site_logo_url: https://assets.ubuntu.com/v1/31c507a5-logo-juju-icon.svg
+site_logo_url: https://assets.ubuntu.com/v1/9afc1e35-juju_white-orange_hex.svg
+site_favicon: https://assets.ubuntu.com/v1/751b08fb-favicon.ico
+site_remove_navigation_title: true
+
+site_navigation:
+  - title: Store
+    location: https://jujucharms.com/store
+
+  - title: How it works
+    location: https://jujucharms.com/how-it-works
+
+  - title: JAAS
+    location: https://jujucharms.com/jaas
+
+  - title: Experts
+    location: https://jujucharms.com/experts
+
+  - title: Community
+    location: https://jujucharms.com/community
+
+  - title: Docs
+    location: /
+
+  - title: Try the beta
+    location: https://jujucharms.com/new/?dd=cs:bundle/canonical-kubernetes
+
+site_navigation_colors:
+  background: '#022935'
+  border: '#33535d'
+  hover: '#011e26'
+  text: '#fff'
+
+site_footer_links:
+  - title: Docs
+    location: https://docs.jujucharms.com/getting-started
+
+  - title: Community
+    location: https://jujucharms.com/community
+
+  - title: Blog
+    location: https://jujucharms.com/community/blog
+
+  - title: Install Juju
+    location: https://jujucharms.com/docs