fixed application

veasy · Feb 1, 2016 · 54132a6 · 54132a6
1 parent e3b5811
commit 54132a6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/app/colmark/__init__.py b/app/colmark/__init__.py
@@ -3,8 +3,9 @@
 from config import WEB_STATIC_PATH, WEB_TEMPLATE_PATH
 
 app = Flask(__name__,
-            static_folder=WEB_STATIC_PATH,
-            template_folder=WEB_TEMPLATE_PATH)
+            static_url_path=config.WEB_STATIC_PATH,
+            static_folder=config.WEB_STATIC_FOLDER,
+            template_folder=config.WEB_TEMPLATE_PATH)
 socketio = SocketIO(app)
 
 app.config['SECRET_KEY'] = 'secret!'

diff --git a/app/colmark/config.py b/app/colmark/config.py
@@ -1,3 +1,4 @@
 SERVER_PORT = 8000
-WEB_STATIC_PATH = 'web'
-WEB_TEMPLATE_PATH = 'web'
+WEB_STATIC_PATH = '/static'
+WEB_TEMPLATE_PATH = '../web'
+WEB_STATIC_FOLDER = '../web'
diff --git a/app/colmark/routes/index.py b/app/colmark/routes/index.py
@@ -5,4 +5,4 @@
 
 @app.route('/')
 def root():
-    render_template('index', resources=config.WEB_STATIC_PATH)
+    return render_template('index.html', resource=config.WEB_STATIC_PATH)
diff --git a/app/web/index.html b/app/web/index.html
@@ -4,8 +4,8 @@
 	<meta charset="utf-8">
 	<title>Collaborative Markdown</title>
 
-	<link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<link href="css/styles.css" rel="stylesheet">
+	<link href="{{ resource }}/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+	<link href="{{ resource }}/css/styles.css" rel="stylesheet">
 
 	<script type="text/javascript" src="lib/angular/angular.min.js"></script>
 	<script type="text/javascript" src="lib/socket.io/socket.io.min.js"></script>