From cc0b78d60facf1b7fc2a29f3cf64c2d37c5f06a7 Mon Sep 17 00:00:00 2001 From: Lorenz Schmid Date: Tue, 8 Dec 2020 22:53:52 +0100 Subject: [PATCH] Add inactive text for navbar and home live links --- Gemfile.lock | 2 +- README.md | 2 +- _includes/partials/navbar.html | 8 ++++++++ _layouts/home.html | 16 +++++++++++----- jekyll-theme-conference.gemspec | 2 +- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7563e1ee..8ceedbd4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - jekyll-theme-conference (3.0.0) + jekyll-theme-conference (3.0.1) jekyll (~> 4.0) GEM diff --git a/README.md b/README.md index 01135a6f..5c658a21 100644 --- a/README.md +++ b/README.md @@ -552,7 +552,7 @@ Links are used at different location throughout the theme: They can either be us Additionally, a navigation bar or main landing page link can also have the following properties: - `menu` containing another list of links. This creates a dropdown menu of multiple sublinks. The sublinks have the same properties as regular links, or -- `live` making the link only visible during the conference and adds a live indication. The `name` property can be omitted. If streaming is enabled and any URL property is omitted, a click on the link will open the streaming modal (see section _Live Indications_ above). +- `live` making the link only visible during the conference and adds a live indication. The `name` property can be omitted. Using the optional `name_inactive` property shows a placeholder text while the conference is **not** live. If streaming is enabled and any URL property is omitted, a click on the link will open the streaming modal (see section _Live Indications_ above). Using the `file:` indicator, the relative address is automatically set as well as the icon. Using the `video:` indicator, the link is automatically configured to open in an iframe with a corresponding title and the icon is set. diff --git a/_includes/partials/navbar.html b/_includes/partials/navbar.html index 8e5c767e..f28df63b 100644 --- a/_includes/partials/navbar.html +++ b/_includes/partials/navbar.html @@ -31,6 +31,14 @@ {%- elsif link.live -%} {%- include partials/get_live_timestamps.html -%} + {%- if link.name_inactive -%} +
  • + + {{ link.name_inactive }} + +
    • + {%- endif -%} +
  • {%- if site.conference.live.streaming %} diff --git a/_layouts/home.html b/_layouts/home.html index e77de0e3..f4ff6491 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -45,11 +45,17 @@

    {% elsif link.live %} {%- include partials/get_live_timestamps.html -%} - {% if link.name %} - {% assign link_name = link.name %} - {% else %} - {% assign link_name = site.data.lang[site.conference.lang].live.streaming | default: "Live Stream" %} - {% endif %} + {%- if link.name -%} + {%- assign link_name = link.name -%} + {%- else -%} + {%- assign link_name = site.data.lang[site.conference.lang].live.streaming | default: "Live Stream" -%} + {%- endif -%} + + {%- if link.name_inactive -%} + + {{ link.name_inactive }} + + {%- endif -%} {% if site.conference.live.streaming %} diff --git a/jekyll-theme-conference.gemspec b/jekyll-theme-conference.gemspec index cfb1834e..69537a6c 100644 --- a/jekyll-theme-conference.gemspec +++ b/jekyll-theme-conference.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "jekyll-theme-conference" - spec.version = "3.0.0" + spec.version = "3.0.1" spec.authors = ["Lorenz Schmid"] spec.email = ["lorenzschmid@users.noreply.github.com"]