Merge branch 'main' into feat__12_tree_structure

algoo · Jul 11, 2024 · 032166c · 032166c
2 parents a1f47df + e13eb97
commit 032166c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/common-content/templates/jinja2/widgets/page_block_h2_with_ul_content_and_image_right.html b/common-content/templates/jinja2/widgets/page_block_h2_with_ul_content_and_image_right.html
@@ -1,4 +1,3 @@
-
 {% macro page_block_h2_with_ul_content_and_image_right(
       IMAGE_URL = '',
       TITLE = '',

diff --git a/content/pages/a_page.md b/content/pages/a_page.md
@@ -1,7 +1,7 @@
 ---
 title Page1
 slug page1
-engine jinja2
+template_engine jinja2
 ---
 {
 
@@ -11,5 +11,4 @@ engine jinja2
 
 <h2>Page 1</h2>
 
-<p>Go to <a href="{{ url_slug('page2') }}">page 2</a> </p>
-
+<p>Go to <a href="{{ url_slug('page2') }}">page 2</a> </p>
diff --git a/content/pages/another_page.md b/content/pages/another_page.md
@@ -1,7 +1,7 @@
 ---
 title Another page
 slug page2
-engine jinja2
+template_engine jinja2
 ---
 {
 

diff --git a/content/templates/jinja2/widgets/navbar.html b/content/templates/jinja2/widgets/navbar.html
@@ -7,6 +7,7 @@
       CHANGE_LANG_ALT=""
 )
 %}
+
 <!-- Navigation-->
 <nav class="navbar navbar-light bg-light static-top">
   <div class="container">

diff --git a/jssg/jinja2.py b/jssg/jinja2.py
@@ -5,6 +5,7 @@
 
 from jssg.templatetags.filter_opengraph_metadata import filter_opengraph_metadata
 
+
 from jssg.models import Page
 
 def url_from_slug(slug) :
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,6 +5,7 @@

		from jssg.templatetags.filter_opengraph_metadata import filter_opengraph_metadata


		from jssg.models import Page

		def url_from_slug(slug) :
Expand Down