diff --git a/config/plugins/visualizations/charts/templates/charts.mako b/config/plugins/visualizations/charts/templates/charts.mako
index c3edcf23a84..f012b6282ca 100644
--- a/config/plugins/visualizations/charts/templates/charts.mako
+++ b/config/plugins/visualizations/charts/templates/charts.mako
@@ -1,12 +1,4 @@
<%
- scripts = [ 'jquery/jquery.js',
- 'jquery/select2.js',
- 'bootstrap.js',
- 'require.js',
- 'underscore.js',
- 'backbone/backbone.js',
- 'd3.js']
-
root = h.url_for( "/" )
app_root = root + "plugins/visualizations/charts/static/"
%>
@@ -18,19 +10,23 @@
${hda.name} | ${visualization_name}
- %for v in scripts:
-
- %endfor
+ ${h.js( 'libs/jquery/jquery',
+ 'libs/jquery/select2',
+ 'libs/bootstrap',
+ 'libs/require',
+ 'libs/underscore',
+ 'libs/backbone/backbone',
+ 'libs/d3' )}
## css
-
+ ${h.css( 'base' )}
## install nv.d3 module
-
-
+ ${h.javascript_link( app_root + "plugins/nv.d3.js" )}
+ ${h.stylesheet_link( app_root + "plugins/nv.d3.css" )}
## load merged/minified code
-
+ ${h.javascript_link( app_root + "build-app.js" )}
diff --git a/config/plugins/visualizations/scatterplot/templates/scatterplot.mako b/config/plugins/visualizations/scatterplot/templates/scatterplot.mako
index 20e994fa014..08e26b0cf2f 100644
--- a/config/plugins/visualizations/scatterplot/templates/scatterplot.mako
+++ b/config/plugins/visualizations/scatterplot/templates/scatterplot.mako
@@ -6,6 +6,9 @@
# optionally bootstrap data from dprov
##data = list( hda.datatype.dataset_column_dataprovider( hda, limit=10000 ) )
+
+ # Use root for resource loading.
+ root = h.url_for( '/' )
%>
## ----------------------------------------------------------------------------
@@ -16,25 +19,24 @@
${title or default_title} | ${visualization_display_name}
## ----------------------------------------------------------------------------
-
-
-
+${h.css( 'base', 'jquery-ui/smoothness/jquery-ui')}
+${h.stylesheet_link( root + 'plugins/visualizations/scatterplot/static/scatterplot.css' )}
## ----------------------------------------------------------------------------
-
-
-
-
-
-
-
-
+${h.js( 'libs/jquery/jquery',
+ 'libs/jquery/jquery.migrate',
+ 'libs/jquery/jquery-ui',
+ 'libs/bootstrap',
+ 'libs/require',
+ 'libs/underscore',
+ 'libs/backbone/backbone',
+ 'libs/d3',
+ 'libs/handlebars.runtime',
+ 'mvc/base-mvc',
+ 'mvc/ui',
+ 'mvc/visualization/visualization-model' )}
-
-
-
-
-
+${h.javascript_link( root + 'plugins/visualizations/scatterplot/static/scatterplot-edit.js' )}
## ----------------------------------------------------------------------------