Move backend templates into redash/templates

rd_ui/app/index.html

@@ -1,5 +0,0 @@
-{% extends 'app_layout.html' %}
-{% block content %}
-<app-header></app-header>
-<edit-dashboard-form dashboard="newDashboard" id="new_dashboard_dialog"></edit-dashboard-form>
-{% endblock %}

redash/handlers/static.py

@@ -1,16 +1,15 @@
-import os
 import hashlib
 import json
+import os
 
-from flask import render_template, safe_join, send_file, current_app
+from authentication import current_org
+from flask import current_app, render_template, safe_join, send_file
 from flask_login import current_user, login_required
-from werkzeug.exceptions import NotFound
-
-from redash import settings, __version__
+from redash import __version__, settings
 from redash.handlers import routes
 from redash.handlers.base import org_scoped_rule
 from redash.version_check import get_latest_version
-from authentication import current_org
+from werkzeug.exceptions import NotFound
 
 
 @routes.route('/<path:filename>')

redash/settings.py

@@ -1,6 +1,7 @@
 import json
 import os
 import urlparse
+
 from funcy import distinct, remove
 
 
@@ -124,6 +125,7 @@ REMOTE_USER_HEADER = os.environ.get("REDASH_REMOTE_USER_HEADER", "X-Forwarded-Re
 # Usually it will be a single path, but we allow to specify additional ones to override the default assets. Only the
 # last one will be used for Flask templates.
 STATIC_ASSETS_PATHS = [fix_assets_path(path) for path in os.environ.get("REDASH_STATIC_ASSETS_PATH", "../rd_ui/app/").split(',')]
+STATIC_ASSETS_PATHS.append(fix_assets_path('./static/'))
 
 JOB_EXPIRY_TIME = int(os.environ.get("REDASH_JOB_EXPIRY_TIME", 3600 * 6))
 COOKIE_SECRET = os.environ.get("REDASH_COOKIE_SECRET", "c292a0a3aa32397cdb050e233733900f")

redash/static/images/favicon-16x16.png

@@ -0,0 +1 @@
+../../../frontend/app/assets/images/favicon-16x16.png

redash/static/images/favicon-32x32.png

@@ -0,0 +1 @@
+../../../frontend/app/assets/images/favicon-32x32.png

redash/static/images/favicon-96x96.png

@@ -0,0 +1 @@
+../../../frontend/app/assets/images/favicon-96x96.png

redash/static/styles/redash.css

@@ -0,0 +1 @@
+../../../frontend/app/assets/css/redash.css

redash/static/styles/superflat_redash.css

@@ -0,0 +1 @@
+../../../frontend/app/assets/css/superflat_redash.css

redash/templates/error.html

@@ -1,4 +1,4 @@
-{% extends "signed_out_layout.html" %}
+{% extends "layouts/signed_out.html" %}
 
 {% block content %}
     <h2>Error :-(</h2>

redash/templates/forgot.html

@@ -1,4 +1,4 @@
-{% extends "signed_out_layout.html" %}
+{% extends "layouts/signed_out.html" %}
 {% block title %}Password Reset{% endblock %}
 {% block content %}
 {% if submitted %}

redash/templates/invite.html

@@ -1,4 +1,4 @@
-{% extends "signed_out_layout.html" %}
+{% extends "layouts/signed_out.html" %}
 
 {% block content %}
 

redash/templates/layouts/signed_out.html

@@ -8,11 +8,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <!-- build:css /styles/main_login.css -->
     <link rel="stylesheet" href="/styles/superflat_redash.css">
     <link rel="stylesheet" href="/styles/redash.css">
     <link rel="stylesheet" href="/styles/login.css">
-    <!-- endbuild -->
 
     <link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="96x96" href="/images/favicon-96x96.png">
@@ -37,9 +35,7 @@
   </div>
 </div>
 
-<!-- build:js /scripts/layout_vendor.js -->
-<script src="/bower_components/jquery/jquery.js"></script>
-<!-- endbuild -->
+<script src="/js/jquery.min.js"></script>
 {% block scripts %}
 {% endblock %}
 

redash/templates/login.html

@@ -1,4 +1,4 @@
-{% extends "signed_out_layout.html" %}
+{% extends "layouts/signed_out.html" %}
 {% block title %}Login | Redash{% endblock %}
 {% block content %}
   {% with messages = get_flashed_messages() %}
@@ -10,7 +10,7 @@
   {% endwith %}
   {% if show_google_openid %}
   <div class="row">
-    <a href="{{ google_auth_url }}"><img src="/google_login.png" class="login-button"/></a>
+    <a href="{{ google_auth_url }}"><img src="/images/google_login.png" class="login-button"/></a>
   </div>
 
   <div class="login-or">

redash/templates/reset.html

@@ -1,4 +1,4 @@
-{% extends "signed_out_layout.html" %}
+{% extends "layouts/signed_out.html" %}
 
 {% block title %}Password Reset{% endblock %}
 {% block content %}