Skip to content
This repository has been archived by the owner on Feb 23, 2018. It is now read-only.

Commit

Permalink
#27 code fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Hetal Patel committed Jan 24, 2018
1 parent 57858b4 commit fdbd8bf
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 180 deletions.
169 changes: 21 additions & 148 deletions src/emc-metalnx-shared/src/main/resources/views/collections/collectionInfo.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.thymeleaf.org" lang="en"
Expand All @@ -8,110 +9,31 @@

<div class="row">
<th:block th:include="collections/summary :: summaryView"></th:block>
<!--
~ Copyright (c) 2015-2017, Dell EMC
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<th:block th:fragment="treeView">
<!-- <div class="col-md-12" th:fragment="treeView" xmlns:th="http://www.w3.org/1999/xhtml"> -->


<div class="col-md-12" th:unless="${dataProfile == null}">

<div th:unless="${dataProfile.file}" th:fragment="collectionInfoView">
<span>this is collection Info</span>
<div class="panel property">
<div class="row">
<h4 class="property-title" th:text="#{text.info}">
<i class="fa fa-info-circle"></i>
</h4>
<div class="col-md-12 col-sm-12">
<div class="col-md-12 col-sm-12 collLesserInfo divider"></div>
</div>
</div>
<div class="panel-info">
<div class="name">
<i th:class="${ iconToDisplay }"></i> <span><b
th:text="${ dataProfile.getDomainObject().getCollectionName() }"></b></span>
<!-- <span class="resulting-permission" th:text="${ '[' + collectionAndDataObject.getMostPermissiveAccessForCurrentUser() + ' access]'}"></span> -->
<a id="breadcrumbStar" class="btn-favorite" href="#"
data-toggle="popover" data-placement="left" data-trigger="manual"
data-content=""
th:title="${dataProfile.starred}?#{collections.favorite.unmark.button.tooltip}:#{collections.favorite.button.tooltip}">
<i
th:class="true? 'fa fa-star bm-checked' : 'fa fa-star bm-unchecked'"
aria-hidden="true"></i>
</a>
</div>


<div class="row">
<div class="text-right col-md-1 col-sm-4 col-xs-4">
<label th:text="#{collections.management.table.owner.label}"></label>
</div>
<!-- <div class="col-md-9 col-sm-8 col-xs-8"><span th:text="${ currentCollection.getOwner() }"></span></div> -->
</div>
<div class="row">
<div class="text-right col-md-1 col-sm-4 col-xs-4">
<label for="createdAt" th:text="#{collections.management.table.created.label}"></label>
</div>
<div class="col-md-9 col-sm-8 col-xs-8">
<span id="createdAt" th:text="${ dataProfile.getDomainObject().getCreatedAt() }"></span>
</div>
</div>
<div class="row">
<div class="text-right col-md-1 col-sm-4 col-xs-4">
<label for="modifiedAt" th:text="#{collections.management.table.modified.label}"></label>
</div>
<div class="col-md-9 col-sm-8 col-xs-8">
<span id="modifiedAt"
th:text="${ dataProfile.getDomainObject().getModifiedAt() }"></span>
</div>
</div>
<!-- Will we have checksum on collection??? <div class="row">
<div class="text-right col-md-1 col-sm-4 col-xs-4"><label th:text="#{collections.management.checksum.label}"></label></div>
<div class="col-md-9 col-sm-8 col-xs-8"><span th:text="${ dataProfile.getChecksum() }"></span></div>
</div> -->
</div>
</div>

</div>

<div id="tabs">
<ul>
<li><a href="#info"
th:onclick="'javascript:getInfoDetails(\'' + ${dataProfile.absolutePath} + '\');'">
<span><i class="fa fa-info-circle"></i></span> <span
title="File information">Info</span>
</a></li>
<ul>
<li><a href="#info"
th:onclick="'javascript:getInfoDetails(\'' + ${dataProfile.absolutePath} + '\');'">
<span><i class="fa fa-info-circle"></i></span> <span
title="File information">Info</span>
</a></li>

<li><a href="#metadata"
th:onclick="'javascript:getMetadata(\'' + ${dataProfile.absolutePath} + '\');'">
<span><i class="fa fa-tags"></i></span> <span title="Metadata">Metadata</span>
</a></li>
<li><a href="#metadata"
th:onclick="'javascript:getMetadata(\'' + ${dataProfile.absolutePath} + '\');'">
<span><i class="fa fa-tags"></i></span> <span title="Metadata">Metadata</span>
</a></li>

<li><a href="#permission" id="permissions"
th:onclick="'javascript:getPermissionDetails(\'' + ${dataProfile.absolutePath} + '\');'">
<span><i class="fa fa-lock"></i></span> <span title="Permissions">Permissions</span>
</a></li>
<li><a href="#permission" id="permissions"
th:onclick="'javascript:getPermissionDetails(\'' + ${dataProfile.absolutePath} + '\');'">
<span><i class="fa fa-lock"></i></span> <span title="Permissions">Permissions</span>
</a></li>

<li th:unless="${dataProfile.file}"><a href="#collection">
<span><i class="fa fa-lock"></i></span> <span title="Collection">collection</span>
</a></li>
</ul>
<li th:unless="${dataProfile.file}"><a href="#collection">
<span><i class="fa fa-lock"></i></span> <span title="Collection">collection</span>
</a></li>

</ul>



