diff options
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/404.shtml (renamed from layouts/404.html) | 2 | ||||
| -rw-r--r-- | layouts/list.shtml (renamed from layouts/list.html) | 6 | ||||
| -rw-r--r-- | layouts/redirect.html | 14 | ||||
| -rw-r--r-- | layouts/redirect.shtml | 15 | ||||
| -rw-r--r-- | layouts/rss.xml | 4 | ||||
| -rw-r--r-- | layouts/single.html | 16 | ||||
| -rw-r--r-- | layouts/single.shtml | 15 | ||||
| -rw-r--r-- | layouts/templates/main.shtml (renamed from layouts/templates/main.html) | 31 | ||||
| -rw-r--r-- | layouts/video.html | 5 |
9 files changed, 49 insertions, 59 deletions
diff --git a/layouts/404.html b/layouts/404.shtml index c2e4e40..9020112 100644 --- a/layouts/404.html +++ b/layouts/404.shtml @@ -2,4 +2,4 @@ 404 NOT FOUND -{{ partial "footer.html" . }} +{{ partial "footer.html" . }}
\ No newline at end of file diff --git a/layouts/list.html b/layouts/list.shtml index ce3b64e..758dc09 100644 --- a/layouts/list.html +++ b/layouts/list.shtml @@ -1,13 +1,11 @@ -<extend template="main.html"/> +<extend template="main.shtml"> <div id="main"> <h1 var="$page.title"></h1> - <p var="$page.content"></p> - <ul loop="$page.subpages()"> <li> <span class="date" var="$loop.it.date.format('2006/01/02')"></span> - <a href="$loop.it.permalink()" var="$loop.it.title"></a> + <a href="$loop.it.link()" var="$loop.it.title"></a> </li> </ul> </div>
\ No newline at end of file diff --git a/layouts/redirect.html b/layouts/redirect.html deleted file mode 100644 index 9cfd747..0000000 --- a/layouts/redirect.html +++ /dev/null @@ -1,14 +0,0 @@ -<!DOCTYPE HTML> -<html lang="en-US"> - <head> - <meta charset="UTF-8"> - <meta http-equiv="refresh" content="0; url=/posts/"> - <script type="text/javascript"> - window.location.href = "/posts/" - </script> - <title>Page Redirection</title> - </head> - <body> - If you are not redirected automatically, follow this <a href='/post/'>link</a>. - </body> -</html> diff --git a/layouts/redirect.shtml b/layouts/redirect.shtml new file mode 100644 index 0000000..a10982f --- /dev/null +++ b/layouts/redirect.shtml @@ -0,0 +1,15 @@ +<!DOCTYPE HTML> +<html lang="en-US"> + <head> + <meta charset="UTF-8"> + <meta http-equiv="refresh" content="0; url=/posts/"> + <script type="text/javascript"> + window.location.href = "/posts/" + </script> + <title>Page Redirection</title> + </head> + <body> + If you are not redirected automatically, follow this + <a href='/post/'>link</a>. + </body> +</html>
\ No newline at end of file diff --git a/layouts/rss.xml b/layouts/rss.xml index 349f8f0..1023a18 100644 --- a/layouts/rss.xml +++ b/layouts/rss.xml @@ -10,9 +10,9 @@ <atom:link href="https://mfashby.net/index.xml" rel="self" type="application/rss+xml"/> <item inline-loop="$page.subpages()"> <title var="$loop.it.title"></title> - <link var="$loop.it.permalink()"></link> + <link var="$loop.it.link()"></link> <pubDate var="$loop.it.date.formatHTTP()"></pubDate> - <guid isPermaLink="true" var="$loop.it.permalink()"></guid> + <guid isPermaLink="true" var="$loop.it.link()"></guid> <description var="$loop.it.description"></description> <content:encoded var="$loop.it.content"></content:encoded> <!-- This doesn't work, an empty tag is emitted --> </item> diff --git a/layouts/single.html b/layouts/single.html deleted file mode 100644 index 971b664..0000000 --- a/layouts/single.html +++ /dev/null @@ -1,16 +0,0 @@ -<extend template="main.html"/> -<div id="main"> - <div class="article-meta"> - <h1><span class="title" var="$page.title"></span></h1> - </div> - - <main var="$page.content"></main> - - <footer> - <div class="article-meta"> - <span class="author">Author <span var="$page.author"></span></span><br/> - <span>Updated <span class="date" var="$page.date.format('2006/01/02')"></span></span><br/> - </div> - </footer> - -</div>
\ No newline at end of file diff --git a/layouts/single.shtml b/layouts/single.shtml new file mode 100644 index 0000000..d689187 --- /dev/null +++ b/layouts/single.shtml @@ -0,0 +1,15 @@ +<extend template="main.shtml"> +<div id="main"> + <div class="article-meta"> + <h1><span class="title" var="$page.title"></span></h1> + </div> + <main var="$page.content"></main> + <footer> + <div class="article-meta"> + <span class="author">Author + <span var="$page.author"></span></span><br> + <span>Updated + <span class="date" var="$page.date.format('2006/01/02')"></span></span><br> + </div> + </footer> +</div>
\ No newline at end of file diff --git a/layouts/templates/main.html b/layouts/templates/main.shtml index 5d99d63..c9369fc 100644 --- a/layouts/templates/main.html +++ b/layouts/templates/main.shtml @@ -4,32 +4,29 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title var="$page.title.suffix('|', $site.title)"></title> - <link rel="stylesheet" href="/css/style.css"/> - <link rel="stylesheet" href="/css/fonts.css"/> + <link rel="stylesheet" href="/css/style.css"> + <link rel="stylesheet" href="/css/fonts.css"> </head> - <body> <nav> - <ul class="menu"> - <li><a href="/posts">home</a></li> - <li><a href="/about">about</a></li> - <li><a href="/projects">projects</a></li> - <li><a href="/index.xml">rss</a></li> - </ul> - <hr/> + <ul class="menu"> + <li><a href="/posts">home</a></li> + <li><a href="/about">about</a></li> + <li><a href="/projects">projects</a></li> + <li><a href="/index.xml">rss</a></li> + </ul> + <hr> </nav> - <div id="main"> - <super/> + <super> </div> - <footer> - <div if="$page.custom.get('comments', false)"> + <div if="$page.custom.get('comments', false)"> <h2>comments</h2> <div style="visibility: hidden" id="comments">comments go here</div> <div style="visibility: hidden" id="comment_form">comment form goes here</div> <script> - let comments = document.getElementById("comments"); + let comments = document.getElementById("comments"); let urlParam = new URLSearchParams(); urlParam.append("url", document.location.href); fetch(document.location.origin + "/api/comment?" + urlParam.toString()) @@ -47,7 +44,7 @@ }); </script> <noscript>Comments disabled without javascript!</noscript> - </div> + </div> </footer> </body> -</html> +</html>
\ No newline at end of file diff --git a/layouts/video.html b/layouts/video.html deleted file mode 100644 index eba4d66..0000000 --- a/layouts/video.html +++ /dev/null @@ -1,5 +0,0 @@ -<video class="video-shortcode" preload="{{ .Get "preload" }}" controls> - <source src="{{ .Get "src" }}" type="{{ .Get "type" }}"> - There should have been a video here but your browser does not seem - to support it. -</video> |