#27 collection breadcrum

irods-contrib · Jan 30, 2018 · 099a1c1 · 099a1c1
1 parent 039a683
commit 099a1c1
Show file tree

Hide file tree

Showing 9 changed files with 143 additions and 157 deletions.
diff --git a/...-metalnx-services/src/main/java/com/emc/metalnx/services/irods/CollectionServiceImpl.java b/...-metalnx-services/src/main/java/com/emc/metalnx/services/irods/CollectionServiceImpl.java
@@ -463,7 +463,7 @@ public DataGridCollectionAndDataObject findByName(String path) throws DataGridEx
 
 		logger.info("findByName()");
 
-		if (path == null) {
+		if (path == null || path.isEmpty()) {
 			logger.info("Could not find collection or data object by name: path is null");
 			return null;
 		}

diff --git a/src/emc-metalnx-shared/src/main/java/com/emc/metalnx/controller/BrowseController.java b/src/emc-metalnx-shared/src/main/java/com/emc/metalnx/controller/BrowseController.java
@@ -249,7 +249,7 @@ public String getSubDirectories(final Model model, @RequestParam("path") String
 		logger.info("path:{}", path);
 
 		// removes all ocurrences of "/" at the end of the path string
-		while (path.endsWith("/") && !"/".equals(path)) {
+		while (path.endsWith("/") && !"/".equals(path)) { 
 			path = path.substring(0, path.lastIndexOf("/"));
 		}
 

diff --git a/src/emc-metalnx-shared/src/main/resources/static/js/collection.js b/src/emc-metalnx-shared/src/main/resources/static/js/collection.js
@@ -47,7 +47,7 @@ function displayInfoDetails(data){
 }
 
 function displayMetadata(data){
-	console.log("display Metadata");
+	console.log("display Metadata :: " +data);
 	$('#table-loader').hide();
 	$('#table-loader').after(data);
 	/*$("#uploadIcon").prop("disabled", true);

diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionHeader.html b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionHeader.html
@@ -0,0 +1,4 @@
+<th:block th:fragment="collectionHeaderView">
+	<h3 id="collManagement" class="collection-header pull-left" th:text="#{collections.management.page.title}" th:data-content="#{collection.title.popover}"></h3>
+	<a aria-label="page help" id="collections-page-title" href="#" class="page-hint pull-left"><i class="fa fa-question-circle"></i></a>				
+</th:block>
diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html
@@ -32,8 +32,8 @@
 
 <body>
 	<div aria-labelledby="collManagement" layout:fragment="content">
-		<h4 id="collManagement" class="collection-header pull-left" th:text="#{collections.management.page.title}" th:data-content="#{collection.title.popover}"></h4>
-		<a aria-label="page help" id="collections-page-title" href="#" class="page-hint pull-left"><i class="fa fa-question-circle"></i></a>
+		<th:block th:include="collections/collectionHeader :: collectionHeaderView"></th:block>	
+					
 		<ol class="breadcrumb mlx"  th:if="${cameFromMetadataSearch} == true"
 					id="backToMetadataSearch">
 		  <li><a href="/emc-metalnx-web/metadata/?backFromCollections=true" aria-hidden="true">Search Results</a></li>

diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBreadCrumb.html b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBreadCrumb.html
@@ -16,7 +16,9 @@
 <div class="breadcrumb-wrapper">
 
          <ol class="breadcrumb">
-         <a th:href="@{${urlMap.URL_HOME_COLLECTION_USER}}"><i class="fa fa-home"></i></a>
+         		<li>
+         			<a th:href="@{${urlMap.URL_HOME_COLLECTION_USER}}"><i class="fa fa-home"></i></a>
+         		</li>
                 <th:block th:if="${breadcrumb.items.size()} le 3" th:each="breadcrumbItem, iterStat: ${breadcrumb.items}">
                     <th:block th:if="${iterStat.index lt (breadcrumb.items.size()-1)}">
                         <li class="hidden-xs hidden-sm">

diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/info.html b/src/emc-metalnx-shared/src/main/resources/views/collections/info.html
@@ -21,7 +21,7 @@
 	<div class="col-md-12" th:unless="${dataProfile == null}">
 
 		<div th:unless="${dataProfile.file}" th:fragment="collectionInfoView">
-			<div class="panel property">
+			<div class="panel property collection-tabs">
 				<div class="row">
 					<h4 class="property-title" th:text="#{text.info}">
 						<i class="fa fa-info-circle"></i>