Merge pull request 18F#76 from 18F/individ-questions-page

Put question into own page in service of search.gov

_config.yml

@@ -115,7 +115,8 @@ collections:
     output: true
     permalink: /:name
   content:
-    output: false
+    output: true
+    permalink: /:categories/:name
 
 defaults:
   -
@@ -124,7 +125,6 @@ defaults:
     values:
       lang: en
 
-permalink: /:lang/:categories:output_ext#:title
 permalink_custom_vars:
   - lang
 

_includes/accordion.html

@@ -2,6 +2,7 @@
     USWDS Accordion for a given category and posts
 {% endcomment %}
 
+{% assign question = include.accordion_content %}
 <h2 class="usa-accordion__heading">
 <button id="{{ question.title | slugify }}"
     class="usa-accordion__button"
@@ -14,6 +15,7 @@ <h2 class="usa-accordion__heading">
     <p>{{ question.content | markdownify }}</p>
 
     <p class="question-meta">Last updated {{ question.date | date:  "%B %d, %Y" }}.
-    {% if question.source %} | <a href="{{ question.source }}/" class="usa-link usa-link--external">Source</a>{% endif %}
+    {% if question.source %} | <cite>Source: <a href="{{question.source_link}}" class="usa-link usa-link--external">{{ question.source }}</a></cite>
+    {% endif %}
     </p>
 </div>

_includes/breadcrumb.html

@@ -6,9 +6,9 @@
       <a href="{{ site.baseurl }}/">FAQ</a>
       {% for crumb in crumbs offset: 1 %}
         {% if forloop.last %}
-         <span class="text-base padding-x-1">></span> {{ page.title }}
+         <span class="text-base padding-x-1">></span> {{ page.title | upcase }}
         {% else %}
-         <span class="text-base padding-x-1">></span> <a href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}">{{ crumb | replace:'-',' ' | remove:'.html' | capitalize }}</a>
+         <span class="text-base padding-x-1">></span> <a href="{% assign crumb_limit = forloop.index | plus: 1 %}{% for crumb in crumbs limit: crumb_limit %}{{ crumb | append: '/' | replace:'without-plugin/','without-plugins/' }}{% endfor %}">{{ crumb | upcase | replace:'-',' ' | remove:'.html'  }}</a>
         {% endif %}
       {% endfor %}
       </div>

_layouts/category.html

@@ -10,6 +10,9 @@
 {% assign this_category = categories | where:"name", page.name | first %}
 {% assign category_questions = this_category.items %}
 
+{% if page.banner.display == true %}
+  {% include alert-banner.html banner=page.banner %}
+{% endif %}
 <div class="usa-layout-docs usa-section" id="top">
   <div class="grid-container">
     <div class="grid-row grid-gap">
@@ -22,7 +25,7 @@ <h1>{{ page.title }}</h1>
           <div class="usa-accordion usa-accordion--bordered" aria-multiselectable=true>
                 {% for question in category_questions %}
                     {% if page.lang == question.lang %}
-                        {% include accordion.html %}
+                        {% include accordion.html accordion_content=question %}
                     {% endif %}
                 {% endfor %}
           </div>

_layouts/default.html

@@ -14,7 +14,7 @@
 
   {% include menu.html primary_navigation=site.primary_navigation  secondary_navigation=site.secondary_navigation %}
 
-  {% if page.layout == 'category' %}
+  {% if page.layout == 'category' or page.layout == 'post' %}
     {% include breadcrumb.html %}
   {% endif %}
   <main id="main-content">

_layouts/post.html

@@ -10,13 +10,9 @@
   <div class="grid-container">
     <div class="grid-row grid-gap">
       <div class="usa-layout-docs__main desktop:grid-col-9 usa-prose">
-        <h1 class="title">{{page.title}}</h1>
-        <div class="text-base margin-bottom-2">
-          <div class="margin-top-neg-105">
-            By <span class="text-bold">{{ page.author }}</span> · {{ page.date | date: '%B %d, %Y' }}
-          </div>
-        </div>
-        {{ content }}
+        <div class="usa-accordion usa-accordion--bordered" aria-multiselectable=true>
+          {% include accordion.html accordion_content=page %}
+         </div>
       </div>
     </div>
   </div>