Skip to content

Commit

Permalink
#27 tab issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Hetal Patel committed Feb 1, 2018
1 parent 8f30c5f commit 7232923
Show file tree
Hide file tree
Showing 8 changed files with 109 additions and 22 deletions.
10 changes: 10 additions & 0 deletions src/emc-metalnx-shared/src/main/resources/i18n/messages_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,16 @@ collections.form.no.access.error=You do not have rights to create collection {0}
## Collection modification form
collections.edit.form.title=Modify Collection

##Collection information
collections.management.table.datapath.label=DataPath
collections.management.table.datatypename.label=DataPath Name
collections.management.table.expiry.label=Expiry
collections.management.table.datamapid.label=Datamap Id
collections.management.table.speccoltype.label=SpecColType
collections.management.table.objectpath.label=Object Path
collections.management.table.comments.label=Comments
collections.management.table.collectionmapid.label=Collection MapId

## Data Object modification form
dataobject.add.form.title=Modify Data Object
dataobject.add.form.collectionname.label=File name
Expand Down
7 changes: 5 additions & 2 deletions src/emc-metalnx-shared/src/main/resources/views/collections/collectionHeader.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<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>
<h2 id="collManagement" class="collection-header pull-left"
th:text="#{collections.management.page.title}"
th:data-content="#{collection.title.popover}"></h2>
<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>
6 changes: 3 additions & 3 deletions src/emc-metalnx-shared/src/main/resources/views/collections/collectionInfo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<div class="row">
<div id="tabs">
<ul>
<li><a href="#info"
<li><a href="#details"
th:onclick="'javascript:getInfoDetails(\'' + ${dataProfile.absolutePath} + '\');'">
<span><i class="fa fa-info-circle"></i></span> <span
title="File information">Info</span>
title="File information">Details</span>
</a></li>

<li><a href="#metadata"
Expand All @@ -36,7 +36,7 @@

<div class="content_menu">

<div id="info">
<div id="details">
<th:block th:include="collections/info :: infoView"></th:block>
<!-- <th:block th:unless="${dataProfile.file}" th:include="collections/collectionInfo :: collectionInfoView"></th:block> -->
</div>
Expand Down
6 changes: 3 additions & 3 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 @@ -13,10 +13,10 @@

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

<li><a href="#metadata"
Expand All @@ -41,7 +41,7 @@

<div class="content_menu">

<div id="info">
<div id="details">
<th:block th:include="collections/info :: infoView"></th:block>
<!-- <th:block th:unless="${dataProfile.file}" th:include="collections/collectionInfo :: collectionInfoView"></th:block> -->
</div>
Expand Down
78 changes: 75 additions & 3 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 @@ -67,6 +67,33 @@ <h4 class="property-title" th:text="#{text.info}">
th:text="${ dataProfile.getDomainObject().getModifiedAt() }"></span>
</div>
</div>
<div class="row">
<div class="text-right col-md-2 col-sm-2 col-xs-12">
<label th:text="#{collections.management.table.collectionmapid.label}"></label>
</div>
<div class="col-md-10 col-sm-10 col-xs-12">
<span
th:text="${ dataProfile.getDomainObject().getCollectionMapId() }"></span>
</div>
</div>
<div class="row">
<div class="text-right col-md-2 col-sm-2 col-xs-12">
<label th:text="#{collections.management.table.speccoltype.label}"></label>
</div>
<div class="col-md-10 col-sm-10 col-xs-12">
<span
th:text="${ dataProfile.getDomainObject().getSpecColType() }"></span>
</div>
</div>
<div class="row">
<div class="text-right col-md-2 col-sm-2 col-xs-12">
<label th:text="#{collections.management.table.objectpath.label}"></label>
</div>
<div class="col-md-10 col-sm-10 col-xs-12">
<span
th:text="${ dataProfile.getDomainObject().getObjectPath() }"></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>
Expand Down Expand Up @@ -149,16 +176,61 @@ <h4 class="property-title" th:text="#{text.info}">

