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
9062e2c8
Commit
9062e2c8
authored
5 years ago
by
kevalbhatt
Committed by
Sarath Subramanian
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3282 : UI : use search suggestions API for quick-search
Signed-off-by:
Sarath Subramanian
<
sarath@apache.org
>
parent
4e1eeb4c
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
89 additions
and
52 deletions
+89
-52
bootstrap-sidebar.css
dashboardv2/public/css/bootstrap-sidebar.css
+1
-1
common.scss
dashboardv2/public/css/scss/common.scss
+1
-1
theme.scss
dashboardv2/public/css/scss/theme.scss
+39
-42
Header.html
dashboardv2/public/js/templates/site/Header.html
+21
-5
CommonViewFunction.js
dashboardv2/public/js/utils/CommonViewFunction.js
+1
-1
Helper.js
dashboardv2/public/js/utils/Helper.js
+25
-1
LineageUtils.js
dashboardv2/public/js/views/graph/LineageUtils.js
+1
-1
Header.js
dashboardv2/public/js/views/site/Header.js
+0
-0
No files found.
dashboardv2/public/css/bootstrap-sidebar.css
View file @
9062e2c8
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
.sidebar-nav
>
li
{
.sidebar-nav
>
li
{
line-height
:
50px
;
line-height
:
50px
;
padding
:
0
20px
;
padding
:
5px
20px
;
border-bottom
:
1px
#1c1e2a
solid
;
border-bottom
:
1px
#1c1e2a
solid
;
}
}
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/css/scss/common.scss
View file @
9062e2c8
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
.detail-page
{
.detail-page
{
.details-backbutton
{
.details-backbutton
{
display
:
block
!
important
;
display
:
table-cell
!
important
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/css/scss/theme.scss
View file @
9062e2c8
...
@@ -25,50 +25,36 @@ body {
...
@@ -25,50 +25,36 @@ body {
overflow-x
:
hidden
;
overflow-x
:
hidden
;
}
}
.detail-page
{
header
.atlas-header
{
.nav.navbar-nav
{
width
:
16%
;
@media
screen
and
(
max-width
:
1024px
)
{
width
:
24%
;
}
}
.global-search-container
{
width
:
65%
;
@media
screen
and
(
max-width
:
1024px
)
{
width
:
45%
;
}
}
}
}
header
.atlas-header
{
header
.atlas-header
{
background-color
:
$white
;
background-color
:
$white
;
border-bottom
:
1px
$color_mystic_approx
solid
;
border-bottom
:
1px
$color_mystic_approx
solid
;
.nav.navbar-nav
{
.navbar-nav
{
width
:
5%
;
display
:
table
;
}
.global-search-container
{
li
{
top
:
8px
;
float
:
none
;
width
:
76%
;
display
:
table-cell
;
padding
:
0px
5px
;
@media
screen
and
(
max-width
:
1024px
)
{
width
:
65%
;
}
}
}
}
.header-menu
{
&
>
table
{
width
:
18%
;
td
{
padding
:
3px
2px
;
position
:
relative
;
transition
:
width
0
.3s
!
important
;
@media
screen
and
(
max-width
:
1024px
)
{
.global-search-container
{
width
:
30%
;
width
:
input
{
width
:
100%
;
}
}
}
}
}
.header-menu
{
.dropdown-menu
>
li
>
a
{
.dropdown-menu
>
li
>
a
{
color
:
$color_ironside_gray_approx
;
color
:
$color_ironside_gray_approx
;
...
@@ -81,7 +67,7 @@ header.atlas-header {
...
@@ -81,7 +67,7 @@ header.atlas-header {
}
}
}
}
>
a
{
td
>
a
{
display
:
inline-block
;
display
:
inline-block
;
color
:
$color_ironside_gray_approx
;
color
:
$color_ironside_gray_approx
;
padding
:
15px
14px
;
padding
:
15px
14px
;
...
@@ -149,7 +135,7 @@ header.atlas-header {
...
@@ -149,7 +135,7 @@ header.atlas-header {
.page-title
{
.page-title
{
background-color
:
$color_white_lilac_approx
;
background-color
:
$color_white_lilac_approx
;
padding
:
1
0
px
15px
0px
15px
;
padding
:
1
5
px
15px
0px
15px
;
.title
{
.title
{
padding-top
:
0
;
padding-top
:
0
;
...
@@ -480,6 +466,25 @@ hr[size="10"] {
...
@@ -480,6 +466,25 @@ hr[size="10"] {
.ui-menu.ui-widget-content.ui-autocomplete
{
.ui-menu.ui-widget-content.ui-autocomplete
{
box-shadow
:
0px
11px
30px
-8px
grey
;
box-shadow
:
0px
11px
30px
-8px
grey
;
max-width
:
60%
!
important
;
max-width
:
60%
!
important
;
max-height
:
70vh
;
overflow-y
:
auto
;
/* prevent horizontal scrollbar */
overflow-x
:
hidden
;
.ui-autocomplete-category
{
padding
:
10px
;
color
:
#acacac
;
text-transform
:
capitalize
;
}
li
.empty
{
padding
:
5px
2px
;
line-height
:
45px
;
span
.empty-message
{
padding
:
10px
;
}
}
.ui-menu-item
{
.ui-menu-item
{
padding
:
5px
2px
;
padding
:
5px
2px
;
...
@@ -496,17 +501,9 @@ hr[size="10"] {
...
@@ -496,17 +501,9 @@ hr[size="10"] {
.ui-state-active
{
.ui-state-active
{
margin
:
0px
;
margin
:
0px
;
&
.empty
{
background
:
transparent
;
color
:
inherit
!
important
;
cursor
:
default
;
}
border
:
none
;
border
:
none
;
background
:
#cee0fa
;
background
:
#cee0fa
;
color
:
$black
!
important
;
color
:
$black
!
important
;
//color: #686868 !important;
}
}
a
,
a
,
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/templates/site/Header.html
View file @
9062e2c8
...
@@ -15,20 +15,30 @@
...
@@ -15,20 +15,30 @@
* limitations under the License.
* limitations under the License.
-->
-->
<header
class=
"clearfix atlas-header"
>
<header
class=
"clearfix atlas-header"
>
<table>
<tr>
<td>
<ul
class=
"nav navbar-nav"
>
<ul
class=
"nav navbar-nav"
>
<li>
<li>
<a
href=
"javascript:void(0);"
data-id=
"menuHamburger"
><i
class=
"fa fa-bars"
></i></a>
<a
href=
"javascript:void(0);"
data-id=
"menuHamburger"
><i
class=
"fa fa-bars"
></i></a>
</li>
</li>
<li
class=
"details-backbutton"
><a
href=
"javascript:void(0);"
data-id=
"backButton"
><i
class=
"fa fa-chevron-left"
></i>
Back To Results
</a></li>
<li
class=
"details-backbutton"
><a
href=
"javascript:void(0);"
data-id=
"backButton"
><i
class=
"fa fa-chevron-left"
></i>
Back To Results
</a></li>
</ul>
</ul>
<div
class=
"form-group has-feedback align-left-right-icon search-box pull-left global-search-container"
>
</td>
<td
class=
"global-search-container"
>
<div
class=
"has-feedback align-left-right-icon search-box"
>
<span
class=
"fa fa-search form-control-feedback"
></span>
<span
class=
"fa fa-search form-control-feedback"
></span>
<input
type=
"text"
class=
"form-control global-search"
name=
"global search"
placeholder=
"Search entities"
data-id=
"globalSearch"
/>
<input
type=
"text"
class=
"form-control global-search"
name=
"global search"
placeholder=
"Search entities"
data-id=
"globalSearch"
/>
<span
class=
"fa fa-times form-control-feedback clearable"
data-id=
"clearGlobalSearch"
></span>
<span
class=
"fa fa-times form-control-feedback clearable"
data-id=
"clearGlobalSearch"
></span>
</div>
</div>
<div
class=
"btn-group pull-right header-menu"
>
</td>
<a
class=
"show-stat"
href=
"javascript:void(0);"
title=
"Statistics"
><i
class=
"fa fa-bar-chart"
></i></a>
<td>
<a
target=
"_blank"
href=
"http://atlas.apache.org/"
><i
class=
"fa fa-question-circle"
></i></a>
<!-- <div class="btn-group pull-right header-menu"> -->
<table
class=
"header-menu"
>
<tr>
<td><a
class=
"show-stat"
href=
"javascript:void(0);"
title=
"Statistics"
><i
class=
"fa fa-bar-chart"
></i></a></td>
<td><a
target=
"_blank"
href=
"http://atlas.apache.org/"
><i
class=
"fa fa-question-circle"
></i></a></td>
<td>
<a
href=
"javascript:void(0);"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
class=
"user-dropdown"
><i
class=
"fa fa-user user-circle "
></i><span
class=
"userName"
></span></a>
<a
href=
"javascript:void(0);"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
class=
"user-dropdown"
><i
class=
"fa fa-user user-circle "
></i><span
class=
"userName"
></span></a>
<ul
class=
"dropdown-menu"
>
<ul
class=
"dropdown-menu"
>
<li
class=
"aboutAtlas"
><a
href=
"javascript:void(0)"
>
About
</a></li>
<li
class=
"aboutAtlas"
><a
href=
"javascript:void(0)"
>
About
</a></li>
...
@@ -37,5 +47,10 @@
...
@@ -37,5 +47,10 @@
<a
href=
"logout.html"
><i
class=
"fa fa-sign-out"
></i>
Logout
</a>
<a
href=
"logout.html"
><i
class=
"fa fa-sign-out"
></i>
Logout
</a>
</li>
</li>
</ul>
</ul>
</div>
</td>
</tr>
</table>
</td>
</tr>
</table>
</header>
</header>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/utils/CommonViewFunction.js
View file @
9062e2c8
...
@@ -688,7 +688,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
...
@@ -688,7 +688,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
collection
=
options
.
collection
,
collection
=
options
.
collection
,
isGlossaryView
=
options
.
isGlossaryView
,
isGlossaryView
=
options
.
isGlossaryView
,
data
=
ref
.
ui
[(
isGlossaryView
?
"glossaryForm"
:
"categoryTermForm"
)].
serializeArray
().
reduce
(
function
(
obj
,
item
)
{
data
=
ref
.
ui
[(
isGlossaryView
?
"glossaryForm"
:
"categoryTermForm"
)].
serializeArray
().
reduce
(
function
(
obj
,
item
)
{
obj
[
item
.
name
]
=
item
.
value
;
obj
[
item
.
name
]
=
item
.
value
.
trim
()
;
return
obj
;
return
obj
;
},
{}),
},
{}),
newModel
=
new
options
.
collection
.
model
(),
newModel
=
new
options
.
collection
.
model
(),
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/utils/Helper.js
View file @
9062e2c8
...
@@ -18,7 +18,8 @@
...
@@ -18,7 +18,8 @@
define
([
'require'
,
define
([
'require'
,
'utils/Utils'
,
'utils/Utils'
,
'd3'
,
'd3'
,
'marionette'
'marionette'
,
'jquery-ui'
],
function
(
require
,
Utils
,
d3
)
{
],
function
(
require
,
Utils
,
d3
)
{
'use strict'
;
'use strict'
;
_
.
mixin
({
_
.
mixin
({
...
@@ -201,6 +202,29 @@ define(['require',
...
@@ -201,6 +202,29 @@ define(['require',
return
adapter
;
return
adapter
;
});
});
$
.
widget
(
"custom.atlasAutoComplete"
,
$
.
ui
.
autocomplete
,
{
_create
:
function
()
{
this
.
_super
();
this
.
widget
().
menu
(
"option"
,
"items"
,
"> :not(.ui-autocomplete-category,.empty)"
);
},
_renderMenu
:
function
(
ul
,
items
)
{
var
that
=
this
,
currentCategory
=
""
;
items
=
_
.
sortBy
(
items
,
'order'
);
$
.
each
(
items
,
function
(
index
,
item
)
{
var
li
;
if
(
item
.
category
!=
currentCategory
)
{
ul
.
append
(
"<li class='ui-autocomplete-category'>"
+
item
.
category
+
"</li>"
);
currentCategory
=
item
.
category
;
}
that
.
_renderItemData
(
ul
,
item
);
});
},
_renderItemData
:
function
(
ul
,
item
)
{
return
this
.
_renderItem
(
ul
,
item
);
}
});
// For placeholder support
// For placeholder support
if
(
!
(
'placeholder'
in
HTMLInputElement
.
prototype
))
{
if
(
!
(
'placeholder'
in
HTMLInputElement
.
prototype
))
{
var
originalRender
=
Backbone
.
Marionette
.
LayoutView
.
prototype
.
render
;
var
originalRender
=
Backbone
.
Marionette
.
LayoutView
.
prototype
.
render
;
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/graph/LineageUtils.js
View file @
9062e2c8
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
* limitations under the License.
* limitations under the License.
*/
*/
define
([
'require'
,
''
],
function
(
require
)
{
define
([
'require'
],
function
(
require
)
{
'use strict'
;
'use strict'
;
var
LinegaeUtils
=
{};
var
LinegaeUtils
=
{};
LinegaeUtils
.
DragNode
=
function
(
options
)
{
LinegaeUtils
.
DragNode
=
function
(
options
)
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/site/Header.js
View file @
9062e2c8
This diff is collapsed.
Click to expand it.
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