From 78011dd67faa369429aa69c7925c6cf47505d91d Mon Sep 17 00:00:00 2001
From: Marliana Lara <marliana.lara@gmail.com>
Date: Wed, 3 May 2017 16:25:01 -0400
Subject: [PATCH 1/2] Expose CTiT user-session configurations

---
 .../system-form/sub-forms/system-misc.form.js  | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/src/configuration/system-form/sub-forms/system-misc.form.js b/awx/ui/client/src/configuration/system-form/sub-forms/system-misc.form.js
index 892dfd0bc0..a29eeec330 100644
--- a/awx/ui/client/src/configuration/system-form/sub-forms/system-misc.form.js
+++ b/awx/ui/client/src/configuration/system-form/sub-forms/system-misc.form.js
@@ -6,8 +6,8 @@
 
 export default ['i18n', function(i18n) {
     return {
-        showHeader: false,
         name: 'configuration_misc_template',
+        showHeader: false,
         showActions: true,
 
         fields: {
@@ -20,6 +20,22 @@ export default ['i18n', function(i18n) {
             },
             ORG_ADMINS_CAN_SEE_ALL_USERS: {
                 type: 'toggleSwitch',
+            },
+            AUTH_TOKEN_EXPIRATION: {
+                type: 'number',
+                integer: true,
+                min: 60,
+                reset: 'AUTH_TOKEN_EXPIRATION',
+            },
+            AUTH_TOKEN_PER_USER: {
+                type: 'number',
+                integer: true,
+                spinner: true,
+                min: -1,
+                reset: 'AUTH_TOKEN_PER_USER',
+            },
+            AUTH_BASIC_ENABLED: {
+                type: 'toggleSwitch',
             }
         },
 

From ecccc7d1b6f5d05ee7f88358d119cb6a558a5644 Mon Sep 17 00:00:00 2001
From: Marliana Lara <marliana.lara@gmail.com>
Date: Thu, 4 May 2017 11:15:04 -0400
Subject: [PATCH 2/2] Add styles to keep number inputs consistent with form

---
 awx/ui/client/legacy-styles/forms.less | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index ce7043c7e6..ed4fcb82ab 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -199,6 +199,15 @@
     margin-top: 10px;
 }
 
+.Form-formGroup {
+    input.form-control {
+       background-color: @default-secondary-bg;
+       border-color: @b7grey;
+       border-radius: 5px;
+       height: 30px;
+    }
+}
+
 .Form-checkbox--stacked {
     label {
         display: block;