Merge branch 'master' of gitlab.com:dev_urandom/simple-site

This commit is contained in:
/dev/urandom 2020-06-01 13:53:33 +03:00
commit dc66777a0f
5 changed files with 53 additions and 2 deletions

View file

@ -11,6 +11,8 @@ PNGS = $(patsubst $(PAGEDIR)/%,$(OUTDIR)/%,$(_PNGS))
_PAGES = $(shell find $(PAGEDIR) -name \*.md)
PAGES_HTML = $(patsubst $(PAGEDIR)/%.md,$(OUTDIR)/%.html,$(_PAGES))
_BLOG_PAGES = $(shell find $(PAGEDIR)/blog -name \*.md | grep -v $(PAGEDIR)/blog/index\.md$)
_DIRECTORIES = $(shell find $(PAGEDIR)/* -type d)
DIRECTORIES = $(patsubst $(PAGEDIR)/, $(OUTDIR)/, $(_PAGES))
@ -21,11 +23,15 @@ OUT_STATIC = $(patsubst static/%,out/%,$(_STATIC_FILES)) $(patsubst static/%.h,o
.SUFFIXES:
.PHONY: all upload
all: $(PAGES_HTML) $(OUT_STATIC)
all: $(OUTDIR)/blog/index.html $(PAGES_HTML) $(OUT_STATIC)
upload:
./upload.sh
$(OUTDIR)/blog/index.html: $(_BLOG_PAGES) $(TPLDIR)/blog_header.md $(TPLDIR)/blog_footer.md $(TPLDIR)/default.tpl
@mkdir -p $(@D)
./blogindex.sh | theme -C style -t $(TPLDIR)/default.tpl -p blog/index.html -o $@
$(OUTDIR)/%.html: $(PAGEDIR)/%.md $(TPLDIR)/default.tpl
@mkdir -p $(@D)
theme -C style -t $(TPLDIR)/default.tpl -p $(patsubst $(OUTDIR)/%,%,$@) -o $@ $<
@ -39,4 +45,4 @@ $(OUTDIR)/%: static/%
cp -r $< $@
clean:
rm -rf out/*
rm -rf out/* pages/blog/index.md

26
blogindex.sh Executable file
View file

@ -0,0 +1,26 @@
#!/bin/sh
DIRECTORY="pages/blog"
LASTUPLOAD=`stat -c %Y pages/blog/index.md 2>/dev/null`
if [[ -z $LASTUPLOAD ]]; then LASTUPLOAD=0; fi
#echo "Last upload at $LASTUPLOAD"
FILES=`ls $DIRECTORY/*.md -1ct --time=birth`
cat tpl/blog_header.md
for f in $FILES; do
MTIME=`stat -c %Y $f`
TITLE=`head -n 1 $f`
TITLE=${TITLE#"% "}
OUTPAGE=${f%.md}.html
OUTPAGE=/${OUTPAGE#pages/}
echo " * [$TITLE]($OUTPAGE) (last update `date -d "@$MTIME" "+%Y-%m-%d %H:%M"`)"
done
cat tpl/blog_footer.md

View file

@ -30,6 +30,7 @@ border-radius: 4pt;
border-radius: 4pt;
text-align: center;
overflow: hidden;
word-break: break-all;
}
@media tty {
@ -169,13 +170,22 @@ loanword brackets (as replacement for cartouches).
<div class="spitem"><div class="sp">wawa</div> wawa</div>
<div class="spitem"><div class="sp">weka</div> weka</div>
<div class="spitem"><div class="sp">wile</div> wile</div>
<div style="display:flex; flex-basis:100%; text-align:center;">Characters for words not in the
official book:</div>
<div class="spitem"><div class="sp">kin</div> <b>kin</b></div>
<div class="spitem"><div class="sp">tonsi</div> <b>tonsi</b></div>
<div class="spitem"><div class="sp">monsuta</div> <b>monsuta</b></div>
<div class="spitem"><div class="sp">leko</div> <b>leko</b></div>
<div class="spitem"><div class="sp">kipisi</div> <b>kipisi</b></div>
<<<<<<< HEAD
<div class="spitem"><div class="sp">oko</div> <b>oko</b></div>
<div class="spitem"><div class="sp">namako</div> <b>namako</b></div>
=======
<div class="spitem"><div class="sp">namako</div> <b>namako</b></div>
<div class="spitem"><div class="sp">oko</div> <b>oko</b></div>
<div class="spitem"><div class="sp">pake</div> <b>pake</b></div>
<div class="spitem"><div class="sp">kijetesantakalu</div><b>kijetesantakalu</b></div>
>>>>>>> c9d12f3714cd9ba82206d72a894c092919293e40
</div>
Here's some basic text written in sitelen pona.

0
tpl/blog_footer.md Normal file
View file

9
tpl/blog_header.md Normal file
View file

@ -0,0 +1,9 @@
% rnd's blog
% /dev/urandom
% may 2020
This is a small sort of blog where I (very rarely) post stuff. Mostly small bits
of information that i'd like to remember in the future or make public.
---