diff --git a/.gitignore b/.gitignore index c09a9cbf779b136511783258867ad0f0a3b1f961..36bea9ee70a3ad1bbaa79dd00cedcdefe380b831 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,5 @@ coverage build build-debug content -theme static .buildconfig diff --git a/theme/templates/404.html.nunjucks b/theme/templates/404.html.nunj similarity index 100% rename from theme/templates/404.html.nunjucks rename to theme/templates/404.html.nunj diff --git a/theme/templates/article.html.nunjucks b/theme/templates/article.html.nunj similarity index 93% rename from theme/templates/article.html.nunjucks rename to theme/templates/article.html.nunj index 090aeadf9f8bab3e183d9765c6bc61b933e7cc2e..db1cf955940cf1fad7c389d519d7470ba333bd4c 100644 --- a/theme/templates/article.html.nunjucks +++ b/theme/templates/article.html.nunj @@ -1,4 +1,4 @@ -{% include "partials/header" %} +{% include "partials/header.html" %} <div class="section container" id="content"> <div class="metadata"> <h2 id="title">{{ metadata.title }}</h2> @@ -30,4 +30,4 @@ </p> </article> </div> -{% include "partials/footer" %} +{% include "partials/footer.html" %} diff --git a/theme/templates/gallery.html.nunjucks b/theme/templates/gallery.html.nunjucks deleted file mode 100644 index 8cea0527492445075ae5c2e34944234b8d938bbe..0000000000000000000000000000000000000000 --- a/theme/templates/gallery.html.nunjucks +++ /dev/null @@ -1,3 +0,0 @@ -{{ include "partials/header.html" }} - -{{ include "partials/footer.html" }} diff --git a/theme/templates/partials/footer.html.nunjucks b/theme/templates/partials/footer.html.nunj similarity index 100% rename from theme/templates/partials/footer.html.nunjucks rename to theme/templates/partials/footer.html.nunj diff --git a/theme/templates/partials/header.html.nunjucks b/theme/templates/partials/header.html.nunj similarity index 98% rename from theme/templates/partials/header.html.nunjucks rename to theme/templates/partials/header.html.nunj index 0c5b81765e82f0874b296e105993c3a92ee9398c..6c9d1a6c06608db81157b143f2ffc96b7942b42f 100644 --- a/theme/templates/partials/header.html.nunjucks +++ b/theme/templates/partials/header.html.nunj @@ -39,7 +39,7 @@ {{ metadata.headerextra | safe }} </head> <body {{ "class=type-article" if type=="article" }}> - {% import "partials/svgs" as svgs %} + {% import "partials/svgs.html" as svgs %} <div id="all"> <!-- Top nav --> <nav class="supernav" role="navigation" style="z-index:5;position:absolute;"> @@ -141,5 +141,4 @@ </ul> </div> </nav> - {% include "partials/search" %} - + {% include "partials/search.html" %} diff --git a/theme/templates/partials/list.html.nunjucks b/theme/templates/partials/list.html.nunj similarity index 96% rename from theme/templates/partials/list.html.nunjucks rename to theme/templates/partials/list.html.nunj index 8c4a2f7f4c9631e4ee71a81c8fc936b198bea75a..350be36b47ed8a23743cedccd8aeadd68682a6d5 100644 --- a/theme/templates/partials/list.html.nunjucks +++ b/theme/templates/partials/list.html.nunj @@ -1,4 +1,4 @@ -{% import "partials/svgs" as svgs %} +{% import "partials/svgs.html" as svgs %} <div id=content class=container> <div class="section"> <div class="row"> @@ -35,8 +35,8 @@ </div> {% endfor %} </div> - - {% include "partials/paginator" %} + + {% include "partials/paginator.html" %} </div> <div class="hide-on-small-only"> @@ -62,21 +62,21 @@ if ($(this).height() > maxHeight) { maxHeight = $(this).height(); } }); $(".head-perex").height(maxHeight); - + $(".head-title").height("auto"); maxHeight = 0; $(".head-title").each(function(){ if ($(this).height() > maxHeight) { maxHeight = $(this).height(); } }); $(".head-title").height(maxHeight); - + $(".head-info").height("auto"); maxHeight = 0; $(".head-info").each(function(){ if ($(this).height() > maxHeight) { maxHeight = $(this).height(); } }); $(".head-info").height(maxHeight); - + // Sidelink icons of same size $(".sidelink-icon").css("top",$(window).height()/2); }; diff --git a/theme/templates/partials/paginator.html.nunjucks b/theme/templates/partials/paginator.html.nunj similarity index 96% rename from theme/templates/partials/paginator.html.nunjucks rename to theme/templates/partials/paginator.html.nunj index e2a618ffb28c6a2c7ba256dc3b83abf6b497dbdc..ab8dd69ebe76d203a6b9770c0b21717d6111388d 100644 --- a/theme/templates/partials/paginator.html.nunjucks +++ b/theme/templates/partials/paginator.html.nunj @@ -1,4 +1,4 @@ -{% import "partials/svgs" as svgs %} +{% import "partials/svgs.html" as svgs %} <ul class="pagination"> <li><a {{ (" href=\""+config.baseurl +"/"+ metadata.firstpage.file +"\"") | safe if metadata.firstpage.file != file }}> @@ -17,9 +17,8 @@ <li><a {{ " href="+config.baseurl +"/"+ metadata.nextpage.file if metadata.nextpage != undefined }}> {{ svgs.chevronright( "#999" if metadata.nextpage == undefined else "#000", 1,"em" ) }} </a></li> - + <li><a {{ (" href=\""+config.baseurl +"/"+ metadata.lastpage.file +"\"") | safe if metadata.lastpage.file != file }}> {{ svgs.doublechevronright( "#999" if metadata.lastpage.file == file else "#000", 1,"em" ) }} </a></li> </ul> - diff --git a/theme/templates/partials/search.html.nunjucks b/theme/templates/partials/search.html.nunj similarity index 100% rename from theme/templates/partials/search.html.nunjucks rename to theme/templates/partials/search.html.nunj diff --git a/theme/templates/partials/svgs.html.nunjucks b/theme/templates/partials/svgs.html.nunj similarity index 100% rename from theme/templates/partials/svgs.html.nunjucks rename to theme/templates/partials/svgs.html.nunj diff --git a/theme/templates/redirect.html.nunjucks b/theme/templates/redirect.html.nunj similarity index 100% rename from theme/templates/redirect.html.nunjucks rename to theme/templates/redirect.html.nunj diff --git a/theme/templates/tag.html.nunj b/theme/templates/tag.html.nunj new file mode 100644 index 0000000000000000000000000000000000000000..fb0913d0f51a7016fd1b00e95c1619c1e0895d1c --- /dev/null +++ b/theme/templates/tag.html.nunj @@ -0,0 +1,3 @@ +{% include "partials/header.html" %} +{% include "partials/list.html" %} +{% include "partials/footer.html" %} diff --git a/theme/templates/tag.html.nunjucks b/theme/templates/tag.html.nunjucks deleted file mode 100644 index 7ec1cad9b36c5d62b55ab81ad55f220bd78ea398..0000000000000000000000000000000000000000 --- a/theme/templates/tag.html.nunjucks +++ /dev/null @@ -1,3 +0,0 @@ -{% include "partials/header" %} -{% include "partials/list" %} -{% include "partials/footer" %}