Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
f75871f4
Commit
f75871f4
authored
Sep 22, 2017
by
pratik pandey
Committed by
kevalbhatt
Sep 22, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-1905 : Search UI is confusing to user
Signed-off-by:
kevalbhatt
<
kbhatt@apache.org
>
parent
f90cca9d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
SearchLayoutView_tmpl.html
...dv2/public/js/templates/search/SearchLayoutView_tmpl.html
+2
-2
SearchLayoutView.js
dashboardv2/public/js/views/search/SearchLayoutView.js
+4
-0
No files found.
dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
View file @
f75871f4
...
@@ -56,8 +56,8 @@
...
@@ -56,8 +56,8 @@
</div>
</div>
</div>
</div>
<div
class=
"srchType"
>
<div
class=
"srchType"
>
<span
class=
"srchTitle
"
>
Search By Query
</span>
<span
class=
"srchTitle
searchText"
>
Search By Text
</span>
<input
type=
"text"
class=
"form-control"
data-id=
"searchInput"
placeholder=
"Search
using a query string: e.g. sales_fac
t"
style=
"margin: 5px 0px;"
>
<input
type=
"text"
class=
"form-control"
data-id=
"searchInput"
placeholder=
"Search
by tex
t"
style=
"margin: 5px 0px;"
>
</div>
</div>
</div>
</div>
<button
class=
"btn btn-action"
data-id=
"clearSearch"
>
Clear
</button>
<button
class=
"btn btn-action"
data-id=
"clearSearch"
>
Clear
</button>
...
...
dashboardv2/public/js/views/search/SearchLayoutView.js
View file @
f75871f4
...
@@ -541,6 +541,8 @@ define(['require',
...
@@ -541,6 +541,8 @@ define(['require',
this
.
$
(
'.temFilter'
).
removeClass
(
'col-sm-10'
);
this
.
$
(
'.temFilter'
).
removeClass
(
'col-sm-10'
);
this
.
$
(
'.basicSaveSearch'
).
hide
();
this
.
$
(
'.basicSaveSearch'
).
hide
();
this
.
$
(
'.advanceSaveSearch'
).
show
();
this
.
$
(
'.advanceSaveSearch'
).
show
();
this
.
$
(
'.searchText'
).
text
(
'Search By Query'
);
this
.
ui
.
searchInput
.
attr
(
"placeholder"
,
'Search By Query eg. where name="sales_fact"'
);
}
else
{
}
else
{
this
.
$
(
'.temFilter'
).
addClass
(
'col-sm-10'
);
this
.
$
(
'.temFilter'
).
addClass
(
'col-sm-10'
);
this
.
$
(
'.temFilter'
).
removeClass
(
'col-sm-12'
);
this
.
$
(
'.temFilter'
).
removeClass
(
'col-sm-12'
);
...
@@ -550,6 +552,8 @@ define(['require',
...
@@ -550,6 +552,8 @@ define(['require',
this
.
$
(
'.advanceSaveSearch'
).
hide
();
this
.
$
(
'.advanceSaveSearch'
).
hide
();
this
.
dsl
=
false
;
this
.
dsl
=
false
;
this
.
type
=
"basic"
;
this
.
type
=
"basic"
;
this
.
$
(
'.searchText'
).
text
(
'Search By Text'
);
this
.
ui
.
searchInput
.
attr
(
"placeholder"
,
"Search By Text"
);
}
}
if
(
paramObj
&&
this
.
type
==
"basic"
)
{
if
(
paramObj
&&
this
.
type
==
"basic"
)
{
this
.
query
[
this
.
type
].
attributes
=
paramObj
.
attributes
?
paramObj
.
attributes
:
null
;
this
.
query
[
this
.
type
].
attributes
=
paramObj
.
attributes
?
paramObj
.
attributes
:
null
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment