From 6d20093f7b085bd304dac5b1432c438f5192877d Mon Sep 17 00:00:00 2001 From: Carl Eberhard Date: Tue, 19 May 2015 11:55:15 -0400 Subject: [PATCH] UI, Dataset chooser: fix underscore templating and right,left border --- client/galaxy/scripts/mvc/dataset/dataset-choice.js | 9 +++++---- client/galaxy/style/less/ui/dataset-choice.less | 10 ++++++++-- static/maps/mvc/dataset/dataset-choice.js.map | 2 +- static/scripts/mvc/dataset/dataset-choice.js | 2 +- static/style/blue/base.css | 1 + 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/client/galaxy/scripts/mvc/dataset/dataset-choice.js b/client/galaxy/scripts/mvc/dataset/dataset-choice.js index 3831c0e30f9..e05a78b7fe9 100644 --- a/client/galaxy/scripts/mvc/dataset/dataset-choice.js +++ b/client/galaxy/scripts/mvc/dataset/dataset-choice.js @@ -50,6 +50,7 @@ function _filterDatasetJSON( datasetJSON, where, datasetsOnly ){ } return datasetJSON.filter( function( json ){ + console.debug( json ) return ( !json.deleted && json.visible ) && ( !datasetsOnly || json.collection_type === undefined ) && ( matches( json, where ) ); @@ -248,10 +249,10 @@ var DatasetChoice = Backbone.View.extend( BASE_MVC.LoggableMixin ).extend({ _template : function( json ){ return _.template([ '' - ].join(''), { json: json }); + ].join(''))( json ); }, /** return jQ DOM for the selected dataset (only one) */ @@ -267,7 +268,7 @@ var DatasetChoice = Backbone.View.extend( BASE_MVC.LoggableMixin ).extend({ '<%= selected.misc_info %>', '', '' - ].join( '' ), { selected: json.selected[0] })); + ].join( '' ), { variable : 'selected' })( json.selected[0] )); } return $([ '(', @@ -401,7 +402,7 @@ var MultiDatasetChoice = DatasetChoice.extend({ '<% }); %>', '', '' - ].join( '' ), { json: json })); + ].join( '' ), { variable: 'json' })( json )); } return $([ '(', diff --git a/client/galaxy/style/less/ui/dataset-choice.less b/client/galaxy/style/less/ui/dataset-choice.less index 8571b05c0fa..c23979c3ff4 100644 --- a/client/galaxy/style/less/ui/dataset-choice.less +++ b/client/galaxy/style/less/ui/dataset-choice.less @@ -82,7 +82,13 @@ } // modal allowing single or multiple dataset selection - often activated by .dataset-choice above -.dataset-choice-modal .list-panel .controls .title .name { - font-size: 120%; +.dataset-choice-modal .list-panel { + .list-item.dataset { + border-left-width: 1px; + border-right-width: 1px; + } + .controls .title .name { + font-size: 120%; + } } diff --git a/static/maps/mvc/dataset/dataset-choice.js.map b/static/maps/mvc/dataset/dataset-choice.js.map index 2a43d046301..83a34ac76d1 100644 --- a/static/maps/mvc/dataset/dataset-choice.js.map +++ b/static/maps/mvc/dataset/dataset-choice.js.map @@ -1 +1 @@ -{"version":3,"file":"dataset-choice.js","sources":["../../../src/mvc/dataset/dataset-choice.js"],"names":["define","DATASET","DATASET_LIST","MODAL","BASE_MVC","_l","_filterDatasetJSON","datasetJSON","where","datasetsOnly","matches","obj","toMatch","key","hasOwnProperty","filter","json","deleted","visible","undefined","collection_type","DatasetChoiceModal","options","resolveWithSelected","promise","resolve","list","getSelectedModels","map","model","toJSON","_","defaults","state","multiselect","selected","title","modal","buttons","jQuery","Deferred","filterFn","length","View","height","closing_events","closing_callback","body","join","$","remove","css","DatasetList","subtitle","el","$body","find","selecting","collection","DatasetAssociationCollection","once","show","$el","addClass","on","hide","view","render","always","reject","DatasetChoice","Backbone","extend","LoggableMixin","className","initialize","attributes","this","debug","label","_setUpListeners","html","_template","replaceWith","_renderSelected","template","chooser","datasets","compact","id","findWhere","events","click","chooseWithModal","_createModal","done","pluck","trigger","fail","arguments","_getModalOptions","toString","MultiDatasetChoice","prototype","cells","hid","name","misc_blurb","file_ext","genome_build","tags","annotation","showHeaders","call"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"dataset-choice.js","sources":["../../../src/mvc/dataset/dataset-choice.js"],"names":["define","DATASET","DATASET_LIST","MODAL","BASE_MVC","_l","_filterDatasetJSON","datasetJSON","where","datasetsOnly","matches","obj","toMatch","key","hasOwnProperty","filter","json","console","debug","deleted","visible","undefined","collection_type","DatasetChoiceModal","options","resolveWithSelected","promise","resolve","list","getSelectedModels","map","model","toJSON","_","defaults","state","multiselect","selected","title","modal","buttons","jQuery","Deferred","filterFn","length","View","height","closing_events","closing_callback","body","join","$","remove","css","DatasetList","subtitle","el","$body","find","selecting","collection","DatasetAssociationCollection","once","show","$el","addClass","on","hide","view","render","always","reject","DatasetChoice","Backbone","extend","LoggableMixin","className","initialize","attributes","this","label","_setUpListeners","html","_template","replaceWith","_renderSelected","template","variable","chooser","datasets","compact","id","findWhere","events","click","chooseWithModal","_createModal","done","pluck","trigger","fail","arguments","_getModalOptions","toString","MultiDatasetChoice","prototype","cells","hid","name","misc_blurb","file_ext","genome_build","tags","annotation","showHeaders","call"],"mappings":"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"} \ No newline at end of file diff --git a/static/scripts/mvc/dataset/dataset-choice.js b/static/scripts/mvc/dataset/dataset-choice.js index 2d744ae0e8b..e827a4fa230 100644 --- a/static/scripts/mvc/dataset/dataset-choice.js +++ b/static/scripts/mvc/dataset/dataset-choice.js @@ -1,2 +1,2 @@ -define(["mvc/dataset/dataset-model","mvc/dataset/dataset-list","mvc/ui/ui-modal","mvc/base-mvc","utils/localization"],function(a,b,c,d,e){function f(a,b,c){function d(a,b){for(var c in b)if(b.hasOwnProperty(c)&&a[c]!==b[c])return!1;return!0}return a.filter(function(a){return!a.deleted&&a.visible&&(!c||void 0===a.collection_type)&&d(a,b)})}var g=function(d,g){function h(){l.resolve(j.getSelectedModels().map(function(a){return a.toJSON()}))}g=_.defaults(g||{},{datasetsOnly:!0,where:{state:"ok"},multiselect:!1,selected:[]}),g.title=g.title||e(g.multiselect?"Choose datasets:":"Choose a dataset:");var i,j,k,l=jQuery.Deferred(),m=g.filter||f;return d=m(d,g.where,g.datasetsOnly),d.length?(g.multiselect&&(k={},k[e("Ok")]=h),i=new c.View({height:"auto",buttons:k,closing_events:!0,closing_callback:function(){l.resolve(null)},body:['
'].join("")}),i.$(".modal-header").remove(),i.$(".modal-footer").css("margin-top","0px"),j=new b.DatasetList({title:g.title,subtitle:g.subtitle||e(["Click the checkboxes on the right to select datasets. ","Click the datasets names to see their details. "].join("")),el:i.$body.find(".list-panel"),selecting:!0,selected:g.selected,collection:new a.DatasetAssociationCollection(d)}),j.once("rendered:initial",function(){i.show(),i.$el.addClass("dataset-choice-modal")}),g.multiselect||(j.on("rendered",function(){j.$(".list-actions").hide()}),j.on("view:selected",function(a){l.resolve([a.model.toJSON()])})),j.render(0),l.always(function(){i.hide()})):l.reject("No matches found")},h=Backbone.View.extend(d.LoggableMixin).extend({className:"dataset-choice",initialize:function(a){this.debug(this+"(DatasetChoice).initialize:",a),this.label=void 0!==a.label?e(a.label):"",this.where=a.where,this.datasetsOnly=void 0!==a.datasetsOnly?a.datasetsOnly:!0,this.datasetJSON=a.datasetJSON||[],this.selected=a.selected||[],this._setUpListeners()},_setUpListeners:function(){},render:function(){var a=this.toJSON();return this.$el.html(this._template(a)),this.$(".selected").replaceWith(this._renderSelected(a)),this},_template:function(a){return _.template([""].join(""),{json:a})},_renderSelected:function(a){return $(a.selected.length?_.template(['
','<%= selected.hid %>: <%= selected.name %>','',"<%= selected.misc_blurb %>","",e("format")+": ","<%= selected.file_ext %>","<%= selected.misc_info %>","","
"].join(""),{selected:a.selected[0]}):['(',e("click to select a dataset"),")"].join(""))},toJSON:function(){var a=this;return{label:a.label,datasets:a.datasetJSON,selected:_.compact(_.map(a.selected,function(b){return _.findWhere(a.datasetJSON,{id:b})}))}},events:{click:"chooseWithModal"},chooseWithModal:function(){var a=this;return this._createModal().done(function(b){b?(a.selected=_.pluck(b,"id"),a.trigger("selected",a,b),a.render()):a.trigger("cancelled",a)}).fail(function(){a.trigger("error",a,arguments)})},_createModal:function(){return new g(this.datasetJSON,this._getModalOptions())},_getModalOptions:function(){return{title:this.label,multiselect:!1,selected:this.selected,where:this.where,datasetsOnly:this.datasetsOnly}},toString:function(){return"DatasetChoice("+this.selected+")"}}),i=h.extend({className:h.prototype.className+" multi",cells:{hid:e("History #"),name:e("Name"),misc_blurb:e("Summary"),file_ext:e("Format"),genome_build:e("Genome"),tags:e("Tags"),annotation:e("Annotation")},initialize:function(a){this.showHeaders=void 0!==a.showHeaders?a.showHeaders:!0,this.cells=a.cells||this.cells,h.prototype.initialize.call(this,a)},_renderSelected:function(a){return $(a.selected.length?_.template(['',"<% if( json.showHeaders ){ %>","","<% _.map( json.cells, function( val, key ){ %>","","<% }); %>","","<% } %>","","<% _.map( json.selected, function( selected ){ %>","","<% _.map( json.cells, function( val, key ){ %>",'',"<% }) %>","","<% }); %>","","
<%= val %>
<%= selected[ key ] %>
"].join(""),{json:a}):['(',e("click to select a dataset"),")"].join(""))},toJSON:function(){return _.extend(h.prototype.toJSON.call(this),{showHeaders:this.showHeaders,cells:this.cells})},_getModalOptions:function(){return _.extend(h.prototype._getModalOptions.call(this),{multiselect:!0})},toString:function(){return"DatasetChoice("+this.selected+")"}});return{DatasetChoiceModal:g,DatasetChoice:h,MultiDatasetChoice:i}}); +define(["mvc/dataset/dataset-model","mvc/dataset/dataset-list","mvc/ui/ui-modal","mvc/base-mvc","utils/localization"],function(a,b,c,d,e){function f(a,b,c){function d(a,b){for(var c in b)if(b.hasOwnProperty(c)&&a[c]!==b[c])return!1;return!0}return a.filter(function(a){return console.debug(a),!a.deleted&&a.visible&&(!c||void 0===a.collection_type)&&d(a,b)})}var g=function(d,g){function h(){l.resolve(j.getSelectedModels().map(function(a){return a.toJSON()}))}g=_.defaults(g||{},{datasetsOnly:!0,where:{state:"ok"},multiselect:!1,selected:[]}),g.title=g.title||e(g.multiselect?"Choose datasets:":"Choose a dataset:");var i,j,k,l=jQuery.Deferred(),m=g.filter||f;return d=m(d,g.where,g.datasetsOnly),d.length?(g.multiselect&&(k={},k[e("Ok")]=h),i=new c.View({height:"auto",buttons:k,closing_events:!0,closing_callback:function(){l.resolve(null)},body:['
'].join("")}),i.$(".modal-header").remove(),i.$(".modal-footer").css("margin-top","0px"),j=new b.DatasetList({title:g.title,subtitle:g.subtitle||e(["Click the checkboxes on the right to select datasets. ","Click the datasets names to see their details. "].join("")),el:i.$body.find(".list-panel"),selecting:!0,selected:g.selected,collection:new a.DatasetAssociationCollection(d)}),j.once("rendered:initial",function(){i.show(),i.$el.addClass("dataset-choice-modal")}),g.multiselect||(j.on("rendered",function(){j.$(".list-actions").hide()}),j.on("view:selected",function(a){l.resolve([a.model.toJSON()])})),j.render(0),l.always(function(){i.hide()})):l.reject("No matches found")},h=Backbone.View.extend(d.LoggableMixin).extend({className:"dataset-choice",initialize:function(a){this.debug(this+"(DatasetChoice).initialize:",a),this.label=void 0!==a.label?e(a.label):"",this.where=a.where,this.datasetsOnly=void 0!==a.datasetsOnly?a.datasetsOnly:!0,this.datasetJSON=a.datasetJSON||[],this.selected=a.selected||[],this._setUpListeners()},_setUpListeners:function(){},render:function(){var a=this.toJSON();return this.$el.html(this._template(a)),this.$(".selected").replaceWith(this._renderSelected(a)),this},_template:function(a){return _.template([""].join(""))(a)},_renderSelected:function(a){return $(a.selected.length?_.template(['
','<%= selected.hid %>: <%= selected.name %>','',"<%= selected.misc_blurb %>","",e("format")+": ","<%= selected.file_ext %>","<%= selected.misc_info %>","","
"].join(""),{variable:"selected"})(a.selected[0]):['(',e("click to select a dataset"),")"].join(""))},toJSON:function(){var a=this;return{label:a.label,datasets:a.datasetJSON,selected:_.compact(_.map(a.selected,function(b){return _.findWhere(a.datasetJSON,{id:b})}))}},events:{click:"chooseWithModal"},chooseWithModal:function(){var a=this;return this._createModal().done(function(b){b?(a.selected=_.pluck(b,"id"),a.trigger("selected",a,b),a.render()):a.trigger("cancelled",a)}).fail(function(){a.trigger("error",a,arguments)})},_createModal:function(){return new g(this.datasetJSON,this._getModalOptions())},_getModalOptions:function(){return{title:this.label,multiselect:!1,selected:this.selected,where:this.where,datasetsOnly:this.datasetsOnly}},toString:function(){return"DatasetChoice("+this.selected+")"}}),i=h.extend({className:h.prototype.className+" multi",cells:{hid:e("History #"),name:e("Name"),misc_blurb:e("Summary"),file_ext:e("Format"),genome_build:e("Genome"),tags:e("Tags"),annotation:e("Annotation")},initialize:function(a){this.showHeaders=void 0!==a.showHeaders?a.showHeaders:!0,this.cells=a.cells||this.cells,h.prototype.initialize.call(this,a)},_renderSelected:function(a){return $(a.selected.length?_.template(['',"<% if( json.showHeaders ){ %>","","<% _.map( json.cells, function( val, key ){ %>","","<% }); %>","","<% } %>","","<% _.map( json.selected, function( selected ){ %>","","<% _.map( json.cells, function( val, key ){ %>",'',"<% }) %>","","<% }); %>","","
<%= val %>
<%= selected[ key ] %>
"].join(""),{variable:"json"})(a):['(',e("click to select a dataset"),")"].join(""))},toJSON:function(){return _.extend(h.prototype.toJSON.call(this),{showHeaders:this.showHeaders,cells:this.cells})},_getModalOptions:function(){return _.extend(h.prototype._getModalOptions.call(this),{multiselect:!0})},toString:function(){return"DatasetChoice("+this.selected+")"}});return{DatasetChoiceModal:g,DatasetChoice:h,MultiDatasetChoice:i}}); //# sourceMappingURL=../../../maps/mvc/dataset/dataset-choice.js.map \ No newline at end of file diff --git a/static/style/blue/base.css b/static/style/blue/base.css index 832420d5f8b..bd057298576 100644 --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -2304,6 +2304,7 @@ pre.peek table,pre.peek th,pre.peek tr,pre.peek td{font-family:Monaco,Menlo,Cons .dataset-choice.multi table th{padding:0px;font-weight:normal;font-size:80%;color:grey} .dataset-choice.multi table th:not(:last-child),.dataset-choice.multi table td:not(:last-child){padding-right:8px} .dataset-choice.multi table td.cell-name{font-weight:bold} +.dataset-choice-modal .list-panel .list-item.dataset{border-left-width:1px;border-right-width:1px} .dataset-choice-modal .list-panel .controls .title .name{font-size:120%} .peek-column-selector{border-radius:3px;border:1px solid #5f6990} .peek-column-selector td,.peek-column-selector th{padding:4px 10px 4px 4px}