Merge pull request raspberrypi#1980 from raspberrypi/titles3

Fix page titles - again again!

Author: Alasdair Allan

jekyll-assets/_includes/head.html

@@ -1,8 +1,8 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>{{ site.title }} - {{ page.title }}</title>
-<meta property="og:title" content="{{ site.title }} - {{ page.title }}">
+<title>{{ page.title }}</title>
+<meta property="og:title" content="{{ page.title }}">
 <meta property="og:description" content="The official documentation for Raspberry Pi computers and microcontrollers">
 <meta property="og:url" content="https://www.raspberrypi.org{{ page.url | relative_url }}">
 <meta property="og:image" content="https://www.raspberrypi.org{{ "/images/opensocial.png" | relative_url }}">

jekyll-assets/_layouts/docs.html

@@ -14,7 +14,7 @@
       {% include nav.html %}
 
       <section id="content">
-        <h1>{{ page.title }}</h1>
+        <h1>{{ page.sub_title }}</h1>
         {{ content }}
       </section>
     </div>

scripts/create_build_adoc.py

@@ -31,6 +31,7 @@
 :page-layout: docs
 :includedir: {}
 :doctitle: {}
+:page-sub_title: {}
 
 include::{{includedir}}/{{parentdir}}/{}[]
-""".format(output_path, src_dir, index_title, adoc_filename))
+""".format(output_path, src_dir, 'Raspberry Pi Documentation - {}'.format(index_title), index_title, adoc_filename))

scripts/create_jekyll_ninjabuild.py

@@ -38,7 +38,7 @@ def scan_adoc(adoc_filename, apparent_filename):
     output_dir = sys.argv[3]
     output_ninjabuild = sys.argv[4]
 
-    category_pages = set([('index.adoc', 'Index')])
+    category_pages = set([('index.adoc', 'Raspberry Pi Documentation')])
     doc_pages = set()
     page_images = set()
 
@@ -50,7 +50,7 @@ def scan_adoc(adoc_filename, apparent_filename):
             assert ('path' in tab) == ('subitems' in tab)
             if 'path' in tab:
                 # category (boxes) page
-                category_pages.add((os.path.join(tab['path'], 'index.adoc'), tab['title']))
+                category_pages.add((os.path.join(tab['path'], 'index.adoc'), 'Raspberry Pi Documentation - {}'.format(tab['title'])))
                 # build_adoc
                 for subitem in tab['subitems']:
                     if 'subpath' in subitem: