allow posts without dates
This commit is contained in:
parent
46b3656161
commit
f3904cdd4f
12
pkgs-lib.nix
12
pkgs-lib.nix
@ -90,10 +90,14 @@ in {
|
||||
__displayName = l.head (l.splitString "." name);
|
||||
_displayName = l.splitString "_" __displayName;
|
||||
id = l.replaceStrings [" "] ["_"] __displayName;
|
||||
date = l.head _displayName;
|
||||
in {
|
||||
inherit id;
|
||||
displayName = l.last _displayName;
|
||||
date = l.head _displayName;
|
||||
date =
|
||||
if date == ""
|
||||
then null
|
||||
else date;
|
||||
content = l.readFile (parseMarkdown id (l.readFile (path + "/${name}")));
|
||||
}
|
||||
))
|
||||
@ -104,7 +108,11 @@ in {
|
||||
d = getPart p.date;
|
||||
od = getPart op.date;
|
||||
in
|
||||
!(((d 0) > (od 0)) && ((d 1) > (od 1)) && ((d 2) > (od 2)))
|
||||
if p.date == null
|
||||
then false
|
||||
else if op.date == null
|
||||
then true
|
||||
else !(d 0 > od 0 && d 1 > od 1 && d 2 > od 2)
|
||||
))
|
||||
];
|
||||
pagesRendered = let
|
||||
|
@ -15,7 +15,11 @@
|
||||
with html;
|
||||
article [
|
||||
(h1 {inherit (post) id;} post.displayName)
|
||||
(h4 {class = "nohashtag";} ("date: " + post.date))
|
||||
(
|
||||
l.optionalString
|
||||
(post.date != null)
|
||||
(h4 {class = "nohashtag";} ("date: " + post.date))
|
||||
)
|
||||
post.content
|
||||
];
|
||||
|
||||
@ -70,21 +74,32 @@
|
||||
)
|
||||
);
|
||||
|
||||
postsLinks = with html;
|
||||
l.singleton
|
||||
(ul (
|
||||
l.map
|
||||
(
|
||||
post:
|
||||
li (
|
||||
a {href = "${ctx.baseurl}/${post.id}";}
|
||||
"${post.date} - ${post.displayName}"
|
||||
)
|
||||
)
|
||||
ctx.posts
|
||||
));
|
||||
mkPostsLinks = posts:
|
||||
with html;
|
||||
l.singleton
|
||||
(ul (
|
||||
l.map
|
||||
(
|
||||
post:
|
||||
li (
|
||||
a {href = "${ctx.baseurl}/${post.id}";}
|
||||
(
|
||||
if post.date != null
|
||||
then "${post.date} - ${post.displayName}"
|
||||
else post.displayName
|
||||
)
|
||||
)
|
||||
)
|
||||
posts
|
||||
));
|
||||
postsLinksWithDate = mkPostsLinks (l.filter (p: p.date != null) ctx.posts);
|
||||
postsLinksWithoutDate = mkPostsLinks (l.filter (p: p.date == null) ctx.posts);
|
||||
|
||||
postsSectionContent = [(html.h1 "posts")] ++ postsLinks;
|
||||
postsSectionContent =
|
||||
[(html.h1 "posts")]
|
||||
++ postsLinksWithDate
|
||||
++ [(html.h2 "miscellaneous")]
|
||||
++ postsLinksWithoutDate;
|
||||
|
||||
postsRendered = l.listToAttrs (
|
||||
l.map
|
||||
|
Loading…
Reference in New Issue
Block a user