incremental

3 files changed, 36 insertions, 37 deletions

diff --git a/static/index.html b/static/index.html
index 9f08b37..391bf93 100644
--- a/static/index.html
+++ b/static/index.html
@@ -13,43 +13,40 @@
 
     <link rel="icon" href="static/favicon.ico" type="image/x-icon" />
 
-    <script src="static/js/angular.js"></script>
-    <script src="static/js/angular-animate.js"></script>
-    <script src="static/js/angular-sanitize.js"></script>
-    <script src="static/js/angular-cookies.js"></script>
-    <script src="static/js/angular-resource.js"></script>
-    <script src="static/js/angular-ui-router.js"></script>
-    <script src="static/js/angular-websocket.js"></script>
-    <script src="static/js/lodash.core.js"></script>
+    <script type="text/javascript" src="static/js/angular.js"></script>
+    <script type="text/javascript" src="static/js/angular-animate.js"></script>
+    <script type="text/javascript" src="static/js/angular-sanitize.js"></script>
+    <script type="text/javascript" src="static/js/angular-cookies.js"></script>
+    <script type="text/javascript" src="static/js/angular-resource.js"></script>
+    <script type="text/javascript" src="static/js/angular-ui-router.js"></script>
+    <script type="text/javascript" src="static/js/angular-websocket.js"></script>
+    <script type="text/javascript" src="static/js/lodash.core.js"></script>
 
-    <script src="static/js/ui-bootstrap-tpls-2.1.3.js"></script>
+    <script type="text/javascript" src="static/js/ui-bootstrap-tpls-2.1.3.js"></script>
 
-    <script src="static/js/bmcApp.js"></script>
-    <script src="static/js/base64.js"></script>
-    <script src="static/js/versionController.js"></script>
-    <script src="static/js/selController.js"></script>
-    <script src="static/js/loginController.js"></script>
-    <script src="static/js/kvmController.js"></script>
-    <script src="static/js/ipmiController.js"></script>
+    <script type="text/javascript" src="static/js/bmcApp.js"></script>
+    <script type="text/javascript" src="static/js/base64.js"></script>
+    <script type="text/javascript" src="static/js/versionController.js"></script>
+    <script type="text/javascript" src="static/js/selController.js"></script>
+    <script type="text/javascript" src="static/js/loginController.js"></script>
+    <script type="text/javascript" src="static/js/kvmController.js"></script>
+    <script type="text/javascript" src="static/js/ipmiController.js"></script>
  
-    <script src="static/noVNC/core/util.js"></script>
-    <script src="static/noVNC/app/webutil.js"></script>  
+    <script type="text/javascript" src="static/noVNC/core/util.js"></script>
+    <script type="text/javascript" src="static/noVNC/app/webutil.js"></script>  
 
-    <script src="static/noVNC/core/base64.js"></script>
-    <script src="static/noVNC/core/websock.js"></script>
-    <script src="static/noVNC/core/des.js"></script>
-    <script src="static/noVNC/core/input/keysymdef.js"></script>
-    <script src="static/noVNC/core/input/xtscancodes.js"></script>
-    <script src="static/noVNC/core/input/util.js"></script>
-    <script src="static/noVNC/core/input/devices.js"></script>
-    <script src="static/noVNC/core/display.js"></script>
-    <script src="static/noVNC/core/inflator.js"></script>
-    <script src="static/noVNC/core/rfb.js"></script>
-    <script src="static/noVNC/core/input/keysym.js"></script> 
+    <script type="text/javascript" src="static/noVNC/core/base64.js"></script>
+    <script type="text/javascript" src="static/noVNC/core/websock.js"></script>
+    <script type="text/javascript" src="static/noVNC/core/des.js"></script>
+    <script type="text/javascript" src="static/noVNC/core/input/keysymdef.js"></script>
+    <script type="text/javascript" src="static/noVNC/core/input/xtscancodes.js"></script>
+    <script type="text/javascript" src="static/noVNC/core/input/util.js"></script>
+    <script type="text/javascript" src="static/noVNC/core/input/devices.js"></script>
+    <script type="text/javascript" src="static/noVNC/core/display.js"></script>
+    <script type="text/javascript" src="static/noVNC/core/inflator.js"></script>
+    <script type="text/javascript" src="static/noVNC/core/rfb.js"></script>
+    <script type="text/javascript" src="static/noVNC/core/input/keysym.js"></script> 
 
-    <script type="text/javascript">
-        var INCLUDE_URI= "static/noVNC/include/";
-    </script>
 </head>
 
 <body>
@@ -67,7 +64,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" href="#"><img style="max-width:100%; max-height:100%" src="static/img/logo.png" /></a>
+                    <a class="navbar-brand" href="#"><img style="max-width:100%; max-height:100%; height:50; width:73" src="static/img/logo.png" /></a>
                 </div>
 
                 <!-- Collect the nav links, forms, and other content for toggling -->
diff --git a/static/js/bmcApp.js b/static/js/bmcApp.js
index d4282ba..7d31cc2 100644
--- a/static/js/bmcApp.js
+++ b/static/js/bmcApp.js
@@ -10,7 +10,6 @@ var app = angular.module('bmcApp', [
   'ngResource'
 ]);
 
-
 app.controller('MainCtrl', ['$scope', function($scope) {
 
 }]);
@@ -71,8 +70,8 @@ app.directive('windowSize', ['$window', function ($window) {
   }
 }]);
 
-app.run(['$rootScope', '$cookieStore', '$state', '$resource', 'AuthenticationService',
-  function($rootScope, $cookieStore, $state, $resource, AuthenticationService) {
+app.run(['$rootScope', '$cookieStore', '$state', '$resource', 'AuthenticationService', '$http', '$templateCache',
+  function($rootScope, $cookieStore, $state, $resource, AuthenticationService, $http, $templateCache) {
     if ($rootScope.globals == undefined){
         $rootScope.globals = {};
     }
@@ -91,6 +90,8 @@ app.run(['$rootScope', '$cookieStore', '$state', '$resource', 'AuthenticationSer
             $state.go('login');
           }
         });
+  
+    $http.get('static/partial-kvm.html', { cache: $templateCache });
   }
 ]);
 
diff --git a/static/js/kvmController.js b/static/js/kvmController.js
index d10a223..e3dcb14 100644
--- a/static/js/kvmController.js
+++ b/static/js/kvmController.js
@@ -24,7 +24,8 @@ function($scope, $location, $window) {
                         'onUpdateState':  updateState,
                         //'onXvpInit':    xvpInit,
                         'onFBUComplete': FBUComplete,
-                        'onDesktopName': updateDesktopName
+                        'onDesktopName': updateDesktopName,
+                        'foobar': 1
                         });
         rfb.connect(host, port, password, path);
     } catch (exc) {