<div class="row">
<div class="text-right col-md-2 col-sm-2 col-xs-12">
<label th:text="#{collections.management.table.size.label}"></label>
<label th:text="#{collections.management.table.datapath.label}"></label>
</div>
<div class="col-md-10 col-sm-10 col-xs-12">
<span
th:text="${ dataProfile.getDomainObject().getDataPath() }"></span>
</div>
</div>
<div class="row">
<div class="text-right col-md-2 col-sm-2 col-xs-12">
<label th:text="#{collections.management.table.datatypename.label}"></label>
</div>
<div class="col-md-10 col-sm-10 col-xs-12">
<span
th:text="${ dataProfile.getDomainObject().getDataTypeName() }"></span>
</div>
</div>
<div class="row">
<div class="text-right col-md-2 col-sm-2 col-xs-12">
<label th:text="#{collections.management.table.expiry.label}"></label>
</div>
<div class="col-md-10 col-sm-10 col-xs-12">
<span
th:text="${ dataProfile.getDomainObject().getExpiry() }"></span>
</div>
</div>
<div class="row">
<div class="text-right col-md-2 col-sm-2 col-xs-12">
<label th:text="#{collections.management.table.datamapid.label}"></label>
</div>
<div class="col-md-10 col-sm-10 col-xs-12">
<span
th:text="${ dataProfile.getDomainObject().getDataMapId() }"></span>
</div>
</div>
<div class="row">
<div class="text-right col-md-2 col-sm-2 col-xs-12">
<label th:text="#{collections.management.table.speccoltype.label}"></label>
</div>
<div class="col-md-10 col-sm-10 col-xs-12">
<span
th:text="${ dataProfile.getDomainObject().getSpecColType() }"></span>
</div>
</div>
<div class="row">
<div class="text-right col-md-2 col-sm-2 col-xs-12">
<label th:text="#{collections.management.table.objectpath.label}"></label>
</div>
<div class="col-md-10 col-sm-10 col-xs-12">
<span
th:text="${ dataProfile.getDomainObject().getDisplayDataSize() }"></span>
th:text="${ dataProfile.getDomainObject().getObjectPath() }"></span>
</div>
</div>
<div class="row">
<div class="text-right col-md-2 col-sm-2 col-xs-12">
<label text="Comments"></label>
<label th:text="#{collections.management.table.comments.label}"></label>
</div>
<div class="col-md-10 col-sm-10 col-xs-12">
<span th:text="${ dataProfile.getDomainObject().getComments() }"></span>
Expand Down
15 changes: 8 additions & 7 deletions src/emc-metalnx-shared/src/main/resources/views/collections/summary.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
</div>

<div class="row nopadding">
<div class="col-sm-12 col-md-12 col-xs-12 text-left">
<div class="col-sm-9 col-md-9 col-xs-12 text-left">
<div class="breadcrumb-wrapper">
<ol class="breadcrumb">
<li><a th:href="@{${urlMap.URL_HOME_COLLECTION_USER}}"><i
Expand Down Expand Up @@ -149,16 +149,17 @@

</div>
</div>
</div>


<div class="row nopadding">
<div class="col-md-4 col-sm-4 col-xs-12 pull-right">

<div class="col-md-3 col-sm-3 col-xs-12 pull-right">
<a href="#" class="pull-right"><i th:class="${ iconToDisplay }"></i></a>
</div>

</div>





<!-- <div class="col-xs-12 col-md-10 col-sm-9 ">
<div>
<span><b>Summary</b></span>
Expand All @@ -174,7 +175,7 @@
</div> -->

<div class="row">
<div class="row nopadding">
<div class="col-xs-12 col-md-3 col-sm-3 text-left">
<span><b>Collection Name</b></span> <br /> <span
th:text="${ dataProfile.getChildName() }"></span>
Expand Down
1 change: 1 addition & 0 deletions src/emc-metalnx-ui-admin/src/main/java/com/emc/metalnx/controller/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/DashboardController.java
8 changes: 4 additions & 4 deletions src/emc-metalnx-web/src/main/webapp/WEB-INF/applicationContext.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<property name="locations">
<list>

<value>file:/etc/irods-ext/metalnx.properties</value>
<!-- <value>file:///C:/Users/hetalben/opt/etc/irods-ext/metalnx.properties</value> -->
<!-- <value>file:/etc/irods-ext/metalnx.properties</value> -->
<value>file:///C:/Users/hetalben/opt/etc/irods-ext/metalnx.properties</value>
</list>
</property>
<property name="ignoreUnresolvablePlaceholders" value="true"/>
Expand All @@ -41,8 +41,8 @@
<!-- this resource must be in the /etc/irods-ext directory, see the CONFIGURATION.md doc at the top of the repo,
It allows theming and custom messages -->

<import resource="file:/etc/irods-ext/metalnxConfig.xml" />
<!--<import resource="file:///C:/Users/hetalben/opt/etc/irods-ext/metalnxConfig.xml" /> -->
<!-- <import resource="file:/etc/irods-ext/metalnxConfig.xml" /> -->
<import resource="file:///C:/Users/hetalben/opt/etc/irods-ext/metalnxConfig.xml" />

<!-- **************************************************************** -->
<!-- SPRING SECURITY-SPECIFIC ARTIFACTS -->
Expand Down

0 comments on commit 7232923

Please sign in to comment.