Minor style changes to the package tables to increase legibility

Change version number to 1.11.4
NCEAS · Jun 21, 2016 · 8334d86 · 8334d86
1 parent 6a303ff
commit 8334d86
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/metacatui/src/main/webapp/css/metacatui-common.css b/metacatui/src/main/webapp/css/metacatui-common.css
@@ -1408,6 +1408,9 @@ table.download-contents.nested{
 .table .table-header{
 	border-bottom: 1px solid #8DA2AA;
 }
+.table-header-link{
+	font-weight: normal;	
+}
 .download-contents .btn .icon,
 .download-contents .preview .icon{
 	font-size: 1em;

diff --git a/metacatui/src/main/webapp/index.html b/metacatui/src/main/webapp/index.html
@@ -11,7 +11,7 @@
 
 
   <!-- Pull in correct theme configuration, then use Require.js to manage dependencies -->
-  <script id="loader" type="text/javascript" src="loader.js?v=1.11.3" 
+  <script id="loader" type="text/javascript" src="loader.js?v=1.11.4" 
   	data-theme="default" 
   	data-metacat-context="metacat"
   	data-map-key="YOUR-GOOGLE-MAPS-API-KEY"

diff --git a/metacatui/src/main/webapp/js/themes/dataone/css/metacatui.css b/metacatui/src/main/webapp/js/themes/dataone/css/metacatui.css
@@ -459,6 +459,9 @@ tr.table-header th{
     font-size: .9em;
     margin-left: 10px;
 }
+.table-header-link{
+	color: #FFFFFF;
+}
 tr, th, td{
 	border-width: 0px;
 }

diff --git a/metacatui/src/main/webapp/js/views/MetadataView.js b/metacatui/src/main/webapp/js/views/MetadataView.js
@@ -480,7 +480,7 @@ define(['jquery',
 					viewRef.insertPackageTable(packageModel, { title: title });
 
 					_.each(nestedPckgs, function(nestedPackage, i, list){						
-						var title = 'Nested Data Set (' + (i+2) + ' of ' + (list.length+1) + ') <span class="subtle">Package: ' + nestedPackage.get("id") + '</span> <a href="#view/' + nestedPackage.get("id") + '">(View this dataset <i class="icon icon-external-link-sign icon-on-right"></i> ) </a>';
+						var title = 'Nested Data Set (' + (i+2) + ' of ' + (list.length+1) + ') <span class="subtle">Package: ' + nestedPackage.get("id") + '</span> <a href="#view/' + nestedPackage.get("id") + '" class="table-header-link">(View <i class="icon icon-external-link-sign icon-on-right"></i> ) </a>';
 						viewRef.insertPackageTable(nestedPackage, { title: title, nested: true });
 					});
 				}
@@ -1208,6 +1208,9 @@ define(['jquery',
 								xhr.onload = function(){ 
 								    var iframe = $(dataDisplay).find("iframe");
 								    iframe.attr("src", window.URL.createObjectURL(xhr.response)); // xhr.response is a blob
+								    var a = $(dataDisplay).find("a.zoom-in").remove();
+								    //TODO: Allow fancybox previews of private PDFs
+
 								};
 
 								//Open and send the request with the user's auth token

diff --git a/metacatui/src/main/webapp/loader.js b/metacatui/src/main/webapp/loader.js
@@ -12,7 +12,7 @@ if ((mapKey == "YOUR-GOOGLE-MAPS-API-KEY") || (!mapKey)) mapKey = null;
 var useD3 = true; 
 
 //This version of Metacat UI - used for cache busting
-window.metacatUIVersion = "1.11.3";
+window.metacatUIVersion = "1.11.4";
 
 // Step 2: let everything else be taken care of by the app
 preventCompatibilityIssues();