Skip to content

Commit

Permalink
Add similar helper text to composite section
Browse files Browse the repository at this point in the history
  • Loading branch information
guerler committed Aug 18, 2015
1 parent d98aba9 commit 7c0ad6b
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 16 deletions.
8 changes: 3 additions & 5 deletions client/galaxy/scripts/mvc/upload/composite/composite-view.js
Expand Up @@ -190,11 +190,11 @@ return Backbone.View.extend({
if (model && model.get('status') == 'running') {
this.select_genome.disable();
this.select_extension.disable();
this.$('#upload-info').html('Please wait...');
this.$('.upload-helper').fadeOut('fast');
} else {
this.select_genome.enable();
this.select_extension.enable();
this.$('#upload-info').html('You can Drag & Drop files into the rows.');
this.$('.upload-helper').fadeIn('fast');
}
if (this.collection.where({ status : 'ready' }).length == this.collection.length && this.collection.length > 0) {
this.btnStart.enable();
Expand Down Expand Up @@ -228,9 +228,6 @@ return Backbone.View.extend({
// load html template
_template: function() {
return '<div class="upload-view-composite">' +
'<div class="upload-top">' +
'<h6 id="upload-info" class="upload-info"/>' +
'</div>' +
'<div id="upload-footer" class="upload-footer">' +
'<span class="footer-title">Composite Type:</span>' +
'<span id="footer-extension"/>' +
Expand All @@ -239,6 +236,7 @@ return Backbone.View.extend({
'<span id="footer-genome"/>' +
'</div>' +
'<div id="upload-box" class="upload-box">' +
'<div class="upload-helper">Drop files into rows</div>' +
'<table id="upload-table" class="ui-table-striped" style="display: none;">' +
'<thead>' +
'<tr>' +
Expand Down
4 changes: 2 additions & 2 deletions client/galaxy/scripts/mvc/upload/default/default-view.js
Expand Up @@ -508,7 +508,7 @@ return Backbone.View.extend({
this.$('.upload-helper').hide();
} else {
this.$('#upload-table').hide();
this.$('.upload-helper').show().html('Drop files here');
this.$('.upload-helper').show();
}
},

Expand Down Expand Up @@ -537,7 +537,7 @@ return Backbone.View.extend({
'<h6 id="upload-info" class="upload-info"/>' +
'</div>' +
'<div id="upload-box" class="upload-box">' +
'<div class="upload-helper"/>' +
'<div class="upload-helper">Drop files here</div>' +
'<table id="upload-table" class="ui-table-striped" style="display: none;">' +
'<thead>' +
'<tr>' +
Expand Down
13 changes: 9 additions & 4 deletions client/galaxy/style/less/upload.less
Expand Up @@ -169,12 +169,17 @@
border: 1px solid @btn-default-border;
margin-top: 10px;
background: lighten(@btn-default-border, 30%);
.upload-helper {
position: absolute;
padding: 0px;
top: 420px;
}
.title {
width: 210px;
}
}
.upload-buttons {
padding-top: 20px;
.upload-footer {
margin-top: 35px;
}
}

Expand Down Expand Up @@ -237,7 +242,7 @@
}

.upload-footer {
height:5%;
height:20px;
text-align:left;
max-height:20px;
line-height:18px;
Expand Down Expand Up @@ -266,7 +271,7 @@
}

.upload-top {
height:5%;
height:20px;
text-align:center;
.upload-info {
margin-top: 0px;
Expand Down
2 changes: 1 addition & 1 deletion static/maps/mvc/upload/composite/composite-view.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7c0ad6b

Please sign in to comment.