-
Notifications
You must be signed in to change notification settings - Fork 8.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Integrate UI Framework #8679
Integrate UI Framework #8679
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,36 +1,40 @@ | ||
<h3>Help</h3> | ||
<div class="localDropdownTitle">Help</div> | ||
|
||
<tabset> | ||
<tab heading="Request format"> | ||
You can type one or more requests in the white editor. Console understands requests in a compact format: | ||
<sense-help-example></sense-help-example> | ||
<div class="list-group-item list-group-item--noBorder"> | ||
You can type one or more requests in the white editor. Console understands requests in a compact format: | ||
<sense-help-example></sense-help-example> | ||
</div> | ||
</tab> | ||
<tab heading="Keyboard tips"> | ||
<dl class="dl-horizontal"> | ||
<dt></dt> | ||
<dd><strong>General editing</strong></dd> | ||
<dt>Ctrl/Cmd + I</dt> | ||
<dd>Auto indent current request</dd> | ||
<dt>Ctrl + Space</dt> | ||
<dd>Open Auto complete (even if not typing)</dd> | ||
<dt>Ctrl/Cmd + Enter</dt> | ||
<dd>Submit request</dd> | ||
<dt>Ctrl/Cmd + Up/Down</dt> | ||
<dd>Jump to the previous/next request start or end.</dd> | ||
<dt>Ctrl/Cmd + Alt + L</dt> | ||
<dd>Collapse/expand current scope.</dd> | ||
<dt>Ctrl/Cmd + Option + 0</dt> | ||
<dd>Collapse all scopes but the current one. Expand by adding a shift.</dd> | ||
</dl> | ||
<dl class="dl-horizontal"> | ||
<dt></dt> | ||
<dd><strong>When auto-complete is visible</strong></dd> | ||
<dt>Down arrow</dt> | ||
<dd>Switch focus to auto-complete menu. Use arrows to further select a term</dd> | ||
<dt>Enter/Tab</dt> | ||
<dd>Select the currently selected or the top most term in auto-complete menu</dd> | ||
<dt>Esc</dt> | ||
<dd>Close auto-complete menu</dd> | ||
</dl> | ||
<div class="list-group-item list-group-item--noBorder"> | ||
<dl class="dl-horizontal"> | ||
<dt></dt> | ||
<dd><strong>General editing</strong></dd> | ||
<dt>Ctrl/Cmd + I</dt> | ||
<dd>Auto indent current request</dd> | ||
<dt>Ctrl + Space</dt> | ||
<dd>Open Auto complete (even if not typing)</dd> | ||
<dt>Ctrl/Cmd + Enter</dt> | ||
<dd>Submit request</dd> | ||
<dt>Ctrl/Cmd + Up/Down</dt> | ||
<dd>Jump to the previous/next request start or end.</dd> | ||
<dt>Ctrl/Cmd + Alt + L</dt> | ||
<dd>Collapse/expand current scope.</dd> | ||
<dt>Ctrl/Cmd + Option + 0</dt> | ||
<dd>Collapse all scopes but the current one. Expand by adding a shift.</dd> | ||
</dl> | ||
<dl class="dl-horizontal"> | ||
<dt></dt> | ||
<dd><strong>When auto-complete is visible</strong></dd> | ||
<dt>Down arrow</dt> | ||
<dd>Switch focus to auto-complete menu. Use arrows to further select a term</dd> | ||
<dt>Enter/Tab</dt> | ||
<dd>Select the currently selected or the top most term in auto-complete menu</dd> | ||
<dt>Esc</dt> | ||
<dd>Close auto-complete menu</dd> | ||
</dl> | ||
</div> | ||
</tab> | ||
</tabset> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,43 +1,57 @@ | ||
<dashboard-app class="app-container dashboard-container"> | ||
<!-- Local nav. --> | ||
<kbn-top-nav name="dashboard" config="topNavMenu"> | ||
<div class="kibana-nav-info"> | ||
<span ng-show="dash.id" class="kibana-nav-info-title"> | ||
<span ng-bind="::dash.title"></span> | ||
</span> | ||
</div> | ||
</kbn-top-nav> | ||
|
||
<navbar ng-show="chrome.getVisible()" name="dashboard-search"> | ||
<form name="queryInput" | ||
class="fill inline-form" | ||
ng-submit="filterResults()" | ||
role="form"> | ||
|
||
<div class="typeahead" kbn-typeahead="dashboard"> | ||
<div class="input-group" | ||
ng-class="queryInput.$invalid ? 'has-error' : ''"> | ||
|
||
<input | ||
type="text" | ||
placeholder="Filter..." | ||
aria-label="Filter input" | ||
class="form-control" | ||
ng-model="state.query" | ||
input-focus | ||
kbn-typeahead-input | ||
parse-query> | ||
<button type="submit" class="btn btn-default" ng-disabled="queryInput.$invalid" aria-label="Filter dashboards"> | ||
<span aria-hidden="true" class="fa fa-search"></span> | ||
</button> | ||
</div> | ||
|
||
<kbn-typeahead-items></kbn-typeahead-items> | ||
<!-- Transcluded elements. --> | ||
<div data-transclude-slots> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I've made a significant change to the way |
||
<!-- Title. --> | ||
<div | ||
data-transclude-slot="topLeftCorner" | ||
class="localTitle" | ||
> | ||
<span | ||
ng-show="dash.id" | ||
ng-bind="::dash.title" | ||
></span> | ||
</div> | ||
|
||
</form> | ||
<div class="button-group"></div> | ||
</navbar> | ||
<!-- Search. --> | ||
<form | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Most apps have a search bar in the top nav. I typically had to adjust it to use the new |
||
data-transclude-slot="bottomRow" | ||
class="fullWidth" | ||
ng-show="chrome.getVisible()" | ||
role="form" | ||
name="queryInput" | ||
ng-submit="filterResults()" | ||
> | ||
<div class="typeahead" kbn-typeahead="dashboard"> | ||
<div class="localSearch"> | ||
<input | ||
parse-query | ||
input-focus | ||
kbn-typeahead-input | ||
ng-model="state.query" | ||
placeholder="Filter..." | ||
aria-label="Filter input" | ||
type="text" | ||
class="localSearchInput" | ||
ng-class="{'localSearchInput-isInvalid': queryInput.$invalid}" | ||
> | ||
<button | ||
type="submit" | ||
aria-label="Filter Dashboards" | ||
class="localSearchButton" | ||
ng-disabled="queryInput.$invalid" | ||
> | ||
<span class="fa fa-search" aria-hidden="true"></span> | ||
</button> | ||
</div> | ||
<kbn-typeahead-items></kbn-typeahead-items> | ||
</div> | ||
</form> | ||
</div> | ||
</kbn-top-nav> | ||
|
||
<!-- Filters. --> | ||
<filter-bar state="state"></filter-bar> | ||
|
||
<div ng-show="!state.panels.length" class="text-center start-screen"> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -119,7 +119,7 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter, | |
template: require('plugins/kibana/dashboard/partials/save_dashboard.html') | ||
}, { | ||
key: 'open', | ||
description: 'Load Saved Dashboard', | ||
description: 'Open Saved Dashboard', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I made our language more consistent, using the term "Open" instead of "Load". |
||
template: require('plugins/kibana/dashboard/partials/load_dashboard.html') | ||
}, { | ||
key: 'share', | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
<saved-object-finder type="dashboards"></saved-object-finder> | ||
<div class="localDropdownTitle">Open Dashboard</div> | ||
<saved-object-finder type="dashboards"></saved-object-finder> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,9 @@ | ||
<form role="form" class="options"> | ||
<p> | ||
<div class="input-group"> | ||
<label> | ||
<input type="checkbox" ng-model="opts.ui.darkTheme" ng-checked="opts.ui.darkTheme"> | ||
Use dark theme | ||
</label> | ||
</div> | ||
</p> | ||
<form role="form"> | ||
<div class="localDropdownTitle">Options</div> | ||
<div class="input-group"> | ||
<label> | ||
<input type="checkbox" ng-model="opts.ui.darkTheme" ng-checked="opts.ui.darkTheme"> | ||
Use dark theme | ||
</label> | ||
</div> | ||
</form> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,27 @@ | ||
<div ng-switch on="mode" ng-init="mode = 'visualization'" class="dashboard-panel-picker"> | ||
<div | ||
ng-switch="mode" | ||
ng-init="mode = 'visualization'" | ||
> | ||
<div class="localDropdownTitle">Add Panels</div> | ||
|
||
<ul class="nav nav-tabs"> | ||
<li ng-class="{active: mode == 'visualization'}"><a ng-click="mode='visualization'" title="Visualizations">Visualizations</a></li> | ||
<li ng-class="{active: mode == 'search'}"><a ng-click="mode='search'" title="Searches">Searches</a></li> | ||
<li ng-class="{active: mode == 'visualization'}"> | ||
<a ng-click="mode='visualization'" title="Visualizations"> | ||
Visualization | ||
</a> | ||
</li> | ||
<li ng-class="{active: mode == 'search'}"> | ||
<a ng-click="mode='search'" title="Searches"> | ||
Saved Search | ||
</a> | ||
</li> | ||
</ul> | ||
|
||
<div class="list-group-item" ng-switch-when="visualization"> | ||
<div class="list-group-item list-group-item--noBorder" ng-switch-when="visualization"> | ||
<saved-object-finder title="Choose a visualization" type="visualizations" on-choose="opts.addVis"></saved-object-finder> | ||
</div> | ||
|
||
<div class="list-group-item" ng-switch-when="search"> | ||
<div class="list-group-item list-group-item--noBorder" ng-switch-when="search"> | ||
<saved-object-finder title="Choose a search" type="searches" on-choose="opts.addSearch"></saved-object-finder> | ||
</div> | ||
</div> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -152,7 +152,3 @@ dashboard-grid { | |
} | ||
} | ||
} | ||
|
||
.dashboard-panel-picker > .list-group-item { | ||
border-top: 0; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Originally,
data-test-subj
attributes were added to the Menu buttons implicitly, by using thekey
value. I added this property so we can be explicit about this value.