Skip to content

Commit

Permalink
Merge pull request #2 from dannon/selten_dev
Browse files Browse the repository at this point in the history
A few more tweaks to tours
  • Loading branch information
selten committed Oct 24, 2017
2 parents b777762 + f5ae8d2 commit 32ffcaf
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 15 deletions.
13 changes: 7 additions & 6 deletions client/galaxy/scripts/mvc/tours.js
Expand Up @@ -32,8 +32,8 @@ Select any tour to get started (and remember, you can click 'End Tour' at any ti
</a>
- <%- tour.attributes.description || \"No description given.\" %>
<% _.each(tour.attributes.tags, function(tag) { %>
<span class="label label-primary">
<%- tag %>
<span class="label label-primary sm-label-pad">
<%- tag.charAt(0).toUpperCase() + tag.slice(1) %>
</span>
<% }); %>
</li>
Expand Down Expand Up @@ -137,16 +137,17 @@ Select any tour to get started (and remember, you can click 'End Tour' at any ti
var tourtags = {};
_.each(this.model.models, function(tour) {
if (tour.attributes.tags === null) {
if (tourtags[""] === undefined) {
tourtags[""] = { name: "Untagged", tours: [] };
if (tourtags.Untagged === undefined) {
tourtags.Untagged = { name: "Untagged", tours: [] };
}
tourtags[""]["tours"].push(tour);
tourtags.Untagged.tours.push(tour);
} else {
_.each(tour.attributes.tags, function(tag) {
tag = tag.charAt(0).toUpperCase() + tag.slice(1);
if (tourtags[tag] === undefined) {
tourtags[tag] = { name: tag, tours: [] };
}
tourtags[tag]["tours"].push(tour);
tourtags[tag].tours.push(tour);
});
}
});
Expand Down
4 changes: 4 additions & 0 deletions client/galaxy/style/less/base.less
Expand Up @@ -1086,6 +1086,10 @@ div.odd_row {
.label-info();
}

.sm-label-pad {
margin-right: 2px;
}

span.toolParameterExpandableCollapsable {
font-weight: bold;
cursor: pointer;
Expand Down
2 changes: 1 addition & 1 deletion config/plugins/tours/core.galaxy_ui.yaml
Expand Up @@ -3,7 +3,7 @@ name: Galaxy UI
description: A gentle introduction to the Galaxy User Interface
title_default: "Welcome to Galaxy"
tags:
- "default"
- "core"
- "UI"

# A tour is made of several steps, each of them beginning with a dash '-'
Expand Down
2 changes: 1 addition & 1 deletion config/plugins/tours/core.history.yaml
Expand Up @@ -2,7 +2,7 @@ name: History Introduction
description: A detailed introduction to the Galaxy History
title_default: "Galaxy History Introduction"
tags:
- "default"
- "core"
- "history"

steps:
Expand Down
4 changes: 2 additions & 2 deletions config/plugins/tours/core.scratchbook.yaml
Expand Up @@ -2,9 +2,9 @@ name: Scratchbook - Introduction
title_default: "Scratchbook Introduction"
description: "An introduction on how to display multiple datasets and visualizations next to each other."
tags:
- "default"
- "core"
- "UI"
- "visualisation"
- "visualization"

steps:
- content: "This short tour will walk you through <b>Galaxy's Scratchbook</b> feature"
Expand Down
2 changes: 1 addition & 1 deletion static/maps/mvc/tours.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/libs.bundled.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/libs.bundled.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/mvc/tours.js

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

2 changes: 1 addition & 1 deletion static/style/blue/base.css

Large diffs are not rendered by default.

0 comments on commit 32ffcaf

Please sign in to comment.