jekyll-scouts_uk_2018 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64b07c319929cbe6d60418c4d67471784d9508ffcaf68320dd6decca431d1b60
-  data.tar.gz: 34c0d36fa0520f66e02c4c9d206c67e7ff58db48175582776757ff0ee0135874
+  metadata.gz: 6f13a6c70ea2fe5c4718d566517fbf10b37704f03e0be93205b2170bb39c7bba
+  data.tar.gz: fed326a637a25ae28e3b8a1d3853b8d5d27e30de066c8fba6b0914b37520ae1a
 SHA512:
-  metadata.gz: bce68c6958f7ee0f54af84eaad97e0aa6ee07e36fd1aeb68e321b89b201b04ce46df6064cfccd052bb15b3c54384a50e3d986c6a38df2afb3e8cc81741741c50
-  data.tar.gz: 4cf935fb9c923eb2390e721ff8c0fa136422e8c45dd70ef8d27e13f7339577e896b15a32afaa5cf6325210209c7b194b2cabf850e892b8c76360b53d34d9f6d2
+  metadata.gz: 94e6db136730c4a9b89b2a1c1617997988d91f139f224b491dd85199e0dfc8c1ba9a895e5f1cbeabcc37ce92f415cc420f39edb35a0b7ddbafdbdeeccf1cfe5c
+  data.tar.gz: 30c772f509b4eb8d950c0d3f8a658fc7f10f7e4145f07e2cbe4e93c8457eb64731a000e5a6f79291abcf6b005b7e68db67c99bf3b0b5a94b14353c4338e7be7b

data/README.md

