From aa9facc48f9fe69a7a3cb0ca1b0bd70090c25124 Mon Sep 17 00:00:00 2001 From: Mike Conway Date: Wed, 29 Nov 2017 07:52:40 -0500 Subject: [PATCH 1/5] #25 search defaults to contains --- README.md | 2 ++ .../src/main/resources/i18n/messages_en.properties | 1 + .../resources/views/metadata/metadataDisplay.html | 14 +++++++------- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1daeaeeb8..37232e621 100755 --- a/README.md +++ b/README.md @@ -94,3 +94,5 @@ Add a global config to turn on/off certain features via metalnx.properties. This #### NIEHS identified misc theming issues * #22 fix search text + +* #25 search - default to 'contains' 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 df0e9e23a..25b4c757c 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 @@ -496,6 +496,7 @@ collections.error.info.tab=An error occured. Please contact your administrator. collections.warning.noresources=There is no other resource available for replication. Check if this object is already replicated across all the resources on this zone. # Metadata +metadata.search.title=Metadata Search metadata.menu.title=Metadata metadata.search.page.title=Search metadata.search.page.title.popover=Search for files and collections by metadata and file properties. diff --git a/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataDisplay.html b/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataDisplay.html index 8f05c86df..c1f7ff284 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataDisplay.html +++ b/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataDisplay.html @@ -41,7 +41,7 @@

@@ -53,9 +53,9 @@

@@ -90,9 +90,9 @@

@@ -209,9 +209,9 @@

}); }else{ $(this).parents('.propertiesSearchRow').find('.propertiesOper').html( - ''+ + ''+ ''+ - ''+ + ''+ '' ); } From 79a34925d0402b77189aae0bbe9b2075ebe2c253 Mon Sep 17 00:00:00 2001 From: Mike Conway Date: Wed, 29 Nov 2017 08:22:54 -0500 Subject: [PATCH 2/5] #11 remove jquery table search --- README.md | 2 ++ .../main/resources/views/collections/collectionsBrowser.html | 1 + 2 files changed, 3 insertions(+) diff --git a/README.md b/README.md index 37232e621..8babb818d 100755 --- a/README.md +++ b/README.md @@ -96,3 +96,5 @@ Add a global config to turn on/off certain features via metalnx.properties. This * #22 fix search text * #25 search - default to 'contains' + +* #11 Consider removing Jquery data table search filter as confusing next to the planned global search diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBrowser.html b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBrowser.html index ee439cced..c7b6378d7 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBrowser.html +++ b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionsBrowser.html @@ -387,6 +387,7 @@

"stateSave": true, "autoWidth": false, "processing": true, + "searching": false, "stateSaveParams": function (settings, data) { data.search.search = ""; }, From b5c417714d4b149013673f5a6e4d039502100024 Mon Sep 17 00:00:00 2001 From: Mike Conway Date: Wed, 29 Nov 2017 09:07:28 -0500 Subject: [PATCH 3/5] #19 move icon --- .../main/resources/views/collections/collectionManagement.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index a251a592d..073b9a6d5 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html +++ b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html @@ -34,7 +34,7 @@

- +
@@ -48,8 +48,8 @@

 

- -
+ +
@@ -61,14 +61,14 @@

- +
- + - +
- \ No newline at end of file + diff --git a/src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html b/src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html index 2e3e680c1..697d939fc 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html +++ b/src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html @@ -34,7 +34,7 @@

- +
diff --git a/src/emc-metalnx-shared/src/main/resources/views/groups/groupsCollections.html b/src/emc-metalnx-shared/src/main/resources/views/groups/groupsCollections.html index a92015ad6..d4e559fe8 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/groups/groupsCollections.html +++ b/src/emc-metalnx-shared/src/main/resources/views/groups/groupsCollections.html @@ -36,7 +36,7 @@

- +
@@ -47,9 +47,9 @@

  - +

- +
@@ -62,8 +62,8 @@

-
- +
+ - - + + - \ No newline at end of file + diff --git a/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataDisplay.html b/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataDisplay.html index c1f7ff284..5440b0a57 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataDisplay.html +++ b/src/emc-metalnx-shared/src/main/resources/views/metadata/metadataDisplay.html @@ -36,7 +36,7 @@

- +
diff --git a/src/emc-metalnx-ui-admin/src/main/resources/views/defaultTemplate.html b/src/emc-metalnx-ui-admin/src/main/resources/views/defaultTemplate.html index 7780775c6..c806d1db7 100644 --- a/src/emc-metalnx-ui-admin/src/main/resources/views/defaultTemplate.html +++ b/src/emc-metalnx-ui-admin/src/main/resources/views/defaultTemplate.html @@ -277,8 +277,13 @@
-

- +

+ This software contains the intellectual property of EMC + Corporation or is licensed to DELL EMC Corporation from third parties. + Use of this software and the intellectual property contained + therein is expressly limited to the terms and conditions of the + License Agreement under which it is provided by or on behalf of + EMC.

From 21b9f7f52d4cb536ea1d7d373605f71b41ab0c07 Mon Sep 17 00:00:00 2001 From: Mike Conway Date: Thu, 30 Nov 2017 09:57:41 -0500 Subject: [PATCH 5/5] #45 favorites popover --- .../src/main/resources/i18n/messages_en.properties | 1 + 1 file changed, 1 insertion(+) 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 25b4c757c..e2b707011 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 @@ -682,6 +682,7 @@ mygroups.empty.table=You are not listed in any group # Favorites favorites.page.title=Favorites +favorites.page.title.popover=Bookmark a collection or data object as a favorite to make it easy to find favorites.result.number.found=favorite item(s) found favorites.table.name.label=Name favorites.table.path.label=Path