From e4310f28ce8371b531f992784d06fbd4dbb396fd Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 17 Aug 2015 11:11:01 +0000
Subject: [PATCH] SSDM-2340 : Support open on new tab for all javascript links.
SVN: 34468
---
.../eln-lims/1/as/webapps/eln-lims/html/css/style.css | 1 -
.../eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js | 2 +-
.../webapps/eln-lims/html/js/views/legacy/DataSetViewer.js | 5 ++++-
.../eln-lims/html/js/views/legacy/SampleLinksWidget.js | 2 --
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
index 5f18cacc3f6..dafa5725da8 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css
@@ -575,5 +575,4 @@ table.downloads {
*/
.browser-compatible-javascript-link {
text-decoration: none;
- color: #000000;
}
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
index 215a228277e..886f99308b6 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
@@ -303,7 +303,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
var $menuItemLink = null;
if (menuItem.isSelectable) {
- $menuItemLink = $("<a>", {"href": href, "class" : "browser-compatible-javascript-link"}).append(itemDisplayName);
+ $menuItemLink = $("<a>", {"href": href, "class" : "browser-compatible-javascript-link", "style" : "color: #000000"}).append(itemDisplayName);
} else {
$menuItemLink = itemDisplayName;
}
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/DataSetViewer.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/DataSetViewer.js
index c76ecfc0665..866e73fe269 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/DataSetViewer.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/DataSetViewer.js
@@ -347,8 +347,11 @@ function DataSetViewer(containerId, profile, sample, serverFacade, datastoreDown
}
for(var i = 0; i < datasetFiles.length; i++) {
+
+ var href = Util.getURLFor(mainController.sideMenu.getCurrentNodeId(), "showViewDataSetPageFromPermId", datasetCode);
+ var $datasetLink = $("<a>", {"class" : "browser-compatible-javascript-link", "href" : href }).append(dataset.code);
var $tableRow = $("<tr>")
- .append($("<td>").html(dataset.code))
+ .append($("<td>").html($datasetLink))
.append($("<td>").html(dataset.dataSetTypeCode));
var downloadUrl = datastoreDownloadURL + '/' + dataset.code + "/" + encodeURIComponent(datasetFiles[i].pathInDataSet) + "?sessionID=" + this.serverFacade.getSession();
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/SampleLinksWidget.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/SampleLinksWidget.js
index cb98ede0880..4055b322542 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/SampleLinksWidget.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/legacy/SampleLinksWidget.js
@@ -431,8 +431,6 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType
if(sampleToAdd.notFound) {
style = "color: red;"
notFound = " (Not Found)"
- } else {
- style = "color: #337AB7;"
}
var href = Util.getURLFor(mainController.sideMenu.getCurrentNodeId(), "showViewSamplePageFromPermId", sampleToAdd.permId);
--
GitLab