From 9bab5b12a4cd1ad5a3fce03ffeba78d3f7d7eac8 Mon Sep 17 00:00:00 2001 From: Emil Miler Date: Mon, 23 Mar 2020 23:39:46 +0100 Subject: [PATCH] =?UTF-8?q?Kompletn=C3=AD=20p=C5=99eps=C3=A1n=C3=AD=20syst?= =?UTF-8?q?=C3=A9mu=20pro=20spr=C3=A1vu=20sekc=C3=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aby bylo možné vnořovat potencionálně nekonečné množství vrstev uvitř navigace, byl přepsán celý systém tak, aby generoval nazavující objekty v navigaci cyklem. Veškerý obsah je řešen v rámci sekcí a šablony nepočítají s původní koncepcí stránek. --- config.toml | 4 +- content/_index.md | 1 - content/ms/_index.md | 3 ++ content/section1/_index.md | 3 -- content/section1/page1.md | 5 --- content/section1/page2.md | 3 -- content/section2/_index.md | 3 -- content/zs-ss/_index.md | 3 ++ content/zs-ss/dejepis/_index.md | 3 ++ content/zs-ss/dejepis/novovek/_index.md | 3 ++ .../dejepis/novovek/ferdinand-v/_index.md | 3 ++ .../dejepis/novovek/katerina-velika/_index.md | 3 ++ .../dejepis/novovek/kral-slunce/_index.md | 3 ++ .../obraz-rudolfa-ii-ve-filmu/_index.md | 3 ++ .../novovek/obrazy-krystofa-kolumba/_index.md | 3 ++ .../zs-ss/dejepis/pravek-a-starovek/_index.md | 3 ++ .../pravek-a-starovek/boj-o-ohen/_index.md | 3 ++ .../obchod-s-otroky/_index.md | 3 ++ .../otrok-vs-rimsky-vojak/_index.md | 3 ++ content/zs-ss/dejepis/stredovek/_index.md | 3 ++ .../stredovek/bitva-u-hastings/_index.md | 3 ++ .../stredovek/cyril-a-metodej/_index.md | 3 ++ .../stredovek/kostnicky-koncil/_index.md | 3 ++ sass/_media.scss | 12 ------ sass/style.scss | 38 ++++++++++------ templates/index.html | 43 +++++++++---------- templates/page.html | 34 --------------- templates/section.html | 35 ++++++++++++--- 28 files changed, 128 insertions(+), 104 deletions(-) create mode 100644 content/ms/_index.md delete mode 100644 content/section1/_index.md delete mode 100644 content/section1/page1.md delete mode 100644 content/section1/page2.md delete mode 100644 content/section2/_index.md create mode 100644 content/zs-ss/_index.md create mode 100644 content/zs-ss/dejepis/_index.md create mode 100644 content/zs-ss/dejepis/novovek/_index.md create mode 100644 content/zs-ss/dejepis/novovek/ferdinand-v/_index.md create mode 100644 content/zs-ss/dejepis/novovek/katerina-velika/_index.md create mode 100644 content/zs-ss/dejepis/novovek/kral-slunce/_index.md create mode 100644 content/zs-ss/dejepis/novovek/obraz-rudolfa-ii-ve-filmu/_index.md create mode 100644 content/zs-ss/dejepis/novovek/obrazy-krystofa-kolumba/_index.md create mode 100644 content/zs-ss/dejepis/pravek-a-starovek/_index.md create mode 100644 content/zs-ss/dejepis/pravek-a-starovek/boj-o-ohen/_index.md create mode 100644 content/zs-ss/dejepis/pravek-a-starovek/obchod-s-otroky/_index.md create mode 100644 content/zs-ss/dejepis/pravek-a-starovek/otrok-vs-rimsky-vojak/_index.md create mode 100644 content/zs-ss/dejepis/stredovek/_index.md create mode 100644 content/zs-ss/dejepis/stredovek/bitva-u-hastings/_index.md create mode 100644 content/zs-ss/dejepis/stredovek/cyril-a-metodej/_index.md create mode 100644 content/zs-ss/dejepis/stredovek/kostnicky-koncil/_index.md delete mode 100644 sass/_media.scss delete mode 100644 templates/page.html diff --git a/config.toml b/config.toml index 37afe86..2633902 100644 --- a/config.toml +++ b/config.toml @@ -2,8 +2,8 @@ base_url = "https://example.com" # The site title and description; used in RSS by default. -title = "Title" -description = "Description" +title = "Učitel online" +description = "Web pro ditstribuci užitečných materiálů" # Whether to automatically compile all Sass files in the sass directory compile_sass = true diff --git a/content/_index.md b/content/_index.md index e4d3c3d..ac36e06 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,3 +1,2 @@ +++ -title="Section Title" +++ diff --git a/content/ms/_index.md b/content/ms/_index.md new file mode 100644 index 0000000..76e39a0 --- /dev/null +++ b/content/ms/_index.md @@ -0,0 +1,3 @@ ++++ +title="Mateřská škola" ++++ diff --git a/content/section1/_index.md b/content/section1/_index.md deleted file mode 100644 index 1e57fa8..0000000 --- a/content/section1/_index.md +++ /dev/null @@ -1,3 +0,0 @@ -+++ -title="Section 1" -+++ diff --git a/content/section1/page1.md b/content/section1/page1.md deleted file mode 100644 index 4ac75fb..0000000 --- a/content/section1/page1.md +++ /dev/null @@ -1,5 +0,0 @@ -+++ -title="Page 1" -+++ - -{{ video(title="Video title",src="",author="Jane Doe",date="2019-12-24") }} diff --git a/content/section1/page2.md b/content/section1/page2.md deleted file mode 100644 index f126268..0000000 --- a/content/section1/page2.md +++ /dev/null @@ -1,3 +0,0 @@ -+++ -title="Page 2" -+++ diff --git a/content/section2/_index.md b/content/section2/_index.md deleted file mode 100644 index b785528..0000000 --- a/content/section2/_index.md +++ /dev/null @@ -1,3 +0,0 @@ -+++ -title="Section 2" -+++ diff --git a/content/zs-ss/_index.md b/content/zs-ss/_index.md new file mode 100644 index 0000000..b6aa979 --- /dev/null +++ b/content/zs-ss/_index.md @@ -0,0 +1,3 @@ ++++ +title="Základní a střední škola" ++++ diff --git a/content/zs-ss/dejepis/_index.md b/content/zs-ss/dejepis/_index.md new file mode 100644 index 0000000..ca05960 --- /dev/null +++ b/content/zs-ss/dejepis/_index.md @@ -0,0 +1,3 @@ ++++ +title="Dějepis" ++++ diff --git a/content/zs-ss/dejepis/novovek/_index.md b/content/zs-ss/dejepis/novovek/_index.md new file mode 100644 index 0000000..02b619e --- /dev/null +++ b/content/zs-ss/dejepis/novovek/_index.md @@ -0,0 +1,3 @@ ++++ +title="Novověk" ++++ diff --git a/content/zs-ss/dejepis/novovek/ferdinand-v/_index.md b/content/zs-ss/dejepis/novovek/ferdinand-v/_index.md new file mode 100644 index 0000000..e5e5444 --- /dev/null +++ b/content/zs-ss/dejepis/novovek/ferdinand-v/_index.md @@ -0,0 +1,3 @@ ++++ +title="Ferdinand V." ++++ diff --git a/content/zs-ss/dejepis/novovek/katerina-velika/_index.md b/content/zs-ss/dejepis/novovek/katerina-velika/_index.md new file mode 100644 index 0000000..ebfb683 --- /dev/null +++ b/content/zs-ss/dejepis/novovek/katerina-velika/_index.md @@ -0,0 +1,3 @@ ++++ +title="Kateřina veliká" ++++ diff --git a/content/zs-ss/dejepis/novovek/kral-slunce/_index.md b/content/zs-ss/dejepis/novovek/kral-slunce/_index.md new file mode 100644 index 0000000..2c40b8a --- /dev/null +++ b/content/zs-ss/dejepis/novovek/kral-slunce/_index.md @@ -0,0 +1,3 @@ ++++ +title="Král slunce a jeho doba" ++++ diff --git a/content/zs-ss/dejepis/novovek/obraz-rudolfa-ii-ve-filmu/_index.md b/content/zs-ss/dejepis/novovek/obraz-rudolfa-ii-ve-filmu/_index.md new file mode 100644 index 0000000..c4c5a04 --- /dev/null +++ b/content/zs-ss/dejepis/novovek/obraz-rudolfa-ii-ve-filmu/_index.md @@ -0,0 +1,3 @@ ++++ +title="Obraz Rudolfa II. ve filmu" ++++ diff --git a/content/zs-ss/dejepis/novovek/obrazy-krystofa-kolumba/_index.md b/content/zs-ss/dejepis/novovek/obrazy-krystofa-kolumba/_index.md new file mode 100644 index 0000000..689bf2a --- /dev/null +++ b/content/zs-ss/dejepis/novovek/obrazy-krystofa-kolumba/_index.md @@ -0,0 +1,3 @@ ++++ +title="Obrazy Kryštofa Kolumba" ++++ diff --git a/content/zs-ss/dejepis/pravek-a-starovek/_index.md b/content/zs-ss/dejepis/pravek-a-starovek/_index.md new file mode 100644 index 0000000..2c60bee --- /dev/null +++ b/content/zs-ss/dejepis/pravek-a-starovek/_index.md @@ -0,0 +1,3 @@ ++++ +title="Pravěk a starověk" ++++ diff --git a/content/zs-ss/dejepis/pravek-a-starovek/boj-o-ohen/_index.md b/content/zs-ss/dejepis/pravek-a-starovek/boj-o-ohen/_index.md new file mode 100644 index 0000000..6256d92 --- /dev/null +++ b/content/zs-ss/dejepis/pravek-a-starovek/boj-o-ohen/_index.md @@ -0,0 +1,3 @@ ++++ +title="Boj o oheň" ++++ diff --git a/content/zs-ss/dejepis/pravek-a-starovek/obchod-s-otroky/_index.md b/content/zs-ss/dejepis/pravek-a-starovek/obchod-s-otroky/_index.md new file mode 100644 index 0000000..a46eda9 --- /dev/null +++ b/content/zs-ss/dejepis/pravek-a-starovek/obchod-s-otroky/_index.md @@ -0,0 +1,3 @@ ++++ +title="Obchod s otroky" ++++ diff --git a/content/zs-ss/dejepis/pravek-a-starovek/otrok-vs-rimsky-vojak/_index.md b/content/zs-ss/dejepis/pravek-a-starovek/otrok-vs-rimsky-vojak/_index.md new file mode 100644 index 0000000..9d88ef2 --- /dev/null +++ b/content/zs-ss/dejepis/pravek-a-starovek/otrok-vs-rimsky-vojak/_index.md @@ -0,0 +1,3 @@ ++++ +title="Otrok vs. římský voják" ++++ diff --git a/content/zs-ss/dejepis/stredovek/_index.md b/content/zs-ss/dejepis/stredovek/_index.md new file mode 100644 index 0000000..ca2c079 --- /dev/null +++ b/content/zs-ss/dejepis/stredovek/_index.md @@ -0,0 +1,3 @@ ++++ +title="Středověk" ++++ diff --git a/content/zs-ss/dejepis/stredovek/bitva-u-hastings/_index.md b/content/zs-ss/dejepis/stredovek/bitva-u-hastings/_index.md new file mode 100644 index 0000000..3607909 --- /dev/null +++ b/content/zs-ss/dejepis/stredovek/bitva-u-hastings/_index.md @@ -0,0 +1,3 @@ ++++ +title="Bitva u Hastings" ++++ diff --git a/content/zs-ss/dejepis/stredovek/cyril-a-metodej/_index.md b/content/zs-ss/dejepis/stredovek/cyril-a-metodej/_index.md new file mode 100644 index 0000000..019d478 --- /dev/null +++ b/content/zs-ss/dejepis/stredovek/cyril-a-metodej/_index.md @@ -0,0 +1,3 @@ ++++ +title="Cyril a Metoděj" ++++ diff --git a/content/zs-ss/dejepis/stredovek/kostnicky-koncil/_index.md b/content/zs-ss/dejepis/stredovek/kostnicky-koncil/_index.md new file mode 100644 index 0000000..6bca9db --- /dev/null +++ b/content/zs-ss/dejepis/stredovek/kostnicky-koncil/_index.md @@ -0,0 +1,3 @@ ++++ +title="Kostnický koncil" ++++ diff --git a/sass/_media.scss b/sass/_media.scss deleted file mode 100644 index b3547f4..0000000 --- a/sass/_media.scss +++ /dev/null @@ -1,12 +0,0 @@ -@media only screen and (max-width: 700px) { - #content { - flex-direction: column; - } - - #nav { - border: 0; - border-bottom: 1px dotted #ccc; - width: 100%; - } -} - diff --git a/sass/style.scss b/sass/style.scss index 7ee344f..aaf01a7 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -53,29 +53,40 @@ body { } } -#content { - display: flex; -} - #nav { - float: left; - border-right: 1px dotted #ccc; + display: flex; + border-bottom: 1px dotted #ccc; padding: 1em 0; - width: 200px; + width: 100%; box-sizing: border-box; - ul li a { - display: block; - padding: .5em; - color: #000; - &:hover { - background-color: #ddd; + ul { + min-width: 25%; + + a { + display: block; + padding: .5em 1em; + color: $primary; + + &.ancestor { + background-color: #eee; + } + + &:hover { + background-color: #ccc; + } + + &.active { + background-color: $primary; + color: #fff; + } } } } #main { + clear: both; padding: 1.5em; flex-grow: 1; @@ -94,4 +105,3 @@ body { } } -@import "_media.scss"; diff --git a/templates/index.html b/templates/index.html index 49322f7..536f706 100644 --- a/templates/index.html +++ b/templates/index.html @@ -10,36 +10,35 @@
{% block nav %} - {% if section.pages %} - - {% endif %} {% endblock %}
- {% block content%}{% endblock %} + {% block content%} + {{ section.content | safe }} + {% endblock %}
diff --git a/templates/page.html b/templates/page.html deleted file mode 100644 index d8e55c8..0000000 --- a/templates/page.html +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "index.html" %} - -{% block subtitle %} - {% set current_section = get_section(path=page.ancestors[1]) %} - {{ current_section.title }} -{% endblock %} - -{% block menu %} - {% set global_section = get_section(path="_index.md") %} - {% for s in global_section.subsections %} - {% set subsection = get_section(path=s) %} -
  • - {{ subsection.title }} -
    • - {% endfor %} -{% endblock %} - -{% block nav %} - {% if current_section.pages %} - - {% endif %} -{% endblock %} - -{% block content %} -

    {{ page.title }}

    - {{ page.content | safe }} -{% endblock %} - diff --git a/templates/section.html b/templates/section.html index 1f83f01..8fbb6a4 100644 --- a/templates/section.html +++ b/templates/section.html @@ -1,11 +1,36 @@ {% extends "index.html" %} -{% block subtitle %} - {% if section.description %} - {{ section.description }} - {% else %} - {{ section.title }} +{% block title %}{{ config.title }} – {{ section.title }}{% endblock %} + +{% block nav %} + {% endblock %} {% block content %}