Merge pull request #6 from LASSAT-YU/master
Added functionality and stopped undesirable behaviour
This commit is contained in:
commit
605c8917e3
3 changed files with 147 additions and 113 deletions
|
@ -11,3 +11,4 @@ highlight_theme = "base16-ocean-light"
|
||||||
logo = "https://easydocs.codeandmedia.com/logo.svg"
|
logo = "https://easydocs.codeandmedia.com/logo.svg"
|
||||||
release = "https://api.github.com/repos/getzola/zola/releases/latest"
|
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
|
|
@ -1,17 +1,21 @@
|
||||||
<!DOCTYPE HTML>
|
<!DOCTYPE HTML>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<link rel="stylesheet" href="{{ get_url(path="main.css") | safe }}">
|
<link rel="stylesheet" href="{{ get_url(path="main.css") | safe }}">
|
||||||
{% if config.extra.favicon %}
|
{% if config.extra.favicon %}
|
||||||
<link rel="icon" href="{{ config.extra.favicon | safe }}">
|
{% 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 %}
|
{% endif %}
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
|
||||||
<title>{% block title %}{{ config.title }}{% endblock title %}</title>
|
<title>{% block title %}{{ config.title }}{% endblock title %}</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
{% if config.extra.release %}
|
{% if config.extra.release %}
|
||||||
<script>
|
<script>
|
||||||
fetch('{{ config.extra.release | safe }}')
|
fetch('{{ config.extra.release | safe }}')
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
|
@ -23,18 +27,21 @@
|
||||||
release.innerHTML = `<a href='${html_url}'>${release_name}</a>`;
|
release.innerHTML = `<a href='${html_url}'>${release_name}</a>`;
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<main>
|
<main>
|
||||||
|
|
||||||
{% block nav %}
|
{% block nav %}
|
||||||
|
|
||||||
<nav>
|
<nav>
|
||||||
{% if config.extra.logo %}
|
{% if config.extra.logo %}
|
||||||
{% if current_path == "/" %}
|
{% set _logo = config.extra.logo %}
|
||||||
<img src="{{ config.extra.logo | safe }}" alt="" />
|
{% 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 }}">
|
{% else %}<a href="{{ config.base_url }}">
|
||||||
<img src="{{ config.extra.logo | safe }}" alt="" />
|
<img src="{{ _logo | safe }}" alt=""/>
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
@ -48,24 +55,25 @@
|
||||||
|
|
||||||
<a href="javascript:void(0);" onclick="burger()" id="mobile" class="ms-Icon--GlobalNavButton"></a>
|
<a href="javascript:void(0);" onclick="burger()" id="mobile" class="ms-Icon--GlobalNavButton"></a>
|
||||||
<div id="trees">
|
<div id="trees">
|
||||||
{% set section = get_section(path="_index.md") %}
|
{% set section_ = get_section(path="_index.md") %}
|
||||||
{% for p in section.subsections %}
|
{% for p in section_.subsections %}
|
||||||
{% set subsection = get_section(path=p) %}
|
{% set subsection = get_section(path=p) %}
|
||||||
|
|
||||||
|
|
||||||
<input class="tree-toggle" type="checkbox" id="{{ subsection.title | slugify }}"
|
<input class="tree-toggle" type="checkbox" id="{{ subsection.title | slugify }}"
|
||||||
{% if current_path is starting_with(subsection.path) %}checked{% endif %} />
|
{% if current_path is starting_with(subsection.path) %}checked{% endif %}/>
|
||||||
<label class="tree-toggle-label" for="{{ subsection.title | slugify }}">{{ subsection.title }}</label>
|
<label class="tree-toggle-label"
|
||||||
|
for="{{ subsection.title | slugify }}">{{ subsection.title }}</label>
|
||||||
|
|
||||||
<ul class="subtree">
|
<ul class="subtree">
|
||||||
{% for page in subsection.pages %}
|
{% for page in subsection.pages %}
|
||||||
<li {% if current_path == page.path %}class="active"{% endif %}>
|
<li {% if current_path == page.path %}class="active"{% endif %}>
|
||||||
<a href="{{page.permalink | safe }}">{{page.title}}</a>
|
<a href="{{ page.permalink | safe }}">{{ page.title }}</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
{% if page.toc %}
|
{% if page.toc %}
|
||||||
|
|
||||||
{% if current_path == page.path %}
|
{% if current_path == page.path %}
|
||||||
|
|
||||||
{% set_global header_count = 0 %}
|
{% set_global header_count = 0 %}
|
||||||
{% for h2 in page.toc %}
|
{% for h2 in page.toc %}
|
||||||
|
@ -85,7 +93,9 @@
|
||||||
{% if h2.children %}
|
{% if h2.children %}
|
||||||
<ul>
|
<ul>
|
||||||
{% for h3 in h2.children %}
|
{% for h3 in h2.children %}
|
||||||
<li><a href="{{ h3.permalink | safe }}">{{ h3.title }}</a></li>
|
<li>
|
||||||
|
<a href="{{ h3.permalink | safe }}">{{ h3.title }}</a>
|
||||||
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -103,7 +113,7 @@
|
||||||
</nav>
|
</nav>
|
||||||
{% endblock nav %}
|
{% endblock nav %}
|
||||||
|
|
||||||
<article>
|
<article>
|
||||||
|
|
||||||
{% if config.build_search_index %}
|
{% if config.build_search_index %}
|
||||||
<div id="on_right">
|
<div id="on_right">
|
||||||
|
@ -124,14 +134,14 @@
|
||||||
{% endblock content %}
|
{% endblock content %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</article>
|
</article>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
{% if config.build_search_index %}
|
{% 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="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="search_index.en.js") | safe }}" defer></script>
|
||||||
<script type="text/javascript" src="{{ get_url(path="js.js") | safe }}" defer></script>
|
<script type="text/javascript" src="{{ get_url(path="js.js") | safe }}" defer></script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
23
templates/section.html
Normal file
23
templates/section.html
Normal 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 %}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue