diff --git a/content/pages/about.html b/content/pages/about.html index 52ce7ce..1f15674 100644 --- a/content/pages/about.html +++ b/content/pages/about.html @@ -1,6 +1,7 @@ +
diff --git a/content/pages/homepage.html b/content/pages/homepage.html index 9239252..0824b7c 100644 --- a/content/pages/homepage.html +++ b/content/pages/homepage.html @@ -113,7 +113,7 @@

{{ article.title }}

-

{{ article.summary|raw|limit(30) }}

+

{{ article.summary|striptags|e|limit(30) }}

diff --git a/content/pages/robotics/2014/index.html b/content/pages/robotics/2014/index.html index 8ba82aa..786a3bb 100644 --- a/content/pages/robotics/2014/index.html +++ b/content/pages/robotics/2014/index.html @@ -1,6 +1,5 @@ - diff --git a/content/pages/robotics/2015/code.md b/content/pages/robotics/2015/code.md index 756c808..184b5c6 100644 --- a/content/pages/robotics/2015/code.md +++ b/content/pages/robotics/2015/code.md @@ -1,8 +1,6 @@ title: The Code html_title: The Code | SR2015 slug: robotics/2015/code -template: page-title - The code used for this competition was by far the most complicated and advanced code that had ever been written by a Collyer's team. diff --git a/content/pages/robotics/2015/index.html b/content/pages/robotics/2015/index.html index 3938a3d..98bf81d 100644 --- a/content/pages/robotics/2015/index.html +++ b/content/pages/robotics/2015/index.html @@ -1,7 +1,6 @@ -
diff --git a/content/pages/robotics/2015/robot.md b/content/pages/robotics/2015/robot.md index a6ace53..41ebf99 100644 --- a/content/pages/robotics/2015/robot.md +++ b/content/pages/robotics/2015/robot.md @@ -1,4 +1,3 @@ -template: page-title title: The Robot - A.L.I.C.E html_title: The Robot | SR2015 slug: robotics/2015/robot diff --git a/content/pages/robotics/index.md b/content/pages/robotics/index.md index 90467b1..7e3fa6d 100644 --- a/content/pages/robotics/index.md +++ b/content/pages/robotics/index.md @@ -1,5 +1,4 @@ title: Student Robotics -template: page-title slug: robotics diff --git a/theme/templates/blog.html b/theme/templates/blog.html index 61e5beb..e903c51 100644 --- a/theme/templates/blog.html +++ b/theme/templates/blog.html @@ -5,7 +5,7 @@ {% endblock %} {% block metadata %} - {% for tag, value in page.ogtags %} + {% for tag, value in article.ogtags %} {% endfor %} {% endblock %} diff --git a/theme/templates/category.html b/theme/templates/category.html index d007f9e..97fed89 100644 --- a/theme/templates/category.html +++ b/theme/templates/category.html @@ -33,7 +33,7 @@ {{ article.title }}
- {{ article.summary|raw }} + {{ article.summary|striptags|e }}
diff --git a/theme/templates/page-home.html b/theme/templates/page-home.html index 0ee6a1d..750084e 100644 --- a/theme/templates/page-home.html +++ b/theme/templates/page-home.html @@ -10,33 +10,33 @@ {% endfor %} {% endblock %} +{% block navbar %} + +{% endblock %} + {% block content %} {{ page.content }} {% endblock %} - -{% block navbar %} - -{% endblock %} diff --git a/theme/templates/page-title.html b/theme/templates/page-title.html deleted file mode 100644 index fe5b4b5..0000000 --- a/theme/templates/page-title.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "base.html" %} - -{% block htmltitle %} - {{ page.html_title or page.title }} -{% endblock %} - -{% block metadata %} - {% for tag, value in page.ogtags %} - - {% endfor %} -{% endblock %} - -{% block content %} -
-
-

{{ page.title }}

-
-
-
-
-
- {{ page.content }} -
-
-{% endblock %} diff --git a/theme/templates/page.html b/theme/templates/page.html index 7644776..3764cfa 100644 --- a/theme/templates/page.html +++ b/theme/templates/page.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block htmltitle %} - {{ page.title }} + {{ page.html_title or page.title }} {% endblock %} {% block metadata %} @@ -11,5 +11,19 @@ {% endblock %} {% block content %} - {{ page.content }} + {% if not page.no_container %} +
+
+

{{ page.title }}

+
+
+
+
+
+ {{ page.content }} +
+
+ {% else %} + {{ page.content }} + {% endif %} {% endblock %}