diff --git a/_includes/layouts/base.html b/_includes/layouts/base.html index e2c355ca..a2576741 100644 --- a/_includes/layouts/base.html +++ b/_includes/layouts/base.html @@ -4,50 +4,41 @@ {% endcomment %} - {% assign was_redirected = false %} - {% if env.production %} - {% assign is_index = page.url == "/" %} - {% if redirect_bases[tags[0]] or is_index %} - {% assign was_redirected = true %} - {% include "meta_redirect.html", is_index: is_index %} - {% endif %} +{% include "meta.html" %} + + + {% include "header.html" %} + {% if tags %} + {% assign primary_navigation = navigation[tags] %} + {% else %} + {% assign primary_navigation = site.primary_navigation %} {% endif %} - {% unless was_redirected %} - {% include "meta.html" %} - - {% include "header.html" %} - {% if tags %} - {% assign primary_navigation = navigation[tags] %} - {% else %} - {% assign primary_navigation = site.primary_navigation %} - {% endif %} + {% include "menu.html" %} - {% include "menu.html" %} + {{ content }} - {{ content }} + {% include "touchpoints-button.html" %} - {% include "touchpoints-button.html" %} - - {% include "footer.html" %} + {% include "footer.html" %} - {% comment %} Hide SVG Sprites {% endcomment %} -
- {% usa_icons_sprite %} + {% comment %} Hide SVG Sprites {% endcomment %} +
+ {% usa_icons_sprite %} - {% comment %} + {% comment %} - TODO: Remove once this set of icons once we've determined the usa_icons - above is enough. Currently, keeping both adds two sets of SVGs with duplicate IDs, - which is flagged as by pa11y as an accessibility error. + TODO: Remove once this set of icons once we've determined the usa_icons + above is enough. Currently, keeping both adds two sets of SVGs with duplicate IDs, + which is flagged as by pa11y as an accessibility error. - {% uswds_icons_sprite %} + {% uswds_icons_sprite %} - {% endcomment %} + {% endcomment %} -
+
- {% include "scripts.html" %} - - {% endunless %} - + {% include "scripts.html" %} + + + \ No newline at end of file diff --git a/_includes/meta_redirect.html b/_includes/meta_redirect.html deleted file mode 100644 index 11851e4d..00000000 --- a/_includes/meta_redirect.html +++ /dev/null @@ -1,14 +0,0 @@ - - - {% if is_index %} - - - {% else %} - - {% assign guide_name = tags[0] %} - {% assign redirect_base = redirect_bases[guide_name] %} - {% assign page_path = page.url %} - - {% endif %} - -