From 3d155f0be0c91dbfe891394261c08922f75f3f17 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 16 Nov 2016 12:24:28 -0500 Subject: [PATCH 1/2] Fix history list selector --- config/plugins/tours/core.history.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/config/plugins/tours/core.history.yaml b/config/plugins/tours/core.history.yaml index cb4bf349bb0..5e0e28f59f6 100644 --- a/config/plugins/tours/core.history.yaml +++ b/config/plugins/tours/core.history.yaml @@ -54,42 +54,42 @@ steps: - "div.title-bar.clear:eq(0)" - title: "Metadata" - element: "#current-history-panel > div.list-items > div:nth-child(1) > div.details > div.summary > div.datatype > label" + element: "#current-history-panel > ul.list-items > div:nth-child(1) > div.details > div.summary > div.datatype > label" intro: "Galaxy has assigned a datatype to your dataset during upload, which you can see here." position: "left" - - element: "#current-history-panel > div.list-items > div:nth-child(1) > div.details > div.actions.clear > div.left > a.download-btn.icon-btn" + - element: "#current-history-panel > ul.list-items > div:nth-child(1) > div.details > div.actions.clear > div.left > a.download-btn.icon-btn" title: "Download your dataset" intro: "You can download every dataset by using the floppy disc symbol." position: "left" - - element: "#current-history-panel > div.list-items > div:nth-child(1) > div.details > div.actions.clear > div.left > a.icon-btn.params-btn" + - element: "#current-history-panel > ul.list-items > div:nth-child(1) > div.details > div.actions.clear > div.left > a.icon-btn.params-btn" title: "Even more information" intro: "Get an overview of all metadata associated with your dataset by using the Information symbol." position: "left" preclick: - - "#current-history-panel > div.list-items > div:nth-child(1) > div.details > div.actions.clear > div.left > a.icon-btn.params-btn" + - "#current-history-panel > ul.list-items > div:nth-child(1) > div.details > div.actions.clear > div.left > a.icon-btn.params-btn" - - element: "#current-history-panel > div.list-items > div:nth-child(1) > div.primary-actions > a.icon-btn.display-btn" + - element: "#current-history-panel > ul.list-items > div:nth-child(1) > div.primary-actions > a.icon-btn.display-btn" title: "Inspect your data" intro: "The eye symbol can be used to look at your data." position: "left" preclick: - - "#current-history-panel > div.list-items > div:nth-child(1) > div.primary-actions > a.icon-btn.display-btn" + - "#current-history-panel > ul.list-items > div:nth-child(1) > div.primary-actions > a.icon-btn.display-btn" - - element: "#current-history-panel > div.list-items > div:nth-child(1) > div.primary-actions > a.icon-btn.edit-btn" + - element: "#current-history-panel > ul.list-items > div:nth-child(1) > div.primary-actions > a.icon-btn.edit-btn" title: "Edit metadata" intro: "With the pencil button you can edit metadata attributes of your dataset, like the associated filetype or the dataset name." position: "left" preclick: - - "#current-history-panel > div.list-items > div:nth-child(1) > div.primary-actions > a.icon-btn.edit-btn" + - "#current-history-panel > ul.list-items > div:nth-child(1) > div.primary-actions > a.icon-btn.edit-btn" - - element: "#current-history-panel > div.list-items > div:nth-child(1) > div.primary-actions > a.icon-btn.delete-btn" + - element: "#current-history-panel > ul.list-items > div:nth-child(1) > div.primary-actions > a.icon-btn.delete-btn" title: "Remove datasets" intro: "You can remove a dataset from the history with the cross symbol." position: "left" postclick: - - "#current-history-panel > div.list-items > div:nth-child(1) > div.primary-actions > a.icon-btn.delete-btn" + - "#current-history-panel > ul.list-items > div:nth-child(1) > div.primary-actions > a.icon-btn.delete-btn" - element: "#current-history-panel > div.controls > div.subtitle > a" title: "Include all deleted datasets" @@ -98,14 +98,14 @@ steps: postclick: - "#current-history-panel > div.controls > div.subtitle > a" - - element: "#current-history-panel > div.list-items > div:nth-child(1) > div.warnings > div > a" + - element: "#current-history-panel > ul.list-items > div:nth-child(1) > div.warnings > div > a" title: "Undeleting a dataset" intro: | Galaxy datasets are only marked as deleled and can be recovered by clicking this link. Please note that datasets marked as deleted can be purged by your administrator at any time. position: "bottom" postclick: - - "#current-history-panel > div.list-items > div:nth-child(1) > div.warnings > div > a" + - "#current-history-panel > ul.list-items > div:nth-child(1) > div.warnings > div > a" - element: "#current-history-panel > div.controls > div.subtitle > a" title: "Hiding all deleted datasets" From b57a961f250968d6d62eff142b4ee6e046085fda Mon Sep 17 00:00:00 2001 From: John Chilton Date: Wed, 21 Dec 2016 21:48:23 -0500 Subject: [PATCH 2/2] Merge changes fixing tour from dev commit 10720fa4f9e26b3feec1a90468f4ecc726a99c05 Cannot do a full cherry-pick because the test modified did not exist in 16.10. --- config/plugins/tours/core.history.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/plugins/tours/core.history.yaml b/config/plugins/tours/core.history.yaml index 5e0e28f59f6..3a0e84059f6 100644 --- a/config/plugins/tours/core.history.yaml +++ b/config/plugins/tours/core.history.yaml @@ -91,12 +91,12 @@ steps: postclick: - "#current-history-panel > ul.list-items > div:nth-child(1) > div.primary-actions > a.icon-btn.delete-btn" - - element: "#current-history-panel > div.controls > div.subtitle > a" + - element: "#current-history-panel > .controls > .subtitle .toggle-deleted-link" title: "Include all deleted datasets" intro: "By default your history will hide all deleted datasets from you. You can visualize them by toggling this button." position: "bottom" postclick: - - "#current-history-panel > div.controls > div.subtitle > a" + - "#current-history-panel > .controls > .subtitle .toggle-deleted-link" - element: "#current-history-panel > ul.list-items > div:nth-child(1) > div.warnings > div > a" title: "Undeleting a dataset" @@ -107,12 +107,12 @@ steps: postclick: - "#current-history-panel > ul.list-items > div:nth-child(1) > div.warnings > div > a" - - element: "#current-history-panel > div.controls > div.subtitle > a" + - element: "#current-history-panel > div.controls > .subtitle .toggle-deleted-link" title: "Hiding all deleted datasets" intro: "Hiding datasets that were previously deleted works in the same way." position: "bottom" preclick: - - "#current-history-panel > div.controls > div.subtitle > a" + - "#current-history-panel > div.controls > .subtitle .toggle-deleted-link" - element: "#current-history-panel > div.controls > div.title > div" title: "Change your History name"