From 3c90d8d2a3aae22d6dec0504783c6fd86513e166 Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Tue, 23 May 2017 14:18:08 -0700
Subject: [PATCH] Polish Admin UI

- Mostly using new form styles instead of the previous one-off styles
---
 ui/src/admin/components/AdminTabs.js          |  2 +-
 ui/src/admin/components/ChangePassRow.js      |  8 +--
 ui/src/admin/components/DatabaseManager.js    |  2 +-
 ui/src/admin/components/DatabaseRow.js        | 13 +++--
 .../admin/components/DatabaseTableHeader.js   | 11 ++--
 ui/src/admin/components/FilterBar.js          |  2 +-
 ui/src/admin/components/QueriesTable.js       |  4 +-
 ui/src/admin/components/RoleRow.js            |  6 ++-
 ui/src/admin/components/RolesTable.js         |  4 +-
 ui/src/admin/components/UserEditingRow.js     | 10 ++--
 ui/src/admin/components/UserRow.js            | 17 ++++--
 ui/src/admin/components/UsersTable.js         |  4 +-
 ui/src/shared/components/YesNoButtons.js      | 23 ++++++--
 ui/src/style/pages/admin.scss                 | 54 +++++++++----------
 14 files changed, 100 insertions(+), 60 deletions(-)

