Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Restore the navbar injection functionality #6684

Merged
merged 5 commits into from
Mar 29, 2016
+7 −7
Merged

Restore the navbar injection functionality #6684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ea364f
change main navbar back, drop the -options
w33ble Mar 18, 2016
8406574
move the chrom nav controls out of the main button group
w33ble Mar 18, 2016
a28ced3
change timepicker selector
w33ble Mar 21, 2016
76a3e9e
Merge branch 'master' into fix/custom-navbar
w33ble Mar 25, 2016
705ffac
Merge branch 'master' into fix/custom-navbar
w33ble Mar 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/plugins/kibana/public/dashboard/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div dashboard-app class="app-container dashboard-container">
<navbar name="dashboard-options" class="kibana-nav-options">
<navbar name="dashboard" class="kibana-nav-options">
<div class="kibana-nav-info">
<span ng-show="dash.id" class="kibana-nav-info-title">
<span ng-bind="::dash.title"></span>
Expand Down Expand Up @@ -51,8 +51,8 @@
ng-click="configTemplate.toggle('options');">
<span>Options</span>
</button>
<div class="chrome-actions"kbn-chrome-append-nav-controls></div>
</div>
<div class="chrome-actions" kbn-chrome-append-nav-controls></div>
</navbar>
<config config-template="configTemplate" config-object="opts"></config>

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/kibana/public/discover/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div ng-controller="discover" class="app-container">
<navbar name="discover-options" class="kibana-nav-options">
<navbar name="discover" class="kibana-nav-options">
<div class="kibana-nav-info">
<span ng-show="opts.savedSearch.id" class="kibana-nav-info-title">
<span ng-bind="::opts.savedSearch.title"></span>
Expand Down Expand Up @@ -39,8 +39,8 @@
ng-click="configTemplate.toggle('share');">
<span>Share</span>
</button>
<div class="chrome-actions" kbn-chrome-append-nav-controls></div>
</div>
<div class="chrome-actions" kbn-chrome-append-nav-controls></div>
</navbar>
<config
config-template="configTemplate"
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/kibana/public/visualize/editor/editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div ng-controller="VisEditor" class="app-container vis-editor vis-type-{{ vis.type.name }}">
<navbar name="visualize-options" class="kibana-nav-options" ng-if="chrome.getVisible()">
<navbar name="visualize" class="kibana-nav-options" ng-if="chrome.getVisible()">
<div class="vis-editor-info">
<span ng-show="savedVis.id" class="vis-editor-info-title">
<span ng-bind="::savedVis.title"></span>
Expand Down Expand Up @@ -46,8 +46,8 @@
aria-label="Refresh">
<span>Refresh</span>
</button>
<div class="chrome-actions"kbn-chrome-append-nav-controls></div>
</div>
<div class="chrome-actions" kbn-chrome-append-nav-controls></div>
</navbar>
<config
ng-if="chrome.getVisible()"
Expand Down
2 changes: 1 addition & 1 deletion test/support/pages/discover_page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ define(function (require) {

getTimespanText: function getTimespanText() {
return thisTime
.findByCssSelector('.kibana-nav-actions .navbar-timepicker-time-desc pretty-duration')
.findByCssSelector('.kibana-nav-options .navbar-timepicker-time-desc pretty-duration')
.getVisibleText();
},

Expand Down