diff --git a/incorporealcms/config.py b/incorporealcms/config.py index 6518f07..bc8c3ba 100644 --- a/incorporealcms/config.py +++ b/incorporealcms/config.py @@ -48,7 +48,9 @@ class Config(object): }, } - DEFAULT_PAGE_STYLE = 'light' - - TITLE_SUFFIX = 'incorporeal.org' MEDIA_DIR = 'media' + + # customizations + DEFAULT_PAGE_STYLE = 'light' + TITLE_SUFFIX = 'incorporeal.org' + CONTACT_EMAIL = 'bss@incorporeal.org' diff --git a/incorporealcms/templates/404.html b/incorporealcms/templates/404.html index bac3191..e087fe0 100644 --- a/incorporealcms/templates/404.html +++ b/incorporealcms/templates/404.html @@ -11,7 +11,7 @@

NOT FOUND

Sorry, {{ request.path }} does not seem to exist, at least not anymore.

It's possible you followed a dead link on this site, in which case I would appreciate it if you could email me via: - bss @ <this domain> and I can take a look. I make an effort to symlink old content to its new location, + {{ config.CONTACT_EMAIL }} and I can take a look. I make an effort to symlink old content to its new location, so old links and URLs should, generally speaking, work.

Otherwise, I suggest you go to the index and navigate your way (hopefully) to what you're looking for.

diff --git a/incorporealcms/templates/500.html b/incorporealcms/templates/500.html index 68341a3..4d31af2 100644 --- a/incorporealcms/templates/500.html +++ b/incorporealcms/templates/500.html @@ -9,6 +9,6 @@ {% block body %}

INTERNAL SERVER ERROR

-

Something bad happened! Please email me at bss @ <this domain> and tell me what happened.

+

Something bad happened! Please email me at {{ config.CONTACT_EMAIL }} and tell me what happened.

{% endblock %} diff --git a/tests/functional_tests.py b/tests/functional_tests.py index 6353ac4..bd3a892 100644 --- a/tests/functional_tests.py +++ b/tests/functional_tests.py @@ -14,6 +14,8 @@ def test_page_that_doesnt_exist(client): response = client.get('/ohuesthaoeusth') assert response.status_code == 404 assert b'/ohuesthaoeusth does not seem to exist' in response.data + # test the contact email config + assert b'bss@incorporeal.org' in response.data def test_files_outside_pages_do_not_get_served(client): @@ -28,6 +30,8 @@ def test_internal_server_error_serves_error_page(client): response = client.get('/actually-a-png') assert response.status_code == 500 assert b'INTERNAL SERVER ERROR' in response.data + # test the contact email config + assert b'bss@incorporeal.org' in response.data def test_weird_paths_do_not_get_served(client):