From ea914bcb5587b96fe07596ade8f4601c9a2dfe1a Mon Sep 17 00:00:00 2001
From: Mike Conway <mike.conway@nih.gov>
Date: Tue, 21 Nov 2017 16:24:31 -0500
Subject: [PATCH] #49 merge with new template stuff

---
 .../resources/i18n/messages_en.properties     |  39 ++++--
 src/emc-metalnx-ui-admin/pom.xml              | 121 +++++-------------
 2 files changed, 57 insertions(+), 103 deletions(-)

diff --git a/src/emc-metalnx-shared/src/main/resources/i18n/messages_en.properties b/src/emc-metalnx-shared/src/main/resources/i18n/messages_en.properties
index b766eeff4..df0e9e23a 100644
--- a/src/emc-metalnx-shared/src/main/resources/i18n/messages_en.properties
+++ b/src/emc-metalnx-shared/src/main/resources/i18n/messages_en.properties
@@ -16,9 +16,21 @@
 
 # Misc
 text.back=Back
+text.creation.date=Creation Date
+text.contains=Contains
+text.file.name=File Name
 text.info=Info
 text.delete=Delete
+text.is.equals=Is (Equals)
+text.is.not.equals=Is Not (Not Equals)
 text.close=Close
+text.modification.date=Modification Date
+text.not.contains=Does Not Contain
+text.path=Path
+text.replica.number=Replica Number
+text.resource.name=Resource Name
+text.size=Size
+text.owner.name=Owner Name
 
 #Login
 login.label=Login
@@ -487,6 +499,7 @@ collections.warning.noresources=There is no other resource available for replica
 metadata.menu.title=Metadata
 metadata.search.page.title=Search
 metadata.search.page.title.popover=Search for files and collections by metadata and file properties.
+metadata.search.prompt=Search for files and collections that match one or more of the conditions below:
 metadata.search.menu.title=Search
 metadata.template.management.menu.title=Templates
 metadata.template.management.page.title=Templates
@@ -625,16 +638,16 @@ messages.error.2=Data Duplicate Exception
 templates.metadata.error.import.label=Error!
 templates.metadata.error.import.message=The templates could not be imported.
 
-tab.title.dashboard=EMC Metalnx - Dashboard
-tab.title.groups=EMC Metalnx - Groups
-tab.title.users=EMC Metalnx - Users
-tab.title.resources=EMC Metalnx - Resources
-tab.title.collections=EMC Metalnx - Collections
-tab.title.search=EMC Metalnx - Search
-tab.title.templates=EMC Metalnx - Templates
-tab.title.shared=EMC Metalnx - Shared Links
-tab.title.favorites=EMC Metalnx - Favorites
-tab.title.profile=EMC Metalnx - Profile
+tab.title.dashboard=Metalnx - Dashboard
+tab.title.groups=Metalnx - Groups
+tab.title.users= Metalnx - Users
+tab.title.resources=Metalnx - Resources
+tab.title.collections=Metalnx - Collections
+tab.title.search=Metalnx - Search
+tab.title.templates=Metalnx - Templates
+tab.title.shared=Metalnx - Shared Links
+tab.title.favorites=Metalnx - Favorites
+tab.title.profile=Metalnx - Profile
 
 # Side bar user menu
 sidebar.user.mycollections=My Collections
@@ -793,7 +806,7 @@ favorite.page.content.path.not.remove=Could not remove path from favorites.
 httperror.403.message=Sorry, you do not have permissions to access that page. Your session is no longer valid.
 httperror.404.message=Sorry, we could not process your request.
 httperror.500.message=Sorry, something went wrong. Please, contact your system administrator.
-httperror.server.no.response.message=
+httperror.server.no.response.message=No server response
 
 #login
 login.invalid.username.password=Invalid username or password
@@ -823,8 +836,8 @@ about.modal= <i> This software contains the intellectual property of EMC
 
 #collection
 
-collections.group.form.permission=Do you want to apply this change to subcolletions and files in
-collections.user.form.permissions=Do you want to apply this change to subcolletions and files in
+collections.group.form.permission=Do you want to apply this change to subcollections and files in
+collections.user.form.permissions=Do you want to apply this change to subcollections and files in
 
 #dashboard
 #isilonserver
diff --git a/src/emc-metalnx-ui-admin/pom.xml b/src/emc-metalnx-ui-admin/pom.xml
index 155702f8e..b1da7dad5 100755
--- a/src/emc-metalnx-ui-admin/pom.xml
+++ b/src/emc-metalnx-ui-admin/pom.xml
@@ -1,12 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- ~ 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. -->
+<!--
+  ~ 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.
+  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -33,90 +39,25 @@
 
 	</dependencies>
 
-	<profiles>
-		<profile>
-			<id>default-metalnx-template</id>
-
-			<activation>
-				<property>
-					<name>!metalnx.custom.template</name>
-				</property>
-
-			</activation>
-			<build>
-				<plugins>
-
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>validate</phase>
-								<configuration>
-									<tasks>
-										<copy
-											file="${project.basedir}/src/main/resources/views/defaultTemplate.html"
-											tofile="${project.basedir}/src/main/resources/views/template.html" />
-									</tasks>
-								</configuration>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>custom-metalnx-template</id>
-
-			<activation>
-				<property>
-					<name>metalnx.custom.template</name>
-				</property>
-
-			</activation>
-			<build>
-				<plugins>
-
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>validate</phase>
-								<configuration>
-									<tasks>
-										<copy file="${metalnx.custom.template}"
-											tofile="${project.basedir}/src/main/resources/views/template.html" />
-									</tasks>
-								</configuration>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
 	<build>
 		<finalName>emc-metalnx-ui-admin</finalName>
 
 		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<includes>
-					<include>static/**</include>
-					<include>**/*.html</include>
-					<include>**/*.xml</include>
-					<include>**/*.properties</include>
-				</includes>
-			</resource>
-		</resources>
-
+	        <resource>
+	            <directory>src/main/resources</directory>
+	            <includes>
+	            	<include>static/**</include>
+	            	<include>**/*.html</include>
+	                <include>**/*.xml</include>
+	                <include>**/*.properties</include>
+	            </includes>
+	        </resource>
+	    </resources>
+		<pluginManagement>
+			<plugins>
+				
+			</plugins>
+		</pluginManagement>
 	</build>
 
-</project>
\ No newline at end of file
+</project>