summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolpeon <git@volpeon.ink>2020-12-29 21:24:31 +0100
committerVolpeon <git@volpeon.ink>2020-12-29 21:24:31 +0100
commit435e558193d7d5f2e04b1bfe2295a5070aa14cc9 (patch)
tree98d06440bbe720316d911717ddd78f08d9c6406a
parentAdded definition list styling (diff)
downloadvolpeon.ink-435e558193d7d5f2e04b1bfe2295a5070aa14cc9.tar.gz
volpeon.ink-435e558193d7d5f2e04b1bfe2295a5070aa14cc9.tar.bz2
volpeon.ink-435e558193d7d5f2e04b1bfe2295a5070aa14cc9.zip
Fixed regression: Category showed up in child pages as well
-rwxr-xr-xscripts/build_content.sh5
-rw-r--r--templates/base.html6
2 files changed, 8 insertions, 3 deletions
diff --git a/scripts/build_content.sh b/scripts/build_content.sh
index e2b3bb3..12de8c8 100755
--- a/scripts/build_content.sh
+++ b/scripts/build_content.sh
@@ -94,12 +94,15 @@ get_subpages_meta() {
94 94
95 pages=$(echo "{}" | jq ". + { \ 95 pages=$(echo "{}" | jq ". + { \
96 all: [], \ 96 all: [], \
97 by_year: {} \ 97 by_year: {}, \
98 not_empty: false \
98 }") 99 }")
99 100
100 if [ ${#child_pages[@]} -ne 0 ]; then 101 if [ ${#child_pages[@]} -ne 0 ]; then
101 #echo -e "\033[0;90m[////////]\033[0m Child pages:" 102 #echo -e "\033[0;90m[////////]\033[0m Child pages:"
102 103
104 pages=$(echo "$pages" | jq ".not_empty = true")
105
103 for file in "${child_pages[@]}"; do 106 for file in "${child_pages[@]}"; do
104 #echo -e "\033[0;90m[////////]\033[0m - $file" 107 #echo -e "\033[0;90m[////////]\033[0m - $file"
105 108
diff --git a/templates/base.html b/templates/base.html
index 0704388..9574d08 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -52,8 +52,10 @@ ${pageHeader()}
52$body$ 52$body$
53 53
54 $if(section.is_blog)$ 54 $if(section.is_blog)$
55 ${categories.blog:categoryRef()} 55 $if(pages.not_empty)$
56 ${pagelistByYear()} 56 ${categories.blog:categoryRef()}
57 ${pagelistByYear()}
58 $endif$
57 $endif$ 59 $endif$
58 </div> 60 </div>
59 </main> 61 </main>