--- a/layouts/shortcodes/gsoc.html Fri Jan 18 21:26:26 2019 +0000
+++ b/layouts/shortcodes/gsoc.html Fri Jan 18 21:57:19 2019 +0000
@@ -1,5 +1,5 @@
{{ range sort .Site.Data.gsoc "year" "desc" }}
- <h3 id="gsoc-{{.year}}">{{.year}}</h3>
+ <h3 id="gsoc-{{ .year }}">{{ .year }}</h3> @@ -9,14 +9,14 @@
- {{range .participants}}
+ {{ range .participants }} <td>{{ .status | markdownify }}</td>
--- a/layouts/shortcodes/i18n-languages.html Fri Jan 18 21:26:26 2019 +0000
+++ b/layouts/shortcodes/i18n-languages.html Fri Jan 18 21:57:19 2019 +0000
@@ -1,5 +1,5 @@
{{- range .Site.Data.i18n_languages -}}
--- a/layouts/shortcodes/plugintable.html Fri Jan 18 21:26:26 2019 +0000
+++ b/layouts/shortcodes/plugintable.html Fri Jan 18 21:57:19 2019 +0000
@@ -15,18 +15,18 @@
{{ range .Site.Data.plugins }}
- <tr data-type="{{.type}}">
+ <tr data-type="{{ .type }}"> - <img src="{{.logo}}" />
+ <img src="{{ .logo }}" /> <td class="pulgin-heading">
- <b>{{.type}}</b> {{.info | markdownify}}
+ <b>{{ .type }}</b> {{ .info | markdownify }} - <a href="{{.repo}}">{{.maintainer}}</a>
+ <a href="{{ .repo }}">{{ .maintainer }}</a> --- a/readme.md Fri Jan 18 21:26:26 2019 +0000
+++ b/readme.md Fri Jan 18 21:57:19 2019 +0000
@@ -4,11 +4,11 @@
- * [Community](community.md)
- * [Contributing](contributing.md)
- * [Design Guidelines](design-guidelines.md)
- * [Development FAQ](development-faq.md)
- * [Release Process](release-process.md)
+- [Community](community.md) +- [Contributing](contributing.md) +- [Design Guidelines](design-guidelines.md) +- [Development FAQ](development-faq.md) +- [Release Process](release-process.md) @@ -17,6 +17,16 @@
1. To start devleopment server run: `hugo server -D --disableFastRender -v --verboseLog --noHTTPCache`
- * `--disableFastRender`. Disabling fast render is needed because hugo starts to ignore new content in the data dir
- * `-v --verboseLog`. Better logging and debugging experience
- * `--noHTTPCache`. To prevent caching issues with
\ No newline at end of file
+ - `--disableFastRender`. Disabling fast render is needed because hugo starts to ignore new content in the data dir + - `-v --verboseLog`. Better logging and debugging experience + - `--noHTTPCache`. To prevent caching issues with +These are some regexes to quickly format templating +| -------------------- | -------- | +| `\{\{(\w|\.|\$|\()` | `{{ $1` | +| `\{\{-(\w|\.|$)` | `{{- $1` | +| `("|\w|\.|\))(-)?}}` | `$1 }}` | --- a/themes/learn/layouts/404.html Fri Jan 18 21:26:26 2019 +0000
+++ b/themes/learn/layouts/404.html Fri Jan 18 21:57:19 2019 +0000
@@ -1,59 +1,74 @@
<html lang="{{ .Page.Language | default "en" }}" class="js csstransforms3d">
- <meta charset="utf-8"> {{ partial "meta.html" . }} {{ partial "favicon.html" . }} {{ .Scratch.Add "title" "" }}{{ if eq .Site.Data.titles .Title }}{{ .Scratch.Set "title" (index .Site.Data.titles .Title).title }}{{ else }}{{ .Scratch.Set "title" .Title}}{{end}}
- <title>{{ .Scratch.Get "title" }}</title>
+ {{ partial "meta.html" . }} + {{ partial "favicon.html" . }} - {{ $assetBusting := not .Site.Params.disableAssetsBusting }}
- <link href="{{"css/nucleus.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/fontawesome-all.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/hybrid.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/featherlight.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/perfect-scrollbar.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/horsey.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/theme.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/hugo-theme.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- {{with .Site.Params.themeVariant}}
- <link href="{{(printf "css/theme-%s.css" .) | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- :root #header + #content > #left > #rlblock_left {
+ {{ .Scratch.Add "title" "" }} + {{ if eq .Site.Data.titles .Title }} + {{ .Scratch.Set "title" (index .Site.Data.titles .Title).title }} + {{ .Scratch.Set "title" .Title }} + <title>{{ .Scratch.Get "title" }}</title> + {{ $assetBusting := not .Site.Params.disableAssetsBusting }} + <link href="{{ "css/nucleus.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/fontawesome-all.min.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/hybrid.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/featherlight.min.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/perfect-scrollbar.min.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/horsey.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/theme.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/hugo-theme.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + {{ with .Site.Params.themeVariant }} + <link href="{{ (printf "css/theme-%s.css" .) | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <style type="text/css"> + :root #header+#content>#left>#rlblock_left { display: none !important;
+ p, li, ul { text-align: center
-{{ partial "custom-header.html" . }}
- <body class="" data-url="/">
+ {{ partial "custom-header.html" . }} +<body class="" data-url="/"> + <section id="body" style="margin-left:0px;"> + <div id="overlay"></div> - <section id="body" style="margin-left:0px;">
- <div id="overlay"></div>
- <h1>{{T "title-404"}}</h1>
- <p>{{T "message-404"}}</p>
- <p><a href='{{ "" | relLangURL }}'>{{T "Go-to-homepage"}}</a></p>
- <p><img src='{{ "/images/gopher-404.jpg" | relURL }}' style="width:50%" alt="Page not found!"></img></p>
+ <a href='{{ "" | relLangURL }}'>{{ T "Go-to-homepage" }}</a> + <img src='{{ "/images/gopher-404.jpg" | relURL }}' style="width:50%" alt="Page not found!" />
--- a/themes/learn/layouts/_default/list.html Fri Jan 18 21:26:26 2019 +0000
+++ b/themes/learn/layouts/_default/list.html Fri Jan 18 21:57:19 2019 +0000
@@ -3,10 +3,10 @@
<footer class=" footline" >
- {{with .Params.LastModifierDisplayName}}
- <i class='fas fa-user'></i> <a href="mailto:{{ $.Params.LastModifierEmail }}">{{ . }}</a> {{with $.Date}} <i class='fas fa-calendar'></i> {{ .Format "02/01/2006" }}{{end}}
+ {{ with .Params.LastModifierDisplayName }} + <i class='fas fa-user'></i> <a href="mailto:{{ $.Params.LastModifierEmail }}">{{ . }}</a> {{ with $.Date }} <i class='fas fa-calendar'></i> {{ .Format "02/01/2006" }}{{ end }}
{{ partial "footer.html" . }}
\ No newline at end of file
--- a/themes/learn/layouts/_default/single.html Fri Jan 18 21:26:26 2019 +0000
+++ b/themes/learn/layouts/_default/single.html Fri Jan 18 21:57:19 2019 +0000
@@ -3,11 +3,10 @@
<footer class=" footline" >
- {{with .Params.LastModifierDisplayName}}
- <i class='fas fa-user'></i> <a href="mailto:{{ $.Params.LastModifierEmail }}">{{ . }}</a> {{with $.Date}} <i class='fas fa-calendar'></i> {{ .Format "02/01/2006" }}{{end}}
+ {{ with .Params.LastModifierDisplayName }} + <i class='fas fa-user'></i> <a href="mailto:{{ $.Params.LastModifierEmail }}">{{ . }}</a> {{ with $.Date }} <i class='fas fa-calendar'></i> {{ .Format "02/01/2006" }}{{ end }}
{{ partial "footer.html" . }}
--- a/themes/learn/layouts/index.html Fri Jan 18 21:26:26 2019 +0000
+++ b/themes/learn/layouts/index.html Fri Jan 18 21:57:19 2019 +0000
@@ -1,31 +1,37 @@
{{ partial "header.html" . }}
<span id="sidebar-toggle-span">
-<a href="#" id="sidebar-toggle" data-sidebar-toggle=""><i class="fas fa-bars"></i> navigation</a>
+ <a href="#" id="sidebar-toggle" data-sidebar-toggle=""> + <i class="fas fa-bars"></i> navigation -{{if .Site.Home.Content }}
- {{if eq .Site.Language.Lang "fr"}}
+{{ if .Site.Home.Content }} + {{ .Site.Home.Content }} + {{ if eq .Site.Language.Lang "fr" }} <h1>Personaliser la page d'accueil</h1>
Le site fonctionne. Ne pas oublier de personaliser cette page avec votre propre contenu. 3 manières de faire :
<li><b>1. </b> Créer un fichier _index.md dans le dossier <b>content</b> et le remplir de Markdown</li>
<li><b>2. </b> Créer un fichier index.html dans le dossier <b>static</b> et le remplir de code HTML</li>
<li><b>3. </b> Configurer le serveur http pour rediriger automatiquement la homepage vers la page de votre choix dans le site</li>
<h1>Customize your own home page</h1>
The site is working. Don't forget to customize this homepage with your own. You typically have 3 choices :
<li><b>1. </b> Create an _index.md document in <b>content</b> folder and fill it with Markdown content</li>
<li><b>2. </b> Create an <b>index.html</b> file in the <b>static</b> folder and fill the file with HTML content</li>
<li><b>3. </b> Configure your server to automatically redirect home page to one your documentation page</li>
{{ partial "footer.html" . }}
--- a/themes/learn/layouts/partials/footer.html Fri Jan 18 21:26:26 2019 +0000
+++ b/themes/learn/layouts/partials/footer.html Fri Jan 18 21:57:19 2019 +0000
@@ -1,54 +1,55 @@
- {{ if .Params.chapter }}
- </div> <!-- end chapter-->
+ {{/* TODO: Remove disgusting conditional tag spanning file */}} + {{ if .Params.chapter }} + </div> <!-- end chapter--> {{ partial "custom-comments.html" . }}
{{ template "menu-nextprev" dict "menu" .Site.Home "currentnode" $currentNode }}
{{ define "menu-nextprev" }}
- {{$currentNode := .currentnode }}
- {{ if ne .menu.Params.hidden true}}
- {{if hasPrefix $currentNode.URL .menu.URL }}
+ {{ $currentNode := .currentnode }} + {{ if ne .menu.Params.hidden true }} + {{ if hasPrefix $currentNode.URL .menu.URL }} {{ $currentNode.Scratch.Set "NextPageOK" "OK" }}
{{ $currentNode.Scratch.Set "prevPage" ($currentNode.Scratch.Get "prevPageTmp") }}
- {{if eq ($currentNode.Scratch.Get "NextPageOK") "OK"}}
+ {{ if eq ($currentNode.Scratch.Get "NextPageOK") "OK" }} {{ $currentNode.Scratch.Set "NextPageOK" nil }}
{{ $currentNode.Scratch.Set "nextPage" .menu }}
{{ $currentNode.Scratch.Set "prevPageTmp" .menu }}
- {{ $currentNode.Scratch.Set "pages" .menu.Pages }}
- {{ $currentNode.Scratch.Set "pages" .menu.Sections }}
- {{ else if .menu.Sections}}
- {{ $currentNode.Scratch.Set "pages" (.menu.Pages | union .menu.Sections) }}
- {{ $pages := ($currentNode.Scratch.Get "pages") }}
+ {{ $currentNode.Scratch.Set "pages" .menu.Pages }} + {{ $currentNode.Scratch.Set "pages" .menu.Sections }} + {{ else if .menu.Sections }} + {{ $currentNode.Scratch.Set "pages" (.menu.Pages | union .menu.Sections) }} + {{ $pages := ($currentNode.Scratch.Get "pages") }} - {{ range $pages.ByWeight }}
- {{ template "menu-nextprev" dict "menu" . "currentnode" $currentNode }}
+ {{ range $pages.ByWeight }} + {{ template "menu-nextprev" dict "menu" . "currentnode" $currentNode }} - {{$showPrevNext := (and (not .Params.disableNextPrev) (not .Site.Params.disableNextPrev))}}
- {{with ($.Scratch.Get "prevPage")}}
- <a class="nav nav-prev" href="{{.URL}}" title="{{.Title}}"> <i class="fa fa-chevron-left"></i></a>
- {{with ($.Scratch.Get "nextPage")}}
- <a class="nav nav-next" href="{{.URL}}" title="{{.Title}}" style="margin-right: 0px;"><i class="fa fa-chevron-right"></i></a>
+ {{ $showPrevNext := (and (not .Params.disableNextPrev) (not .Site.Params.disableNextPrev)) }} + {{ with ($.Scratch.Get "prevPage") }} + <a class="nav nav-prev" href="{{ .URL }}" title="{{ .Title }}"> <i class="fa fa-chevron-left"></i></a> + {{ with ($.Scratch.Get "nextPage") }} + <a class="nav nav-next" href="{{ .URL }}" title="{{ .Title }}" style="margin-right: 0px;"><i class="fa fa-chevron-right"></i></a> @@ -56,20 +57,20 @@
<div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
<div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
- <script src="{{"js/clipboard.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
- <script src="{{"js/perfect-scrollbar.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
- <script src="{{"js/perfect-scrollbar.jquery.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
- <script src="{{"js/jquery.sticky.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
- <script src="{{"js/featherlight.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
- <script src="{{"js/html5shiv-printshiv.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
- <script src="{{"js/highlight.pack.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+ <script src="{{ "js/clipboard.min.js" | relURL }}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script> + <script src="{{ "js/perfect-scrollbar.min.js" | relURL }}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script> + <script src="{{ "js/perfect-scrollbar.jquery.min.js" | relURL }}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script> + <script src="{{ "js/jquery.sticky.js" | relURL }}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script> + <script src="{{ "js/featherlight.min.js" | relURL }}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script> + <script src="{{ "js/html5shiv-printshiv.min.js" | relURL }}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script> + <script src="{{ "js/highlight.pack.js" | relURL }}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script> <script>hljs.initHighlightingOnLoad();</script>
- <script src="{{"js/modernizr.custom.71422.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
- <script src="{{"js/learn.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
- <script src="{{"js/hugo-learn.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+ <script src="{{ "js/modernizr.custom.71422.js" | relURL }}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script> + <script src="{{ "js/learn.js" | relURL }}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script> + <script src="{{ "js/hugo-learn.js" | relURL }}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script> - <link href="{{"mermaid/mermaid.css" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}" type="text/css" rel="stylesheet" />
- <script src="{{"mermaid/mermaid.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+ <link href="{{ "mermaid/mermaid.css" | relURL }}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}" type="text/css" rel="stylesheet" /> + <script src="{{ "mermaid/mermaid.js" | relURL }}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script> mermaid.initialize({ startOnLoad: true });
--- a/themes/learn/layouts/partials/header.html Fri Jan 18 21:26:26 2019 +0000
+++ b/themes/learn/layouts/partials/header.html Fri Jan 18 21:57:19 2019 +0000
@@ -1,100 +1,104 @@
<html lang="{{ .Page.Language | default "en" }}" class="js csstransforms3d">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- {{ partial "meta.html" . }}
- {{ partial "favicon.html" . }}
- <title>{{ .Title }} :: {{ .Site.Title }}</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"> + {{ partial "meta.html" . }} + {{ partial "favicon.html" . }} + <title>{{ .Title }} :: {{ .Site.Title }}</title> - {{ $assetBusting := not .Site.Params.disableAssetsBusting }}
- <link href="{{"css/nucleus.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/fontawesome-all.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/hybrid.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/featherlight.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/perfect-scrollbar.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/auto-complete.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/theme.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- <link href="{{"css/hugo-theme.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
- {{with .Site.Params.themeVariant}}
- <link href="{{(printf "css/theme-%s.css" .) | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
+ {{ $assetBusting := not .Site.Params.disableAssetsBusting }} + <link href="{{ "css/nucleus.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/fontawesome-all.min.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/hybrid.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/featherlight.min.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/perfect-scrollbar.min.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/auto-complete.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/theme.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + <link href="{{ "css/hugo-theme.css" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> + {{ with .Site.Params.themeVariant }} + <link href="{{ (printf "css/theme-%s.css" .) | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet"> - <script src="{{"js/jquery-2.x.min.js"| relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
+ <script src="{{ "js/jquery-2.x.min.js"| relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script> - <style type="text/css">
- :root #header + #content > #left > #rlblock_left{
- display:none !important;
+ <style type="text/css"> + :root #header + #content > #left > #rlblock_left{ + display:none !important; + {{ if .Site.Params.disableInlineCopyToClipBoard }} + :not(pre) > code + span.copy-to-clipboard { - {{ if .Site.Params.disableInlineCopyToClipBoard }}
- :not(pre) > code + span.copy-to-clipboard {
- {{ partial "custom-header.html" . }}
- <body class="" data-url="{{ .RelPermalink }}">
- {{ partial "menu.html" . }}
- <div id="overlay"></div>
- <div class="padding highlightable">
- {{ if and (or .IsPage .IsSection) .Site.Params.editURL }}
- <div id="top-github-link">
- <a class="github-link" title='{{T "Edit-this-page"}}' href="{{ $Site.Params.editURL }}{{ replace $File.Dir "\\" "/" }}{{ $File.LogicalName }}" target="blank">
- <i class="fas fa-code-branch"></i>
- <span id="top-github-link-text">{{T "Edit-this-page"}}</span>
- {{$toc := (and (not .Params.disableToc) (not .Params.chapter))}}
- <div id="breadcrumbs" itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb">
- <span id="sidebar-toggle-span">
- <a href="#" id="sidebar-toggle" data-sidebar-toggle="">
- <i class="fas fa-bars"></i>
- <span id="toc-menu"><i class="fas fa-list-alt"></i></span>
- {{$showBreadcrumb := (and (not .Params.disableBreadcrumb) (not .Site.Params.disableBreadcrumb))}}
- {{ template "breadcrumb" dict "page" . "value" .Title }}
+ {{ partial "custom-header.html" . }} +<body class="" data-url="{{ .RelPermalink }}"> + {{ partial "menu.html" . }} + <div id="overlay"></div> + <div class="padding highlightable"> + {{ if and (or .IsPage .IsSection) .Site.Params.editURL }} + <div id="top-github-link"> + <a class="github-link" title='{{ T "Edit-this-page" }}' href="{{ $Site.Params.editURL }}{{ replace $File.Dir "\\" "/" }}{{ $File.LogicalName }}" target="blank"> + <i class="fas fa-code-branch"></i> + <span id="top-github-link-text">{{ T "Edit-this-page" }}</span>
- {{ partial "toc.html" . }}
- {{ if .Params.chapter }}
+ {{ $toc := (and (not .Params.disableToc) (not .Params.chapter)) }} + <div id="breadcrumbs" itemscope="" itemtype="http://data-vocabulary.org/Breadcrumb"> + <span id="sidebar-toggle-span"> + <a href="#" id="sidebar-toggle" data-sidebar-toggle=""> + <i class="fas fa-bars"></i> + <span id="toc-menu"><i class="fas fa-list-alt"></i></span> + {{ $showBreadcrumb := (and (not .Params.disableBreadcrumb) (not .Site.Params.disableBreadcrumb)) }} + {{ if $showBreadcrumb }} + {{ template "breadcrumb" dict "page" . "value" .Title }} + {{ partial "toc.html" . }} + {{/* TODO: Remove disgusting conditional tag spanning file */}} + {{ if .Params.chapter }} + {{ if and (not .IsHome) (not .Params.chapter) }}
- {{if and (not .IsHome) (not .Params.chapter) }}
- {{define "breadcrumb"}}
- {{$parent := .page.Parent }}
+ {{ define "breadcrumb" }} + {{ $parent := .page.Parent }} {{ $value := (printf "<a href='%s'>%s</a> > %s" $parent.URL $parent.Title .value) }}
{{ template "breadcrumb" dict "page" $parent "value" $value }}
--- a/themes/learn/layouts/partials/menu.html Fri Jan 18 21:26:26 2019 +0000
+++ b/themes/learn/layouts/partials/menu.html Fri Jan 18 21:57:19 2019 +0000
@@ -1,89 +1,89 @@
-<nav id="sidebar" class="{{if $.Site.Params.showVisitedLinks }}showVisitedLinks{{end}}">
+<nav id="sidebar" class="{{ if $.Site.Params.showVisitedLinks }}showVisitedLinks{{ end }}">
-{{ $showvisitedlinks := .Site.Params.showVisitedLinks }}
+ {{ $currentNode := . }} + {{ $showvisitedlinks := .Site.Params.showVisitedLinks }} <div id="header-wrapper">
{{ partial "logo.html" . }}
- {{if not .Site.Params.disableSearch}}
- {{ partial "search.html" . }}
+ {{ if not .Site.Params.disableSearch }} + {{ partial "search.html" . }} - <div class="highlightable">
+ <div class="highlightable"> - {{if eq .Site.Params.ordersectionsby "title"}}
- {{range .Site.Home.Sections.ByTitle}}
- {{ template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks}}
- {{range .Site.Home.Sections.ByWeight}}
- {{ template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks}}
+ {{ if eq .Site.Params.ordersectionsby "title" }} + {{ range .Site.Home.Sections.ByTitle }} + {{ template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks }} + {{ range .Site.Home.Sections.ByWeight }} + {{ template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks }} - {{ $disableShortcutsTitle := .Site.Params.DisableShortcutsTitle}}
- {{with .Site.Menus.shortcuts}}
+ {{ $disableShortcutsTitle := .Site.Params.DisableShortcutsTitle }} + {{ with .Site.Menus.shortcuts }} - <h3>{{ if not $disableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}</h3>
+ <h3>{{ if not $disableShortcutsTitle }}{{ T "Shortcuts-Title" }}{{ end }}</h3> - {{ range sort . "Weight"}}
- {{.Pre}}<a class="padding" href="{{.URL | absLangURL }}">{{safeHTML .Name}}</a>{{.Post}}
+ {{ range sort . "Weight" }} + {{ .Pre }}<a class="padding" href="{{ .URL | absLangURL }}">{{ safeHTML .Name }}</a>{{ .Post }}
- {{ if or .Site.IsMultiLingual $showvisitedlinks }}
- <section id="prefooter">
- {{ if and .Site.IsMultiLingual (not .Site.Params.DisableLanguageSwitchingButton)}}
- <i class="fas fa-language fa-fw"></i>
- <div class="select-style">
- <select id="select-language" onchange="location = this.value;">
- {{ $siteLanguages := .Site.Languages}}
- {{ $pageLang := .Page.Lang}}
- {{ range .Page.AllTranslations }}
- {{ range $siteLanguages }}
- {{ if eq $translation.Lang .Lang }}
- {{ $selected := false }}
- {{ if eq $pageLang .Lang}}
- <option id="{{ $translation.Language }}" value="{{ $translation.URL }}" selected>{{ .LanguageName }}</option>
- <option id="{{ $translation.Language }}" value="{{ $translation.URL }}">{{ .LanguageName }}</option>
- <svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="255px" height="255px" viewBox="0 0 255 255" style="enable-background:new 0 0 255 255;" xml:space="preserve">
- <g id="arrow-drop-down">
- <polygon points="0,63.75 127.5,191.25 255,63.75 " />
- {{ if $showvisitedlinks}}
- <li><a class="padding" href="#" data-clear-history-toggle=""><i class="fas fa-history fa-fw"></i> {{T "Clear-History"}}</a></li>
+ {{ if or .Site.IsMultiLingual $showvisitedlinks }} + <section id="prefooter"> + {{ if and .Site.IsMultiLingual (not .Site.Params.DisableLanguageSwitchingButton) }} + <i class="fas fa-language fa-fw"></i> + <div class="select-style"> + <select id="select-language" onchange="location = this.value;"> + {{ $siteLanguages := .Site.Languages }} + {{ $pageLang := .Page.Lang }} + {{ range .Page.AllTranslations }} + {{ $translation := . }} + {{ range $siteLanguages }} + {{ if eq $translation.Lang .Lang }} + {{ $selected := false }} + {{ if eq $pageLang .Lang }} + <option id="{{ $translation.Language }}" value="{{ $translation.URL }}" selected>{{ .LanguageName }}</option> + <option id="{{ $translation.Language }}" value="{{ $translation.URL }}">{{ .LanguageName }}</option> + <svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="255px" height="255px" viewBox="0 0 255 255" style="enable-background:new 0 0 255 255;" xml:space="preserve"> + <g id="arrow-drop-down"> + <polygon points="0,63.75 127.5,191.25 255,63.75 " /> + {{ if $showvisitedlinks }} + <li><a class="padding" href="#" data-clear-history-toggle=""><i class="fas fa-history fa-fw"></i> {{ T "Clear-History" }}</a></li>
{{ partial "menu-footer.html" . }}
@@ -94,56 +94,58 @@
{{ define "section-tree-nav" }}
{{ $showvisitedlinks := .showvisitedlinks }}
{{ $currentNode := .currentnode }}
- {{safeHTML .Params.head}}
- <li data-nav-id="{{.URL}}" title="{{.Title}}" class="dd-item
- {{- if .IsAncestor $currentNode }} parent{{ end -}}
- {{- if eq .UniqueID $currentNode.UniqueID }} active{{ end -}}
- {{- if .Params.alwaysopen }} parent{{ end }}">
- <a href="{{.RelPermalink}}">
- {{safeHTML .Params.Pre}}{{or .Params.menuTitle .LinkTitle .Title}}{{safeHTML .Params.Post}}
- {{ if $showvisitedlinks}}
+ {{ safeHTML .Params.head }} + <li data-nav-id="{{ .URL }}" title="{{ .Title }}" class="dd-item + {{- if .IsAncestor $currentNode }} parent{{ end -}} + {{- if eq .UniqueID $currentNode.UniqueID }} active{{ end -}} + {{- if .Params.alwaysopen }} parent{{ end }}"> + <a href="{{ .RelPermalink }}"> + {{ safeHTML .Params.Pre }}{{ or .Params.menuTitle .LinkTitle .Title }}{{ safeHTML .Params.Post }} + {{ if $showvisitedlinks }} <i class="fas read-icon"></i>
- {{ $numberOfPages := (add (len .Pages) (len .Sections)) }}
- {{ if ne $numberOfPages 0 }}
- {{ $currentNode.Scratch.Set "pages" .Pages }}
- {{ $currentNode.Scratch.Set "pages" (.Pages | union .Sections) }}
- {{ $pages := ($currentNode.Scratch.Get "pages") }}
- {{if eq .Site.Params.ordersectionsby "title"}}
- {{ range $pages.ByTitle }}
- {{ if and .Params.hidden (not $.showhidden) }}
- {{ template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks }}
- {{ range $pages.ByWeight }}
- {{ if and .Params.hidden (not $.showhidden) }}
- {{ template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks }}
- {{ if not .Params.Hidden }}
- <li data-nav-id="{{.URL}}" title="{{.Title}}" class="dd-item {{if eq .UniqueID $currentNode.UniqueID}}active{{end}}">
- <a href="{{ .RelPermalink}}">
- {{safeHTML .Params.Pre}}{{or .Params.menuTitle .LinkTitle .Title}}{{safeHTML .Params.Post}}
- {{ if $showvisitedlinks}}<i class="fas fa-check read-icon"></i>{{end}}
+ {{ $numberOfPages := (add (len .Pages) (len .Sections)) }} + {{ if ne $numberOfPages 0 }} + {{ $currentNode.Scratch.Set "pages" .Pages }} + {{ $currentNode.Scratch.Set "pages" (.Pages | union .Sections) }} + {{ $pages := ($currentNode.Scratch.Get "pages") }} + {{ if eq .Site.Params.ordersectionsby "title" }} + {{ range $pages.ByTitle }} + {{ if and .Params.hidden (not $.showhidden) }} + {{ template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks }} + {{ range $pages.ByWeight }} + {{ if and .Params.hidden (not $.showhidden) }} + {{ template "section-tree-nav" dict "sect" . "currentnode" $currentNode "showvisitedlinks" $showvisitedlinks }} + {{ if not .Params.Hidden }} + <li data-nav-id="{{ .URL }}" title="{{ .Title }}" class="dd-item {{ if eq .UniqueID $currentNode.UniqueID }}active{{ end }}"> + <a href="{{ .RelPermalink }}"> + {{ safeHTML .Params.Pre }}{{ or .Params.menuTitle .LinkTitle .Title }}{{ safeHTML .Params.Post }} + {{ if $showvisitedlinks }} + <i class="fas fa-check read-icon"></i> --- a/themes/learn/layouts/partials/search.html Fri Jan 18 21:26:26 2019 +0000
+++ b/themes/learn/layouts/partials/search.html Fri Jan 18 21:57:19 2019 +0000
@@ -1,16 +1,16 @@
<label for="search-by"><i class="fas fa-search"></i></label>
- <input data-search-input id="search-by" type="search" placeholder="{{T "Search-placeholder"}}">
+ <input data-search-input id="search-by" type="search" placeholder="{{ T "Search-placeholder" }}"> <span data-search-clear=""><i class="fas fa-times"></i></span>
{{ $assetBusting := not .Site.Params.disableAssetsBusting }}
-<script type="text/javascript" src="{{"js/lunr.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
-<script type="text/javascript" src="{{"js/auto-complete.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
+<script type="text/javascript" src="{{ "js/lunr.min.js" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script> +<script type="text/javascript" src="{{ "js/auto-complete.js" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script> <script type="text/javascript">
{{ if .Site.IsMultiLingual }}
- var baseurl = "{{.Site.BaseURL}}{{.Site.LanguagePrefix}}";
+ var baseurl = "{{ .Site.BaseURL }}{{ .Site.LanguagePrefix }}"; - var baseurl = "{{.Site.BaseURL}}";
+ var baseurl = "{{ .Site.BaseURL }}"; -<script type="text/javascript" src="{{"js/search.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
+<script type="text/javascript" src="{{ "js/search.js" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script> --- a/themes/learn/layouts/shortcodes/attachments.html Fri Jan 18 21:26:26 2019 +0000
+++ b/themes/learn/layouts/shortcodes/attachments.html Fri Jan 18 21:57:19 2019 +0000
@@ -1,35 +1,41 @@
-<section class="attachments {{ with .Get "style"}}{{.}}{{ end }}">
+<section class="attachments {{ with .Get "style" }}{{ . }}{{ end }}"> <i class="fas fa-paperclip" aria-hidden="true"></i>
- {{with .Get "title"}}{{.}}{{else}}{{T "Attachments-label"}}{{end}}
+ {{ with .Get "title" }} + {{ T "Attachments-label" }} - {{if eq .Page.File.BaseFileName "index"}}
- {{$.Scratch.Add "filesName" "files"}}
- {{$.Scratch.Add "filesName" (printf "%s.files" .Page.File.BaseFileName)}}
+ {{ if eq .Page.File.BaseFileName "index" }} + {{ $.Scratch.Add "filesName" "files" }} + {{ $.Scratch.Add "filesName" (printf "%s.files" .Page.File.BaseFileName) }} <div class="attachments-files">
- {{ range (readDir (printf "./content/%s%s" .Page.File.Dir ($.Scratch.Get "filesName")) ) }}
- {{ $fileDir := replace $.Page.File.Dir "\\" "/" }}
- {{if ($.Get "pattern")}}
- {{if (findRE ($.Get "pattern") .Name)}}
+ {{ range (readDir (printf "./content/%s%s" .Page.File.Dir ($.Scratch.Get "filesName")) ) }} + {{ $fileDir := replace $.Page.File.Dir "\\" "/" }} + {{ if ($.Get "pattern") }} + {{ if (findRE ($.Get "pattern") .Name) }} + <a href="{{ (printf "%s%s/%s" $fileDir ($.Scratch.Get "filesName") .Name) | relURL }}" > + ({{ div .Size 1024 }} ko) <a href="{{ (printf "%s%s/%s" $fileDir ($.Scratch.Get "filesName") .Name) | relURL }}" >
- ({{div .Size 1024 }} ko)
+ ({{ div .Size 1024 }} ko)
- <a href="{{ (printf "%s%s/%s" $fileDir ($.Scratch.Get "filesName") .Name) | relURL }}" >
- ({{div .Size 1024 }} ko)
--- a/themes/learn/layouts/shortcodes/button.html Fri Jan 18 21:26:26 2019 +0000
+++ b/themes/learn/layouts/shortcodes/button.html Fri Jan 18 21:57:19 2019 +0000
@@ -1,13 +1,13 @@
-<a {{ with .Get "href"}} href="{{.}}" target="_blank" {{ end }} class="btn btn-default">
+<a {{ with .Get "href" }} href="{{ . }}" target="_blank" {{ end }} class="btn btn-default"> {{ $icon := .Get "icon" }}
{{ $iconposition := .Get "icon-position" }}
{{ if or (not ($iconposition)) (eq $iconposition "left") }}
- <i class="{{$icon}}"></i>
+ <i class="{{ $icon }}"></i> - {{ if and ($icon) (eq $iconposition "right")}}
- <i class="{{$icon}}"></i>
+ {{ if and ($icon) (eq $iconposition "right") }} + <i class="{{ $icon }}"></i> --- a/themes/learn/layouts/shortcodes/children.html Fri Jan 18 21:26:26 2019 +0000
+++ b/themes/learn/layouts/shortcodes/children.html Fri Jan 18 21:57:19 2019 +0000
@@ -1,96 +1,88 @@
-{{ $showhidden := .Get "showhidden"}}
+{{ $showhidden := .Get "showhidden" }} {{ $style := .Get "style" | default "li" }}
{{ $depth := .Get "depth" | default 1 }}
{{ $withDescription := .Get "description" | default false }}
{{ $sortTerm := .Get "sort" | default "Weight" }}
-<ul class="children children-{{$style}}">
+<ul class="children children-{{ $style }}"> {{ .Scratch.Set "pages" .Page.Pages }}
- {{ .Scratch.Set "pages" (.Page.Pages | union .Page.Sections) }}
- {{ $pages := (.Scratch.Get "pages") }}
+ {{ if .Page.Sections }} + {{ .Scratch.Set "pages" (.Page.Pages | union .Page.Sections) }} + {{ $pages := (.Scratch.Get "pages") }} - {{if eq $sortTerm "Weight"}}
- {{template "childs" dict "menu" $pages.ByWeight "style" $style "showhidden" $showhidden "count" 1 "depth" $depth "pages" .Site.Pages "description" $withDescription "sortTerm" $sortTerm}}
- {{else if eq $sortTerm "Name"}}
- {{template "childs" dict "menu" $pages.ByTitle "style" $style "showhidden" $showhidden "count" 1 "depth" $depth "pages" .Site.Pages "description" $withDescription "sortTerm" $sortTerm}}
- {{else if eq $sortTerm "PublishDate"}}
- {{template "childs" dict "menu" $pages.ByPublishDate "style" $style "showhidden" $showhidden "count" 1 "depth" $depth "pages" .Site.Pages "description" $withDescription "sortTerm" $sortTerm}}
- {{else if eq $sortTerm "Date"}}
- {{template "childs" dict "menu" $pages.ByDate "style" $style "showhidden" $showhidden "count" 1 "depth" $depth "pages" .Site.Pages "description" $withDescription "sortTerm" $sortTerm}}
- {{else if eq $sortTerm "Length"}}
- {{template "childs" dict "menu" $pages.ByLength "style" $style "showhidden" $showhidden "count" 1 "depth" $depth "pages" .Site.Pages "description" $withDescription "sortTerm" $sortTerm}}
- {{template "childs" dict "menu" $pages "style" $style "showhidden" $showhidden "count" 1 "depth" $depth "pages" .Site.Pages "description" $withDescription "sortTerm" $sortTerm}}
+ {{ if eq $sortTerm "Weight" }} + {{ template "childs" dict "menu" $pages.ByWeight "style" $style "showhidden" $showhidden "count" 1 "depth" $depth "pages" .Site.Pages "description" $withDescription "sortTerm" $sortTerm }} + {{ else if eq $sortTerm "Name" }} + {{ template "childs" dict "menu" $pages.ByTitle "style" $style "showhidden" $showhidden "count" 1 "depth" $depth "pages" .Site.Pages "description" $withDescription "sortTerm" $sortTerm }} + {{ else if eq $sortTerm "PublishDate" }} + {{ template "childs" dict "menu" $pages.ByPublishDate "style" $style "showhidden" $showhidden "count" 1 "depth" $depth "pages" .Site.Pages "description" $withDescription "sortTerm" $sortTerm }} + {{ else if eq $sortTerm "Date" }} + {{ template "childs" dict "menu" $pages.ByDate "style" $style "showhidden" $showhidden "count" 1 "depth" $depth "pages" .Site.Pages "description" $withDescription "sortTerm" $sortTerm }} + {{ else if eq $sortTerm "Length" }} + {{ template "childs" dict "menu" $pages.ByLength "style" $style "showhidden" $showhidden "count" 1 "depth" $depth "pages" .Site.Pages "description" $withDescription "sortTerm" $sortTerm }} + {{ template "childs" dict "menu" $pages "style" $style "showhidden" $showhidden "count" 1 "depth" $depth "pages" .Site.Pages "description" $withDescription "sortTerm" $sortTerm }}
{{ if and .Params.hidden (not $.showhidden) }}
+ {{ if hasPrefix $.style "h" }} + {{ $num := sub ( int (trim $.style "h") ) 1 }} + {{ $numn := add $num $.count }} -{{if hasPrefix $.style "h"}}
- {{$num := sub ( int (trim $.style "h") ) 1 }}
- {{$numn := add $num $.count }}
-{{(printf "<h%d>" $numn)|safeHTML}}
-<a href="{{.URL}}" >{{ .Title }}</a>
-{{(printf "</h%d>" $numn)|safeHTML}}
+ {{ (printf "<h%d>" $numn)|safeHTML }} + <a href="{{ .URL }}" >{{ .Title }}</a> + {{ (printf "</h%d>" $numn)|safeHTML }}
-{{(printf "<%s>" $.style)|safeHTML}}
-<a href="{{.URL}}" >{{ .Title }}</a>
-{{(printf "</%s>" $.style)|safeHTML}}
+ {{ (printf "<%s>" $.style)|safeHTML }} + <a href="{{ .URL }}" >{{ .Title }}</a> + {{ (printf "</%s>" $.style)|safeHTML }}
+ <p>{{ .Description }}</p>
- {{ if lt $.count $.depth}}
- {{ $.Page.Scratch.Set "pages" .Pages }}
- {{ $.Page.Scratch.Set "pages" (.Pages | union .Sections) }}
- {{ $pages := ($.Page.Scratch.Get "pages") }}
+ {{ if lt $.count $.depth }} + {{ if eq $.style "li" }} + {{ $.Page.Scratch.Set "pages" .Pages }} + {{ $.Page.Scratch.Set "pages" (.Pages | union .Sections) }} - {{if eq $.sortTerm "Weight"}}
- {{template "childs" dict "menu" $pages.ByWeight "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm}}
- {{else if eq $.sortTerm "Name"}}
- {{template "childs" dict "menu" $pages.ByTitle "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm}}
- {{else if eq $.sortTerm "PublishDate"}}
- {{template "childs" dict "menu" $pages.ByPublishDate "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm}}
- {{else if eq $.sortTerm "Date"}}
- {{template "childs" dict "menu" $pages.ByDate "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm}}
- {{else if eq $.sortTerm "Length"}}
- {{template "childs" dict "menu" $pages.ByLength "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm}}
- {{template "childs" dict "menu" $pages "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm}}
+ {{ $pages := ($.Page.Scratch.Get "pages") }} + {{ if eq $.sortTerm "Weight" }} + {{ template "childs" dict "menu" $pages.ByWeight "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm }} + {{ else if eq $.sortTerm "Name" }} + {{ template "childs" dict "menu" $pages.ByTitle "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm }} + {{ else if eq $.sortTerm "PublishDate" }} + {{ template "childs" dict "menu" $pages.ByPublishDate "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm }} + {{ else if eq $.sortTerm "Date" }} + {{ template "childs" dict "menu" $pages.ByDate "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm }} + {{ else if eq $.sortTerm "Length" }} + {{ template "childs" dict "menu" $pages.ByLength "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm }} + {{ template "childs" dict "menu" $pages "style" $.style "showhidden" $.showhidden "count" (add $.count 1) "depth" $.depth "pages" $.pages "description" $.description "sortTerm" $.sortTerm }}
\ No newline at end of file
+ {{ if eq $.style "li" }} \ No newline at end of file
--- a/themes/learn/layouts/shortcodes/expand.html Fri Jan 18 21:26:26 2019 +0000
+++ b/themes/learn/layouts/shortcodes/expand.html Fri Jan 18 21:57:19 2019 +0000
@@ -2,15 +2,15 @@
<div class="expand-label" style="cursor: pointer;" onclick="$h = $(this);$h.next('div').slideToggle(100,function () {$h.children('i').attr('class',function () {return $h.next('div').is(':visible') ? 'fas fa-chevron-down' : 'fas fa-chevron-right';});});">
<i style="font-size:x-small;" class="fas fa-chevron-right"></i>
- {{$expandMessage := T "Expand-title"}}
+ {{ $expandMessage := T "Expand-title" }} - {{.Get "default" | default $expandMessage}}
- {{.Get 0 | default $expandMessage}}
+ {{ .Get "default" | default $expandMessage }} + {{ .Get 0 | default $expandMessage }} <div class="expand-content" style="display: none;">
+ {{ .Inner | safeHTML }} \ No newline at end of file
--- a/themes/learn/layouts/shortcodes/mermaid.html Fri Jan 18 21:26:26 2019 +0000
+++ b/themes/learn/layouts/shortcodes/mermaid.html Fri Jan 18 21:57:19 2019 +0000
@@ -1,1 +1,3 @@
-<div class="mermaid" align="{{ if .Get "align" }}{{ .Get "align" }}{{ else }}center{{ end }}">{{ safeHTML .Inner }}</div>
+<div class="mermaid" align='{{ if .Get "align" }}{{ .Get "align" }}{{ else }}center{{ end }}'>