Merge branch 'release-1.10.5'

baton/static/baton/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "1.10.4",
+  "version": "1.10.5",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

baton/static/baton/app/src/core/Login.js

@@ -0,0 +1,30 @@
+import $ from 'jquery'
+
+const Login = {
+  init: function () {
+    let inputUsername = $('#id_username')
+    let inputPassword = $('#id_password')
+
+    const usernameField = $('<div />', { class: 'input-group mb-2' })
+      .append(
+        $('<div />', { class: 'input-group-prepend' }).append(
+          '<div class="input-group-text"><i class="fa fa-user"></i></div>'
+        )
+      )
+      .append(inputUsername.clone())
+
+    inputUsername.replaceWith(usernameField)
+
+    const passwordField = $('<div />', { class: 'input-group mb-2' })
+      .append(
+        $('<div />', { class: 'input-group-prepend' }).append(
+          '<div class="input-group-text"><i class="fa fa-key"></i></div>'
+        )
+      )
+      .append(inputPassword.clone())
+
+    inputPassword.replaceWith(passwordField)
+  }
+}
+
+export default Login

baton/static/baton/app/src/index.js

@@ -13,6 +13,7 @@ import Analytics from './core/Analytics'
 import Tabs from './core/Tabs'
 import ChangeList from './core/ChangeList'
 import ChangeForm from './core/ChangeForm'
+import Login from './core/Login'
 import Filer from './core/Filer'
 
 window.Baton = {
@@ -28,7 +29,9 @@ window.Baton = {
     if (page !== 'login' && page !== 'logout' && !/_popup/.test(location.search)) {
       Menu.init(config, Dispatcher)
     }
-    if (page === 'logout' || page === 'password_change_success') {
+    if (page === 'login') {
+      Login.init()
+    } else if (page === 'logout' || page === 'password_change_success') {
       ActionResult.init()
     } else if (page === 'password_change') {
       PasswordChange.init()

baton/static/baton/app/src/styles/_login.scss

@@ -38,6 +38,11 @@ body.login {
 
     form {
       padding: 1rem;
+
+      .input-group-text {
+        justify-content: center;
+        width: 42px;
+      }
     }
 
     input[type='text'],

docs/conf.py

@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.10.4'
+version = u'1.10.5'
 # The full version, including alpha/beta/rc tags.
-release = u'1.10.4'
+release = u'1.10.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='django-baton',
-    version='1.10.4',
+    version='1.10.5',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',