Pull template changes from docs site

Author: jmooring

layouts/partials/components/author-github-data-card.html

@@ -4,14 +4,14 @@
 
     {{ $data := "" }}
     {{ $url := urls.JoinPath "https://api.github.com/users" $author }}
-    {{ with resources.GetRemote $url }}
+    {{ with try (resources.GetRemote $url) }}
       {{ with .Err }}
         {{ errorf "%s" . }}
-      {{ else }}
+      {{ else with .Value }}
         {{ $data = . | transform.Unmarshal }}
+      {{ else }}
+        {{ errorf "Unable to get remote resource %q" $url }}
       {{ end }}
-    {{ else }}
-      {{ errorf "Unable to get remote resource %q" $url }}
     {{ end }}
 
     <div class="tc">

layouts/partials/components/author-github-data.html

@@ -4,14 +4,14 @@
 
     {{ $data := "" }}
     {{ $url := urls.JoinPath "https://api.github.com/users" $author }}
-    {{ with resources.GetRemote $url }}
+    {{ with try (resources.GetRemote $url) }}
       {{ with .Err }}
         {{ errorf "%s" . }}
-      {{ else }}
+      {{ else with .Value }}
         {{ $data = . | transform.Unmarshal }}
+      {{ else }}
+        {{ errorf "Unable to get remote resource %q" $url }}
       {{ end }}
-    {{ else }}
-      {{ errorf "Unable to get remote resource %q" $url }}
     {{ end }}
 
     {{ with $data }}

layouts/partials/utilities/get-remote-data.html

@@ -11,13 +11,13 @@
 
 {{ $url := . }}
 {{ $data := dict }}
-{{ with resources.GetRemote $url }}
+{{ with try (resources.GetRemote $url) }}
   {{ with .Err }}
     {{ errorf "%s" . }}
-  {{ else }}
+  {{ else with .Value }}
     {{ $data = .Content | transform.Unmarshal }}
+  {{ else }}
+    {{ errorf "Unable to get remote resource %q" $url }}
   {{ end }}
-{{ else }}
-  {{ errorf "Unable to get remote resource %q" $url }}
 {{ end }}
 {{ return $data }}

layouts/shortcodes/hl.html

@@ -0,0 +1,11 @@
+{{- /*
+Returns syntax-highlighted code from the given text.
+
+This is useful as a terse way to highlight inline code snippets. Calling the
+highlight shortcode for inline snippets is verbose.
+*/}}
+
+{{- $code := .Inner | strings.TrimSpace }}
+{{- $lang := or (.Get 0) "go"  }}
+{{- $opts := dict "hl_inline" true "noClasses" true }}
+{{- transform.Highlight $code $lang $opts }}

layouts/shortcodes/img.html

@@ -120,8 +120,8 @@
 
 {{- $validFilters := slice
   "autoorient" "brightness" "colorbalance" "colorize" "contrast" "dither"
-  "gamma" "gaussianblur" "grayscale" "hue" "invert" "none" "opacity" "overlay"
-  "padding" "pixelate" "process" "saturation" "sepia" "sigmoid" "text"
+  "gamma" "gaussianblur" "grayscale" "hue" "invert" "mask" "none" "opacity"
+  "overlay" "padding" "pixelate" "process" "saturation" "sepia" "sigmoid" "text"
   "unsharpmask"
 }}
 
@@ -229,6 +229,12 @@
   {{- $ctx = merge $ctx (dict "argsRequired" 0) }}
   {{- template "validate-arg-count" $ctx }}
   {{- $f = images.Invert }}
+{{- else if eq $filter "mask" }}
+  {{- $ctx = merge $ctx (dict "argsRequired" 1) }}
+  {{- template "validate-arg-count" $ctx }}
+  {{- $ctx := dict "src" (index $filterArgs 0) "name" .Name "position" .Position }}
+  {{- $maskImage := partial "inline/get-resource.html" $ctx }}
+  {{- $f = images.Mask $maskImage }}
 {{- else if eq $filter "opacity" }}
   {{- $ctx = merge $ctx (dict "argsRequired" 1) }}
   {{- template "validate-arg-count" $ctx }}
@@ -322,11 +328,15 @@
 {{- end }}
 
 {{- /* Render. */}}
+{{- $class := "di va b--black-20" }}
+{{- if eq $filter "mask" }}
+  {{- $class = "di va" }}
+{{- end }}
 {{- if $example }}
   <p>Original</p>
-  <img class='di ba b--black-20' style="width: initial;" src="{{ $i.RelPermalink }}" alt="{{ $alt }}">
+  <img class="{{ $class}}" style="width: initial;" src="{{ $i.RelPermalink }}" alt="{{ $alt }}">
   <p>Processed</p>
-  <img class='di ba b--black-20' style="width: initial;" src="{{ $fi.RelPermalink }}" alt="{{ $alt }}">
+  <img class="{{ $class }}" style="width: initial;" src="{{ $fi.RelPermalink }}" alt="{{ $alt }}">
 {{- else -}}
   <img class='di' style="width: initial;" src="{{ $fi.RelPermalink }}" alt="{{ $alt }}">
 {{- end }}
@@ -354,15 +364,15 @@
   {{- $u := urls.Parse .src }}
   {{- $msg := "The %q shortcode was unable to resolve %s. See %s" }}
   {{- if $u.IsAbs }}
-    {{- with resources.GetRemote $u.String }}
+    {{- with try (resources.GetRemote $u.String) }}
       {{- with .Err }}
         {{- errorf "%s" . }}
-      {{- else }}
+      {{- else with .Value }}
         {{- /* This is a remote resource. */}}
         {{- $r = . }}
+      {{- else }}
+        {{- errorf $msg $.name $u.String $.position }}
       {{- end }}
-    {{- else }}
-      {{- errorf $msg $.name $u.String $.position }}
     {{- end }}
   {{- else }}
     {{- with .page.Resources.Get (strings.TrimPrefix "./" $u.Path) }}