diff --git a/archetypes/project/index.md b/archetypes/project/index.md index e3f3f1a9..4da13a56 100644 --- a/archetypes/project/index.md +++ b/archetypes/project/index.md @@ -30,6 +30,10 @@ url_slides = "" url_video = "" url_poster = "" +# Custom links (optional). +# Uncomment line below to enable. For multiple links, use the form `[{...}, {...}, {...}]`. +# url_custom = [{icon_pack = "fab", icon="twitter", name="Follow", url = "https://twitter.com"}] + # Featured image # To use, add an image named `featured.jpg/png` to your page's folder. [image] diff --git a/exampleSite/content/project/internal-project/index.md b/exampleSite/content/project/internal-project/index.md index 05705051..eb1a2adb 100644 --- a/exampleSite/content/project/internal-project/index.md +++ b/exampleSite/content/project/internal-project/index.md @@ -29,6 +29,10 @@ url_slides = "" url_video = "" url_code = "" +# Custom links (optional). +# Uncomment line below to enable. For multiple links, use the form `[{...}, {...}, {...}]`. +url_custom = [{icon_pack = "fab", icon="twitter", name="Follow", url = "https://twitter.com/georgecushen"}] + # Featured image # To use, add an image named `featured.jpg/png` to your project's folder. [image] diff --git a/layouts/partials/css/academic.css b/layouts/partials/css/academic.css index be3ca692..c1ed1397 100644 --- a/layouts/partials/css/academic.css +++ b/layouts/partials/css/academic.css @@ -694,6 +694,12 @@ article { box-sizing: border-box; } +/* Prevent FA's line height of 1 causing FA button links to be taller than other button links. */ +.btn-links .fab, +.btn-links .fas { + line-height: inherit !important; +} + .split-header-image { position: relative; /* Required for caption positioning */ clear: both; @@ -983,7 +989,7 @@ article .article-metadata { color: rgba(255,255,255,0.54); } -.pub-list-item .pub-links { +.pub-list-item .btn-links { padding-top: 10px; } diff --git a/layouts/partials/page_links.html b/layouts/partials/page_links.html index b3af334e..b8119826 100644 --- a/layouts/partials/page_links.html +++ b/layouts/partials/page_links.html @@ -120,11 +120,21 @@ {{ end }} {{ range $.Params.url_custom }} -{{ $link := .url }} -{{ if not (urls.Parse .url).Scheme }} -{{ $link = (printf "%s%s" $.Dir .url) | relURL }} -{{ end }} - - {{ .name }} - + {{ $pack := or .icon_pack "fas" }} + {{ $pack_prefix := $pack }} + {{ if in (slice "fab" "fas" "far" "fal") $pack }} + {{ $pack_prefix = "fa" }} + {{ end }} + {{ $link := .url }} + {{ $scheme := (urls.Parse $link).Scheme }} + {{ $target := "" }} + {{ if not $scheme }} + {{ $link = (printf "%s%s" $.Dir .url) | relURL }} + {{ else if in (slice "http" "https") $scheme }} + {{ $target = "target=\"_blank\" rel=\"noopener\"" }} + {{ end }} + + {{ if .icon }}{{end}} + {{ with .name }}{{ . | safeHTML }}{{end}} + {{ end }} diff --git a/layouts/partials/page_links_div.html b/layouts/partials/page_links_div.html index 6df74104..f4d18caa 100644 --- a/layouts/partials/page_links_div.html +++ b/layouts/partials/page_links_div.html @@ -19,7 +19,7 @@ {{ end }} {{ if $cite_link | or $pdf_link | or .Params.external_link | or .Params.url_preprint | or .Params.url_pdf | or .Params.url_slides | or .Params.url_video | or .Params.url_source | or .Params.url_code | or .Params.url_dataset | or .Params.url_poster | or .Params.url_project | or .Params.url_custom | or .Params.projects | or .Params.slides }} -
+
{{ with .Params.external_link }} {{ i18n "open_project_site" }} {{ end }} diff --git a/layouts/partials/project_li_showcase.html b/layouts/partials/project_li_showcase.html index 34bf3c09..1122545a 100644 --- a/layouts/partials/project_li_showcase.html +++ b/layouts/partials/project_li_showcase.html @@ -39,7 +39,7 @@
{{ end }} -
+
{{ partial "page_links" (dict "content" $item "is_list" 0) }}
diff --git a/layouts/partials/publication_li_detailed.html b/layouts/partials/publication_li_detailed.html index 8536d44a..563815f0 100644 --- a/layouts/partials/publication_li_detailed.html +++ b/layouts/partials/publication_li_detailed.html @@ -38,7 +38,7 @@ {{ .Date.Format "2006" }}
-
+
{{ partial "page_links" (dict "content" . "is_list" 1) }}
diff --git a/layouts/partials/publication_li_stream.html b/layouts/partials/publication_li_stream.html index 7a9c4859..6b3215b9 100644 --- a/layouts/partials/publication_li_stream.html +++ b/layouts/partials/publication_li_stream.html @@ -27,7 +27,7 @@
-
+
{{ partial "page_links" (dict "content" . "is_list" 1) }}
diff --git a/layouts/partials/talk_li_detailed.html b/layouts/partials/talk_li_detailed.html index 1e32e8e1..10a5149f 100644 --- a/layouts/partials/talk_li_detailed.html +++ b/layouts/partials/talk_li_detailed.html @@ -42,7 +42,7 @@ {{ end }}
-
+
{{ partial "page_links" (dict "content" . "is_list" 1) }}
diff --git a/layouts/partials/talk_li_simple.html b/layouts/partials/talk_li_simple.html index 76bc521d..a562067e 100644 --- a/layouts/partials/talk_li_simple.html +++ b/layouts/partials/talk_li_simple.html @@ -15,7 +15,7 @@ {{ .Params.event | markdownify }} {{ end }}
-
+
{{ partial "page_links" (dict "content" . "is_list" 1) }}
diff --git a/layouts/partials/talk_li_stream.html b/layouts/partials/talk_li_stream.html index 8e516326..fed3fb4b 100644 --- a/layouts/partials/talk_li_stream.html +++ b/layouts/partials/talk_li_stream.html @@ -43,7 +43,7 @@ -
+
{{ partial "page_links" (dict "content" . "is_list" 1) }}