Merge remote-tracking branch 'marutib/master' into dashTitle

rashidkpc · Jan 21, 2014 · 93b6c69 · 93b6c69
2 parents 234094d + e52e72d
commit 93b6c69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/app/app.js b/src/app/app.js
@@ -126,7 +126,7 @@ function (angular, $, _, appLevelRequire) {
     angular
       .element(document)
       .ready(function() {
-        $('body').attr('ng-controller', 'DashCtrl');
+        $('html').attr('ng-controller', 'DashCtrl');
         angular.bootstrap(document, apps_deps)
           .invoke(['$rootScope', function ($rootScope) {
             _.each(pre_boot_modules, function (module) {
@@ -152,4 +152,4 @@ function (angular, $, _, appLevelRequire) {
   });
 
   return app;
-});
+});
diff --git a/src/index.html b/src/index.html
@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width">
 
-    <title>Kibana 3</title>
+    <title>Kibana 3{{dashboard.current.title ? " - "+dashboard.current.title : ""}}</title>
     <link rel="stylesheet" href="css/bootstrap.light.min.css" title="Light">
     <link rel="stylesheet" href="css/timepicker.css">
     <link rel="stylesheet" href="css/animate.min.css">