Mercurial > wikked

changeset 145:74690402fef2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved all the static content to, well, a `/static` folder.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 11 Dec 2013 17:45:52 -0800
parents f4b0ae3c0dae
children 0b284cb64bb3
files static/tpl/edit-page.html wikked/templates/index-dev.html wikked/templates/index.html wikked/web.py
diffstat 4 files changed, 14 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- 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 @@
         </div>
     </form>
 </article>
-<script type="text/javascript" src="/js/pagedown/Markdown.Converter.js"></script>
-<script type="text/javascript" src="/js/pagedown/Markdown.Sanitizer.js"></script>
-<script type="text/javascript" src="/js/pagedown/Markdown.Editor.js"></script>
+<script type="text/javascript" src="/static/js/pagedown/Markdown.Converter.js"></script>
+<script type="text/javascript" src="/static/js/pagedown/Markdown.Sanitizer.js"></script>
+<script type="text/javascript" src="/static/js/pagedown/Markdown.Editor.js"></script>
--- 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 @@
     <head>
         <title>Wikked</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <link rel="stylesheet" type="text/css" href="/css/wikked.min.css" />
+        <link rel="stylesheet" type="text/css" href="/static/css/wikked.min.css" />
     </head>
     <body>
         <div id="app" class="container">
         </div>
         <script type="text/javascript">
             var require = {
-                baseUrl: "/",
-                deps: ["/js/wikked.js{{cache_bust}}"]
+                baseUrl: "/static/",
+                deps: ["/static/js/wikked.js{{cache_bust}}"]
             };
         </script>
-        <script src="/js/require.js"></script>
+        <script src="/static/js/require.js"></script>
     </body>
 </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 @@
     <head>
         <title>Wikked</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <link rel="stylesheet" type="text/css" href="/css/wikked.min.css" />
+        <link rel="stylesheet" type="text/css" href="/static/css/wikked.min.css" />
     </head>
     <body>
         <div id="app" class="container">
         </div>
-        <script src="/js/require.js"></script>
-        <script src="/js/wikked.min.js"></script>
+        <script src="/static/js/require.js"></script>
+        <script src="/static/js/wikked.min.js"></script>
     </body>
 </html>
--- 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')
     })