-
+
Show more
diff --git a/client/galaxy/scripts/components/Toolshed/ServerSelection.vue b/client/galaxy/scripts/components/Toolshed/ServerSelection.vue
index abd24b8d522..466a61648e1 100644
--- a/client/galaxy/scripts/components/Toolshed/ServerSelection.vue
+++ b/client/galaxy/scripts/components/Toolshed/ServerSelection.vue
@@ -10,7 +10,8 @@
v-for="url in toolshedUrls"
:key="url"
class="dropdown-item"
- href="#"
+ href="javascript:void(0)"
+ role="button"
@click.prevent="onToolshed(url)"
>{{ url }}
diff --git a/client/galaxy/scripts/components/login/Login.vue b/client/galaxy/scripts/components/login/Login.vue
index 149251ea0c7..b13e168fd93 100644
--- a/client/galaxy/scripts/components/login/Login.vue
+++ b/client/galaxy/scripts/components/login/Login.vue
@@ -12,8 +12,8 @@
Forgot password? Click here to reset your
- password. Forgot password? Click here to reset your
+ password.
Login
@@ -21,7 +21,7 @@
Don't have an account?
- Register here.
+ Register here.
Registration for this Galaxy instance is disabled. Please contact an administrator for
diff --git a/client/galaxy/scripts/components/login/Register.vue b/client/galaxy/scripts/components/login/Register.vue
index 30a90483ce8..af71cb8969f 100644
--- a/client/galaxy/scripts/components/login/Register.vue
+++ b/client/galaxy/scripts/components/login/Register.vue
@@ -37,7 +37,7 @@
Already have an account?
- Log in here.
+ Log in here.
diff --git a/client/galaxy/scripts/layout/masthead.js b/client/galaxy/scripts/layout/masthead.js
index dc41a0b738d..367f280f814 100644
--- a/client/galaxy/scripts/layout/masthead.js
+++ b/client/galaxy/scripts/layout/masthead.js
@@ -98,8 +98,8 @@ const View = Backbone.View.extend({
_template: function() {
return `
-
-
+
diff --git a/client/galaxy/scripts/layout/menu.js b/client/galaxy/scripts/layout/menu.js
index e7bacebe9fa..10cb4da0ce2 100644
--- a/client/galaxy/scripts/layout/menu.js
+++ b/client/galaxy/scripts/layout/menu.js
@@ -66,24 +66,26 @@ const Collection = Backbone.Collection.extend({
//
// Visualization tab.
//
- this.add({
- id: "visualization",
- title: _l("Visualize"),
- tooltip: _l("Visualize datasets"),
- disabled: !Galaxy.user.id,
- menu: [
- {
- title: _l("Create Visualization"),
- url: "visualizations",
- target: "__use_router__"
- },
- {
- title: _l("Interactive Environments"),
- url: "visualization/gie_list",
- target: "galaxy_main"
- }
- ]
- });
+ if (Galaxy.config.visualizations_visible) {
+ this.add({
+ id: "visualization",
+ title: _l("Visualize"),
+ tooltip: _l("Visualize datasets"),
+ disabled: !Galaxy.user.id,
+ menu: [
+ {
+ title: _l("Create Visualization"),
+ url: "visualizations",
+ target: "__use_router__"
+ },
+ {
+ title: _l("Interactive Environments"),
+ url: "visualization/gie_list",
+ target: "galaxy_main"
+ }
+ ]
+ });
+ }
//
// 'Shared Items' or Libraries tab.
@@ -298,12 +300,6 @@ const Collection = Backbone.Collection.extend({
url: "pages/list",
target: "__use_router__"
},
- {
- title: _l("Visualizations"),
- url: "visualizations/list",
- target: "__use_router__",
- divider: true,
- },
{
title: _l("Active InteractiveTools"),
url: "realtime_entry_points/list",
@@ -311,6 +307,13 @@ const Collection = Backbone.Collection.extend({
}
]
};
+ if (Galaxy.config.visualizations_visible) {
+ userTab.menu.push({
+ title: _l("Visualizations"),
+ url: "visualizations/list",
+ target: "__use_router__"
+ });
+ }
}
this.add(userTab);
return new $.Deferred().resolve().promise();
diff --git a/client/galaxy/scripts/legacy/grid/grid-template.js b/client/galaxy/scripts/legacy/grid/grid-template.js
index e5fda7d790f..ea12c2ab369 100644
--- a/client/galaxy/scripts/legacy/grid/grid-template.js
+++ b/client/galaxy/scripts/legacy/grid/grid-template.js
@@ -387,7 +387,7 @@ export default {
// show advanced search link in standard display
if (show_advanced_search_link) {
- tmpl += 'Advanced Search ';
+ tmpl += 'Advanced Search ';
}
// finalize standard search display
@@ -396,7 +396,7 @@ export default {
//
// advanced search
//
- tmpl += `Close Advanced Search Close Advanced Search ${text} `);
+ var t = $(`${text} `);
t.click(() => {
self.set_categorical_filter(name, filter_value);
});
@@ -441,7 +441,7 @@ export default Backbone.View.extend({
text = $(this).text();
$(this).empty();
$(this).removeClass("inactive-link");
- var t = $(`${text} `);
+ var t = $(`${text} `);
t.click(() => {
self.set_page(page_num);
});
diff --git a/client/galaxy/scripts/mvc/collection/list-collection-creator.js b/client/galaxy/scripts/mvc/collection/list-collection-creator.js
index 3bf74c9a950..a613f5cd13d 100644
--- a/client/galaxy/scripts/mvc/collection/list-collection-creator.js
+++ b/client/galaxy/scripts/mvc/collection/list-collection-creator.js
@@ -59,7 +59,7 @@ var DatasetCollectionElementView = Backbone.View.extend(BASE_MVC.LoggableMixin).
[
'',
+ '" href="javascript:void(0)" role="button">',
"<%- element.name %>",
" ",
'${_l("Cancel")} `;
+ message += `${_l("Cancel")} `;
message += _l("or");
- message += ` ${_l("start over")} .`;
+ message += ` ${_l("start over")} .`;
this._showAlert(message);
return;
}
@@ -778,11 +778,11 @@ var ListCollectionCreator = Backbone.View.extend(BASE_MVC.LoggableMixin)
header: _.template(
[
'',
- '
',
+ ' ',
_l("More help"),
" ",
'
",
@@ -801,13 +801,13 @@ var ListCollectionCreator = Backbone.View.extend(BASE_MVC.LoggableMixin)
middle: _.template(
[
'
',
- '
',
_l("Start over"),
" ",
- '
',
@@ -852,10 +852,10 @@ var ListCollectionCreator = Backbone.View.extend(BASE_MVC.LoggableMixin)
' ',
_l("No elements left! "),
_l("Would you like to "),
- '',
+ ' ',
_l("start over"),
" ?",
" "
@@ -980,7 +980,7 @@ var ListCollectionCreator = Backbone.View.extend(BASE_MVC.LoggableMixin)
_l("At least one element is needed for the collection"),
". ",
_l("You may need to "),
- ' ',
+ ' ',
_l("cancel"),
" ",
_l("and reselect new elements"),
diff --git a/client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js b/client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
index 52d84691d82..41e7ade12de 100644
--- a/client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
+++ b/client/galaxy/scripts/mvc/collection/list-of-pairs-collection-creator.js
@@ -1545,11 +1545,11 @@ var PairedCollectionCreator = Backbone.View.extend(baseMVC.LoggableMixin)
header: _.template(
[
'
',
- '
',
+ ' ',
_l("More help"),
" ",
'
",
@@ -1577,13 +1577,13 @@ var PairedCollectionCreator = Backbone.View.extend(baseMVC.LoggableMixin)
"
",
'
',
'
',
- '
',
+ ' ',
_l("Choose filters"),
" ",
- '
',
+ ' ',
_l("Clear filters"),
" ",
- '
',
+ ' ',
_l("Auto-pair"),
" ",
"
",
@@ -1630,7 +1630,7 @@ var PairedCollectionCreator = Backbone.View.extend(baseMVC.LoggableMixin)
'
',
'
",
- '
',
+ ' ',
_l("Unpair all"),
" ",
"
",
@@ -1679,10 +1679,10 @@ var PairedCollectionCreator = Backbone.View.extend(baseMVC.LoggableMixin)
'
',
"",
'",
diff --git a/client/galaxy/scripts/mvc/dataset/dataset-li-edit.js b/client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
index 87417282ce6..742b2f33170 100644
--- a/client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
+++ b/client/galaxy/scripts/mvc/dataset/dataset-li-edit.js
@@ -263,15 +263,21 @@ var DatasetListItemEdit = _super.extend(
/** Render an icon-button or popupmenu of links based on the applicable visualizations */
_renderVisualizationsButton: function() {
//TODO: someday - lazyload visualizations
- var visualizations = this.model.get("visualizations");
- if (this.model.isDeletedOrPurged() || !this.hasUser || !this.model.hasData() || _.isEmpty(visualizations)) {
+ const Galaxy = getGalaxyInstance();
+ const visualizations = this.model.get("visualizations");
+ if (
+ !Galaxy.config.visualizations_visible ||
+ this.model.isDeletedOrPurged() ||
+ !this.hasUser ||
+ !this.model.hasData() ||
+ _.isEmpty(visualizations)
+ ) {
return null;
}
if (!_.isObject(visualizations[0])) {
this.warn("Visualizations have been switched off");
return null;
}
-
if (visualizations.length >= 1) {
const dsid = this.model.get("id");
const url = getAppRoot() + "visualizations?dataset_id=" + dsid;
@@ -281,7 +287,6 @@ var DatasetListItemEdit = _super.extend(
classes: "visualization-link",
faIcon: "fa-bar-chart-o",
onclick: ev => {
- const Galaxy = getGalaxyInstance();
if (Galaxy.frame && Galaxy.frame.active) {
ev.preventDefault();
Galaxy.frame.add({ url: url, title: "Visualization" });
diff --git a/client/galaxy/scripts/mvc/grid/grid-template.js b/client/galaxy/scripts/mvc/grid/grid-template.js
index a9975babc93..6852d68d8dc 100644
--- a/client/galaxy/scripts/mvc/grid/grid-template.js
+++ b/client/galaxy/scripts/mvc/grid/grid-template.js
@@ -403,7 +403,7 @@ export default {
// show advanced search link in standard display
if (show_advanced_search_link) {
- tmpl += '
Advanced Search ';
+ tmpl += '
Advanced Search ';
}
// finalize standard search display
@@ -412,7 +412,7 @@ export default {
//
// advanced search
//
- tmpl += `
Close Advanced Search Close Advanced Search ${text} `);
+ var t = $(`${text} `);
t.click(() => {
self.set_categorical_filter(name, filter_value);
});
@@ -458,7 +458,7 @@ export default Backbone.View.extend({
text = $(this).text();
$(this).empty();
$(this).removeClass("inactive-link");
- var t = $(`${text} `);
+ var t = $(`${text} `);
t.click(() => {
self.set_page(page_num);
});
diff --git a/client/galaxy/scripts/mvc/history/hdca-li-edit.js b/client/galaxy/scripts/mvc/history/hdca-li-edit.js
index d9d8a6e5074..70b017c695d 100644
--- a/client/galaxy/scripts/mvc/history/hdca-li-edit.js
+++ b/client/galaxy/scripts/mvc/history/hdca-li-edit.js
@@ -40,13 +40,13 @@ var HDCAListItemEdit = _super.extend(