diff --git a/.htaccess b/.htaccess deleted file mode 100644 index 7b23492..0000000 --- a/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ -RewriteEngine on -RewriteBase /~j3parker/ -RewriteRule ^pub/(.*) - [L] -RewriteRule ^(.*) bin/web [L] diff --git a/pub/style/style.css b/pub/style/style.css index 2d30b41..1c270c7 100644 --- a/pub/style/style.css +++ b/pub/style/style.css @@ -6,6 +6,8 @@ accent colour: #E2AA00 dark blue: #2724AE +alternate dark blue: + #4A47AE */ body { @@ -13,7 +15,7 @@ body { text-align: center; color: black; background-color: white; - font-family: Helvetica, Verdana, Arial, 'Liberation Sans', FreeSans, sans-serif; + font-family: Helvetica, Verdana, Arial, DejaVu Sans, sans-serif; font-size: 84%; /* Enables font size scaling in MSIE */ margin: 0; padding: 0; @@ -63,7 +65,7 @@ a:hover { text-decoration: underline; } .midHeader { color: #fff; - background-color: #2724AE; + background-color: #4A47AE; border-bottom: solid 2px #E2AA00; } @@ -192,7 +194,7 @@ padding: 0;} #horiz-side-bar ul:first-child li a:hover { /* - background-color: #2724AE; + background-color: #4A47AE; */ background-color: #eee; @@ -217,9 +219,9 @@ padding: 0;} #horiz-side-bar ul:first-child li.thisPage a { /* color: #fff; - background-color: #2724AE; + background-color: #4A47AE; */ - border-left: 0.5em solid #2724AE; + border-left: 0.5em solid #4A47AE; background-color: #eee; } @@ -328,13 +330,13 @@ li ul { padding: 2mm 5mm 2mm 5mm; } -#main-copy p { +#main-copy p, #main-copy li { margin: 1em 1ex 1em 1ex !important; /* Need !important so troff-generated pages don't look totally squezed */ padding: 0; } #main-copy a { - color: #2724AE; + color: #4A47AE; color: #E2AA00; color: rgb(100,135,220); text-decoration: underline; @@ -410,7 +412,7 @@ dd { /* # Footer # */ #footer { color: white; - background-color: #2724AE; + background-color: #4A47AE; padding: 0.25ex; clear: both; border-top: solid 2px #E2AA00; diff --git a/src/config.d.sample b/src/config.d.sample new file mode 100644 index 0000000..e61dd74 --- /dev/null +++ b/src/config.d.sample @@ -0,0 +1,13 @@ +const string url_root = "/"; + +const string site_title = "This is a Title"; +const string site_subtitle = "but this is a subtitle"; + +const bool nav_tree_vert = false; + +string[string] handlers; + +void init_handlers() { + handlers["*.md"] = "contrib/Markdown.pl"; + handlers["changelog"] = "changelog.sh"; +} diff --git a/src/web.d b/src/web.d index efc7040..a2491f9 100755 --- a/src/web.d +++ b/src/web.d @@ -11,10 +11,9 @@ void html_push(string s) { html(s); indent ~= " "; } void write_link(string to, bool expand) { bool isdir = dirExists(dweb_root ~ "/srv/" ~ to[url_root.length..$]); - string flair = nav_tree_chev? (expand? "» " : "› ") : ""; html_push(""); html("" - ~ flair ~ baseName(to) ~ (isdir ? "/" : "") ~ ""); + ~ baseName(to) ~ (isdir ? "/" : "") ~ ""); html_pop(""); } @@ -167,13 +166,13 @@ void main(string[] args) { html(""); html_pop("\n"); - html_push(""); - if (page_container) html_push("
"); + html_push(""); + html_push("
"); do_header(); do_nav_tree(url); do_content(url); do_footer(); - if (page_container) html_pop("
"); + html_pop("
"); html_pop("\n"); html_pop("");