Minor tweaks

apache · Apr 5, 2016 · 81de51b · 81de51b
1 parent 0d1f27d
commit 81de51b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/caravel/assets/javascripts/modules/caravel.js b/caravel/assets/javascripts/modules/caravel.js
@@ -2,8 +2,6 @@ var $ = require('jquery');
 var jQuery = $;
 var d3 = require('d3');
 
-require('../../stylesheets/caravel.css');
-
 // vis sources
 var sourceMap = {
   area: 'nvd3_vis.js',

diff --git a/caravel/assets/javascripts/welcome.js b/caravel/assets/javascripts/welcome.js
@@ -1,7 +1,6 @@
 var $ = window.$ = require('jquery');
 var jQuery = window.jQuery = $;
 
-require('../stylesheets/caravel.css');
 require('../stylesheets/welcome.css');
 require('bootstrap');
 require('datatables.net-bs');

diff --git a/caravel/templates/caravel/basic.html b/caravel/templates/caravel/basic.html
@@ -8,6 +8,7 @@
     {% block head_meta %}{% endblock %}
     {% block head_css %}
       <link rel="stylesheet" type="text/css" href="/static/assets/node_modules/font-awesome/css/font-awesome.min.css" />
+      <link rel="stylesheet" type="text/css" href="/static/assets/stylesheets/caravel.css" />
       <link rel="icon" type="image/png" href="/static/assets/images/favicon.png">
     {% endblock %}
     {% block head_js %}

diff --git a/caravel/views.py b/caravel/views.py
@@ -230,8 +230,8 @@ class SliceModelView(CaravelModelView, DeleteMixin):  # noqa
     }
     list_columns = [
         'slice_link', 'viz_type',
-        'datasource_link', 'created_by_', 'changed_on']
-    order_columns = utils.list_minus(list_columns, ['created_by_'])
+        'datasource_link', 'created_by_', 'modified']
+    order_columns = utils.list_minus(list_columns, ['created_by_', 'modified'])
     edit_columns = [
         'slice_name', 'description', 'viz_type', 'druid_datasource',
         'table', 'dashboards', 'params', 'cache_timeout']
@@ -271,8 +271,8 @@ class DashboardModelView(CaravelModelView, DeleteMixin):  # noqa
     label_columns = {
         'created_by_': 'Creator',
     }
-    list_columns = ['dashboard_link', 'created_by_', 'changed_on']
-    order_columns = utils.list_minus(list_columns, ['created_by_'])
+    list_columns = ['dashboard_link', 'created_by_', 'modified']
+    order_columns = utils.list_minus(list_columns, ['created_by_', 'modified'])
     edit_columns = [
         'dashboard_title', 'slug', 'slices', 'position_json', 'css',
         'json_metadata']