morpheus-site

morpheus.2f30.org website
git clone git://git.2f30.org/morpheus-site.git
Log | Files | Refs | LICENSE

commit 7545fb3e22b322e60b84d22f2f1f44ceb26f9667
parent d8caca981363d9be64bc35fbf6a8c2f8b803166e
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Mon Dec 16 20:54:28 +0100

consistency fixes, update template page

Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>

Diffstat:
site.conf | 11++++++-----
site/layout/atom/atom.sh | 8++++----
site/layout/index/index.sh | 6+++---
site/layout/page/page.sh | 2+-
site/layout/rss/rss.sh | 2+-
site/pages/example-page-template.html | 2+-
site/pages/example-page-template.sh | 4++--
7 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/site.conf b/site.conf @@ -1,3 +1,5 @@ +#!/bin/sh +# # Site title (part of ${pagetitle} probably). sitetitle="Codemadness" # Main site domain. @@ -5,9 +7,9 @@ sitedomain="http://www.codemadness.nl" # Short site domain. sitedomainshort="codemadness.nl" # Relative site url. -siterelurl="" +siteurlrel="" # Full site url. -sitefullurl="${sitedomain}${siterelurl}" +siteurlfull="${sitedomain}${siteurlrel}" # Site keywords (default). sitekeywords="blog, suckless, dwm-hiltjo" # Site description (default). @@ -22,6 +24,5 @@ pagesdir="site/pages" outputdir="site/output" # Layout dir. layoutdir="site/layout" - -# TODO: markdown program: http://freecode.com/projects/smu -markdown="smu" +#Markdown processor: default: is "smu". +#markdown="smu" diff --git a/site/layout/atom/atom.sh b/site/layout/atom/atom.sh @@ -5,10 +5,10 @@ cat <<!__EOF__ <feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en"> <title type="text">${sitetitle}</title> <subtitle type="text">${sitedescription}</subtitle> - <updated>$(date "+%Y-%m-%dT%H:%M:%SZ" -d "${builddate}")</updated> - <link rel="alternate" type="text/html" href="${sitefullurl}" /> - <id>${sitefullurl}/atom.xml</id> - <link rel="self" type="application/atom+xml" href="${sitefullurl}/atom.xml" /> + <updated>$(date "+%Y-%m-%dT%H:%M:%SZ" -d "${builddate}")</updated> + <link rel="alternate" type="text/html" href="${siteurlfull}" /> + <id>${siteurlfull}/atom.xml</id> + <link rel="self" type="application/atom+xml" href="${siteurlfull}/atom.xml" /> ${content} </feed> !__EOF__ diff --git a/site/layout/index/index.sh b/site/layout/index/index.sh @@ -20,14 +20,14 @@ cat <<!__EOF__ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Language" content="en" /> <meta content="width=device-width" name="viewport" /> - <meta content="${keywords}" name="keywords" /> - <meta content="${description}" name="description" /> + <meta content="${sitekeywords}" name="keywords" /> + <meta content="${sitedescription}" name="description" /> </head> <body> <div id="menuwrap"> <div id="menu"> <span id="links"> - <a href="${siterelurl}/" title="Blog">Blog</a> | + <a href="${siteurlrel}/" title="Blog">Blog</a> | <a href="/downloads/projects/" title="Software I've written">Software</a> </span> <span id="links-contact"> diff --git a/site/layout/page/page.sh b/site/layout/page/page.sh @@ -27,7 +27,7 @@ cat <<!__EOF__ <div id="menuwrap"> <div id="menu"> <span id="links"> - <a href="${siterelurl}/" title="Blog">Blog</a> | + <a href="${siteurlrel}/" title="Blog">Blog</a> | <a href="/downloads/projects/" title="Software I've written">Software</a> </span> <span id="links-contact"> diff --git a/site/layout/rss/rss.sh b/site/layout/rss/rss.sh @@ -5,7 +5,7 @@ cat <<!__EOF__ <rss version="2.0"> <channel> <title>${sitetitle}</title> - <link>${sitefullurl}</link> + <link>${siteurlfull}</link> <description></description> <language>en</language> ${content} diff --git a/site/pages/example-page-template.html b/site/pages/example-page-template.html @@ -1 +1 @@ -Hai there +<p>This is an example page :)</p> diff --git a/site/pages/example-page-template.sh b/site/pages/example-page-template.sh @@ -1,6 +1,6 @@ #!/bin/sh -title="title" -description="description" +title="Example title" +description="description here" id="example-page-template" url="${id}.html" tags="tags, comma, separated"