Skip to content

Commit

Permalink
[console] reimplement the navbar by copying dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
spalger committed Mar 23, 2016
1 parent 0534e07 commit c8b5ab5
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 88 deletions.
6 changes: 0 additions & 6 deletions src/plugins/console/public/css/sense.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@ nav.navbar .logo.hidden-sm {
display: block !important;
}

[sense-navbar] {
.server-url-form {
flex: 1 1 1%;
}
}

#editor_output_container {
display: flex;
flex: 1 1 auto;
Expand Down
4 changes: 1 addition & 3 deletions src/plugins/console/public/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<navbar sense-navbar></navbar>

<config config-template="sense.dropdown" config-object="sense"></config>
<sense-navbar></sense-navbar>

<div id="editor_output_container">
<div id="editor_container">
Expand Down
61 changes: 0 additions & 61 deletions src/plugins/console/public/src/directives/navbar.html

This file was deleted.

62 changes: 62 additions & 0 deletions src/plugins/console/public/src/directives/sense_navbar.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<navbar name="sense-options" class="kibana-nav-options">
<div class="kibana-nav-info">
<span ng-show="dash.id" class="kibana-nav-info-title">
Elasticsearch Console
</span>
</div>

<div class="button-group kibana-nav-actions" role="toolbar">
<button
ng-click="sense.dropdown.toggle('history')"
aria-label="History"
aria-haspopup="true"
aria-expanded="{{ sense.dropdown.is('history') }}"
ng-class="{active: sense.dropdown.is('save')}">
<span>History</span>
</button>

<button
aria-label="Settings"
aria-haspopup="true"
aria-expanded="{{ sense.dropdown.is('settings') }}"
ng-class="{active: sense.dropdown.is('settings')}"
ng-click="sense.dropdown.toggle('settings');">
<span>Settings</span>
</button>

<button
aria-label="Help"
aria-haspopup="true"
aria-expanded="{{ sense.dropdown.is('help') }}"
ng-class="{active: sense.dropdown.is('help')}"
ng-click="sense.dropdown.toggle('help');">
<span>Share</span>
</button>
<div class="chrome-actions"kbn-chrome-append-nav-controls></div>
</div>
</navbar>
<config config-template="sense.dropdown" config-object="sense"></config>

<navbar ng-show="chrome.getVisible()" name="sense-serverInput">
<form
name="serverInput"
class="fill inline-form"
ng-submit="sense.sendSelected()"
role="form">

<input
type="text"
placeholder="http://servername:port"
aria-label="Server Name"
class="form-control"
ng-focus="navbar.updateServerUrlHistory()"
ng-blur="navbar.commitServerUrlFormModel()"

sense-uib-typeahead="url for url in navbar.serverUrlHistory"
ng-model="navbar.serverUrlFormModel"
typeahead-append-to-body="true"
typeahead-focus-first="false"

required>
</form>
</navbar>
38 changes: 24 additions & 14 deletions src/plugins/console/public/src/directives/sense_navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,34 @@ require('ui/modules')
.get('app/sense')
.directive('senseNavbar', function () {
return {
restrict: 'A',
template: require('./navbar.html'),
restrict: 'E',
template: require('./sense_navbar.html'),
require: '^ngController',
scope: {},
link($scope, $el, attrs, sense) {
$scope.sense = sense
$scope.navbar.link($scope)
},
controllerAs: 'navbar',
controller: function SenseNavbarController($scope, $element) {
this.serverUrlHistory = [];
this.updateServerUrlHistory = function () {
this.serverUrlHistory = history.getHistoricalServers();
};
controller: class SenseNavbarController {
constructor($scope) {
$scope.chrome = require('ui/chrome');
this.updateServerUrlHistory();
}

this.updateServerUrlHistory();
link($scope) {
$scope.$watch('sense.serverUrl', (url) => {
this.serverUrlFormModel = url
})
}

this.commitServerUrlFormModel = () => {
es.setBaseUrl(this.serverUrlFormModel);
};
updateServerUrlHistory() {
this.serverUrlHistory = history.getHistoricalServers();
}

$scope.$watch('sense.serverUrl', (serverUrl) => {
this.serverUrlFormModel = serverUrl;
});
commitServerUrlFormModel() {
es.setBaseUrl(this.serverUrlFormModel);
}
}
};
});
8 changes: 4 additions & 4 deletions src/plugins/console/public/src/directives/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ <h3>Settings</h3>
<h4>Editor &amp; Output pane settings</h4>

<div class="form-group">
<label for="fontSize">Font Size</label>
<label>Font Size</label>
<div>
<input
input-focus
Expand All @@ -19,7 +19,7 @@ <h4>Editor &amp; Output pane settings</h4>
</div>

<div class="checkbox">
<label for="wrapMode">
<label>
<input type="checkbox" ng-model="settings.vals.wrapMode"/> Wrap long lines
</label>
</div>
Expand All @@ -30,7 +30,7 @@ <h4>Editor &amp; Output pane settings</h4>
<h4>Autocomplete</h4>

<div class="checkbox">
<label for="autocompleteFields">
<label>
<input
name="autocompleteFields"
type="checkbox"
Expand All @@ -41,7 +41,7 @@ <h4>Autocomplete</h4>
</div>

<div class="checkbox">
<label for="autocompleteIndices">
<label>
<input
name="autocompleteIndices"
type="checkbox"
Expand Down
1 change: 1 addition & 0 deletions src/ui/public/styles/base.less
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ a {
cursor: pointer;
}

.application,
.app-container {
> * {
position: relative;
Expand Down

0 comments on commit c8b5ab5

Please sign in to comment.