diff --git a/ui/src/admin/components/AdminTabs.js b/ui/src/admin/components/AdminTabs.js
index ea4f35ba0..12bcf06c8 100644
--- a/ui/src/admin/components/AdminTabs.js
+++ b/ui/src/admin/components/AdminTabs.js
@@ -96,7 +96,7 @@ const AdminTabs = ({
       <TabList customClass="col-md-2 admin-tabs">
         {tabs.map((t, i) => <Tab key={tabs[i].type}>{tabs[i].type}</Tab>)}
       </TabList>
-      <TabPanels customClass="col-md-10">
+      <TabPanels customClass="col-md-10 admin-tabs--content">
         {tabs.map((t, i) => (
           <TabPanel key={tabs[i].type}>{t.component}</TabPanel>
         ))}
diff --git a/ui/src/admin/components/ChangePassRow.js b/ui/src/admin/components/ChangePassRow.js
index 64982f6fc..4150c2163 100644
--- a/ui/src/admin/components/ChangePassRow.js
+++ b/ui/src/admin/components/ChangePassRow.js
@@ -48,13 +48,13 @@ class ChangePassRow extends Component {
   }
 
   render() {
-    const {user} = this.props
+    const {user, buttonSize} = this.props
 
     if (this.state.showForm) {
       return (
         <div className="admin-change-pw">
           <input
-            className="form-control"
+            className="form-control input-xs"
             name="password"
             type="password"
             value={user.password || ''}
@@ -67,6 +67,7 @@ class ChangePassRow extends Component {
             onConfirm={this.handleSubmit}
             item={user}
             onCancel={this.handleCancel}
+            buttonSize={buttonSize}
           />
         </div>
       )
@@ -83,12 +84,13 @@ class ChangePassRow extends Component {
   }
 }
 
-const {shape, func} = PropTypes
+const {func, shape, string} = PropTypes
 
 ChangePassRow.propTypes = {
   user: shape().isRequired,
   onApply: func.isRequired,
   onEdit: func.isRequired,
+  buttonSize: string,
 }
 
 export default OnClickOutside(ChangePassRow)
diff --git a/ui/src/admin/components/DatabaseManager.js b/ui/src/admin/components/DatabaseManager.js
index 5d4921818..11a89dbf5 100644
--- a/ui/src/admin/components/DatabaseManager.js
+++ b/ui/src/admin/components/DatabaseManager.js
@@ -25,7 +25,7 @@ const DatabaseManager = ({
   onDeleteRetentionPolicy,
 }) => {
   return (
-    <div className="panel panel-info">
+    <div className="panel panel-default">
       <div className="panel-heading u-flex u-ai-center u-jc-space-between">
         <h2 className="panel-title">
           {databases.length === 1
diff --git a/ui/src/admin/components/DatabaseRow.js b/ui/src/admin/components/DatabaseRow.js
index 7e56eaa3b..512ae1420 100644
--- a/ui/src/admin/components/DatabaseRow.js
+++ b/ui/src/admin/components/DatabaseRow.js
@@ -48,13 +48,15 @@ class DatabaseRow extends Component {
             {isNew
               ? <div className="admin-table--edit-cell">
                   <input
-                    className="form-control"
+                    className="form-control input-sm"
                     type="text"
                     defaultValue={name}
                     placeholder="Name this RP"
                     onKeyDown={e => this.handleKeyDown(e, database)}
                     ref={r => (this.name = r)}
                     autoFocus={true}
+                    spellCheck={false}
+                    autoComplete={false}
                   />
                 </div>
               : <div className="admin-table--edit-cell">
@@ -64,7 +66,7 @@ class DatabaseRow extends Component {
           <td>
             <div className="admin-table--edit-cell">
               <input
-                className="form-control"
+                className="form-control input-sm"
                 name="name"
                 type="text"
                 defaultValue={formattedDuration}
@@ -72,13 +74,15 @@ class DatabaseRow extends Component {
                 onKeyDown={e => this.handleKeyDown(e, database)}
                 ref={r => (this.duration = r)}
                 autoFocus={!isNew}
+                spellCheck={false}
+                autoComplete={false}
               />
             </div>
           </td>
           <td style={isRFDisplayed ? {} : {display: 'none'}}>
             <div className="admin-table--edit-cell">
               <input
-                className="form-control"
+                className="form-control input-sm"
                 name="name"
                 type="number"
                 min="1"
@@ -86,6 +90,8 @@ class DatabaseRow extends Component {
                 placeholder="# of Nodes"
                 onKeyDown={e => this.handleKeyDown(e, database)}
                 ref={r => (this.replication = r)}
+                spellCheck={false}
+                autoComplete={false}
               />
             </div>
           </td>
@@ -121,6 +127,7 @@ class DatabaseRow extends Component {
             ? <YesNoButtons
                 onConfirm={() => onDelete(database, retentionPolicy)}
                 onCancel={this.handleEndDelete}
+                buttonSize="btn-xs"
               />
             : <button
                 className="btn btn-xs btn-danger admin-table--hidden"
diff --git a/ui/src/admin/components/DatabaseTableHeader.js b/ui/src/admin/components/DatabaseTableHeader.js
index a82637bcc..5f99a163f 100644
--- a/ui/src/admin/components/DatabaseTableHeader.js
+++ b/ui/src/admin/components/DatabaseTableHeader.js
@@ -90,7 +90,7 @@ const Header = ({
     <div style={confirmStyle}>
       <div className="admin-table--delete-cell">
         <input
-          className="form-control"
+          className="form-control input-xs"
           name="name"
           type="text"
           value={database.deleteCode || ''}
@@ -98,12 +98,15 @@ const Header = ({
           onChange={e => onDatabaseDeleteConfirm(database, e)}
           onKeyDown={e => onDatabaseDeleteConfirm(database, e)}
           autoFocus={true}
+          autoComplete={false}
+          spellCheck={false}
         />
       </div>
       <ConfirmButtons
         item={database}
         onConfirm={onConfirm}
         onCancel={onCancel}
+        buttonSize="btn-xs"
       />
     </div>
   )
@@ -119,14 +122,16 @@ const Header = ({
 const EditHeader = ({database, onEdit, onKeyDown, onConfirm, onCancel}) => (
   <div className="db-manager-header db-manager-header--edit">
     <input
-      className="form-control"
+      className="form-control input-sm"
       name="name"
       type="text"
       value={database.name}
-      placeholder="Name this database"
+      placeholder="Name this Database"
       onChange={e => onEdit(database, {name: e.target.value})}
       onKeyDown={e => onKeyDown(e, database)}
       autoFocus={true}
+      spellCheck={false}
+      autoComplete={false}
     />
     <ConfirmButtons item={database} onConfirm={onConfirm} onCancel={onCancel} />
   </div>
diff --git a/ui/src/admin/components/FilterBar.js b/ui/src/admin/components/FilterBar.js
index 77a3865ef..b41c7a7b0 100644
--- a/ui/src/admin/components/FilterBar.js
+++ b/ui/src/admin/components/FilterBar.js
@@ -31,7 +31,7 @@ class FilterBar extends Component {
         <div className="users__search-widget input-group admin__search-widget">
           <input
             type="text"
-            className="form-control"
+            className="form-control input-sm"
             placeholder={`Filter ${placeholderText}...`}
             value={this.state.filterText}
             onChange={this.handleText}
diff --git a/ui/src/admin/components/QueriesTable.js b/ui/src/admin/components/QueriesTable.js
index 9973d0437..c8439d5b3 100644
--- a/ui/src/admin/components/QueriesTable.js
+++ b/ui/src/admin/components/QueriesTable.js
@@ -4,9 +4,9 @@ import QueryRow from 'src/admin/components/QueryRow'
 
 const QueriesTable = ({queries, onKillQuery}) => (
   <div>
-    <div className="panel panel-minimal">
+    <div className="panel panel-default">
       <div className="panel-body">
-        <table className="table v-center admin-table">
+        <table className="table v-center admin-table table-highlight">
           <thead>
             <tr>
               <th>Database</th>
diff --git a/ui/src/admin/components/RoleRow.js b/ui/src/admin/components/RoleRow.js
index e7a290da5..512f5421b 100644
--- a/ui/src/admin/components/RoleRow.js
+++ b/ui/src/admin/components/RoleRow.js
@@ -72,7 +72,11 @@ const RoleRow = ({
             />
           : null}
       </td>
-      <DeleteConfirmTableCell onDelete={onDelete} item={role} />
+      <DeleteConfirmTableCell
+        onDelete={onDelete}
+        item={role}
+        buttonSize="btn-xs"
+      />
     </tr>
   )
 }
diff --git a/ui/src/admin/components/RolesTable.js b/ui/src/admin/components/RolesTable.js
index e5f951096..7b3729895 100644
--- a/ui/src/admin/components/RolesTable.js
+++ b/ui/src/admin/components/RolesTable.js
@@ -17,7 +17,7 @@ const RolesTable = ({
   onUpdateRoleUsers,
   onUpdateRolePermissions,
 }) => (
-  <div className="panel panel-info">
+  <div className="panel panel-default">
     <FilterBar
       type="roles"
       onFilter={onFilter}
@@ -25,7 +25,7 @@ const RolesTable = ({
       onClickCreate={onClickCreate}
     />
     <div className="panel-body">
-      <table className="table v-center admin-table">
+      <table className="table v-center admin-table table-highlight">
         <thead>
           <tr>
             <th>Name</th>
diff --git a/ui/src/admin/components/UserEditingRow.js b/ui/src/admin/components/UserEditingRow.js
index d6194ced4..e8e86e522 100644
--- a/ui/src/admin/components/UserEditingRow.js
+++ b/ui/src/admin/components/UserEditingRow.js
@@ -25,10 +25,10 @@ class UserEditingRow extends Component {
   render() {
     const {user, isNew} = this.props
     return (
-      <td>
+      <td style={{width: '240px'}}>
         <div className="admin-table--edit-cell">
           <input
-            className="form-control"
+            className="form-control input-sm"
             name="name"
             type="text"
             value={user.name || ''}
@@ -36,16 +36,20 @@ class UserEditingRow extends Component {
             onChange={this.handleEdit(user)}
             onKeyPress={this.handleKeyPress(user)}
             autoFocus={true}
+            spellCheck={false}
+            autoComplete={false}
           />
           {isNew
             ? <input
-                className="form-control"
+                className="form-control input-sm"
                 name="password"
                 type="password"
                 value={user.password || ''}
                 placeholder="Password"
                 onChange={this.handleEdit(user)}
                 onKeyPress={this.handleKeyPress(user)}
+                spellCheck={false}
+                autoComplete={false}
               />
             : null}
         </div>
diff --git a/ui/src/admin/components/UserRow.js b/ui/src/admin/components/UserRow.js
index 7a468e9ac..d46800d25 100644
--- a/ui/src/admin/components/UserRow.js
+++ b/ui/src/admin/components/UserRow.js
@@ -48,8 +48,9 @@ const UserRow = ({
           onSave={onSave}
           isNew={isNew}
         />
-        {hasRoles ? <td /> : null}
-        <td />
+        {hasRoles ? <td>--</td> : null}
+        <td>--</td>
+        <td style={{width: '190px'}} />
         <td className="text-right" style={{width: '85px'}}>
           <ConfirmButtons item={user} onConfirm={onSave} onCancel={onCancel} />
         </td>
@@ -59,7 +60,7 @@ const UserRow = ({
 
   return (
     <tr>
-      <td>{name}</td>
+      <td style={{width: '240px'}}>{name}</td>
       {hasRoles
         ? <td>
             <MultiSelectDropdown
@@ -74,6 +75,7 @@ const UserRow = ({
             />
           </td>
         : null}
+
       <td>
         {allPermissions && allPermissions.length
           ? <MultiSelectDropdown
@@ -86,14 +88,19 @@ const UserRow = ({
             />
           : null}
       </td>
-      <td className="text-right" style={{width: '300px'}}>
+      <td className="text-right" style={{width: '190px'}}>
         <ChangePassRow
           onEdit={onEdit}
           onApply={handleUpdatePassword}
           user={user}
+          buttonSize="btn-xs"
         />
       </td>
-      <DeleteConfirmTableCell onDelete={onDelete} item={user} />
+      <DeleteConfirmTableCell
+        onDelete={onDelete}
+        item={user}
+        buttonSize="btn-xs"
+      />
     </tr>
   )
 }
diff --git a/ui/src/admin/components/UsersTable.js b/ui/src/admin/components/UsersTable.js
index 3f9e92c8c..c0cb3503d 100644
--- a/ui/src/admin/components/UsersTable.js
+++ b/ui/src/admin/components/UsersTable.js
@@ -20,7 +20,7 @@ const UsersTable = ({
   onUpdateRoles,
   onUpdatePassword,
 }) => (
-  <div className="panel panel-info">
+  <div className="panel panel-default">
     <FilterBar
       type="users"
       onFilter={onFilter}
@@ -28,7 +28,7 @@ const UsersTable = ({
       onClickCreate={onClickCreate}
     />
     <div className="panel-body">
-      <table className="table v-center admin-table">
+      <table className="table v-center admin-table table-highlight">
         <thead>
           <tr>
             <th>User</th>
diff --git a/ui/src/shared/components/YesNoButtons.js b/ui/src/shared/components/YesNoButtons.js
index c54e04f4d..d5c748f30 100644
--- a/ui/src/shared/components/YesNoButtons.js
+++ b/ui/src/shared/components/YesNoButtons.js
@@ -1,21 +1,36 @@
 import React, {PropTypes} from 'react'
+import classnames from 'classnames'
 
-const YesNoButtons = ({onConfirm, onCancel}) => (
+const YesNoButtons = ({onConfirm, onCancel, buttonSize}) => (
   <div>
-    <button className="btn btn-xs btn-info" onClick={onCancel}>
+    <button
+      className={classnames('btn btn-square btn-info', {
+        [buttonSize]: buttonSize,
+      })}
+      onClick={onCancel}
+    >
       <span className="icon remove" />
     </button>
-    <button className="btn btn-xs btn-success" onClick={onConfirm}>
+    <button
+      className={classnames('btn btn-square btn-success', {
+        [buttonSize]: buttonSize,
+      })}
+      onClick={onConfirm}
+    >
       <span className="icon checkmark" />
     </button>
   </div>
 )
 
-const {func} = PropTypes
+const {func, string} = PropTypes
 
 YesNoButtons.propTypes = {
   onConfirm: func.isRequired,
   onCancel: func.isRequired,
+  buttonSize: string,
+}
+YesNoButtons.defaultProps = {
+  buttonSize: 'btn-sm',
 }
 
 export default YesNoButtons
diff --git a/ui/src/style/pages/admin.scss b/ui/src/style/pages/admin.scss
index 115b5a780..ab89b18d0 100644
--- a/ui/src/style/pages/admin.scss
+++ b/ui/src/style/pages/admin.scss
@@ -12,22 +12,7 @@
 */
 .admin-tabs {
   padding-right: 0;
-
-  & + div {
-    padding-left: 0;
-
-    .panel {
-      border-top-left-radius: 0;
-    }
-    .panel-body {
-      min-height: 300px;
-    }
-    .panel-title {
-      font-size: 17px;
-      font-weight: 400 !important;
-      color: $g12-forge;
-    }
-  }
+  & + div {padding-left: 0;}
 }
 .admin-tabs .btn-group {
   margin: 0;
@@ -64,8 +49,26 @@
     }
   }
 }
-
-
+.admin-tabs--content {
+  .panel {
+    border-top-left-radius: 0;
+  }
+  .panel-heading {
+    height: 60px;
+  }
+  .panel-title {
+    font-size: 17px;
+    font-weight: 400 !important;
+    color: $g12-forge;
+    padding: 0;
+  }
+  .panel-body {
+    min-height: 300px;
+  }
+  .panel-heading + .panel-body {
+    padding-top: 0;
+  }
+}
 /*
     Admin Table
     ----------------------------------------------
@@ -184,21 +187,18 @@
   h4 {
     margin: 0px;
     color: $c-potassium;
-    font-size: 17px;
+    font-size: 16px;
     font-family: $code-font;
     padding-left: 6px;
+    width: auto;
   }
 }
 .db-manager-header--edit {
   justify-content: flex-start;
 
   .form-control {
-    height: 22px;
-    padding: 0 6px;
-    margin: 0 4px 0 0;
-    min-width: 110px;
-    font-size: 12px;
-    width: 50%;
+    margin: 0 8px 0 0;
+    flex: 1 0 0;
   }
 }
 
@@ -215,11 +215,7 @@
   flex-wrap: nowrap;
 
   .form-control {
-    height: 22px;
-    padding: 0 6px;
     margin: 0 4px 0 0;
-    min-width: 110px;
-    font-size: 12px;
     width: 120px;
   }
 }