diff --git a/client/galaxy/scripts/layout/menu.js b/client/galaxy/scripts/layout/menu.js index be37421f08a..e494d17e039 100644 --- a/client/galaxy/scripts/layout/menu.js +++ b/client/galaxy/scripts/layout/menu.js @@ -279,22 +279,27 @@ var Collection = Backbone.Collection.extend({ onclick: logoutClick }, { - title: _l("Saved Datasets"), + title: _l("Datasets"), url: "datasets/list", target: "__use_router__" }, { - title: _l("Saved Histories"), + title: _l("Histories"), url: "histories/list", target: "__use_router__" }, { - title: _l("Saved Pages"), + title: _l("Histories shared with me"), + url: "histories/list_shared", + target: "__use_router__" + }, + { + title: _l("Pages"), url: "pages/list", target: "__use_router__" }, { - title: _l("Saved Visualizations"), + title: _l("Visualizations"), url: "visualizations/list", target: "__use_router__" } diff --git a/client/galaxy/scripts/mvc/history/options-menu.js b/client/galaxy/scripts/mvc/history/options-menu.js index 1f678403c07..411d4a6d2cb 100644 --- a/client/galaxy/scripts/mvc/history/options-menu.js +++ b/client/galaxy/scripts/mvc/history/options-menu.js @@ -10,26 +10,12 @@ import Webhooks from "mvc/webhooks"; // ============================================================================ var menu = [ { - html: _l("History Lists"), - header: true - }, - { - html: _l("Saved Histories"), - href: "histories/list", - target: "_top" - }, - { - html: _l("Histories Shared with Me"), - href: "histories/list_shared", - target: "_top" - }, - { - html: _l("Current History"), + html: _l("History Actions"), header: true, anon: true }, { - html: _l("Copy History"), + html: _l("Copy"), func: function() { const Galaxy = getGalaxyInstance(); historyCopyDialog(Galaxy.currHistoryPanel.model).done(() => { @@ -61,7 +47,16 @@ var menu = [ href: "workflow/build_from_current_history" }, { - html: _l("Make Data Private"), + html: _l("Set Permissions"), + func: function() { + const Galaxy = getGalaxyInstance(); + if (Galaxy && Galaxy.currHistoryPanel && Galaxy.router) { + Galaxy.router.push(`/histories/permissions?id=${Galaxy.currHistoryPanel.model.id}`); + } + } + }, + { + html: _l("Make Private"), anon: true, func: function() { const Galaxy = getGalaxyInstance(); @@ -80,6 +75,11 @@ var menu = [ } } }, + { + html: _l("Resume Paused Jobs"), + href: "history/resume_paused_jobs?current=True", + anon: true + }, { html: _l("Dataset Actions"), header: true, @@ -89,20 +89,6 @@ var menu = [ html: _l("Copy Datasets"), href: "dataset/copy_datasets" }, - { - html: _l("Dataset Security"), - func: function() { - const Galaxy = getGalaxyInstance(); - if (Galaxy && Galaxy.currHistoryPanel && Galaxy.router) { - Galaxy.router.push(`/histories/permissions?id=${Galaxy.currHistoryPanel.model.id}`); - } - } - }, - { - html: _l("Resume Paused Jobs"), - href: "history/resume_paused_jobs?current=True", - anon: true - }, { html: _l("Collapse Expanded Datasets"), func: function() {