opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 02:04:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prepare composite tab

Browse Source
This commit is contained in:
guerler
2015-07-18 16:15:53 -04:00
parent ad661147e8
commit 3678c111a6
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/upload/upload-view.js
+7 -1
View File
@@ -140,10 +140,16 @@ return Backbone.View.extend({
this.default_view = new UploadViewDefault(this);
this.tabs.add({
id : 'default',
title : 'Default',
title : 'Regular',
$el : this.default_view.$el
});
this.tabs.add({
id : 'composite',
title : 'Composite',
$el : $('<div>Composite upload panel</div>')
});
// make modal
this.modal = new Modal.View({
title : 'Download data directly from web or upload files from your disk',
client/galaxy/style/less/upload.less
+2 -2
View File
@@ -54,7 +54,7 @@
.upload-box {
width : 100%;
height : 320px;
height : 310px;
text-align : center;
overflow : scroll;
font-size : @font-size-base;
@@ -229,7 +229,7 @@
}
.upload-buttons {
padding-top: 20px;
padding-top: 30px;
button {
margin-left: 5px;
}
static/maps/mvc/upload/upload-view.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"upload-view.js","sources":["../../../src/mvc/upload/upload-view.js"],"names":["define","Utils","Modal","Tabs","UploadButton","UploadViewDefault","Backbone","View","extend","options","nginx_upload_path","ftp_upload_site","default_genome","default_extension","height","width","auto","id","text","description","modal","ui_button","current_history","list_extensions","list_genomes","initialize","self","this","merge","Model","ui_button_view","model","onclick","e","preventDefault","show","onunload","$","append","$el","get","url","galaxy_config","root","success","datatypes","key","push","extension","description_url","sort","a","b","datatypes_disable_auto","unshift","genomes","Galaxy","currHistoryPanel","refresh","tabs","default_view","add","title","body","closing_events","find","css","border","padding-bottom","window","setTimeout","current_user","currUser"],"mappings":"AACAA,QAAQ,cACA,kBACA,iBACA,2BACA,kCACA,SAAYC,EACAC,EACAC,EACAC,EACAC,GACpB,MAAOC,UAASC,KAAKC,QAEjBC,SACIC,kBAAsB,GACtBC,gBAAsB,MACtBC,eAAsB,IACtBC,kBAAsB,OACtBC,OAAsB,IACtBC,MAAsB,IACtBC,MACIC,GAAc,OACdC,KAAc,cACdC,YAAc,wZAKtBC,MAAO,KAGPC,UAAW,KAGXC,gBAAiB,KAGjBC,mBAGAC,gBAGAC,WAAY,SAAShB,GAEjB,GAAIiB,GAAOC,IAGXA,MAAKlB,QAAUR,EAAM2B,MAAMnB,EAASkB,KAAKlB,SAGzCkB,KAAKN,UAAY,GAAIjB,GAAayB,MAGlCF,KAAKG,eAAiB,GAAI1B,GAAaG,MACnCwB,MAAcJ,KAAKN,UACnBW,QAAc,SAASC,GACnBA,EAAEC,iBACFR,EAAKS,QAETC,SAAc,eAQlBC,EAAE,uBAAuBC,OAAOX,KAAKG,eAAeS,IAGpD,IAAIb,GAAOC,IACX1B,GAAMuC,KACFC,IAAUC,cAAcC,KAAO,qCAC/BC,QAAU,SAASC,GACf,IAAKC,MAAOD,GACRnB,EAAKH,gBAAgBwB,MACjB9B,GAAkB4B,EAAUC,KAAKE,UACjC9B,KAAkB2B,EAAUC,KAAKE,UACjC7B,YAAkB0B,EAAUC,KAAK3B,YACjC8B,gBAAkBJ,EAAUC,KAAKG,iBAKzCvB,GAAKH,gBAAgB2B,KAAK,SAASC,EAAGC,GAClC,MAAOD,GAAEjC,KAAOkC,EAAElC,KAAO,EAAIiC,EAAEjC,KAAOkC,EAAElC,KAAO,GAAK,IAInDQ,EAAKjB,QAAQ4C,wBACd3B,EAAKH,gBAAgB+B,QAAQ5B,EAAKjB,QAAQO,SAMtDf,EAAMuC,KACFC,IAAUC,cAAcC,KAAO,cAC/BC,QAAU,SAASW,GACf,IAAKT,MAAOS,GACR7B,EAAKF,aAAauB,MACd9B,GAAUsC,EAAQT,KAAK,GACvB5B,KAAUqC,EAAQT,KAAK,IAK/BpB,GAAKF,aAAa0B,KAAK,SAASC,EAAGC,GAC/B,MAAID,GAAElC,IAAMS,EAAKjB,QAAQG,eAAyB,GAC9CwC,EAAEnC,IAAMS,EAAKjB,QAAQG,eAAyB,EAC3CuC,EAAEjC,KAAOkC,EAAElC,KAAO,EAAIiC,EAAEjC,KAAOkC,EAAElC,KAAO,GAAK,QAWpEiB,KAAM,WAEF,GAAIT,GAAOC,IACX,OAAK6B,QAAOC,kBAAqBD,OAAOC,iBAAiB1B,OAMzDJ,KAAK+B,UAGA/B,KAAKP,QAENO,KAAKgC,KAAO,GAAIxD,GAAKI,KAGrBoB,KAAKiC,aAAe,GAAIvD,GAAkBsB,MAC1CA,KAAKgC,KAAKE,KACN5C,GAAU,UACV6C,MAAU,UACVvB,IAAUZ,KAAKiC,aAAarB,MAIhCZ,KAAKP,MAAQ,GAAIlB,GAAMK,MACnBuD,MAAkB,iEAClBC,KAAkBpC,KAAKgC,KAAKpB,IAC5BzB,OAAkBa,KAAKlB,QAAQK,OAC/BC,MAAkBY,KAAKlB,QAAQM,MAC/BiD,gBAAkB,IAEtBrC,KAAKP,MAAMmB,IAAI0B,KAAK,iBAAiBC,KACjCC,OAAU,OACVC,iBAAmB,aAK3BzC,MAAKP,MAAMe,YAnCPkC,QAAOC,WAAW,WAAa5C,EAAKS,QAAU,MAuCtDuB,QAAS,WACL/B,KAAK4C,aAAef,OAAOgB,SAAShC,IAAI,MACxCb,KAAKL,gBAAkB,KACnBK,KAAK4C,eACL5C,KAAKL,gBAAkBkC,OAAOC,iBAAiB1B,MAAMS,IAAI"}
{"version":3,"file":"upload-view.js","sources":["../../../src/mvc/upload/upload-view.js"],"names":["define","Utils","Modal","Tabs","UploadButton","UploadViewDefault","Backbone","View","extend","options","nginx_upload_path","ftp_upload_site","default_genome","default_extension","height","width","auto","id","text","description","modal","ui_button","current_history","list_extensions","list_genomes","initialize","self","this","merge","Model","ui_button_view","model","onclick","e","preventDefault","show","onunload","$","append","$el","get","url","galaxy_config","root","success","datatypes","key","push","extension","description_url","sort","a","b","datatypes_disable_auto","unshift","genomes","Galaxy","currHistoryPanel","refresh","tabs","default_view","add","title","body","closing_events","find","css","border","padding-bottom","window","setTimeout","current_user","currUser"],"mappings":"AACAA,QAAQ,cACA,kBACA,iBACA,2BACA,kCACA,SAAYC,EACAC,EACAC,EACAC,EACAC,GACpB,MAAOC,UAASC,KAAKC,QAEjBC,SACIC,kBAAsB,GACtBC,gBAAsB,MACtBC,eAAsB,IACtBC,kBAAsB,OACtBC,OAAsB,IACtBC,MAAsB,IACtBC,MACIC,GAAc,OACdC,KAAc,cACdC,YAAc,wZAKtBC,MAAO,KAGPC,UAAW,KAGXC,gBAAiB,KAGjBC,mBAGAC,gBAGAC,WAAY,SAAShB,GAEjB,GAAIiB,GAAOC,IAGXA,MAAKlB,QAAUR,EAAM2B,MAAMnB,EAASkB,KAAKlB,SAGzCkB,KAAKN,UAAY,GAAIjB,GAAayB,MAGlCF,KAAKG,eAAiB,GAAI1B,GAAaG,MACnCwB,MAAcJ,KAAKN,UACnBW,QAAc,SAASC,GACnBA,EAAEC,iBACFR,EAAKS,QAETC,SAAc,eAQlBC,EAAE,uBAAuBC,OAAOX,KAAKG,eAAeS,IAGpD,IAAIb,GAAOC,IACX1B,GAAMuC,KACFC,IAAUC,cAAcC,KAAO,qCAC/BC,QAAU,SAASC,GACf,IAAKC,MAAOD,GACRnB,EAAKH,gBAAgBwB,MACjB9B,GAAkB4B,EAAUC,KAAKE,UACjC9B,KAAkB2B,EAAUC,KAAKE,UACjC7B,YAAkB0B,EAAUC,KAAK3B,YACjC8B,gBAAkBJ,EAAUC,KAAKG,iBAKzCvB,GAAKH,gBAAgB2B,KAAK,SAASC,EAAGC,GAClC,MAAOD,GAAEjC,KAAOkC,EAAElC,KAAO,EAAIiC,EAAEjC,KAAOkC,EAAElC,KAAO,GAAK,IAInDQ,EAAKjB,QAAQ4C,wBACd3B,EAAKH,gBAAgB+B,QAAQ5B,EAAKjB,QAAQO,SAMtDf,EAAMuC,KACFC,IAAUC,cAAcC,KAAO,cAC/BC,QAAU,SAASW,GACf,IAAKT,MAAOS,GACR7B,EAAKF,aAAauB,MACd9B,GAAUsC,EAAQT,KAAK,GACvB5B,KAAUqC,EAAQT,KAAK,IAK/BpB,GAAKF,aAAa0B,KAAK,SAASC,EAAGC,GAC/B,MAAID,GAAElC,IAAMS,EAAKjB,QAAQG,eAAyB,GAC9CwC,EAAEnC,IAAMS,EAAKjB,QAAQG,eAAyB,EAC3CuC,EAAEjC,KAAOkC,EAAElC,KAAO,EAAIiC,EAAEjC,KAAOkC,EAAElC,KAAO,GAAK,QAWpEiB,KAAM,WAEF,GAAIT,GAAOC,IACX,OAAK6B,QAAOC,kBAAqBD,OAAOC,iBAAiB1B,OAMzDJ,KAAK+B,UAGA/B,KAAKP,QAENO,KAAKgC,KAAO,GAAIxD,GAAKI,KAGrBoB,KAAKiC,aAAe,GAAIvD,GAAkBsB,MAC1CA,KAAKgC,KAAKE,KACN5C,GAAU,UACV6C,MAAU,UACVvB,IAAUZ,KAAKiC,aAAarB,MAGhCZ,KAAKgC,KAAKE,KACN5C,GAAU,YACV6C,MAAU,YACVvB,IAAUF,EAAE,uCAIhBV,KAAKP,MAAQ,GAAIlB,GAAMK,MACnBuD,MAAkB,iEAClBC,KAAkBpC,KAAKgC,KAAKpB,IAC5BzB,OAAkBa,KAAKlB,QAAQK,OAC/BC,MAAkBY,KAAKlB,QAAQM,MAC/BiD,gBAAkB,IAEtBrC,KAAKP,MAAMmB,IAAI0B,KAAK,iBAAiBC,KACjCC,OAAU,OACVC,iBAAmB,aAK3BzC,MAAKP,MAAMe,YAzCPkC,QAAOC,WAAW,WAAa5C,EAAKS,QAAU,MA6CtDuB,QAAS,WACL/B,KAAK4C,aAAef,OAAOgB,SAAShC,IAAI,MACxCb,KAAKL,gBAAkB,KACnBK,KAAK4C,eACL5C,KAAKL,gBAAkBkC,OAAOC,iBAAiB1B,MAAMS,IAAI"}
static/scripts/mvc/upload/upload-view.js
+1 -1
View File
@@ -1,2 +1,2 @@
define(["utils/utils","mvc/ui/ui-modal","mvc/ui/ui-tabs","mvc/upload/upload-button","mvc/upload/upload-view-default"],function(a,b,c,d,e){return Backbone.View.extend({options:{nginx_upload_path:"",ftp_upload_site:"n/a",default_genome:"?",default_extension:"auto",height:500,width:900,auto:{id:"auto",text:"Auto-detect",description:"This system will try to detect the file type automatically. If your file is not detected properly as one of the known formats, it most likely means that it has some format problems (e.g., different number of columns on different rows). You can still coerce the system to set your data to the format you think it should be. You can also upload compressed files, which will automatically be decompressed."}},modal:null,ui_button:null,current_history:null,list_extensions:[],list_genomes:[],initialize:function(b){var c=this;this.options=a.merge(b,this.options),this.ui_button=new d.Model,this.ui_button_view=new d.View({model:this.ui_button,onclick:function(a){a.preventDefault(),c.show()},onunload:function(){}}),$(".with-upload-button").append(this.ui_button_view.$el);var c=this;a.get({url:galaxy_config.root+"api/datatypes?extension_only=False",success:function(a){for(key in a)c.list_extensions.push({id:a[key].extension,text:a[key].extension,description:a[key].description,description_url:a[key].description_url});c.list_extensions.sort(function(a,b){return a.text>b.text?1:a.text<b.text?-1:0}),c.options.datatypes_disable_auto||c.list_extensions.unshift(c.options.auto)}}),a.get({url:galaxy_config.root+"api/genomes",success:function(a){for(key in a)c.list_genomes.push({id:a[key][1],text:a[key][0]});c.list_genomes.sort(function(a,b){return a.id==c.options.default_genome?-1:b.id==c.options.default_genome?1:a.text>b.text?1:a.text<b.text?-1:0})}})},show:function(){var a=this;return Galaxy.currHistoryPanel&&Galaxy.currHistoryPanel.model?(this.refresh(),this.modal||(this.tabs=new c.View,this.default_view=new e(this),this.tabs.add({id:"default",title:"Default",$el:this.default_view.$el}),this.modal=new b.View({title:"Download data directly from web or upload files from your disk",body:this.tabs.$el,height:this.options.height,width:this.options.width,closing_events:!0}),this.modal.$el.find(".modal-header").css({border:"none","padding-bottom":"0px"})),void this.modal.show()):void window.setTimeout(function(){a.show()},500)},refresh:function(){this.current_user=Galaxy.currUser.get("id"),this.current_history=null,this.current_user&&(this.current_history=Galaxy.currHistoryPanel.model.get("id"))}})});
define(["utils/utils","mvc/ui/ui-modal","mvc/ui/ui-tabs","mvc/upload/upload-button","mvc/upload/upload-view-default"],function(a,b,c,d,e){return Backbone.View.extend({options:{nginx_upload_path:"",ftp_upload_site:"n/a",default_genome:"?",default_extension:"auto",height:500,width:900,auto:{id:"auto",text:"Auto-detect",description:"This system will try to detect the file type automatically. If your file is not detected properly as one of the known formats, it most likely means that it has some format problems (e.g., different number of columns on different rows). You can still coerce the system to set your data to the format you think it should be. You can also upload compressed files, which will automatically be decompressed."}},modal:null,ui_button:null,current_history:null,list_extensions:[],list_genomes:[],initialize:function(b){var c=this;this.options=a.merge(b,this.options),this.ui_button=new d.Model,this.ui_button_view=new d.View({model:this.ui_button,onclick:function(a){a.preventDefault(),c.show()},onunload:function(){}}),$(".with-upload-button").append(this.ui_button_view.$el);var c=this;a.get({url:galaxy_config.root+"api/datatypes?extension_only=False",success:function(a){for(key in a)c.list_extensions.push({id:a[key].extension,text:a[key].extension,description:a[key].description,description_url:a[key].description_url});c.list_extensions.sort(function(a,b){return a.text>b.text?1:a.text<b.text?-1:0}),c.options.datatypes_disable_auto||c.list_extensions.unshift(c.options.auto)}}),a.get({url:galaxy_config.root+"api/genomes",success:function(a){for(key in a)c.list_genomes.push({id:a[key][1],text:a[key][0]});c.list_genomes.sort(function(a,b){return a.id==c.options.default_genome?-1:b.id==c.options.default_genome?1:a.text>b.text?1:a.text<b.text?-1:0})}})},show:function(){var a=this;return Galaxy.currHistoryPanel&&Galaxy.currHistoryPanel.model?(this.refresh(),this.modal||(this.tabs=new c.View,this.default_view=new e(this),this.tabs.add({id:"default",title:"Regular",$el:this.default_view.$el}),this.tabs.add({id:"composite",title:"Composite",$el:$("<div>Composite upload panel</div>")}),this.modal=new b.View({title:"Download data directly from web or upload files from your disk",body:this.tabs.$el,height:this.options.height,width:this.options.width,closing_events:!0}),this.modal.$el.find(".modal-header").css({border:"none","padding-bottom":"0px"})),void this.modal.show()):void window.setTimeout(function(){a.show()},500)},refresh:function(){this.current_user=Galaxy.currUser.get("id"),this.current_history=null,this.current_user&&(this.current_history=Galaxy.currHistoryPanel.model.get("id"))}})});
//# sourceMappingURL=../../../maps/mvc/upload/upload-view.js.map
static/style/blue/base.css
+2 -2
View File
@@ -1384,7 +1384,7 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close{left:auto;
.upload-button .label{position:absolute;top:2px;width:inherit;text-align:center;line-height:19px;font-size:1.2em}
.upload-icon{font-size:1.2em;width:1.2em}
.upload-icon-button{font-size:1.2em;width:1.2em;cursor:pointer}
.upload-box{width:100%;height:320px;text-align:center;overflow:scroll;font-size:12px;line-height:1.33;-moz-border-radius:5px;border-radius:5px;border:1px dashed #bfbfbf;padding:10px;overflow-x:hidden;-ms-overflow-style:none}.upload-box .table{width:100%}
.upload-box{width:100%;height:310px;text-align:center;overflow:scroll;font-size:12px;line-height:1.33;-moz-border-radius:5px;border-radius:5px;border:1px dashed #bfbfbf;padding:10px;overflow-x:hidden;-ms-overflow-style:none}.upload-box .table{width:100%}
.upload-box .table th{text-align:center;white-space:nowrap}
.upload-box .table td{margin:0px}
.upload-box .upload-item .select2-arrow b{background-position:0 -3px}
@@ -1406,7 +1406,7 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close{left:auto;
.upload-ftp .upload-ftp-row{cursor:pointer}.upload-ftp .upload-ftp-row .label{width:240px}.upload-ftp .upload-ftp-row .label p{width:inherit;word-wrap:break-word}
.upload-ftp .upload-ftp-row .nonlabel{white-space:nowrap}
.upload-settings .upload-settings-cover{position:absolute;width:100%;height:100%;top:0px;left:0px;background:#fff;opacity:0.4;cursor:no-drop}
.upload-buttons{padding-top:20px}.upload-buttons button{margin-left:5px}
.upload-buttons{padding-top:30px}.upload-buttons button{margin-left:5px}
.upload-footer{height:5%;text-align:left;max-height:20px;line-height:18px;margin-top:10px}.upload-footer .footer-title{font-weight:bold;padding-left:60px;padding-right:20px}
.upload-footer .footer-selection{width:200px;min-width:200px;font-size:11px;padding-right:10px}
.upload-footer .select2-choice{max-height:20px;line-height:18px;background:transparent;text-align:center;font-weight:normal}.upload-footer .select2-choice .select2-arrow b{background-position:0 -3px}