incremental
diff --git a/static/css/font-awesome.css b/static/css/font-awesome.css
index a67a323..d7de407 100644
--- a/static/css/font-awesome.css
+++ b/static/css/font-awesome.css
@@ -6,7 +6,7 @@
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
- /* WARNING: This line is modified from stock FA, to make cachign work*/
+ /* WARNING: This line is modified from stock FA, to make caching work*/
src: url('../../static/fonts/fontawesome-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
diff --git a/static/css/intel.css b/static/css/intel.css
index 5080c77..5ce5e38 100644
--- a/static/css/intel.css
+++ b/static/css/intel.css
@@ -561,3 +561,10 @@
.table-striped-invert > tbody > tr:nth-child(2n+1) > td, .table-striped > tbody > tr:nth-child(2n+1) > th {
background-color: #ffffff;
}
+
+
+.div-fake-hidden {
+ width:0px;
+ height:0px;
+ overflow:hidden;
+}
\ No newline at end of file
diff --git a/static/index.html b/static/index.html
index f0f4148..687aa64 100644
--- a/static/index.html
+++ b/static/index.html
@@ -3,74 +3,75 @@
<head>
<meta charset="utf-8" />
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Integrated BMC Console</title>
- <link href="static/css/bootstrap.css" rel="stylesheet">
- <link href="static/css/font-awesome.css" rel="stylesheet" >
- <link href="static/css/intel.css" rel="stylesheet">
+ <link href="static/css/bootstrap.css" rel="stylesheet" />
+ <link href="static/css/font-awesome.css" rel="stylesheet" />
+ <link href="static/css/intel.css" rel="stylesheet" />
<link rel="icon" href="static/favicon.ico" type="image/x-icon" />
- <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 type="text/javascript" src="static/js/angular.js" defer></script>
+ <script type="text/javascript" src="static/js/angular-animate.js" defer></script>
+ <script type="text/javascript" src="static/js/angular-sanitize.js" defer></script>
+ <script type="text/javascript" src="static/js/angular-cookies.js" defer></script>
+ <script type="text/javascript" src="static/js/angular-resource.js" defer></script>
+ <script type="text/javascript" src="static/js/angular-ui-router.js" defer></script>
+ <script type="text/javascript" src="static/js/angular-websocket.js" defer></script>
+ <script type="text/javascript" src="static/js/lodash.core.js" defer></script>
- <script type="text/javascript" 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" defer></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 type="text/javascript" src="static/noVNC/core/util.js"></script>
- <script type="text/javascript" src="static/noVNC/app/webutil.js"></script>
+ <script type="text/javascript" src="static/js/bmcApp.js" defer></script>
+ <script type="text/javascript" src="static/js/base64.js" defer></script>
+ <script type="text/javascript" src="static/js/versionController.js" defer></script>
+ <script type="text/javascript" src="static/js/selController.js" defer></script>
+ <script type="text/javascript" src="static/js/loginController.js" defer></script>
+ <script type="text/javascript" src="static/js/kvmController.js" defer></script>
+ <script type="text/javascript" src="static/js/ipmiController.js" defer></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" src="static/noVNC/core/util.js" defer></script>
+ <script type="text/javascript" src="static/noVNC/app/webutil.js" defer></script>
+
+ <script type="text/javascript" src="static/noVNC/core/base64.js" defer></script>
+ <script type="text/javascript" src="static/noVNC/core/websock.js" defer></script>
+ <script type="text/javascript" src="static/noVNC/core/des.js" defer></script>
+ <script type="text/javascript" src="static/noVNC/core/input/keysymdef.js" defer></script>
+ <script type="text/javascript" src="static/noVNC/core/input/xtscancodes.js" defer></script>
+ <script type="text/javascript" src="static/noVNC/core/input/util.js" defer></script>
+ <script type="text/javascript" src="static/noVNC/core/input/devices.js" defer></script>
+ <script type="text/javascript" src="static/noVNC/core/display.js" defer></script>
+ <script type="text/javascript" src="static/noVNC/core/inflator.js" defer></script>
+ <script type="text/javascript" src="static/noVNC/core/rfb.js" defer></script>
+ <script type="text/javascript" src="static/noVNC/core/input/keysym.js" defer></script>
</head>
<body>
+ <div class="div-fake-hidden"><i class="fa fa-square-o fa-3x"></i></div>
<div ng-controller="MainCtrl">
-
<nav class="navbar navbar-inverse">
+
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header navbar-left">
+ <a class="navbar-brand" href="#"><img style="max-width:100%; max-height:100%;" src="static/img/logo.png" /></a>
<button type="button" class="navbar-toggle" ng-init="navCollapsed = true" ng-click="navCollapsed = !navCollapsed" />
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
- </button>
- <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 -->
<div class="collapse navbar-collapse" uib-collapse="navCollapsed">
<ul class="nav navbar-nav navbar-left">
+
<li class="dropdown" uib-dropdown dropdown-append-to-body>
<a href="#" class="dropdown-toggle" uib-dropdown-toggle role="button" aria-haspopup="true" aria-expanded="false">System <span class="caret"></span></a>
<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="systemlink">
@@ -104,7 +105,7 @@
<li><a href="#">Firmware Update</a></li>
</ul>
</li>
- <li class="dropdown"uib-dropdown dropdown-append-to-body>
+ <li class="dropdown" uib-dropdown dropdown-append-to-body>
<a href="#" class="dropdown-toggle" uib-dropdown-toggle role="button" aria-haspopup="true" aria-expanded="false">Remote Control <span class="caret"></span></a>
<ul class="dropdown-menu" uib-dropdown-menu role="menu">
<li><a ui-sref="kvm">KVM Redirection</a></li>
diff --git a/static/js/bmcApp.js b/static/js/bmcApp.js
index 7d31cc2..2678ac0 100644
--- a/static/js/bmcApp.js
+++ b/static/js/bmcApp.js
@@ -10,6 +10,8 @@
'ngResource'
]);
+
+
app.controller('MainCtrl', ['$scope', function($scope) {
}]);
@@ -72,9 +74,14 @@
app.run(['$rootScope', '$cookieStore', '$state', '$resource', 'AuthenticationService', '$http', '$templateCache',
function($rootScope, $cookieStore, $state, $resource, AuthenticationService, $http, $templateCache) {
+
+ $http.get('static/partial-login.html', {cache:$templateCache});
+ $http.get('static/partial-kvm.html', {cache: $templateCache});
+
if ($rootScope.globals == undefined){
$rootScope.globals = {};
}
+
// keep user logged in after page refresh
AuthenticationService.RestoreCredientials();
@@ -90,8 +97,7 @@
$state.go('login');
}
});
-
- $http.get('static/partial-kvm.html', { cache: $templateCache });
+
}
]);
diff --git a/static/partial-login.html b/static/partial-login.html
index 247ad1e..bee698e 100644
--- a/static/partial-login.html
+++ b/static/partial-login.html
@@ -14,6 +14,5 @@
</div>
<div class="form-actions">
<button type="submit" ng-disabled="form.$invalid || dataLoading" class="btn btn-danger">Login</button>
- <img ng-if="dataLoading" src="data:image/gif;base64,R0lGODlhEAAQAPIAAP///wAAAMLCwkJCQgAAAGJiYoKCgpKSkiH/C05FVFNDQVBFMi4wAwEAAAAh/hpDcmVhdGVkIHdpdGggYWpheGxvYWQuaW5mbwAh+QQJCgAAACwAAAAAEAAQAAADMwi63P4wyklrE2MIOggZnAdOmGYJRbExwroUmcG2LmDEwnHQLVsYOd2mBzkYDAdKa+dIAAAh+QQJCgAAACwAAAAAEAAQAAADNAi63P5OjCEgG4QMu7DmikRxQlFUYDEZIGBMRVsaqHwctXXf7WEYB4Ag1xjihkMZsiUkKhIAIfkECQoAAAAsAAAAABAAEAAAAzYIujIjK8pByJDMlFYvBoVjHA70GU7xSUJhmKtwHPAKzLO9HMaoKwJZ7Rf8AYPDDzKpZBqfvwQAIfkECQoAAAAsAAAAABAAEAAAAzMIumIlK8oyhpHsnFZfhYumCYUhDAQxRIdhHBGqRoKw0R8DYlJd8z0fMDgsGo/IpHI5TAAAIfkECQoAAAAsAAAAABAAEAAAAzIIunInK0rnZBTwGPNMgQwmdsNgXGJUlIWEuR5oWUIpz8pAEAMe6TwfwyYsGo/IpFKSAAAh+QQJCgAAACwAAAAAEAAQAAADMwi6IMKQORfjdOe82p4wGccc4CEuQradylesojEMBgsUc2G7sDX3lQGBMLAJibufbSlKAAAh+QQJCgAAACwAAAAAEAAQAAADMgi63P7wCRHZnFVdmgHu2nFwlWCI3WGc3TSWhUFGxTAUkGCbtgENBMJAEJsxgMLWzpEAACH5BAkKAAAALAAAAAAQABAAAAMyCLrc/jDKSatlQtScKdceCAjDII7HcQ4EMTCpyrCuUBjCYRgHVtqlAiB1YhiCnlsRkAAAOwAAAAAAAAAAAA=="/>
</div>
</form>
\ No newline at end of file