Fixes a number of v 2 bugs

Author: Matt Gaunt

src/content/en/resources/jekyll/custom-jekyll-variables.markdown

@@ -14,9 +14,9 @@ from the current page down.
 
 You can view the content of the object for a page with:
 
-{% highlight text %}
-    {% raw %}{{page.context}}{% endraw %}
-{% endhighlight %}
+<pre>
+&#123;&#123;page.context&#125;&#125;
+</pre>
 
 ## Structure of page.context
 
@@ -42,18 +42,15 @@ The current pages context is:
 
 To display all the pages title you can use liquid like so:
 
-{% highlight text %}
-{% raw %}
-<ol>
-  {% for page in page.context.pages %}
-    <li>
-    {{page.title}}
-    </li>
-  {% endfor %}
-</ol>
-{% endraw %}
-{% endhighlight %}
-
+<pre>
+&lt;ol&gt;
+&#123;% for page in page.context.pages %&#125;
+  &lt;li&gt;
+    &#123;&#123;page.title&#125;&#125;
+    &lt;/li&gt;
+  &#123;% endfor %&#125;
+&lt;/ol&gt;
+</pre>
 
 <ol>
   {% for page in page.context.pages %}
@@ -66,18 +63,15 @@ To display all the pages title you can use liquid like so:
 To display titles for all the subdirectories you could do something
 like the following:
 
-
-{% highlight text %}
-{% raw %}
-<ol>
-  {% for subdirectory in page.context.subdirectories %}
-    <li>
-    {{subdirectory.index.title}}
-    </li>
-  {% endfor %}
-</ol>
-{% endraw %}
-{% endhighlight %}
+<pre>
+&lt;ol&gt;
+  &#123;% for subdirectory in page.context.subdirectories %&#125;
+    &lt;li&gt;
+    &#123;&#123;subdirectory.index.title&#125;&#125;
+    &lt;/li&gt;
+  &#123;% endfor %&#125;
+&lt;/ol&gt;
+</pre>
 
 # page.nextPage & page.previousPage
 
@@ -87,17 +81,9 @@ do with the nextPage and previousPage variables.
 
 This code:
 
-{% highlight text %}
-{% raw %}
-{{page.nextPage}}
-{% endraw %}
-{% endhighlight %}
+&#123;&#123;page.nextPage&#125;&#125;
 
-{% highlight text %}
-{% raw %}
-{{page.previousPage}}
-{% endraw %}
-{% endhighlight %}
+&#123;&#123;page.previousPage&#125;&#125;
 
 Will output the following (Note: you may see 0, 1 or 2 snippets depending
   on whether or not this page has a next and / or previous page):
@@ -131,11 +117,9 @@ is that it will also account for language of the current page.
 Canonical URL has some filtering done on it to become a canonical url and
 will always be the full path.
 
-{% highlight text %}
-{% raw %}
-{{page.canonical_url}}
-{% endraw %}
-{% endhighlight %}
+<pre>
+&#123;&#123;page.canonical_url&#125;&#125;
+</pre>
 
 {% highlight text %}
 {{page.canonical_url}}
@@ -145,11 +129,9 @@ will always be the full path.
 
 The relative url is the relative url for a page from the root of the domain
 
-{% highlight text %}
-{% raw %}
-{{page.relative_url}}
-{% endraw %}
-{% endhighlight %}
+<pre>
+&#123;&#123;page.relative_url&#125;&#125;
+</pre>
 
 {% highlight text %}
 {{page.relative_url}}
@@ -160,8 +142,6 @@ The relative url is the relative url for a page from the root of the domain
 This variable is defined for every page and will be true if a translation is
 no longer up to date with the primary language version, otherwise its false.
 
-{% highlight text %}
-{% raw %}
-{{page.outOfDate}}
-{% endraw %}
-{% endhighlight %}
+<pre>
+&#123;&#123;page.outOfDate&#125;&#125;
+</pre>

src/content/en/resources/jekyll/custom-tags.markdown

@@ -21,7 +21,7 @@ We'll look at each of these in more detail below.
 
 Includes the entire contents of a file
 
-<pre>{% raw %}{% include_code src=_code/example.js %}{% endraw %}</pre>
+<pre>&#123;% include_code src=_code/example.js %&#125;</pre>
 
 {% include_code src=_code/example.js %}
 
@@ -43,7 +43,7 @@ The snippet is defined in example.html like so:
 
 You can then add it to a page with:
 