@@ -8,7 +8,7 @@ A [Jekyll](https://jekyllrb.com/) template for the UK Scouts brand (2018). You c
 Add this line to your Jekyll site's Gemfile:
 
 ```ruby
-gem 'jekyll-scouts_uk_2018', '~> 1.1'
+gem 'jekyll-scouts_uk_2018', '~> 1.3', group: 'jekyll_plugins'
 ```
 
 And add this line to your Jekyll site's _config.yml:
@@ -96,6 +96,34 @@ Then create your files in the _sections directory. A number of front matter sett
 
 ### Other things you get
 
+#### Included Tags
+
+The gem **MUST** be in the jekyll_plugins group to use the included tags.
+
+##### youth_approved
+
+```
+{% youth_approved %}
+```
+Will render an image of [Scout Scotland's Youth Approved](https://www.scouts.scot/members/youth-involvement/youth-approved-award/) seal, with the level chosen by:
+
+* The value of the youth_approved.level front matter
+* The generic Youth Approved logo
+
+If the frontmatter youth_approved.expires is present and in the past then nothing will be rendered.
+
+```
+{% youth_approved <level> %}
+```
+Will render an image of Scout Scotland's Youth Approved seal at the passed level.
+
+```
+{% youth_approved <level> <expires> %}
+```
+Will render an image of Scout Scotland's Youth Approved seal at the passed level if the passed expires (format YYYY-MM-DD) has not passed.
+
+In all cases the img has a class of youth-approved-seal and is enclosed by a link to the scheme on Scouts Scotland's website.
+
 #### Ability to display twitter content (provided by [jekyll-twitter-plugin](https://github.com/rob-murray/jekyll-twitter-plugin))
 
 If a section has a social_links.twitter value and the screen is wide enough then their last five tweets will be displayed at the side of the page.
@@ -108,4 +136,4 @@ If a section has a social_links.twitter value and the screen is wide enough then
   * FleurDeLis
 * [Tabler icons](https://tablericons.com/): assets/images/tabler-icons-sprite.svg
 * Scouts Scotland's Youth Approved seals: assets/images
-* Nunito Sans font: assets/fonts/NunitoSans
+* Nunito Sans font: assets/fonts/NunitoSans

data/_layouts/section.html

@@ -18,25 +18,13 @@ main_class: section
   <div id="content-footer">
     {%- assign social_links = page.social_links -%}
     {%- include social-links.html -%}
-
-    {%- if page.youth_approved -%}
-      {%- assign today = 'now' | date: '%Y-%m-%d' -%}
-      {%- assign expires = page.youth_approved.expires | date: '%Y-%m-%d' -%}
-      {%- if expires >= today -%}
-        <a href="https://www.scouts.scot/members/youth-involvement/youth-approved-award/" rel="nofollow noopener" target="_blank">
-          {%- assign logo = page.youth_approved.level | capitalize -%}
-          {%- assign logo = "assets/images/YouthApproved" | append: logo | relative_url -%}
-          {%- assign alt = "We've got the " | append: page.youth_approved.level | append: " Youth Approved award from Scouts Scotland." -%}
-          <img class="youth-approved-seal" src="{{ logo }}.png" srcset="{{ logo }}-100.png 100w, {{ logo }}-320.png 320w, {{ logo }}-480.png 480w, {{ logo }}-640.png 640w" alt="{{ alt }}">
-        </a>
-        {%- endif -%}
-    {%- endif -%}
+    {%- if page.youth_approved -%}{% youth_approved %}{%- endif -%}
   </div>
 </div>
 
 {%- if page.social_links.twitter -%}
   <div id="tweets">
     {% assign twitter_url = 'https://twitter.com/' | append: page.social_links.twitter %}
-    {% twitternocache twitter_url limit=3 %}
+    {% twitter twitter_url limit=3 %}
   </div>
 {%- endif -%}

data/assets/css/main.scss

@@ -154,6 +154,10 @@ ul.social-links {
   }
 }
 
+.youth-approved-seal {
+  max-width: 20rem;
+}
+
 
 @import "header";
 

data/lib/jekyll-scouts_uk_2018/tag.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module ScoutsUk2018
+    class Tag < Liquid::Tag
+      def initialize(_tag_name, markup, _parse_context)
+        super
+
+        @level, @expires = markup.strip.split(/\s+/, 2)
+      end
+
+      def render(context)
+        expires = @expires || context.registers[:page]['youth_approved']&.[]('expires')
+        return if expires && expires.to_s < Date.today.to_s
+        level = @level || context.registers[:page]['youth_approved']&.[]('level')
+
+        logo = "#{context.registers[:site].config.fetch('baseurl', '').to_s.chomp('/')}/assets/images/YouthApproved#{level&.capitalize}"
+        alt = if level
+          "We've got the #{level.capitalize} Youth Approved award from Scouts Scotland."
+        else
+          "Scouts Scotland's Youth Approved award."
+        end
+
+        html = <<~__HTML__
+          <a href="https://www.scouts.scot/members/youth-involvement/youth-approved-award/" rel="nofollow noopener" target="_blank">
+            <img
+              class="youth-approved-seal"
+              src="#{logo}.png"
+              srcset="#{logo}-100.png 100w,
+                      #{logo}-320.png 320w,
+                      #{logo}-480.png 480w,
+                      #{logo}-640.png 640w"
+              alt="#{alt}"
+            >
+          </a>
+        __HTML__
+        html.gsub(/\s+\>/, '>').gsub(/\s+\</, '<').gsub(/\s+/, ' ')
+      end
+    end
+  end
+end

data/lib/jekyll-scouts_uk_2018.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative 'jekyll-scouts_uk_2018/tag'
+
+module Jekyll
+  module ScoutsUk2018
+  end
+end
+
+
+Liquid::Template.register_tag('youth_approved', Jekyll::ScoutsUk2018::Tag)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scouts_uk_2018
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Robert Gauld
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -61,7 +61,6 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
-- _config.yml
 - _includes/footer.html
 - _includes/head.html
 - _includes/header-logo.html
@@ -302,6 +301,8 @@ files:
 - assets/images/logos/SquirrelsSymbolYellow-100.png
 - assets/images/logos/SquirrelsSymbolYellow.png
 - assets/images/tabler-icons-sprite.svg
+- lib/jekyll-scouts_uk_2018.rb
+- lib/jekyll-scouts_uk_2018/tag.rb
 homepage: https://github.com/27thAberdeenScoutGroup/jekyll-scouts_uk_2018
 licenses:
 - BSD-3-Clause