# HG changeset patch # User Ludovic Chabant # Date 1386812752 28800 # Node ID 74690402fef27ea77194a280af9f92839c71acfb # Parent f4b0ae3c0dae43b1a8906bc6ff49fdd20f760e1f Moved all the static content to, well, a `/static` folder. diff -r f4b0ae3c0dae -r 74690402fef2 static/tpl/edit-page.html --- a/static/tpl/edit-page.html Tue Dec 10 16:57:20 2013 -0800 +++ b/static/tpl/edit-page.html Wed Dec 11 17:45:52 2013 -0800 @@ -42,6 +42,6 @@ - - - + + + diff -r f4b0ae3c0dae -r 74690402fef2 wikked/templates/index-dev.html --- a/wikked/templates/index-dev.html Tue Dec 10 16:57:20 2013 -0800 +++ b/wikked/templates/index-dev.html Wed Dec 11 17:45:52 2013 -0800 @@ -3,17 +3,17 @@ Wikked - +
- + diff -r f4b0ae3c0dae -r 74690402fef2 wikked/templates/index.html --- a/wikked/templates/index.html Tue Dec 10 16:57:20 2013 -0800 +++ b/wikked/templates/index.html Wed Dec 11 17:45:52 2013 -0800 @@ -3,12 +3,12 @@ Wikked - +
- - + + diff -r f4b0ae3c0dae -r 74690402fef2 wikked/web.py --- a/wikked/web.py Tue Dec 10 16:57:20 2013 -0800 +++ b/wikked/web.py Wed Dec 11 17:45:52 2013 -0800 @@ -5,10 +5,11 @@ from utils import find_wiki_root # Create the main app. +static_folder = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'build') app = Flask( 'wikked', - static_folder='build', - static_url_path='/') + static_folder=static_folder, + static_url_path='/static') app.config.from_object('wikked.settings') app.config.from_envvar('WIKKED_SETTINGS', silent=True) @@ -37,7 +38,7 @@ from werkzeug import SharedDataMiddleware import os app.wsgi_app = SharedDataMiddleware(app.wsgi_app, { - '/files': os.path.join(wiki_root, '_files') + '/files': os.path.join(wiki_root, '_files') })