diff --git a/README.md b/README.md index 14532e2d6..59045af7f 100755 --- a/README.md +++ b/README.md @@ -94,3 +94,7 @@ 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' + +* #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/i18n/messages_en.properties b/src/emc-metalnx-shared/src/main/resources/i18n/messages_en.properties index df0e9e23a..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 @@ -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. @@ -681,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 diff --git a/src/emc-metalnx-shared/src/main/resources/static/css/styles.css b/src/emc-metalnx-shared/src/main/resources/static/css/styles.css index 3f1d8cf2e..3cb215128 100644 --- a/src/emc-metalnx-shared/src/main/resources/static/css/styles.css +++ b/src/emc-metalnx-shared/src/main/resources/static/css/styles.css @@ -96,7 +96,7 @@ body { .panel-primary .panel-heading { border-color: #2c95dd; - background-color: #2c95dd; + background-color: #2c95dd; } .panel-success { @@ -112,16 +112,16 @@ body { .panel-warning .panel-heading { border-color: #FECC66; background-color: #FECC66; - color: #ffffff; + color: #ffffff; } -.panel-error { +.panel-error { border-color: #CC6666; } .panel-error .panel-heading { background-color: #CC6666; - color: #ffffff; + color: #ffffff; } .gray-bg { @@ -139,11 +139,11 @@ body { .templates i { /* color: #ffffff; */ - font-size: inherit; + font-size: inherit; } table { - table-layout: fixed; + table-layout: fixed; } table td{ @@ -340,7 +340,7 @@ h3.collection-details -o-transition: left 0.15s ease-out; transition: left 0.15s ease-out; } - + /************************************* Server Details *********************************************/ .list #resourcesByServerList ul a { @@ -428,7 +428,7 @@ h3.collection-details table-layout: auto; } -#resourcesByServerList .resourcesTableWrapper table tbody tr td{ +#resourcesByServerList .resourcesTableWrapper table tbody tr td{ border-top: 1px dotted #ccc; line-height: 2.5em; } @@ -439,7 +439,7 @@ h3.collection-details width: 1%; padding-right: 20px; } -#resourcesByServerList .resourcesTableWrapper table > tbody > tr span, +#resourcesByServerList .resourcesTableWrapper table > tbody > tr span, #resourcesByServerList .resourcesTableWrapper table > thead > tr > th span{ padding: 5px 5px 5px 20px; } @@ -471,7 +471,7 @@ h3.collection-details #resourceMapPanel { max-width: 100%; - max-height: 50em; + max-height: 50em; overflow: auto; padding: 0; margin-top: 1%; @@ -703,8 +703,8 @@ div.dataTables_wrapper .toolbar .input-group{ } #templateFieldsList .requiredHeaderSpan{ - font-size:10px; - font-weight: normal; + font-size:10px; + font-weight: normal; margin-left: 5px; } @@ -737,7 +737,7 @@ div.dataTables_wrapper .toolbar .input-group{ #actions .btn-group a:FIRST-CHILD{ border-top-right-radius: 0; - border-bottom-right-radius: 0; + border-bottom-right-radius: 0; } #actions .btn-group ul li.divider { @@ -1152,7 +1152,7 @@ ul{ a.page-hint { font-size:1.3em; - margin-top:30px; + margin-top:30px; } .property{ @@ -1336,7 +1336,7 @@ alert-dialog { margin-bottom: 10px; } -.alert-dismissable .close, +.alert-dismissable .close, .alert-dismissible .close { position: relative; @@ -1370,7 +1370,7 @@ alert-dialog { .scrollable-modal-body { max-height: 300px; - overflow: auto; + overflow: auto; } .modal .modal-header{ background-color: #428bca; @@ -1433,8 +1433,7 @@ alert-dialog { } #wrapper { - width: 1026px; - margin: 0 auto; + width: 100%; } #page-wrapper, #page-wrapper-tickets { @@ -1489,8 +1488,8 @@ i.fa-user.menu-icon{ top:-1; } -ul.navbar-top-links > li.dropdown > .dropdown-toggle:hover, -ul.navbar-top-links > li.dropdown > .dropdown-toggle:focus, +ul.navbar-top-links > li.dropdown > .dropdown-toggle:hover, +ul.navbar-top-links > li.dropdown > .dropdown-toggle:focus, ul.navbar-top-links > li.open > a.dropdown-toggle{ background-color: #2c95dd; box-shadow: inset 0 3px 10px rgba(0,0,0,.125); @@ -1623,7 +1622,7 @@ ul.navbar-top-links > li.open > a.dropdown-toggle{ bottom: -6px; } -.navbar-default .navbar-toggle:hover, +.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { background-color: #2786c6; } @@ -1643,7 +1642,7 @@ button.btn-primary > i, a.btn-primary > i { margin-right: 3px; } - + .user-panel { padding: 5%; padding-left: 5%; @@ -1658,7 +1657,7 @@ a.btn-primary > i { } .img-circle { - border-radius: 65%; + border-radius: 65%; } .user-panel p { @@ -1735,10 +1734,10 @@ a.btn-primary > i { background-color: #f2f6f9;; } -.modal .nav-tabs > li.active > a, -.modal .nav-tabs > li.active > a:hover, -.modal .nav-tabs > li.active > a:focus, -.modal .nav > li > a:hover, +.modal .nav-tabs > li.active > a, +.modal .nav-tabs > li.active > a:hover, +.modal .nav-tabs > li.active > a:focus, +.modal .nav > li > a:hover, .modal .nav > li > a:focus{ background-color: #f2f6f9; border: 1px solid #f2f6f9; @@ -1747,7 +1746,7 @@ a.btn-primary > i { border-bottom: 1px hidden #DDD; } .modal-footer .targetPathInfoDiv{ - margin-bottom: 10px; + margin-bottom: 10px; } .modal-footer .targetPathInfoSpan{ font-weight: bold; @@ -1766,9 +1765,9 @@ a.btn-primary > i { } footer { - text-align: center; - font-size:12px; - width: 100%; + text-align: center; + font-size:12px; + width: 100%; color: #777; margin-top: -20px; } @@ -1901,8 +1900,8 @@ footer { width: 100%; table-layout: auto; } -#serverListPanel .dashboardServersList > tbody > tr > td, -#isilonServerListPanel .table tbody > tr > td, +#serverListPanel .dashboardServersList > tbody > tr > td, +#isilonServerListPanel .table tbody > tr > td, #nonResourceServerListPanel .table tbody > tr > td{ padding: 8px; border-top: 1px dotted #C8DFF7; @@ -2055,7 +2054,7 @@ form.registerForm .bootstrap-tagsinput { } @media ( min-width : 769px) and (max-width: 1000px) { - + #treeViewTable { float: left; } @@ -2161,7 +2160,7 @@ form.registerForm .bootstrap-tagsinput { { font-size:40px; } - + .sidebar ul li a { border-top-style: none; text-align: center; @@ -2182,7 +2181,7 @@ form.registerForm .bootstrap-tagsinput { text-align: center; font-family: Verdana, Geneva, sans-serif; } - + .navbar-top-links .dropdown-messages, .navbar-top-links .dropdown-tasks, .navbar-top-links .dropdown-alerts { margin-left: auto; @@ -2318,4 +2317,4 @@ form.registerForm .bootstrap-tagsinput { } #existingIpIcon{ left: 360px; -} +} \ No newline at end of file diff --git a/src/emc-metalnx-shared/src/main/resources/views/bookmarks/userBookmarks.html b/src/emc-metalnx-shared/src/main/resources/views/bookmarks/userBookmarks.html index e3239dc99..2bb0ab48d 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/bookmarks/userBookmarks.html +++ b/src/emc-metalnx-shared/src/main/resources/views/bookmarks/userBookmarks.html @@ -36,7 +36,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/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 @@

- +
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 8f05c86df..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,12 +36,12 @@

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

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

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

}); }else{ $(this).parents('.propertiesSearchRow').find('.propertiesOper').html( - ''+ + ''+ ''+ - ''+ + ''+ '' ); } 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.