Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use regular font-size and styling in uploader #7232

Merged
merged 12 commits into from Jan 18, 2019
Merged

Use regular font-size and styling in uploader #7232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f663e09
Use regular font-size in popovers by default
guerler Jan 16, 2019
9a6ae4d
Use multistring for composite upload row template
guerler Jan 16, 2019
73e027b
Use multistring for composite upload view template
guerler Jan 16, 2019
4c0df7e
Use multistring for collection upload view template
guerler Jan 16, 2019
7e4a051
Fix font size handling in upload view
guerler Jan 16, 2019
ca4e567
Fix footer styles in upload view
guerler Jan 17, 2019
bdc2584
Merge branch 'dev' into upload_view_fixes
guerler Jan 17, 2019
bf27a7c
Use regular font size throughout uploader
guerler Jan 17, 2019
43409ce
Fix collection uploaders table header alignment
guerler Jan 17, 2019
1cacdb7
Apply suggestions from code review
nsoranzo Jan 18, 2019
6713667
Adjust info message padding for uploader, convert nav-tabs margin fro…
dannon Jan 18, 2019
7742bed
Leave a block element in upload-top-info for consistent spacing. The…
dannon Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/galaxy/scripts/mvc/upload/collection/collection-row.js
View file
Open in desktop
Expand Up @@ -160,7 +160,7 @@ export default Backbone.View.extend({
_template: function(options) {
return `<tr id="upload-row-${
options.id
}" class="upload-row"><td><div class="upload-text-column"><div class="upload-mode"/><div class="upload-title-extended"/><div class="upload-text"><div class="upload-text-info">You can tell Galaxy to download data from web by entering URL in this box (one per line). You can also directly paste the contents of a file.</div><textarea class="upload-text-content form-control"/></div></div></td><td><div class="upload-size"/></td><td><div class="upload-info"><div class="upload-info-text"/><div class="upload-info-progress progress"><div class="upload-progress-bar progress-bar progress-bar-success"/><div class="upload-percentage">0%</div></div></div></td><td><div class="upload-symbol ${
}" class="upload-row"><td><div class="upload-text-column"><div class="upload-mode"/><div class="upload-title-extended"/><div class="upload-text"><div class="upload-text-info">Download data from the web by entering URLs (one per line) or directly paste content.</div><textarea class="upload-text-content form-control"/></div></div></td><td><div class="upload-size"/></td><td><div class="upload-info"><div class="upload-info-text"/><div class="upload-info-progress progress"><div class="upload-progress-bar progress-bar progress-bar-success"/><div class="upload-percentage">0%</div></div></div></td><td><div class="upload-symbol ${
this.status_classes.init
}"/></td></tr>`;
}
Expand Down
62 changes: 31 additions & 31 deletions client/galaxy/scripts/mvc/upload/collection/collection-view.js
View file
Open in desktop
Expand Up @@ -155,7 +155,6 @@ export default Backbone.View.extend({

// select extension
this.select_extension = new Select.View({
css: "upload-footer-selection-compressed",
container: this.$(".upload-footer-extension"),
data: _.filter(this.list_extensions, ext => !ext.composite_files),
value: this.options.default_extension,
Expand All @@ -166,7 +165,6 @@ export default Backbone.View.extend({

this.collectionType = "list";
this.select_collection = new Select.View({
css: "upload-footer-selection-compressed",
container: this.$(".upload-footer-collection-type"),
data: [
{ id: "list", text: "List" },
Expand Down Expand Up @@ -467,35 +465,37 @@ export default Backbone.View.extend({
/** Template */
_template: function() {
return (
'<div class="upload-view-default">' +
'<div class="upload-top">' +
'<h6 class="upload-top-info"/>' +
"</div>" +
'<div class="upload-box">' +
'<div class="upload-helper"><i class="fa fa-files-o"/>Drop files here</div>' +
'<table class="upload-table ui-table-striped" style="display: none;">' +
"<thead>" +
"<tr>" +
"<th>Name</th>" +
"<th>Size</th>" +
"<th>Status</th>" +
"<th/>" +
"</tr>" +
"</thead>" +
"<tbody/>" +
"</table>" +
"</div>" +
'<div class="upload-footer">' +
'<span class="upload-footer-title-compressed">Collection Type:</span>' +
'<span class="upload-footer-collection-type"/>' +
'<span class="upload-footer-title-compressed">File Type:</span>' +
'<span class="upload-footer-extension"/>' +
'<span class="upload-footer-extension-info upload-icon-button fa fa-search"/> ' +
'<span class="upload-footer-title-compressed">Genome (set all):</span>' +
'<span class="upload-footer-genome"/>' +
"</div>" +
'<div class="upload-buttons"/>' +
"</div>"
`<div class="upload-view-default">
<div class="upload-top">
<div class="upload-top-info"/>
</div>
<div class="upload-box">
<div class="upload-helper">
<i class="fa fa-files-o"/>Drop files here
</div>
<table class="upload-table ui-table-striped" style="display: none;">
<thead>
<tr>
<th>Name</th>
<th>Size</th>
<th>Status</th>
<th/>
</tr>
</thead>
<tbody/>
</table>
</div>
<div class="upload-footer">
<span class="upload-footer-title">Collection Type:</span>
<span class="upload-footer-collection-type"/>
<span class="upload-footer-title">File Type:</span>
<span class="upload-footer-extension"/>
<span class="upload-footer-extension-info upload-icon-button fa fa-search"/>
<span class="upload-footer-title">Genome (set all):</span>
<span class="upload-footer-genome"/>
</div>
<div class="upload-buttons"/>
</div>`
);
}
});
4 changes: 2 additions & 2 deletions client/galaxy/scripts/mvc/upload/collection/rules-input-view.js
View file
Open in desktop
Expand Up @@ -182,9 +182,9 @@ export default Backbone.View.extend({
return `
<div class="upload-view-default">
<div class="upload-top">
<h6 class="upload-top-info">
<div class="upload-top-info">
Tabular source data to extract collection files and metadata from
</h6>
</div>
</div>
<div class="upload-box" style="height: 335px;">
<span style="width: 25%; display: inline; height: 100%" class="float-left">
Expand Down
68 changes: 35 additions & 33 deletions client/galaxy/scripts/mvc/upload/composite/composite-row.js
View file
Open in desktop
Expand Up @@ -286,39 +286,41 @@ export default Backbone.View.extend({
/** Template */
_template: function() {
return (
'<tr class="upload-row">' +
"<td>" +
'<div class="upload-source"/>' +
'<div class="upload-text-column">' +
'<div class="upload-text">' +
'<div class="upload-text-info">You can tell Galaxy to download data from web by entering URL in this box (one per line). You can also directly paste the contents of a file.</div>' +
'<textarea class="upload-text-content form-control"/>' +
"</div>" +
"</div>" +
"</td>" +
"<td>" +
'<div class="upload-status"/>' +
"</td>" +
"<td>" +
'<div class="upload-file-desc upload-title"/>' +
"</td>" +
"<td>" +
'<div class="upload-file-name upload-title"/>' +
"</td>" +
"<td>" +
'<div class="upload-file-size upload-size"/>' +
"</td>" +
'<td><div class="upload-settings upload-icon-button fa fa-gear"/></td>' +
"<td>" +
'<div class="upload-info">' +
'<div class="upload-info-text"/>' +
'<div class="upload-info-progress progress">' +
'<div class="upload-progress-bar progress-bar progress-bar-success"/>' +
'<div class="upload-percentage">0%</div>' +
"</div>" +
"</div>" +
"</td>" +
"</tr>"
`<tr class="upload-row">
<td>
<div class="upload-source"/>
<div class="upload-text-column">
<div class="upload-text">
<div class="upload-text-info">Download data from the web by entering a URL (one per line) or directly paste content.</div>
<textarea class="upload-text-content form-control"/>
</div>
</div>
</td>
<td>
<div class="upload-status"/>
</td>
<td>
<div class="upload-file-desc upload-title"/>
</td>
<td>
<div class="upload-file-name upload-title"/>
</td>
<td>
<div class="upload-file-size upload-size"/>
</td>
<td>
<div class="upload-settings upload-icon-button fa fa-gear"/>
</td>
<td>
<div class="upload-info">
<div class="upload-info-text"/>
<div class="upload-info-progress progress">
<div class="upload-progress-bar progress-bar progress-bar-success"/>
<div class="upload-percentage">0%</div>
</div>
</div>
</td>
</tr>`
);
}
});
58 changes: 29 additions & 29 deletions client/galaxy/scripts/mvc/upload/composite/composite-view.js
View file
Open in desktop
Expand Up @@ -177,35 +177,35 @@ export default Backbone.View.extend({
/** Load html template */
_template: function() {
return (
'<div class="upload-view-composite">' +
'<div class="upload-top">' +
'<h6 class="upload-top-info"/>' +
"</div>" +
'<div class="upload-box">' +
'<table class="upload-table ui-table-striped" style="display: none;">' +
"<thead>" +
"<tr>" +
"<th/>" +
"<th/>" +
"<th>Description</th>" +
"<th>Name</th>" +
"<th>Size</th>" +
"<th>Settings</th>" +
"<th>Status</th>" +
"</tr>" +
"</thead>" +
"<tbody/>" +
"</table>" +
"</div>" +
'<div class="upload-footer">' +
'<span class="upload-footer-title">Composite Type:</span>' +
'<span class="upload-footer-extension"/>' +
'<span class="upload-footer-extension-info upload-icon-button fa fa-search"/> ' +
'<span class="upload-footer-title">Genome/Build:</span>' +
'<span class="upload-footer-genome"/>' +
"</div>" +
'<div class="upload-buttons"/>' +
"</div>"
`<div class="upload-view-composite">
<div class="upload-top">
<div class="upload-top-info">&nbsp;</div>
</div>
<div class="upload-box">
<table class="upload-table ui-table-striped" style="display: none;">
<thead>
<tr>
<th/>
<th/>
<th>Description</th>
<th>Name</th>
<th>Size</th>
<th>Settings</th>
<th>Status</th>
</tr>
</thead>
<tbody/>
</table>
</div>
<div class="upload-footer">
<span class="upload-footer-title">Composite Type:</span>
<span class="upload-footer-extension"/>
<span class="upload-footer-extension-info upload-icon-button fa fa-search"/>
<span class="upload-footer-title">Genome/Build:</span>
<span class="upload-footer-genome"/>
</div>
<div class="upload-buttons"/>
</div>`
);
}
});
2 changes: 1 addition & 1 deletion client/galaxy/scripts/mvc/upload/default/default-row.js
View file
Open in desktop
Expand Up @@ -280,7 +280,7 @@ export default Backbone.View.extend({
<input class="upload-title ml-2 border rounded"/>
<div class="upload-text">
<div class="upload-text-info">
You can tell Galaxy to download data from web by entering URL in this box (one per line). You can also directly paste the contents of a file.
Download data from the web by entering URLs (one per line) or directly paste content.
</div>
<textarea class="upload-text-content form-control"/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion client/galaxy/scripts/mvc/upload/default/default-view.js
View file
Open in desktop
Expand Up @@ -467,7 +467,7 @@ export default Backbone.View.extend({
_template: function() {
return `<div class="upload-view-default">
<div class="upload-top">
<h6 class="upload-top-info"/>
<div class="upload-top-info"/>
</div>
<div class="upload-box">
<div class="upload-helper">
Expand Down
6 changes: 5 additions & 1 deletion client/galaxy/style/scss/overrides.scss
View file
Open in desktop
Expand Up @@ -28,6 +28,10 @@ pre {
border: 1px solid $border-default-color;
}

.popover .popover-body {
font-size: $font-size-base;
}

.dropdown-menu {
max-width: auto;
.dropdown-item {
Expand Down Expand Up @@ -75,7 +79,7 @@ input[type="radio"] {
// Tabs -- border color is hardcoded in navs.scss, change to $btnBorder here

.nav-tabs {
margin-bottom: 15px;
@extend .mb-2;
}

// Don't make blockquotes very large since they're often used in the toolform
Expand Down