From 306da7b79373f8cc99f62da5a042536ef694965f Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Thu, 12 Jan 2017 19:39:32 -0500 Subject: [PATCH] Updated the search key to be a little more relevant --- .../smart-search/smart-search.block.less | 47 +++++++++++-------- .../smart-search/smart-search.partial.html | 30 ++++++------ 2 files changed, 44 insertions(+), 33 deletions(-) diff --git a/awx/ui/client/src/shared/smart-search/smart-search.block.less b/awx/ui/client/src/shared/smart-search/smart-search.block.less index 0b22331d5a..8ef22851b2 100644 --- a/awx/ui/client/src/shared/smart-search/smart-search.block.less +++ b/awx/ui/client/src/shared/smart-search/smart-search.block.less @@ -197,29 +197,11 @@ border: 1px solid @login-notice-border; background-color: @login-notice-bg; color: @login-notice-text; -} - -.SmartSearch-relations{ - margin-top: 15px; + position: relative; } .SmartSearch-keyRow { - width: 33%; - flex: 1 1 auto; - flex-direction: column; margin-bottom: 15px; - padding-right: 50px; -} -// 100% rows in a modal -.modal-body .SmartSearch-keyRow{ - width: 100%; -} -// `.${list.name}List` class can be used to set add custom class overrides -.groupsList .SmartSearch-keyRow, .hostsList .SmartSearch-keyRow, .PortalMode .SmartSearch-keyRow{ - width: 100%; -} -.SmartSearch-keyRow:nth-child(3){ - padding-right: 0px; } .SmartSearch-keyName { @@ -232,3 +214,30 @@ .SmartSearch-keyComparators { flex: 1 0 auto; } + +.SmartSearch-keyPane--exitHolder { + position: absolute; + right: 10px; + top: 10px; +} + +.SmartSearch-keyPane--exit { + background-color: @login-notice-bg; +} + +.SmartSearch-examples { + display: flex; +} + +.SmartSearch-examples--title { + margin-right: 5px; +} + +.SmartSearch-examples--search { + color: @default-err; + background-color: @default-bg; + border: 1px solid @default-border; + border-radius: 5px; + padding: 0px 5px; + margin-right: 5px; +} diff --git a/awx/ui/client/src/shared/smart-search/smart-search.partial.html b/awx/ui/client/src/shared/smart-search/smart-search.partial.html index 073cb6f8d1..04f5d8d6bf 100644 --- a/awx/ui/client/src/shared/smart-search/smart-search.partial.html +++ b/awx/ui/client/src/shared/smart-search/smart-search.partial.html @@ -33,25 +33,27 @@
-
-
-
-
- {{ key }} -
-
-
Type: {{ value.type }}
-
Description: {{value.help_text}}
-
- Enumerated: {{ choice[0] }} -
+
+
+ EXAMPLES:
+ + +
-
- Searchable relationships: {{ relation }}, +
+ FIELDS: {{ key }}, +
+
+ RELATED FIELDS: {{ relation }}, +
+
+ ADDITIONAL INFORMATION: For additional information on advanced search search syntax please see the Ansible Tower documentation.