updated login view with build info

pull/1442/head
Torkel Ödegaard 11 years ago
parent d1b31bb3d6
commit 72d9532207
  1. 7
      src/app/components/settings.js
  2. 7
      src/app/controllers/loginCtrl.js
  3. 28
      src/app/partials/login.html

@ -26,7 +26,12 @@ function (_, crypto) {
unsaved_changes_warning : true, unsaved_changes_warning : true,
search : { max_results: 100 }, search : { max_results: 100 },
admin : {}, admin : {},
appSubUrl: "" appSubUrl: "",
buildInfo: {
version: 'master',
commit: 'NA',
buildstamp: new Date().getTime()
}
}; };
// This initializes a new hash on purpose, to avoid adding parameters to // This initializes a new hash on purpose, to avoid adding parameters to

@ -11,6 +11,13 @@ function (angular, config) {
$scope.loginModel = {}; $scope.loginModel = {};
$scope.grafana.sidemenu = false; $scope.grafana.sidemenu = false;
// build info view model
$scope.buildInfo = {
version: config.buildInfo.version,
commit: config.buildInfo.commit,
buildstamp: new Date(config.buildInfo.buildstamp * 1000)
};
$scope.init = function() { $scope.init = function() {
if ($routeParams.logout) { if ($routeParams.logout) {
$scope.logout(); $scope.logout();

@ -10,17 +10,17 @@
<div class="login-inner-box"> <div class="login-inner-box">
<form name="loginForm"> <form name="loginForm">
<input type="text" required ng-model="loginModel.email" id="inputEmail" placeholder="Email"> <input type="text" required ng-model="loginModel.email" id="inputEmail" placeholder="Email">
<input type="password" required ng-model="loginModel.password" id="inputPassword" placeholder="Password"> <input type="password" required ng-model="loginModel.password" id="inputPassword" placeholder="Password">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" ng-model="loginModel.remember" ng-checked="login.remember"> Remember me <input type="checkbox" ng-model="loginModel.remember" ng-checked="login.remember"> Remember me
</label> </label>
<button type="submit" ng-click="login()" class="btn btn-success" style="margin-bottom: 20px"> <button type="submit" ng-click="login()" class="btn btn-success" style="margin-bottom: 20px">
Sign in Sign in
</button> </button>
</form> </form>
<div class="alert alert-error" ng-show="loginError"> <div class="alert alert-error" ng-show="loginError">
@ -42,4 +42,16 @@
</div> </div>
</div> </div>
<div class="clearfix"></div>
</div> </div>
<div class="row" style="margin-top: 100px">
<div class="version-footer text-center small">
Grafana version: {{buildInfo.version}}, commit: {{buildInfo.commit}},
build date: {{buildInfo.buildstamp | date: 'yyyy-MM-dd HH:mm:ss' }}
</div>
</div>
</div>

Loading…
Cancel
Save