diff --git a/app.py b/app.py index 644baf8..e505069 100755 --- a/app.py +++ b/app.py @@ -30,8 +30,8 @@ route_restricted = make_route_restricter( MakoTemplates(app) set_up_asset_versioning(app) -config.install(app) calefaction.enable_logging() +config.install(app) @app.before_request def prepare_request(): diff --git a/calefaction/modules/campaigns.py b/calefaction/modules/campaigns.py new file mode 100644 index 0000000..e69de29 diff --git a/config/config.yml.sample b/config/config.yml.sample index 6a1efcb..cf42742 100644 --- a/config/config.yml.sample +++ b/config/config.yml.sample @@ -18,6 +18,15 @@ corp: # Full corp name (doesn't need to match in-game name exactly, but it should): name: My Corp Name Here +modules: + # Most site functionality comes from optional modules selected based on your + # corp's needs. They are located in the calefaction/modules/ directory. The + # order below determines how they appear in the navigation menu. + # List of enabled modules: + - campaigns + - map + - members + auth: # Secure session signing key. Never share with anyone. Can generate with # "import base64, os; base64.b64encode(os.urandom(24))": @@ -25,9 +34,8 @@ auth: # You need to create an application at # https://developers.eveonline.com/applications for this corp's website. # Set the callback URL to http(s):///login (match the protocol - # with "site.https" above) and the scopes to: - # - publicData - # - ... + # with "site.https" above) and the scopes to whatever is required by the + # modules you've enabled. # SSO client ID: client_id: a290afea820b8dd8c46d3883898ab66d # SSO client secret: diff --git a/static/main.css b/static/main.css index ad20a9e..92c2d12 100644 --- a/static/main.css +++ b/static/main.css @@ -24,8 +24,8 @@ a:hover { text-decoration: underline; } -h1 { - margin-top: 0.5em; +h2 { + margin: 0.5em 0; } #container { @@ -158,8 +158,10 @@ footer ul li:not(:last-child):after { margin-right: 0.25em; } -#corp-masthead span { +#corp-masthead h1 { + display: inline; font-size: 120%; + font-weight: normal; } #corp-masthead > * { diff --git a/templates/404.mako b/templates/404.mako index 8096f25..b441775 100644 --- a/templates/404.mako +++ b/templates/404.mako @@ -2,5 +2,5 @@ <%block name="title"> 404 – ${g.config.get("corp.name") | h} -

Error 404

+

Error 404

The page you asked for couldn't be found.

diff --git a/templates/_base.mako b/templates/_base.mako index ce34ed5..f3fd7be 100644 --- a/templates/_base.mako +++ b/templates/_base.mako @@ -27,7 +27,7 @@ <%block name="lefthead"> Logo - ${g.config.get("corp.name") | h} +

${g.config.get("corp.name") | h}

diff --git a/templates/error.mako b/templates/error.mako index 8397ff4..df70604 100644 --- a/templates/error.mako +++ b/templates/error.mako @@ -2,7 +2,7 @@ <%block name="title"> Error – ${g.config.get("corp.name") | h} -

Error!

+

Error!

You may report the following information to the developers:

${traceback | trim,h}
diff --git a/templates/logout.mako b/templates/logout.mako index 9583f76..fd7afb4 100644 --- a/templates/logout.mako +++ b/templates/logout.mako @@ -2,7 +2,7 @@ <%block name="title"> Log out – ${g.config.get("corp.name") | h} -

Log out

+

Log out

Use the button below to safely log out and clear your session.