guides_style_18f 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed8884311059c0f0419dea17f6622f5e56b357a
-  data.tar.gz: 8bac760301892a270a60742dc76e28247159c01c
+  metadata.gz: 8e8e90ac6e098d4a7f00a3bba6b02feef2ca7b31
+  data.tar.gz: 55f98a82961b0653128999fc82606640d9f97fd5
 SHA512:
-  metadata.gz: 8c29860082cc18fdd88eaf8305fb408ed839612a43959dfb13d1189866287955debe83b0186387a5c9b6ca8cfc091181a39f28a9355b8a7c279c03c657eccd6e
-  data.tar.gz: 0f955271cc7d346e506b41d05bccdf9714dd4d50b8929154785f29f4a0b9426fbefcb4ade3621b3f06ebcb3fc3460a48bc540f736650454b0c65e239c12016d5
+  metadata.gz: 033076c750131294a897ca24db5d4badf8b46b8711976024d92f02fd09c52e468199a0e1c10de4581cb388f73562a9f5b58b88924acd990eb6189f7db6dc394b
+  data.tar.gz: 60a3142ec6eb987c7bb37f507bc7e515f10b324560ce0c7490778ce93f1bb5076dd5e8d3e20c9a512fb3db34032c0d4321a61971bd632281fdacf9b044549432

data/lib/guides_style_18f.rb

@@ -7,5 +7,6 @@ require 'guides_style_18f/layouts'
 require 'guides_style_18f/navigation'
 require 'guides_style_18f/repository'
 require 'guides_style_18f/sass'
+require 'guides_style_18f/tags'
 require 'guides_style_18f/update'
 require 'guides_style_18f/version'

data/lib/guides_style_18f/includes/sidebar-children.html

@@ -0,0 +1,17 @@
+{% if parent.children %}
+{% capture expand_nav %}{% guides_style_18f_should_expand_nav parent_url %}{% endcapture %}
+<button class="expand-subnav"
+        aria-expanded="{{ expand_nav }}"
+        aria-controls="nav-collapsible-{{ forloop.index }}">+</button>
+<ul class="nav-children" id="nav-collapsible-{{ forloop.index }}"
+    aria-hidden="{% if expand_nav == 'true' %}false{% else %}true{% endif %}">
+  {% for child in parent.children %}
+  {% capture child_url %}{{ parent_url }}{{ child.url }}{% endcapture %}
+    <li class="{% if page.title == child.text %}sidebar-nav-active{% endif %}">
+      <a href="{% if child.internal == true %}{{ site.baseurl }}{{ child_url }}{% else %}{{ child.url }}{% endif %}"
+        title="{% if page.title == child.text %}Current Page{% else %}{{ child.text }}{% endif %}">{{ child.text }}</a>
+      {% assign parent = child %}{% assign parent_url = child_url %}
+      {% guides_style_18f_include sidebar-children.html %}
+      {% capture parent_url %}{% guides_style_18f_pop_last_url_component parent_url %}{% endcapture %}
+    </li>{% endfor %}
+</ul>{% endif %}

data/lib/guides_style_18f/includes/sidebar.html

@@ -1,29 +1,15 @@
 <aside>
   <p class="intro">{{ site.subtitle }}</p>
   <nav class="sidebar-nav" role="navigation">
-    <ul>
-      {% for link in site.navigation %}
+    <ul>{% for link in site.navigation %}
         <li class="group {% if page.title == link.text %}sidebar-nav-active{% endif %}">
           <a href="{% if link.internal == true %}{{ site.baseurl }}/{% endif %}{{ link.url }}"  
             title="{% if page.title == link.text %}Current Page
                   {% else %}{{ link.text }}{% endif %}">{{ link.text }}</a>
-          {% if link.children %}
-            <button class="expand-subnav"
-                    aria-expanded="{% if link.text == page.parent or link.text == page.title %}true{% else %}false{% endif %}"
-                    aria-controls="nav-collapsible-{{ forloop.index }}">+</button>
-            <ul class="nav-children" id="nav-collapsible-{{ forloop.index }}" 
-                aria-hidden="{% if link.text == page.parent or link.text == page.title %}false{% else %}true{% endif %}">
-              {% for child in link.children %}
-                <li class="{% if page.title == child.text %}sidebar-nav-active{% endif %}">
-                  <a href="{% if child.internal == true %}{{ site.baseurl }}/{{ link.url }}{% endif %}{{ child.url }}"
-                    title="{% if page.title == child.text %}Current Page
-                          {% else %}{{ child.text }}{% endif %}">{{ child.text }}</a>
-                </li>
-              {% endfor %}
-            </ul>
-          {% endif %}
-        </li>
-      {% endfor %}
+          {% assign parent = link %}
+          {% capture parent_url %}/{{ link.url }}{% endcapture %}
+          {% guides_style_18f_include sidebar-children.html %}
+        </li>{% endfor %}
     </ul>
   </nav>
 </aside>

data/lib/guides_style_18f/tags.rb

@@ -0,0 +1,40 @@
+require 'jekyll/tags/include'
+require 'liquid'
+
+module GuidesStyle18F
+  class ShouldExpandNavTag < ::Liquid::Tag
+    NAME = 'guides_style_18f_should_expand_nav'
+    ::Liquid::Template.register_tag(NAME, self)
+
+    attr_reader :reference
+
+    def initialize(_tag_name, markup, _)
+      @reference = markup.strip
+    end
+
+    def render(context)
+      scope = context.scopes.detect { |s| s.member?(reference) }
+      parent_url = scope[reference]
+      page_url = context['page']['url']
+      page_url != parent_url && page_url.start_with?(parent_url)
+    end
+  end
+
+  class PopLastUrlComponent < ::Liquid::Tag
+    NAME = 'guides_style_18f_pop_last_url_component'
+    ::Liquid::Template.register_tag(NAME, self)
+
+    attr_reader :reference
+
+    def initialize(_tag_name, markup, _)
+      @reference = markup.strip
+    end
+
+    def render(context)
+      scope = context.scopes.detect { |s| s.member?(reference) }
+      parent_url = scope[reference]
+      result = File.dirname(parent_url)
+      result == '/' ? result : "#{result}/"
+    end
+  end
+end

data/lib/guides_style_18f/version.rb

@@ -1,5 +1,5 @@
 # @author Mike Bland (michael.bland@gsa.gov)
 
 module GuidesStyle18F
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guides_style_18f
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Mike Bland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -172,6 +172,7 @@ files:
 - lib/guides_style_18f/includes/footer.html
 - lib/guides_style_18f/includes/header.html
 - lib/guides_style_18f/includes/scripts.html
+- lib/guides_style_18f/includes/sidebar-children.html
 - lib/guides_style_18f/includes/sidebar.html
 - lib/guides_style_18f/layouts.rb
 - lib/guides_style_18f/layouts/default.html
@@ -182,6 +183,7 @@ files:
 - lib/guides_style_18f/sass/_guides_style_18f_main.scss
 - lib/guides_style_18f/sass/_guides_style_18f_syntax.scss
 - lib/guides_style_18f/sass/guides_style_18f.scss
+- lib/guides_style_18f/tags.rb
 - lib/guides_style_18f/update.rb
 - lib/guides_style_18f/version.rb
 homepage: https://github.com/18F/guides-style