changed static tructure

jvsteiner · Nov 5, 2014 · 8c387ab · 8c387ab
1 parent 57f02d2
commit 8c387ab
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,8 @@
 *.pyc
 venv/
 static/*
-!static/custom.js
-!static/style.css
 env/*
 !env/__init__.py
 !env/email.py.example
-!env/env.py.example
+!env/env.py.example
+.DS_Store
diff --git a/app.py b/app.py
@@ -1,5 +1,5 @@
 
-from flask import Flask, render_template, request, session, redirect, url_for
+from flask import Flask, render_template, request, session, redirect, url_for, send_from_directory
 from flask.ext.babel import Babel
 from flask.ext.mail import Mail
 from flask.ext.bcrypt import *
@@ -21,6 +21,7 @@
 app.config.from_object('config.config')
 app.config.from_object('env.env') #overwrites config.config for production server
 app.config.from_object('env.email') #overwrites config.config for production server
+install_dir = os.path.split(os.path.realpath(__file__))[0]
 
 # Setup mail extension
 mail = Mail(app)
@@ -102,6 +103,10 @@ def async_security_email(msg):
 def index():
     return render_template('index.html')
 
+@app.route('/custom/<path:filename>')
+def custom(filename):
+    return send_from_directory(os.path.join(install_dir, app.config['CUSTOM_STATIC_PATH']), filename)
+
 @app.route('/profile')
 def profile():
     if current_user.is_authenticated():

diff --git a/config/config.py b/config/config.py
@@ -14,3 +14,4 @@
 SECURITY_FORGOT_PASSWORD_TEMPLATE = 'security/reset.html'
 SECURITY_CHANGE_PASSWORD_TEMPLATE = 'security/change.html'
 PRODUCTION = False
+CUSTOM_STATIC_PATH = 'custom'
diff --git a/static/custom.js → custom/custom.js b/static/custom.js → custom/custom.js
diff --git a/static/style.css → custom/style.css b/static/style.css → custom/style.css
diff --git a/templates/index.html b/templates/index.html
@@ -9,6 +9,6 @@
 </div>
 <body>
 	{% include "_scripts.html" %}
-	<script src="{{ url_for('static', filename='custom.js') }}"></script>
+	<script src="{{ url_for('custom', filename='custom.js') }}"></script>
 </body>
 {% endblock %}
diff --git a/templates/layout.html b/templates/layout.html
@@ -7,7 +7,7 @@
 	{% else %}
 		<link href="{{ url_for('static', filename='bootstrap.min.css') }}" rel="stylesheet">
 	{% endif %}
-	<link href="{{ url_for('static', filename='style.css') }}" rel="stylesheet">
+	<link href="{{ url_for('custom', filename='style.css') }}" rel="stylesheet">
 </head>
 <nav class="navbar navbar-default" role="navigation">
 	<div class="container-fluid">