Expand All @@ -125,56 +47,7 @@ <h4 class="property-title" th:text="#{text.info}">
<div id="info">
<th:block th:include="collections/info :: infoView"></th:block>
<!-- <th:block th:unless="${dataProfile.file}" th:include="collections/collectionInfo :: collectionInfoView"></th:block> -->

<div class="panel-info">
<div class="name">
<i th:class="${ iconToDisplay }"></i> <span><b
th:text="${ dataProfile.getDomainObject().getCollectionName() }"></b></span>
<!-- <span class="resulting-permission" th:text="${ '[' + collectionAndDataObject.getMostPermissiveAccessForCurrentUser() + ' access]'}"></span> -->
<a id="breadcrumbStar" class="btn-favorite" href="#"
data-toggle="popover" data-placement="left" data-trigger="manual"
data-content=""
th:title="${dataProfile.starred}?#{collections.favorite.unmark.button.tooltip}:#{collections.favorite.button.tooltip}">
<i
th:class="true? 'fa fa-star bm-checked' : 'fa fa-star bm-unchecked'"
aria-label="access the info page for details"></i>
</a>
</div>


<div class="row">
<div class="text-right col-md-1 col-sm-4 col-xs-4">
<label th:text="#{collections.management.table.owner.label}"></label>
</div>
<!-- <div class="col-md-9 col-sm-8 col-xs-8"><span th:text="${ currentCollection.getOwner() }"></span></div> -->
</div>
<div class="row">
<div class="text-right col-md-1 col-sm-4 col-xs-4">
<label for="createdAt" th:text="#{collections.management.table.created.label}"></label>
</div>
<div id="createdAt" class="col-md-9 col-sm-8 col-xs-8">
<span th:text="${ dataProfile.getDomainObject().getCreatedAt() }"></span>
</div>
</div>
<div class="row">
<div class="text-right col-md-1 col-sm-4 col-xs-4">
<label for="updatedAt" th:text="#{collections.management.table.modified.label}"></label>
</div>
<div class="col-md-9 col-sm-8 col-xs-8" >
<span id="updatedAt" th:text="${ dataProfile.getDomainObject().getUpdatedAt() }"></span>
</div>
</div>
<div class="row">
<div class="text-right col-md-1 col-sm-4 col-xs-4">
<label for="checksum" th:text="#{collections.management.checksum.label}"></label>
</div>
<div class="col-md-9 col-sm-8 col-xs-8">
<span id="checksum" th:text="${ dataProfile.getDomainObject().getChecksum() }"></span>
</div>
</div>

</div>

<div id="metadata"></div>

<div id="permission"></div>
Expand All @@ -187,7 +60,6 @@ <h4 class="property-title" th:text="#{text.info}">
</div>



<!-- JQuery UI CSS -->
<link href="../static/css/jquery-ui.min.css" rel="stylesheet"
th:href="@{/css/jquery-ui.min.css}" />
Expand All @@ -203,6 +75,7 @@ <h4 class="property-title" th:text="#{text.info}">


</script>

</div>
</body>

Expand Down
1 change: 1 addition & 0 deletions src/emc-metalnx-shared/src/main/resources/views/collections/fileInfo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@

</script>
</div>

</body>

</html>
33 changes: 1 addition & 32 deletions src/emc-metalnx-shared/src/main/resources/views/collections/info.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,7 @@ <h4 class="property-title" th:text="#{text.info}">
</div>
</div>
<div class="panel-info">
<!-- <div class="name">
<i th:class="${ iconToDisplay }"></i> <span><b
th:text="${ dataProfile.getDomainObject().getCollectionName() }"></b></span>
<span class="resulting-permission" th:text="${ '[' + collectionAndDataObject.getMostPermissiveAccessForCurrentUser() + ' access]'}"></span>
<a id="breadcrumbStar" class="btn-favorite" href="#"
data-toggle="popover" data-placement="left" data-trigger="manual"
data-content=""
th:title="${dataProfile.starred}?#{collections.favorite.unmark.button.tooltip}:#{collections.favorite.button.tooltip}">
<i
th:class="true? 'fa fa-star bm-checked' : 'fa fa-star bm-unchecked'"
aria-hidden="true"></i>
</a>
</div> -->


<div class="row">
<div class="text-right col-md-1 col-sm-4 col-xs-4">
<label th:text="#{collections.management.table.owner.label}"></label>
Expand Down Expand Up @@ -77,25 +64,7 @@ <h4 class="property-title" th:text="#{text.info}">
</div>
</div>

<div id="tabs">
<ul>
<li><a href="#info" aria-label="file information"
th:onclick="'javascript:getInfoDetails(\'' + ${dataProfile.absolutePath} + '\');'">
<span><i class="fa fa-info-circle"></i></span> <span
title="File information">Info</span>
</a></li>

<li><a href="#metadata" aria-label="file metadata"
th:onclick="'javascript:getMetadata(\'' + ${dataProfile.absolutePath} + '\');'">
<span><i class="fa fa-tags"></i></span> <span title="Metadata">Metadata</span>
</a></li>

<li><a href="#permission" id="permissions" aria-label="file permissions"
th:onclick="'javascript:getPermissionDetails(\'' + ${dataProfile.absolutePath} + '\');'">
<span><i class="fa fa-lock"></i></span> <span title="Permissions">Permissions</span>
</a></li>
</ul>

<div th:if="${dataProfile.file}" th:fragment="FileInfoView">
<span>this is File Info</span>
<div class="panel property">
Expand Down

0 comments on commit fdbd8bf

Please sign in to comment.