Merge branch 'master' of https://github.com/joshuawoodward/grafana into joshuawoodward-master

conf/defaults.ini

@@ -231,6 +231,7 @@ verify_email_enabled = false
 
 
 # Background text for the user field on the login page
 # Background text for the user field on the login page
 login_hint = email or username
 login_hint = email or username
+passowrd_hint = password
 
 
 # Default UI theme ("dark" or "light")
 # Default UI theme ("dark" or "light")
 default_theme = dark
 default_theme = dark

pkg/api/login.go

@@ -36,6 +36,7 @@ func (hs *HTTPServer) LoginView(c *m.ReqContext) {
 	viewData.Settings["oauth"] = enabledOAuths
 	viewData.Settings["oauth"] = enabledOAuths
 	viewData.Settings["disableUserSignUp"] = !setting.AllowUserSignUp
 	viewData.Settings["disableUserSignUp"] = !setting.AllowUserSignUp
 	viewData.Settings["loginHint"] = setting.LoginHint
 	viewData.Settings["loginHint"] = setting.LoginHint
+	viewData.Settings["passwordHint"] = setting.PasswordHint
 	viewData.Settings["disableLoginForm"] = setting.DisableLoginForm
 	viewData.Settings["disableLoginForm"] = setting.DisableLoginForm
 
 
 	if loginError, ok := tryGetEncryptedCookie(c, LoginErrorCookieName); ok {
 	if loginError, ok := tryGetEncryptedCookie(c, LoginErrorCookieName); ok {

pkg/setting/setting.go

@@ -109,6 +109,7 @@ var (
 	AutoAssignOrgRole       string
 	AutoAssignOrgRole       string
 	VerifyEmailEnabled      bool
 	VerifyEmailEnabled      bool
 	LoginHint               string
 	LoginHint               string
+	PasswordHint            string
 	DefaultTheme            string
 	DefaultTheme            string
 	DisableLoginForm        bool
 	DisableLoginForm        bool
 	DisableSignoutMenu      bool
 	DisableSignoutMenu      bool
@@ -656,6 +657,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
 	AutoAssignOrgRole = users.Key("auto_assign_org_role").In("Editor", []string{"Editor", "Admin", "Viewer"})
 	AutoAssignOrgRole = users.Key("auto_assign_org_role").In("Editor", []string{"Editor", "Admin", "Viewer"})
 	VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false)
 	VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false)
 	LoginHint = users.Key("login_hint").String()
 	LoginHint = users.Key("login_hint").String()
+	PasswordHint = users.Key("password_hint").String()
 	DefaultTheme = users.Key("default_theme").String()
 	DefaultTheme = users.Key("default_theme").String()
 	ExternalUserMngLinkUrl = users.Key("external_manage_link_url").String()
 	ExternalUserMngLinkUrl = users.Key("external_manage_link_url").String()
 	ExternalUserMngLinkName = users.Key("external_manage_link_name").String()
 	ExternalUserMngLinkName = users.Key("external_manage_link_name").String()

public/app/core/config.ts

@@ -34,6 +34,7 @@ export class Settings {
   oauth: any;
   oauth: any;
   disableUserSignUp: boolean;
   disableUserSignUp: boolean;
   loginHint: any;
   loginHint: any;
+  passwordHint: any;
   loginError: any;
   loginError: any;
   viewersCanEdit: boolean;
   viewersCanEdit: boolean;
   editorsCanOwn: boolean;
   editorsCanOwn: boolean;

public/app/core/controllers/login_ctrl.ts

@@ -25,6 +25,7 @@ export class LoginCtrl {
     $scope.disableLoginForm = config.disableLoginForm;
     $scope.disableLoginForm = config.disableLoginForm;
     $scope.disableUserSignUp = config.disableUserSignUp;
     $scope.disableUserSignUp = config.disableUserSignUp;
     $scope.loginHint = config.loginHint;
     $scope.loginHint = config.loginHint;
+    $scope.passwordHint = config.passwordHint;
 
 
     $scope.loginMode = true;
     $scope.loginMode = true;
     $scope.submitBtnText = 'Log in';
     $scope.submitBtnText = 'Log in';

public/app/partials/login.html

@@ -13,7 +13,7 @@
           </div>
           </div>
           <div class="login-form">
           <div class="login-form">
             <input type="password" name="password" class="gf-form-input login-form-input" required ng-model="formModel.password" id="inputPassword"
             <input type="password" name="password" class="gf-form-input login-form-input" required ng-model="formModel.password" id="inputPassword"
-              placeholder="password">
+              placeholder="{{passwordHint}}">
           </div>
           </div>
           <div class="login-button-group">
           <div class="login-button-group">
             <button type="submit" class="btn btn-large p-x-2" ng-if="!loggingIn" ng-click="submit();" ng-class="{'btn-inverse': !loginForm.$valid, 'btn-primary': loginForm.$valid}">
             <button type="submit" class="btn btn-large p-x-2" ng-if="!loggingIn" ng-click="submit();" ng-class="{'btn-inverse': !loginForm.$valid, 'btn-primary': loginForm.$valid}">