Merge pull request #3 from dannon/Airistotal-Reports_homepage

Several fixes necessary for merging.

.ci/pep8_sources.txt → .ci/flake8_blacklist.txt

@@ -1,4 +1,7 @@
+.venv/
 contrib/
+client/
+database/
 doc/patch.py
 doc/source/conf.py
 lib/galaxy/model/migrate/versions/

.ci/flake8_wrapper.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-flake8 --exclude database/,.venv/,`paste -sd, .ci/pep8_sources.txt` .
+flake8 --exclude `paste -sd, .ci/flake8_blacklist.txt` .
 
 # Look for obviously broken stuff lots more places.
 flake8 --select=E901,E902,F821,F822,F823,F831 --exclude lib/galaxy/util/pastescript/serve.py,lib/pkg_resources.py lib/ test/{api,unit}

client/GruntFile.js

@@ -22,5 +22,6 @@ module.exports = function(grunt) {
 
     // see the sub directory grunt-tasks/ for individual task definitions
     grunt.loadTasks( 'grunt-tasks' );
-    grunt.registerTask( 'default', [ 'uglify' ] );
+    // note: 'handlebars' *not* 'templates' since handlebars doesn't call uglify
+    grunt.registerTask( 'default', [ 'handlebars', 'uglify' ] );
 };

client/README.md

@@ -33,6 +33,19 @@ This will:
 2. generate source maps and place them in static/maps
 
 
+Templates
+=========
+
+You can change and recompile the templates by using:
+
+    grunt templates
+
+This will:
+
+1. recompile the templates in client/galaxy/scripts/templates to client/galaxy/scripts/templates/compiled
+2. minify and generate source maps for the compiled templates
+
+
 Changing Styles/CSS
 ===================
 

client/bower.json

@@ -30,7 +30,7 @@
     "jstree": "~3.0.9",
     "jquery-ui": "git://github.com/jquery/jquery-ui.git#~1.11.2",
     "threedubmedia.jquery.event": "*",
-    "handlebars": "~2.0.0",
+    "handlebars": "~3.0.0",
     "jquery-migrate": "~1.2.1",
     "requirejs": "~2.1.17"
   },