From dfae8e11702b4e89604ca6deb5937a0b19e2f511 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Fri, 8 May 2015 10:28:26 +0100 Subject: [PATCH] Do matching in sidebar_current via regex or equal sign --- website/helpers/sidebar_helpers.rb | 2 +- website/source/layouts/atlas.erb | 2 +- website/source/layouts/aws.erb | 2 +- website/source/layouts/cloudflare.erb | 2 +- website/source/layouts/cloudstack.erb | 2 +- website/source/layouts/consul.erb | 2 +- website/source/layouts/digitalocean.erb | 2 +- website/source/layouts/dme.erb | 2 +- website/source/layouts/dnsimple.erb | 2 +- website/source/layouts/docker.erb | 2 +- website/source/layouts/docs.erb | 16 ++++++++-------- website/source/layouts/google.erb | 2 +- website/source/layouts/heroku.erb | 2 +- website/source/layouts/intro.erb | 6 +++--- website/source/layouts/mailgun.erb | 2 +- website/source/layouts/openstack.erb | 2 +- website/source/layouts/template.erb | 2 +- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/website/helpers/sidebar_helpers.rb b/website/helpers/sidebar_helpers.rb index 124a7c53c6..ef74de49c7 100644 --- a/website/helpers/sidebar_helpers.rb +++ b/website/helpers/sidebar_helpers.rb @@ -3,7 +3,7 @@ module SidebarHelpers # if the YAML frontmatter matches the expected value. def sidebar_current(expected) current = current_page.data.sidebar_current || "" - if current.start_with?(expected) + if current == expected or (expected.is_a?(Regexp) and expected.match(current)) return " class=\"active\"" else return "" diff --git a/website/source/layouts/atlas.erb b/website/source/layouts/atlas.erb index 65e1241b77..8df8365e39 100644 --- a/website/source/layouts/atlas.erb +++ b/website/source/layouts/atlas.erb @@ -10,7 +10,7 @@ Atlas Provider - > + > Resources
    > diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb index bb644a0bbc..4c77e59e64 100644 --- a/website/source/layouts/aws.erb +++ b/website/source/layouts/aws.erb @@ -10,7 +10,7 @@ AWS Provider - > + > Resources
      > diff --git a/website/source/layouts/cloudflare.erb b/website/source/layouts/cloudflare.erb index d30ce6db55..71364951d5 100644 --- a/website/source/layouts/cloudflare.erb +++ b/website/source/layouts/cloudflare.erb @@ -10,7 +10,7 @@ CloudFlare Provider - > + > Resources
        > diff --git a/website/source/layouts/cloudstack.erb b/website/source/layouts/cloudstack.erb index 1d727650f0..d9830586c1 100644 --- a/website/source/layouts/cloudstack.erb +++ b/website/source/layouts/cloudstack.erb @@ -10,7 +10,7 @@ CloudStack Provider - > + > Resources
          > diff --git a/website/source/layouts/consul.erb b/website/source/layouts/consul.erb index 012bc4d5c4..d9ca73e3c7 100644 --- a/website/source/layouts/consul.erb +++ b/website/source/layouts/consul.erb @@ -10,7 +10,7 @@ Consul Provider - > + > Resources
            > diff --git a/website/source/layouts/digitalocean.erb b/website/source/layouts/digitalocean.erb index 63d97742a4..42ede7db34 100644 --- a/website/source/layouts/digitalocean.erb +++ b/website/source/layouts/digitalocean.erb @@ -10,7 +10,7 @@ DigitalOcean Provider - > + > Resources
              > diff --git a/website/source/layouts/dme.erb b/website/source/layouts/dme.erb index f1adf54d7a..e3bd4558e3 100644 --- a/website/source/layouts/dme.erb +++ b/website/source/layouts/dme.erb @@ -10,7 +10,7 @@ DNSMadeEasy Provider - > + > Resources
                > diff --git a/website/source/layouts/dnsimple.erb b/website/source/layouts/dnsimple.erb index fcf9074a3b..531d15446a 100644 --- a/website/source/layouts/dnsimple.erb +++ b/website/source/layouts/dnsimple.erb @@ -10,7 +10,7 @@ DNSimple Provider - > + > Resources
                  > diff --git a/website/source/layouts/docker.erb b/website/source/layouts/docker.erb index 6e39096b99..5bb5a1514d 100644 --- a/website/source/layouts/docker.erb +++ b/website/source/layouts/docker.erb @@ -10,7 +10,7 @@ Docker Provider - > + > Resources
                    > diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index 493dc68161..c7a3d711bc 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -6,7 +6,7 @@ Documentation Home - > + > Configuration
                      > @@ -52,7 +52,7 @@
                    - > + > Commands (CLI)
                      > @@ -105,7 +105,7 @@
                    - > + > State
                      > @@ -114,7 +114,7 @@
                    - > + > Providers
                      > @@ -175,7 +175,7 @@
                    - > + > Provisioners
                      > @@ -196,7 +196,7 @@
                    - > + > Modules
                      > @@ -213,7 +213,7 @@
                    - > + > Plugins
                      > @@ -226,7 +226,7 @@
                    - > + > Internals
                      > diff --git a/website/source/layouts/google.erb b/website/source/layouts/google.erb index fbf05b2013..fc36ea2155 100644 --- a/website/source/layouts/google.erb +++ b/website/source/layouts/google.erb @@ -10,7 +10,7 @@ Google Provider - > + > Resources
                        > diff --git a/website/source/layouts/heroku.erb b/website/source/layouts/heroku.erb index 64eccec536..3e4ea8331c 100644 --- a/website/source/layouts/heroku.erb +++ b/website/source/layouts/heroku.erb @@ -10,7 +10,7 @@ Heroku Provider - > + > Resources
                          > diff --git a/website/source/layouts/intro.erb b/website/source/layouts/intro.erb index 9c19a75db2..294cd279fc 100644 --- a/website/source/layouts/intro.erb +++ b/website/source/layouts/intro.erb @@ -10,7 +10,7 @@ Use Cases - > + > Terraform vs. Other Software
                            > @@ -31,7 +31,7 @@
                          - > + > Getting Started
                            > @@ -80,7 +80,7 @@
                          - > + > Example Configurations
                            > diff --git a/website/source/layouts/mailgun.erb b/website/source/layouts/mailgun.erb index ca85eb9f22..8af740c321 100644 --- a/website/source/layouts/mailgun.erb +++ b/website/source/layouts/mailgun.erb @@ -10,7 +10,7 @@ Mailgun Provider - > + > Resources
                              > diff --git a/website/source/layouts/openstack.erb b/website/source/layouts/openstack.erb index 4646ae904b..39a54fe727 100644 --- a/website/source/layouts/openstack.erb +++ b/website/source/layouts/openstack.erb @@ -10,7 +10,7 @@ OpenStack Provider - > + > Resources
                                > diff --git a/website/source/layouts/template.erb b/website/source/layouts/template.erb index 05c2a4b26b..e9dca7dbb5 100644 --- a/website/source/layouts/template.erb +++ b/website/source/layouts/template.erb @@ -10,7 +10,7 @@ Template Provider - > + > Resources
                                  >