-<pre>{% raw %}{% include_code src=_code/example.html snippet=examplesnippet %}{% endraw %}</pre>
+<pre>&#123;% include_code src=_code/example.html snippet=examplesnippet %&#125;</pre>
 
 The result is:
 
@@ -53,7 +53,7 @@ The special snippet comments are removed from the code in the final docs.
 
 ### Defining the Language of Code
 
-<pre>{% raw %}{% include_code src=_code/example.js snippet=classdefinition lang=javascript %}{% endraw %}</pre>
+<pre>&#123;% include_code src=_code/example.js snippet=classdefinition lang=javascript %&#125;</pre>
 
 {% include_code src=_code/example.js snippet=classdefinition lang=javascript %}
 
@@ -66,9 +66,9 @@ appropriate link to the sample based on the current environment (development,
 This is the same as the link sample button except it's styled as a normal
 link rather than a button.
 
-<pre>{% raw %}{% link_sample _code/mse-gap.html %}
+<pre>&#123;% link_sample _code/mse-gap.html %&#125;
   Demo
-{% endlink_sample %}{% endraw %}</pre>
+&#123;% endlink_sample %&#125;</pre>
 
 {% link_sample _code/mse-gap.html %}Demo{% endlink_sample %}
 
@@ -82,9 +82,9 @@ appropriate link to the sample based on the current environment (development,
 This is the same as the link sample except it's styled as a button rather than
 a link.
 
-<pre>{% raw %}{% link_sample_button _code/mse-gap.html %}
+<pre>&#123;% link_sample_button _code/mse-gap.html %&#125;
   Demo
-{% endlink_sample_button %}{% endraw %}</pre>
+&#123;% endlink_sample_button %&#125;</pre>
 
 {% link_sample_button _code/mse-gap.html %}
   Demo
@@ -100,13 +100,13 @@ embeds.
 
 ### Tag usage
 
-<pre>{% raw %}{% ytvideo 2eu23_if6Lw %}{% endraw %}</pre>
+<pre>&#123;% ytvideo 2eu23_if6Lw %&#125;</pre>
 
 {% ytvideo 2eu23_if6Lw %}
 
 You can add additional arguments to the end of the youtube embed by adding
 them to the end of the tag.
 
-<pre>{% raw %}{% ytvideo 2eu23_if6Lw start=41 %}{% endraw %}</pre>
+<pre>&#123;% ytvideo 2eu23_if6Lw start=41 %&#125;</pre>
 
 {% ytvideo 2eu23_if6Lw start=41 %}

src/content/en/resources/jekyll/useful-and-common-tags.markdown

@@ -41,15 +41,15 @@ related-guides:
 
 This publishes a table of contents for the current page
 
-<pre>{% raw %}{% include shared/toc.liquid %}{% endraw %}</pre>
+<pre>&#123;% include shared/toc.liquid %&#125;</pre>
 
 {% include shared/toc.liquid %}
 
 ## Takeaways
 
 The takeaway include is used to highlight important parts of a doc
 
-<pre>{% raw %}{% include shared/takeaway.liquid list=page.key-takeaways.example %}{% endraw %}</pre>
+<pre>&#123;% include shared/takeaway.liquid list=page.key-takeaways.example %&#125;</pre>
 
 {% include shared/takeaway.liquid list=page.key-takeaways.example %}
 
@@ -66,13 +66,13 @@ key-takeaways:
 
 ## Notes and Remembers
 
-<pre>{% raw %}{% include shared/remember.liquid list=page.notes.example %}{% endraw %}</pre>
+<pre>&#123;% include shared/remember.liquid list=page.notes.example %&#125;</pre>
 
 {% include shared/remember.liquid list=page.notes.example %}
 
 or
 
-<pre>{% raw %}{% include shared/note.liquid list=page.notes.example %}{% endraw %}</pre>
+<pre>&#123;% include shared/note.liquid list=page.notes.example %&#125;</pre>
 
 {% include shared/note.liquid list=page.notes.example %}
 
@@ -90,15 +90,15 @@ notes:
 
 ## Related Guides
 
-<pre>{% raw %}{% include shared/related_guides.liquid list=page.related-guides.example %}{% endraw %}</pre>
+<pre>&#123;% include shared/related_guides.liquid list=page.related-guides.example %&#125;</pre>
 
 {% include shared/related_guides.liquid list=page.related-guides.example %}
 
 {% comment %}
 // This should be enabled but needs a different css file that contains these styles
 ## Subscribe List
 
-<pre>{% raw %}{% include shows/subscribe.liquid %}{% endraw %}</pre>
+<pre>&#123;% include shows/subscribe.liquid %&#125;</pre>
 
 {% include shows/subscribe.liquid %}
 {% endcomment %}
@@ -110,15 +110,13 @@ code highlighter.
 
 ### Example
 
-<pre>{% raw %}
-{% highlight javascript %}
+<pre>&#123;% highlight javascript %&#125;
 if (navigator.onLine) {
   console.log('ONLINE!');
 } else {
   console.log('Connection flaky');
 }
-{% endhighlight %}
-{% endraw %}</pre>
+&#123;% endhighlight %&#125;</pre>
 
 {% highlight javascript %}
 if (navigator.onLine) {

src/content/en/resources/styleguide/index.markdown

@@ -193,12 +193,12 @@ consectetur nisl.
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut et libero eget
 nibh porttitor maximus ac ut urna. `console.log('Inline Code')` Lorem ipsum dolor
-sit amet, consectetur adipiscing elit. 
+sit amet, consectetur adipiscing elit.
 
 ### Code Block
 
-To add code highlighting you need to the `{% raw %}{% highlight javascript %}{% endraw %}` and 
-`{% raw %}{% endhighlight %}{% endraw %}` liquid tags.
+To add code highlighting you need to the {{"{% highlight javascript %}"}} and
+{{"{% endhighlight %}"}} liquid tags.
 
 {% highlight javascript%}
 function() {

src/jekyll/_plugins/build-end-generator.rb

@@ -27,11 +27,22 @@ def generate(site)
 
       generateFeeds(site)
 
+      # Initialise the pageGroups mapping
+      site.data['pageGroups'] = {}
 
-
-      # This should run as the end of all generators and will give pages a
-      # chance to do any final work needed
       site.pages.each { |page|
+        # Add pages to site.pageGroups
+        if not page.data['pageGroups'].nil?
+          page.data['pageGroups'].each { |pageGroup|
+            pageGroup = pageGroup.downcase.strip
+
+            site.data['pageGroups'][pageGroup] ||= []
+            site.data['pageGroups'][pageGroup] << page
+          }
+        end
+
+        # This should run as the end of all generators and will give pages a
+        # chance to do any final work needed
         page.onBuildComplete()
 
         page.data['translations'].each { |langCode, translationPage|
@@ -45,6 +56,17 @@ def generate(site)
         }
       }
 
+
+      site.data['pageGroups'].each { |key, group|
+        group = group.sort do |a, b|
+          a_order = a.data['order'] || a.data['published_on'] || 0
+          b_order = b.data['order'] || b.data['published_on'] || 0
+          a_order <=> b_order
+        end
+
+        site.data['pageGroups'][key] = group
+      }
+
       generateSamples(site)
     end
 
@@ -192,8 +214,8 @@ def getPages(subdirectory)
         array << page
       }
 
-      subdirectory['subdirectories'].each { |subdirectory|
-        array = array + getPages(subdirectory)
+      subdirectory['subdirectories'].each { |innerSubdirectory|
+        array = array + getPages(innerSubdirectory)
       }
 
       return array

src/jekyll/_plugins/pages/WFPage.rb

@@ -46,7 +46,8 @@ def initialize(site, relativeDir, filename, addtionalYamlKeys=[])
         'layout', 'title', 'description', 'order', 'translation_priority',
         'authors', 'translators', 'comments', 'published_on', 'updated_on',
         'published', 'rss', 'comments', 'key-takeaways', 'notes',
-        'related-guides', 'html_head_social_img', 'feedName', 'feedURL'
+        'related-guides', 'html_head_social_img', 'feedName', 'feedURL',
+        'pageGroups'
       ]
 
       # This is a Jekyll::Page method (See: http://www.rubydoc.info/github/mojombo/jekyll/Jekyll/Page#process-instance_method)
@@ -153,7 +154,7 @@ def validateYamlData()
             puts ''
             puts '---------------------------------------------------------------'
             puts ''
-            Jekyll.logger.error "Error: Invalid Author '" + authorKey + "' found in  " + @langcode + '/' + self.relative_path
+            Jekyll.logger.error "Error: Invalid Author '" + authorKey + "' found in  " + @langcode + '/' + self.relative_path + ". Please ensure this author is added to src/content/_contributors.yaml."
             puts ''
             puts '---------------------------------------------------------------'
             puts ''