diff --git a/.gitignore b/.gitignore index 71715a5..0e744d8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ /static/*.css /static/*.js /template.html +/extra/atom.xml log.mege /mege/ apache-config diff --git a/nohi.wsgi b/nohi.wsgi index d43060f..ce201a5 100644 --- a/nohi.wsgi +++ b/nohi.wsgi @@ -9,4 +9,11 @@ except ImportError: sys.path.insert(0, os.path.join(_filedir, 'mege')) import mege.server as server os.chdir(_filedir) -application = server.MegeApplication() + +try: + application = server.MegeApplication() +except Exception as e: + import traceback + with open('.nohifinallog', 'w') as f: + print(e, file=f) + print(traceback.format_exc(), file=f) diff --git a/prestatic/screen.css b/prestatic/screen.css index a11d03d..8ac7378 100644 --- a/prestatic/screen.css +++ b/prestatic/screen.css @@ -79,7 +79,7 @@ body { border-style: dashed; border-color: #ccc; border-width: 4px 0 0 0; - background-color: #aaa; + background: #aaa url('/static/metadata.png') no-repeat right bottom; padding: 2px 5px; color: #fff; } diff --git a/prestatic/template.html b/prestatic/template.html index 45d2448..891d352 100644 --- a/prestatic/template.html +++ b/prestatic/template.html @@ -51,6 +51,7 @@ if page.licenses: less functional. --> + @@ -62,7 +63,7 @@ for x in('projects', 'writings', 'films', 'about'):
> - +
diff --git a/site/films/index.org b/site/films/index.org new file mode 100644 index 0000000..a1560e9 --- /dev/null +++ b/site/films/index.org @@ -0,0 +1 @@ +#+title: Films diff --git a/sitespecial/listdir.org b/sitespecial/listdir.org index 04c385e..8bbb047 100644 --- a/sitespecial/listdir.org +++ b/sitespecial/listdir.org @@ -1,3 +1,5 @@ -#+title: Directory listing: <@eval page.core_url> +#+title: Directory listing: <@eval page.core_url@> -<@eval page.dirlist> +#@deval +page.dirlist +#@ diff --git a/sitespecial/notfound.org b/sitespecial/notfound.org index 2946b63..a0a629f 100644 --- a/sitespecial/notfound.org +++ b/sitespecial/notfound.org @@ -1,7 +1,7 @@ #+title: Error: Page not found -The page <@exec print(repr(page.core_url))> does not exist. The error was: +The page <@deval repr(page.core_url)@> does not exist. The error was: -#\block -<@eval page.error> +#@block +<@deval page.error@> #@ diff --git a/sitespecial/servererror.org b/sitespecial/servererror.org index 24eee81..318d8a5 100644 --- a/sitespecial/servererror.org +++ b/sitespecial/servererror.org @@ -2,6 +2,6 @@ There was an error, most likely due to sloppy programming: -#\block -<@eval page.error> +#@block +<@deval page.error@> #@ diff --git a/static/metadata.png b/static/metadata.png new file mode 100644 index 0000000..08d482c Binary files /dev/null and b/static/metadata.png differ