diff --git a/_includes/footer.html b/_includes/footer.html index 9a286ecec..6b61f38e9 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,61 +1,3 @@ - + + + diff --git a/_includes/head.html b/_includes/head.html index d54756159..513452c4b 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,12 +1,19 @@ - + + + - {% if page.title %}{{ page.title }}{% else %}{{ site.name }}{% endif %} - + - + {% if page.title %}{{ page.title }}{% else %}{{ site.name }}{% endif %} + - - + + + - + + diff --git a/_layouts/default.html b/_layouts/default.html deleted file mode 100644 index 557e1b52e..000000000 --- a/_layouts/default.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - ZoneMinder - - - - - - - - - - - {% include navigation.ext %} - - {% if page.title == 'Home' %} - {% include jumbo.ext %} - {% endif %} - -
- -
-
- {{ content }} -
- -
- {% include latest_release.ext %} - - {% include post_index.ext %} -
-
- -
- - - - diff --git a/_layouts/home.html b/_layouts/home.html new file mode 100644 index 000000000..ef9313bdf --- /dev/null +++ b/_layouts/home.html @@ -0,0 +1,25 @@ +{% include head.html %} + + {% include navigation.ext %} + + {% if page.title == 'Home' %} + {% include jumbo.ext %} + {% endif %} + +
+ +
+
+ {{ content }} +
+ +
+ {% include latest_release.ext %} + + {% include post_index.ext %} +
+
+ +
+ +{% include footer.html %} diff --git a/_layouts/page.html b/_layouts/page.html index c402199e7..9b64469a0 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -1,9 +1,10 @@ ---- -layout: default ---- -
+{% include head.html %} -
+ {% include navigation.ext %} + +
+ +

{{ page.title }}

@@ -11,4 +12,6 @@ layout: default {{ content }} -
\ No newline at end of file +
+ +{% include footer.html %} diff --git a/index.html b/index.html index 06a263729..d835a71e2 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ --- -layout: default +layout: home title: Home permalink: / ---