Merge pull request #2017 from martenson/import-to-new-history

libraries: add 'create history &import to it' feature
galaxyproject · Mar 25, 2016 · b9ccf17 · b9ccf17
2 parents 0d5001e + ce1b9ae
commit b9ccf17
Show file tree

Hide file tree

Showing 9 changed files with 298 additions and 280 deletions.
diff --git a/client/galaxy/scripts/mvc/library/library-dataset-view.js b/client/galaxy/scripts/mvc/library/library-dataset-view.js
@@ -1039,7 +1039,7 @@ var LibraryDatasetView = Backbone.View.extend({
 
   templateBulkImportInModal: function(){
     return _.template([
-    '<span id="history_modal_combo_bulk" style="width:90%; margin-left: 1em; margin-right: 1em; ">',
+    '<span class="library-modal-item">',
       'Select history: ',
       '<select id="dataset_import_single" name="dataset_import_single" style="width:50%; margin-bottom: 1em; "> ',
         '<% _.each(histories, function(history) { %>', //history select btn

diff --git a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
diff --git a/client/galaxy/style/less/library.less b/client/galaxy/style/less/library.less
@@ -240,6 +240,7 @@ span.expandLink {
     width: 27em;
     margin-left: auto;
     margin-right: auto;
+    margin-top: 2em;
 }
 .import-type-switch{
     text-decoration: underline;
@@ -248,3 +249,8 @@ span.expandLink {
 .libimport-select-all{
     margin-left: 0.5em;
 }
+.library-modal-item{
+    width:90%;
+    margin-left: 1em;
+    margin-right: 1em;
+}
diff --git a/static/maps/mvc/library/library-dataset-view.js.map b/static/maps/mvc/library/library-dataset-view.js.map
diff --git a/static/maps/mvc/library/library-foldertoolbar-view.js.map b/static/maps/mvc/library/library-foldertoolbar-view.js.map
diff --git a/static/scripts/mvc/library/library-dataset-view.js b/static/scripts/mvc/library/library-dataset-view.js
diff --git a/static/scripts/mvc/library/library-foldertoolbar-view.js b/static/scripts/mvc/library/library-foldertoolbar-view.js
diff --git a/static/style/blue/base.css b/static/style/blue/base.css
diff --git a/static/style/blue/library.css b/static/style/blue/library.css