From 35c737fc1436470b5e62f9f5cd6bb1d6878dfc6c Mon Sep 17 00:00:00 2001 From: Yehonal Date: Wed, 24 Apr 2019 14:39:50 +0200 Subject: Implemented service config and fixed action buttons --- _includes/git-wiki/components/action_btn/page_actions.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to '_includes') diff --git a/_includes/git-wiki/components/action_btn/page_actions.html b/_includes/git-wiki/components/action_btn/page_actions.html index 03f1d85..097dc51 100644 --- a/_includes/git-wiki/components/action_btn/page_actions.html +++ b/_includes/git-wiki/components/action_btn/page_actions.html @@ -8,14 +8,18 @@ Add new Edit + {% if site.service == "gitlab" %} + Delete + {% else %} Delete + {% endif %} History Source {% if site.blog_feature %} Add new post {% endif %} - {% if site.use_prose_io %} + {% if site.use_prose_io and site.service == "github" %}
Prose.io: Add -- cgit From d6389dfe1fe101a465054793ddd973ddf6b50092 Mon Sep 17 00:00:00 2001 From: nekketsuuu Date: Sat, 4 Jan 2020 13:54:56 +0900 Subject: don't output logo if logo_url is not set --- _includes/git-wiki/sections/header/header.html | 2 ++ 1 file changed, 2 insertions(+) (limited to '_includes') diff --git a/_includes/git-wiki/sections/header/header.html b/_includes/git-wiki/sections/header/header.html index 8612103..8c7f5bb 100644 --- a/_includes/git-wiki/sections/header/header.html +++ b/_includes/git-wiki/sections/header/header.html @@ -1,7 +1,9 @@
+ {% if site.logo_url %} + {% endif %} {{ site.title }}
-- cgit From f98b158f36f7b6323bca657d539ed60cfd723a8d Mon Sep 17 00:00:00 2001 From: Takuma Ishikawa Date: Mon, 6 Jan 2020 17:39:55 +0900 Subject: Escape several strings, especially title (#71) Co-authored-by: Yehonal --- .../git-wiki/components/action_btn/page_actions.html | 20 ++++++++++---------- _includes/git-wiki/components/lists/page-list.html | 2 +- _includes/git-wiki/components/lists/post-list.html | 2 +- _includes/git-wiki/components/logo/logo.html | 2 +- _includes/git-wiki/sections/header/header.html | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to '_includes') diff --git a/_includes/git-wiki/components/action_btn/page_actions.html b/_includes/git-wiki/components/action_btn/page_actions.html index 097dc51..b9151b4 100644 --- a/_includes/git-wiki/components/action_btn/page_actions.html +++ b/_includes/git-wiki/components/action_btn/page_actions.html @@ -5,28 +5,28 @@ History Source {% else %} - Add + Add new - Edit + Edit {% if site.service == "gitlab" %} - Delete + Delete {% else %} - Delete + Delete {% endif %} - History - Source + History + Source {% if site.blog_feature %} - Add + Add new post {% endif %} {% if site.use_prose_io and site.service == "github" %}
Prose.io: - Add + Add new - Edit + Edit {% if site.blog_feature %} - Add + Add new post {% endif %} {% endif %} diff --git a/_includes/git-wiki/components/lists/page-list.html b/_includes/git-wiki/components/lists/page-list.html index dea6758..8129bf0 100644 --- a/_includes/git-wiki/components/lists/page-list.html +++ b/_includes/git-wiki/components/lists/page-list.html @@ -15,7 +15,7 @@ {% if page.is_wiki_page != false and page.sitemap != false %}
  • {% assign title = page.title | default: page.name %} - {{title}} + {{title | escape}}
    • {% assign numPages = numPages | plus: 1 %} {% endif %} diff --git a/_includes/git-wiki/components/lists/post-list.html b/_includes/git-wiki/components/lists/post-list.html index d6fa663..579dab5 100644 --- a/_includes/git-wiki/components/lists/post-list.html +++ b/_includes/git-wiki/components/lists/post-list.html @@ -15,7 +15,7 @@ {% if post.layout != "null" and post.sitemap != false and post.title %}
  • - {{ post.title}} + {{ post.title | escape }}
    • {% assign numPages = numPages | plus: 1 %} {% endif %} diff --git a/_includes/git-wiki/components/logo/logo.html b/_includes/git-wiki/components/logo/logo.html index d33305e..375b06b 100644 --- a/_includes/git-wiki/components/logo/logo.html +++ b/_includes/git-wiki/components/logo/logo.html @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/_includes/git-wiki/sections/header/header.html b/_includes/git-wiki/sections/header/header.html index 8c7f5bb..262bed9 100644 --- a/_includes/git-wiki/sections/header/header.html +++ b/_includes/git-wiki/sections/header/header.html @@ -3,8 +3,8 @@ {% if site.logo_url %} + {{ site.title | escape }} {% endif %} - {{ site.title }}
    -- cgit From 89fbb2f4a2ab7d8a51d665ea399e1b242528b30f Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 6 Jan 2020 14:01:22 +0100 Subject: Fixed wrong behaviour with title --- _includes/git-wiki/sections/header/header.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '_includes') diff --git a/_includes/git-wiki/sections/header/header.html b/_includes/git-wiki/sections/header/header.html index 262bed9..ea83b2c 100644 --- a/_includes/git-wiki/sections/header/header.html +++ b/_includes/git-wiki/sections/header/header.html @@ -3,8 +3,8 @@ {% if site.logo_url %} - {{ site.title | escape }} {% endif %} + {{ site.title | escape }}
    @@ -52,4 +52,4 @@ $(sidebar).attr('style', 'display: block;'); } } - \ No newline at end of file + -- cgit From 709b7cac2d096b476a54c83f38ba85634fec7dc4 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 16:51:07 +0100 Subject: test default value assignment --- _includes/git-wiki/defines/defines.html | 1 + 1 file changed, 1 insertion(+) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 0b47b7d..8ed7e0e 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,3 +1,4 @@ +{% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} {% capture url %} -- cgit From 75f27cf9b2a242203742b0d282020e78d1251309 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:00:04 +0100 Subject: another test --- _includes/git-wiki/defines/defines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 8ed7e0e..bc144f7 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,4 @@ -{% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} +{% assign assign site.git_branch = site.git_branch | default: master %} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} {% capture url %} -- cgit From 585108c40ef255eb74b7ef02feb796e53e493015 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:03:55 +0100 Subject: debug --- _includes/git-wiki/defines/defines.html | 1 + 1 file changed, 1 insertion(+) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index bc144f7..0715541 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,5 @@ {% assign assign site.git_branch = site.git_branch | default: master %} +{{ site.git_branch }} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} {% capture url %} -- cgit From 8217361a5ce2499a0948e2f971f56d786dbe1a5f Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:13:03 +0100 Subject: try 3 --- _includes/git-wiki/defines/defines.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 0715541..3ba0cdc 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,5 +1,7 @@ -{% assign assign site.git_branch = site.git_branch | default: master %} -{{ site.git_branch }} +{% assign site.git_branch = site.git_branch | default: master %} +branch: {{ site.git_branch | default: master }} +{% capture site.git_branch %}{{ site.git_branch | default: master }}{% endcapture %} +branch: {{ site.git_branch }} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} {% capture url %} -- cgit From 11d833832bd77d32188154a3aceacf6b95683d57 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:20:32 +0100 Subject: try 4 --- _includes/git-wiki/defines/defines.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 3ba0cdc..3dcfee3 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,6 +1,6 @@ -{% assign site.git_branch = site.git_branch | default: master %} +{% assign site.git_branch = {{site.git_branch}} | default: master %} branch: {{ site.git_branch | default: master }} -{% capture site.git_branch %}{{ site.git_branch | default: master }}{% endcapture %} +{% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} branch: {{ site.git_branch }} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} -- cgit From 7eb1c4721ba117ba234d009cd8fb7fb1d88d2d34 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:22:46 +0100 Subject: try 5 --- _includes/git-wiki/defines/defines.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 3dcfee3..fe3f34d 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,7 +1,7 @@ {% assign site.git_branch = {{site.git_branch}} | default: master %} -branch: {{ site.git_branch | default: master }} +branch: {{site.git_branch | default: master}} {% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} -branch: {{ site.git_branch }} +branch: {{site.git_branch}} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} {% capture url %} -- cgit From 74adfd258744f9f83bab74dc71d9af28d9cc43bc Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:25:15 +0100 Subject: try 6 --- _includes/git-wiki/defines/defines.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index fe3f34d..cf0a9b2 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,5 @@ -{% assign site.git_branch = {{site.git_branch}} | default: master %} +branch: {{site.git_branch | default: master}} +{% assign site.git_branch = {{site.git_branch | default: master}} %} branch: {{site.git_branch | default: master}} {% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} branch: {{site.git_branch}} -- cgit From d27a494e02d886e469afdf7d78ca17f5e13db6d4 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:27:56 +0100 Subject: try 8 --- _includes/git-wiki/defines/defines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index cf0a9b2..80a6185 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,4 @@ -branch: {{site.git_branch | default: master}} +branch: {{ site.git_branch | default: master }} {% assign site.git_branch = {{site.git_branch | default: master}} %} branch: {{site.git_branch | default: master}} {% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} -- cgit From f5a13132c82f93d89c94fc99507e75a537fc3772 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:29:02 +0100 Subject: try 9 --- _includes/git-wiki/defines/defines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 80a6185..44d0114 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,4 @@ -branch: {{ site.git_branch | default: master }} +branch: {{ git_branch | default: master }} {% assign site.git_branch = {{site.git_branch | default: master}} %} branch: {{site.git_branch | default: master}} {% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} -- cgit From cf74f41e89b01225c4cda44a44bce46db8f2e17d Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:35:01 +0100 Subject: try 10 --- _includes/git-wiki/defines/defines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 44d0114..2839252 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,4 @@ -branch: {{ git_branch | default: master }} +branch: {{ testempty | default: "master" }} {% assign site.git_branch = {{site.git_branch | default: master}} %} branch: {{site.git_branch | default: master}} {% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} -- cgit From 93558f1e51f255689a40e1cddef5c0874104789b Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:40:31 +0100 Subject: try 11 --- _includes/git-wiki/defines/defines.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 2839252..833c205 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,7 +1,4 @@ -branch: {{ testempty | default: "master" }} -{% assign site.git_branch = {{site.git_branch | default: master}} %} -branch: {{site.git_branch | default: master}} -{% capture site.git_branch %}{{site.git_branch | default: master}}{% endcapture %} +{% unless site.git_branch %}{% assign site.git_branch = "master" %}{% endif %} branch: {{site.git_branch}} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} -- cgit From cbb7afe77cc41d445485ba059821fdedac031b1d Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:43:53 +0100 Subject: fix --- _includes/git-wiki/defines/defines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 833c205..8707dcc 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,4 @@ -{% unless site.git_branch %}{% assign site.git_branch = "master" %}{% endif %} +{% unless site.git_branch %}{% assign site.git_branch = "master" %}{% endunless %} branch: {{site.git_branch}} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} -- cgit From 2f28ef820291a0a53147c7354f2d8480f8c2a047 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 6 Jan 2020 17:56:43 +0100 Subject: restored --- _includes/git-wiki/defines/defines.html | 2 -- 1 file changed, 2 deletions(-) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 8707dcc..0b47b7d 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,5 +1,3 @@ -{% unless site.git_branch %}{% assign site.git_branch = "master" %}{% endunless %} -branch: {{site.git_branch}} {% assign version = "2.3.1" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} {% capture url %} -- cgit From f787baf3be7257bd93cfd44a813b7f2d803cafb5 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 6 Jan 2020 19:02:51 +0100 Subject: Show title if no logo set in desktop mode --- _includes/git-wiki/sections/header/header.html | 2 ++ 1 file changed, 2 insertions(+) (limited to '_includes') diff --git a/_includes/git-wiki/sections/header/header.html b/_includes/git-wiki/sections/header/header.html index ea83b2c..cd2f322 100644 --- a/_includes/git-wiki/sections/header/header.html +++ b/_includes/git-wiki/sections/header/header.html @@ -17,6 +17,8 @@
    {% if site.logo_url %} {% include git-wiki/components/logo/logo.html %} + {% else %} + {{ site.title | escape }} {% endif %}
    -- cgit From 9d22819dbae5fd44f3bd4adb3eb38454200f6c7f Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 6 Jan 2020 19:09:46 +0100 Subject:

    for title --- _includes/git-wiki/sections/header/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_includes') diff --git a/_includes/git-wiki/sections/header/header.html b/_includes/git-wiki/sections/header/header.html index cd2f322..38ec85b 100644 --- a/_includes/git-wiki/sections/header/header.html +++ b/_includes/git-wiki/sections/header/header.html @@ -18,7 +18,7 @@ {% if site.logo_url %} {% include git-wiki/components/logo/logo.html %} {% else %} - {{ site.title | escape }} +

    {{ site.title | escape }}

    {% endif %} -- cgit From 7341eb7c340d8291b86268281db274e52cc3cf1b Mon Sep 17 00:00:00 2001 From: Yehonal Date: Tue, 7 Jan 2020 08:19:13 +0100 Subject: move searchdata under assets/js --- _includes/git-wiki/components/search/se_js.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_includes') diff --git a/_includes/git-wiki/components/search/se_js.html b/_includes/git-wiki/components/search/se_js.html index 85e168c..87396be 100644 --- a/_includes/git-wiki/components/search/se_js.html +++ b/_includes/git-wiki/components/search/se_js.html @@ -4,4 +4,4 @@ - + -- cgit From a762bbadefc59a9a4c0ad5bb9541b0109d8fec3d Mon Sep 17 00:00:00 2001 From: Joseph Date: Tue, 7 Jan 2020 17:06:05 +0100 Subject: updated version --- _includes/git-wiki/defines/defines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_includes') diff --git a/_includes/git-wiki/defines/defines.html b/_includes/git-wiki/defines/defines.html index 0b47b7d..ff1c597 100644 --- a/_includes/git-wiki/defines/defines.html +++ b/_includes/git-wiki/defines/defines.html @@ -1,4 +1,4 @@ -{% assign version = "2.3.1" %} +{% assign version = "2.5.0" %} {% capture lchar %}{{page.url | slice: -1, 1}}{% endcapture %} {% capture url %} {% if lchar == "/" %}{{page.url}}index.html{% else %}{{ page.url | default: 'index.html' }}{% endif%} -- cgit From b3079927197d733856f44409a80110a38cdfec33 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Wed, 8 Jan 2020 22:01:08 +0100 Subject: defining service automatically based on metadata hostname --- _includes/git-wiki/components/action_btn/page_actions.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '_includes') diff --git a/_includes/git-wiki/components/action_btn/page_actions.html b/_includes/git-wiki/components/action_btn/page_actions.html index b9151b4..78a4dac 100644 --- a/_includes/git-wiki/components/action_btn/page_actions.html +++ b/_includes/git-wiki/components/action_btn/page_actions.html @@ -8,7 +8,7 @@ Add new Edit - {% if site.service == "gitlab" %} + {% if site.hostname == "gitlab.com" %} Delete {% else %} Delete @@ -19,7 +19,7 @@ Add new post {% endif %} - {% if site.use_prose_io and site.service == "github" %} + {% if site.use_prose_io and site.hostname == "github.com" %}
    Prose.io: Add -- cgit From 29f1c0268fa610a934da837a404b90125a67aa18 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Sat, 11 Jan 2020 12:56:26 +0100 Subject: Update page_actions.html --- _includes/git-wiki/components/action_btn/page_actions.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_includes') diff --git a/_includes/git-wiki/components/action_btn/page_actions.html b/_includes/git-wiki/components/action_btn/page_actions.html index 78a4dac..9902234 100644 --- a/_includes/git-wiki/components/action_btn/page_actions.html +++ b/_includes/git-wiki/components/action_btn/page_actions.html @@ -19,7 +19,7 @@ Add new post {% endif %} - {% if site.use_prose_io and site.hostname == "github.com" %} + {% if site.use_prose_io and site.hostname != "gitlab.com" %}
    Prose.io: Add -- cgit From a81a933ab806dabbc6720d98f470c6a5edcd9a15 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Sat, 11 Jan 2020 23:45:58 +0100 Subject: implemented static TOC #57 Thanks to @vzickus for the suggestion --- _includes/git-wiki/components/toc/toc-lib.html | 96 ++++++++++++++++++++++++ _includes/git-wiki/components/toc/toc.html | 12 +++ _includes/git-wiki/sections/content/content.html | 10 +-- _includes/git-wiki/sections/head/scripts.html | 1 - _includes/git-wiki/sections/tail/tail.html | 11 --- 5 files changed, 109 insertions(+), 21 deletions(-) create mode 100644 _includes/git-wiki/components/toc/toc-lib.html create mode 100644 _includes/git-wiki/components/toc/toc.html (limited to '_includes') diff --git a/_includes/git-wiki/components/toc/toc-lib.html b/_includes/git-wiki/components/toc/toc-lib.html new file mode 100644 index 0000000..4aa9c88 --- /dev/null +++ b/_includes/git-wiki/components/toc/toc-lib.html @@ -0,0 +1,96 @@ +{% capture tocWorkspace %} + {% comment %} + Version 1.0.9 + https://github.com/allejo/jekyll-toc + + "...like all things liquid - where there's a will, and ~36 hours to spare, there's usually a/some way" ~jaybe + + Usage: + {% include toc.html html=content sanitize=true class="inline_toc" id="my_toc" h_min=2 h_max=3 %} + + Parameters: + * html (string) - the HTML of compiled markdown generated by kramdown in Jekyll + + Optional Parameters: + * sanitize (bool) : false - when set to true, the headers will be stripped of any HTML in the TOC + * class (string) : '' - a CSS class assigned to the TOC + * id (string) : '' - an ID to assigned to the TOC + * h_min (int) : 1 - the minimum TOC header level to use; any header lower than this value will be ignored + * h_max (int) : 6 - the maximum TOC header level to use; any header greater than this value will be ignored + * ordered (bool) : false - when set to true, an ordered list will be outputted instead of an unordered list + * item_class (string) : '' - add custom class(es) for each list item; has support for '%level%' placeholder, which is the current heading level + * baseurl (string) : '' - add a base url to the TOC links for when your TOC is on another page than the actual content + * anchor_class (string) : '' - add custom class(es) for each anchor element + + Output: + An ordered or unordered list representing the table of contents of a markdown block. This snippet will only + generate the table of contents and will NOT output the markdown given to it + {% endcomment %} + + {% capture my_toc %}{% endcapture %} + {% assign orderedList = include.ordered | default: false %} + {% assign minHeader = include.h_min | default: 1 %} + {% assign maxHeader = include.h_max | default: 6 %} + {% assign nodes = include.html | split: ' maxHeader %} + {% continue %} + {% endif %} + + {% if firstHeader %} + {% assign firstHeader = false %} + {% assign minHeader = headerLevel %} + {% endif %} + + {% assign indentAmount = headerLevel | minus: minHeader %} + {% assign _workspace = node | split: '' | first }}>{% endcapture %} + {% assign header = _workspace[0] | replace: _hAttrToStrip, '' %} + + {% assign space = '' %} + {% for i in (1..indentAmount) %} + {% assign space = space | prepend: ' ' %} + {% endfor %} + + {% if include.item_class and include.item_class != blank %} + {% capture listItemClass %}{:.{{ include.item_class | replace: '%level%', headerLevel }}}{% endcapture %} + {% endif %} + + {% capture heading_body %}{% if include.sanitize %}{{ header | strip_html }}{% else %}{{ header }}{% endif %}{% endcapture %} + {% capture my_toc %}{{ my_toc }} +{{ space }}{{ listModifier }} {{ listItemClass }} [{{ heading_body | replace: "|", "\|" }}]({% if include.baseurl %}{{ include.baseurl }}{% endif %}#{{ html_id }}){% if include.anchor_class %}{:.{{ include.anchor_class }}}{% endif %}{% endcapture %} + {% endfor %} + + {% if include.class and include.item_class != blank %} + {% capture my_toc %}{:.{{ include.class }}} +{{ my_toc | lstrip }}{% endcapture %} + {% endif %} + + {% if include.id %} + {% capture my_toc %}{: #{{ include.id }}} +{{ my_toc | lstrip }}{% endcapture %} + {% endif %} +{% endcapture %}{% assign tocWorkspace = '' %}{{ my_toc | markdownify | strip }} \ No newline at end of file diff --git a/_includes/git-wiki/components/toc/toc.html b/_includes/git-wiki/components/toc/toc.html new file mode 100644 index 0000000..c354b42 --- /dev/null +++ b/_includes/git-wiki/components/toc/toc.html @@ -0,0 +1,12 @@ +{% if site.inc_before_toc %} +{% include {{ site.inc_before_toc }} %} +{% endif %} + +
    +

    Contents:

    + {% include git-wiki/components/toc/toc-lib.html html=content sanitize=true class="inline_toc" id="git-wiki-toc" h_min=1 h_max=3 ordered=1 %} +
    + +{% if site.inc_after_toc %} +{% include {{ site.inc_after_toc }} %} +{% endif %} diff --git a/_includes/git-wiki/sections/content/content.html b/_includes/git-wiki/sections/content/content.html index 73c7b5b..b356968 100644 --- a/_includes/git-wiki/sections/content/content.html +++ b/_includes/git-wiki/sections/content/content.html @@ -3,15 +3,7 @@ {% include git-wiki/sections/tools/tools.html %} - {% if site.inc_before_toc %} - {% include {{ site.inc_before_toc }} %} - {% endif %} - -
    - - {% if site.inc_after_toc %} - {% include {{ site.inc_after_toc }} %} - {% endif %} + {% include git-wiki/components/toc/toc.html %} {% if site.inc_before_content %} {% include {{ site.inc_before_content }} %} diff --git a/_includes/git-wiki/sections/head/scripts.html b/_includes/git-wiki/sections/head/scripts.html index 65ee4ff..9cf23f3 100644 --- a/_includes/git-wiki/sections/head/scripts.html +++ b/_includes/git-wiki/sections/head/scripts.html @@ -4,7 +4,6 @@ -