Merge pull request #6 from LASSAT-YU/master

Added functionality and stopped undesirable behaviour
This commit is contained in:
Roman 2022-06-02 09:09:34 +02:00 committed by GitHub
commit 605c8917e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 147 additions and 113 deletions

View File

@ -10,4 +10,5 @@ highlight_theme = "base16-ocean-light"
[extra]
logo = "https://easydocs.codeandmedia.com/logo.svg"
release = "https://api.github.com/repos/getzola/zola/releases/latest"
favicon = "https://www.getzola.org/favicon.ico"
favicon = "https://www.getzola.org/favicon.ico"
easydocs_logo_always_clickable = false

View File

@ -1,137 +1,147 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href="{{ get_url(path="main.css") | safe }}">
{% if config.extra.favicon %}
<link rel="icon" href="{{ config.extra.favicon | safe }}">
{% endif %}
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<title>{% block title %}{{ config.title }}{% endblock title %}</title>
</head>
<body>
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href="{{ get_url(path="main.css") | safe }}">
{% if config.extra.favicon %}
{% set _favicon = config.extra.favicon %}
{% if (_favicon is starting_with("http")) == false %}
{% set _favicon = get_url(path=config.extra.favicon) %}
{% endif %}
<link rel="icon" href="{{ _favicon | safe }}">
{% endif %}
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<title>{% block title %}{{ config.title }}{% endblock title %}</title>
</head>
<body>
{% if config.extra.release %}
{% if config.extra.release %}
<script>
fetch('{{ config.extra.release | safe }}')
.then((response) => {
return response.json();
})
.then((data) => {
let release_name = data.name;
let html_url = data.html_url;
release.innerHTML = `<a href='${html_url}'>${release_name}</a>`;
});
fetch('{{ config.extra.release | safe }}')
.then((response) => {
return response.json();
})
.then((data) => {
let release_name = data.name;
let html_url = data.html_url;
release.innerHTML = `<a href='${html_url}'>${release_name}</a>`;
});
</script>
{% endif %}
<main>
{% endif %}
<main>
{% block nav %}
{% block nav %}
<nav>
{% if config.extra.logo %}
{% if current_path == "/" %}
<img src="{{ config.extra.logo | safe }}" alt="" />
{% else %}<a href="{{ config.base_url }}">
<img src="{{ config.extra.logo | safe }}" alt="" />
{% if config.extra.logo %}
{% set _logo = config.extra.logo %}
{% if (_logo is starting_with("http")) == false %}
{% set _logo = get_url(path=config.extra.logo) %}
{% endif %}
{% if current_path == "/" and not config.extra.easydocs_logo_always_clickable %}
<img src="{{ _logo | safe }}" alt=""/>
{% else %}<a href="{{ config.base_url }}">
<img src="{{ _logo | safe }}" alt=""/>
</a>
{% endif %}
{% else %}
<h1><a href="{{ config.base_url }}">{{ config.title }}</a></h1>
{% endif %}
{% else %}
<h1><a href="{{ config.base_url }}">{{ config.title }}</a></h1>
{% endif %}
{% if config.extra.release %}
<div id="release"></div>
{% endif %}
<a href="javascript:void(0);" onclick="burger()" id="mobile" class="ms-Icon--GlobalNavButton"></a>
<div id="trees">
{% set section = get_section(path="_index.md") %}
{% for p in section.subsections %}
{% set subsection = get_section(path=p) %}
<input class="tree-toggle" type="checkbox" id="{{ subsection.title | slugify }}"
{% if current_path is starting_with(subsection.path) %}checked{% endif %} />
<label class="tree-toggle-label" for="{{ subsection.title | slugify }}">{{ subsection.title }}</label>
<ul class="subtree">
{% for page in subsection.pages %}
<li {% if current_path == page.path %}class="active"{% endif %}>
<a href="{{page.permalink | safe }}">{{page.title}}</a>
</li>
{% if config.extra.release %}
<div id="release"></div>
{% endif %}
{% if page.toc %}
<a href="javascript:void(0);" onclick="burger()" id="mobile" class="ms-Icon--GlobalNavButton"></a>
<div id="trees">
{% set section_ = get_section(path="_index.md") %}
{% for p in section_.subsections %}
{% set subsection = get_section(path=p) %}
{% if current_path == page.path %}
{% set_global header_count = 0 %}
{% for h2 in page.toc %}
{% set_global header_count = header_count + 1 %}
{% for h3 in h2.children %}
{% set_global header_count = header_count + 1 %}
{% for h4 in h3.children %}
{% set_global header_count = header_count + 1 %}
{% endfor %}
{% endfor %}
{% endfor %}
<input class="tree-toggle" type="checkbox" id="{{ subsection.title | slugify }}"
{% if current_path is starting_with(subsection.path) %}checked{% endif %}/>
<label class="tree-toggle-label"
for="{{ subsection.title | slugify }}">{{ subsection.title }}</label>
{% if header_count > 4 %}
<ul id="toc">
{% for h2 in page.toc %}
<li><a href="{{ h2.permalink | safe }}">{{ h2.title }}</a>
{% if h2.children %}
<ul>
{% for h3 in h2.children %}
<li><a href="{{ h3.permalink | safe }}">{{ h3.title }}</a></li>
{% endfor %}
</ul>
{% endif %}
</li>
{% endfor %}
</ul>
{% endif %}
<ul class="subtree">
{% for page in subsection.pages %}
<li {% if current_path == page.path %}class="active"{% endif %}>
<a href="{{ page.permalink | safe }}">{{ page.title }}</a>
</li>
{% endif %}
{% endif %}
{% endfor %}
</ul>
{% endfor %}
</div>
</nav>
{% if page.toc %}
{% if current_path == page.path %}
{% set_global header_count = 0 %}
{% for h2 in page.toc %}
{% set_global header_count = header_count + 1 %}
{% for h3 in h2.children %}
{% set_global header_count = header_count + 1 %}
{% for h4 in h3.children %}
{% set_global header_count = header_count + 1 %}
{% endfor %}
{% endfor %}
{% endfor %}
{% if header_count > 4 %}
<ul id="toc">
{% for h2 in page.toc %}
<li><a href="{{ h2.permalink | safe }}">{{ h2.title }}</a>
{% if h2.children %}
<ul>
{% for h3 in h2.children %}
<li>
<a href="{{ h3.permalink | safe }}">{{ h3.title }}</a>
</li>
{% endfor %}
</ul>
{% endif %}
</li>
{% endfor %}
</ul>
{% endif %}
{% endif %}
{% endif %}
{% endfor %}
</ul>
{% endfor %}
</div>
</nav>
{% endblock nav %}
<article>
{% if config.build_search_index %}
<div id="on_right">
<span id="search-ico" class="ms-Icon--Search"></span>
</div>
<div class="search-container">
<input id="search" type="search" placeholder="Search as you type...">
<div class="search-results">
<div class="search-results__header"></div>
<ul class="search-results__items"></ul>
</div>
</div>
{% endif %}
<article>
<div id="wrap">
{% block content %}
{{ section.content | safe }}
{% endblock content %}
</div>
{% if config.build_search_index %}
<div id="on_right">
<span id="search-ico" class="ms-Icon--Search"></span>
</div>
<div class="search-container">
<input id="search" type="search" placeholder="Search as you type...">
<div class="search-results">
<div class="search-results__header"></div>
<ul class="search-results__items"></ul>
</div>
</div>
{% endif %}
</article>
<div id="wrap">
{% block content %}
{{ section.content | safe }}
{% endblock content %}
</div>
</article>
</main>
{% if config.build_search_index %}
<script type="text/javascript" src="{{ get_url(path="elasticlunr.min.js") | safe }}" defer></script>
<script type="text/javascript" src="{{ get_url(path="search_index.en.js") | safe }}" defer></script>
<script type="text/javascript" src="{{ get_url(path="js.js") | safe }}" defer></script>
{% endif %}
{% if config.build_search_index %}
<script type="text/javascript" src="{{ get_url(path="elasticlunr.min.js") | safe }}" defer></script>
<script type="text/javascript" src="{{ get_url(path="search_index.en.js") | safe }}" defer></script>
<script type="text/javascript" src="{{ get_url(path="js.js") | safe }}" defer></script>
{% endif %}
</body>
</html>

23
templates/section.html Normal file
View File

@ -0,0 +1,23 @@
{% extends "index.html" %}
{% block title %} {{ config.title }} | {{ section.title }} {% endblock title %}
{% block content %}
{% if section.word_count > 0 %}
{{ section.content }}
{% else %}
<h1 class="title">
{{ section.title }}
</h1>
Pages:
<ul>
{% for page in section.pages %}
<li><a href="{{ page.permalink | safe }}">{{ page.title }}</a></li>
{% endfor %}
</ul>
{% endif %}
{% endblock content %}