Merge branch 'dev-2.1'

NCEAS · Aug 7, 2018 · 9617235 · 9617235
2 parents 00760bb + 0c3bf09
commit 9617235
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 21 deletions.
diff --git a/src/js/models/AppModel.js b/src/js/models/AppModel.js
@@ -98,15 +98,13 @@ define(['jquery', 'underscore', 'backbone'],
 
 			// Metrics endpoint url
 			metricsUrl: null,
-
+			
 			// Metrics flags for the Dataset Landing Page
 			// Enable these flags to enable metrics display
-			displayMetricWell: true,
 			displayDatasetMetrics: true,
 
 			// Controlling individual functionality
-			// Only works if the parent flags:
-			// displayDatasetMetrics and displayMetricWell are enabled
+			// Only works if the parent flags displayDatasetMetrics is enabled
 			displayDatasetMetricsTooltip: true,
 			displayDatasetCitationMetric: true,
 			displayDatasetDownloadMetric: true,

diff --git a/src/js/themes/arctic/models/AppModel.js b/src/js/themes/arctic/models/AppModel.js
@@ -104,15 +104,13 @@ define(['jquery', 'underscore', 'backbone'],
 
 			// Metrics endpoint url
 			metricsUrl: null,
-
+			
 			// Metrics flags for the Dataset Landing Page
 			// Enable these flags to enable metrics display
-			displayMetricWell: true,
 			displayDatasetMetrics: true,
 
 			// Controlling individual functionality
-			// Only works if the parent flags:
-			// displayDatasetMetrics and displayMetricWell are enabled
+			// Only works if the parent flags displayDatasetMetrics is enabled
 			displayDatasetMetricsTooltip: true,
 			displayDatasetCitationMetric: true,
 			displayDatasetDownloadMetric: true,

diff --git a/src/js/themes/dataone/models/AppModel.js b/src/js/themes/dataone/models/AppModel.js
@@ -75,15 +75,13 @@ define(['jquery', 'underscore', 'backbone'],
 
 			// Metrics endpoint url
 			metricsUrl: null,
-
+			
 			// Metrics flags for the Dataset Landing Page
 			// Enable these flags to enable metrics display
-			displayMetricWell: true,
 			displayDatasetMetrics: true,
 
 			// Controlling individual functionality
-			// Only works if the parent flags:
-			// displayDatasetMetrics and displayMetricWell are enabled
+			// Only works if the parent flags displayDatasetMetrics is enabled
 			displayDatasetMetricsTooltip: true,
 			displayDatasetCitationMetric: true,
 			displayDatasetDownloadMetric: true,

diff --git a/src/js/themes/knb/models/AppModel.js b/src/js/themes/knb/models/AppModel.js
@@ -108,15 +108,13 @@ define(['jquery', 'underscore', 'backbone'],
 
 			// Metrics endpoint url
 			metricsUrl: null,
-
+			
 			// Metrics flags for the Dataset Landing Page
 			// Enable these flags to enable metrics display
-			displayMetricWell: true,
 			displayDatasetMetrics: true,
 
 			// Controlling individual functionality
-			// Only works if the parent flags:
-			// displayDatasetMetrics and displayMetricWell are enabled
+			// Only works if the parent flags displayDatasetMetrics is enabled
 			displayDatasetMetricsTooltip: true,
 			displayDatasetCitationMetric: true,
 			displayDatasetDownloadMetric: true,

diff --git a/src/js/views/MetadataView.js b/src/js/views/MetadataView.js
@@ -1031,11 +1031,7 @@ define(['jquery',
 			// Retreive the model from the server for the given PID
 			// TODO: Create a Metric Request Object
 
-			if (MetacatUI.appModel.get("displayMetricWell")) {
-				var metrics = $(document.createElement("div")).addClass("metric-well well well-lg");
-			} else {
-				var metrics = $(document.createElement("div")).addClass("metric-well");
-			}
+			var metrics = $(document.createElement("div")).addClass("metric-well well well-lg");
 
 			if (MetacatUI.appModel.get("displayDatasetMetrics")) {
 				var buttonToolbar = $(document.createElement("div")).addClass("metric-toolbar btn-toolbar");