aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/templates
diff options
context:
space:
mode:
authorJames Barnett <noreply@jamesbarnett.xyz>2020-07-05 19:29:49 +0100
committerJames Barnett <noreply@jamesbarnett.xyz>2020-07-05 19:29:49 +0100
commit66e4782c5c422b4f99a4763212bdc974efffc65b (patch)
tree0c7f4c62a21c297808a9fd89339c117767453609 /src/main/resources/templates
parent6f52bbd15bd7026b99433dfd30f5c74164b36b9d (diff)
downloadreddit-lite-66e4782c5c422b4f99a4763212bdc974efffc65b.tar.xz
reddit-lite-66e4782c5c422b4f99a4763212bdc974efffc65b.zip
Add dark theme. Improve display of multi-reddits. Add NetPositive inspired error pages
Diffstat (limited to 'src/main/resources/templates')
-rw-r--r--src/main/resources/templates/error/404.ftlh12
-rw-r--r--src/main/resources/templates/error/500.ftlh12
-rw-r--r--src/main/resources/templates/lib.ftlh10
-rw-r--r--src/main/resources/templates/postDetail.ftlh4
4 files changed, 36 insertions, 2 deletions
diff --git a/src/main/resources/templates/error/404.ftlh b/src/main/resources/templates/error/404.ftlh
new file mode 100644
index 0000000..3237d4d
--- /dev/null
+++ b/src/main/resources/templates/error/404.ftlh
@@ -0,0 +1,12 @@
+<html>
+ <head>
+ <title>404</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <link href="/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />
+ </head>
+ <body>
+ You step in the stream<br/>
+ But the water has moved on<br/>
+ This page was not found
+ </body>
+</html>
diff --git a/src/main/resources/templates/error/500.ftlh b/src/main/resources/templates/error/500.ftlh
new file mode 100644
index 0000000..a8d7693
--- /dev/null
+++ b/src/main/resources/templates/error/500.ftlh
@@ -0,0 +1,12 @@
+<html>
+ <head>
+ <title>500</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <link href="/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />
+ </head>
+ <body>
+ To have no errors<br/>
+ Would be life without meaning<br/>
+ No struggle, no joy
+ </body>
+</html>
diff --git a/src/main/resources/templates/lib.ftlh b/src/main/resources/templates/lib.ftlh
index 9b9e96b..ee013a4 100644
--- a/src/main/resources/templates/lib.ftlh
+++ b/src/main/resources/templates/lib.ftlh
@@ -13,7 +13,15 @@
<#macro header subreddit>
<div class="header">
- <a class="subreddit-title" href="/r/${subreddit}">/r/${subreddit}</a>
+ <a class="subreddit-title" href="/r/${subreddit}">
+ <#if subreddit?contains("+")>
+ <#list subreddit?split("+") as multiRedditName>
+ <#if multiRedditName?is_first>/r/<#else>+</#if>${multiRedditName}
+ </#list>
+ <#else>
+ /r/${subreddit}
+ </#if>
+ </a>
<span class="header-links">
<#nested>
</span>
diff --git a/src/main/resources/templates/postDetail.ftlh b/src/main/resources/templates/postDetail.ftlh
index 576e6e1..13d2ee5 100644
--- a/src/main/resources/templates/postDetail.ftlh
+++ b/src/main/resources/templates/postDetail.ftlh
@@ -7,7 +7,9 @@
<@postSummary postDetail.post/>
</div>
- ${(postDetail.selftextHtmlUnescaped?no_esc)!""}
+ <div class="post-selftext">
+ ${(postDetail.selftextHtmlUnescaped?no_esc)!""}
+ </div>
<div class="comment-heading"><@pluralise postDetail.commentCount, "comment"/></div>
<div class="comments">