From 68b02ffb9eeb7a414feae8ed89b4011ccecf96bc Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Fri, 23 Oct 2015 22:33:27 +0500
Subject: [PATCH] Oauth UI Improvements and settings improvement

---
 web/react/components/register_app_modal.jsx   | 135 +++++++++---------
 web/react/components/setting_item_max.jsx     |   4 +-
 .../user_settings/manage_outgoing_hooks.jsx   |   1 +
 .../user_settings_integrations.jsx            |   4 +
 web/sass-files/sass/partials/_settings.scss   |  54 +++----
 5 files changed, 102 insertions(+), 96 deletions(-)

diff --git a/web/react/components/register_app_modal.jsx b/web/react/components/register_app_modal.jsx
index 3d4d9bf458..c40409dcca 100644
--- a/web/react/components/register_app_modal.jsx
+++ b/web/react/components/register_app_modal.jsx
@@ -96,75 +96,74 @@ export default class RegisterAppModal extends React.Component {
         var body = '';
         if (this.state.clientId === '') {
             body = (
-                <div className='form-group user-settings'>
-                    <h3>{'Register a New Application'}</h3>
-                    <br/>
-                    <label className='col-sm-4 control-label'>{'Application Name'}</label>
-                    <div className='col-sm-7'>
-                        <input
-                            ref='name'
-                            className='form-control'
-                            type='text'
-                            placeholder='Required'
-                        />
-                        {nameError}
+                <div className='settings-modal'>
+                    <div className='form-horizontal user-settings'>
+                        <h4 className='padding-bottom x3'>{'Register a New Application'}</h4>
+                        <div className='row'>
+                            <label className='col-sm-4 control-label'>{'Application Name'}</label>
+                            <div className='col-sm-7'>
+                                <input
+                                    ref='name'
+                                    className='form-control'
+                                    type='text'
+                                    placeholder='Required'
+                                />
+                                {nameError}
+                            </div>
+                        </div>
+                        <div className='row padding-top x2'>
+                            <label className='col-sm-4 control-label'>{'Homepage URL'}</label>
+                            <div className='col-sm-7'>
+                                <input
+                                    ref='homepage'
+                                    className='form-control'
+                                    type='text'
+                                    placeholder='Required'
+                                />
+                                {homepageError}
+                            </div>
+                        </div>
+                        <div className='row padding-top x2'>
+                            <label className='col-sm-4 control-label'>{'Description'}</label>
+                            <div className='col-sm-7'>
+                                <input
+                                    ref='desc'
+                                    className='form-control'
+                                    type='text'
+                                    placeholder='Optional'
+                                />
+                            </div>
+                        </div>
+                        <div className='row padding-top padding-bottom x2'>
+                            <label className='col-sm-4 control-label'>{'Callback URL'}</label>
+                            <div className='col-sm-7'>
+                                <textarea
+                                    ref='callback'
+                                    className='form-control'
+                                    type='text'
+                                    placeholder='Required'
+                                    rows='5'
+                                />
+                                {callbackError}
+                            </div>
+                        </div>
+                        {serverError}
+                        <hr />
+                        <a
+                            className='btn btn-sm theme pull-right'
+                            href='#'
+                            data-dismiss='modal'
+                            aria-label='Close'
+                        >
+                            {'Cancel'}
+                        </a>
+                        <a
+                            className='btn btn-sm btn-primary pull-right'
+                            onClick={this.register}
+                        >
+                            {'Register'}
+                        </a>
                     </div>
-                    <br/>
-                    <br/>
-                    <label className='col-sm-4 control-label'>{'Homepage URL'}</label>
-                    <div className='col-sm-7'>
-                        <input
-                            ref='homepage'
-                            className='form-control'
-                            type='text'
-                            placeholder='Required'
-                        />
-                        {homepageError}
-                    </div>
-                    <br/>
-                    <br/>
-                    <label className='col-sm-4 control-label'>{'Description'}</label>
-                    <div className='col-sm-7'>
-                        <input
-                            ref='desc'
-                            className='form-control'
-                            type='text'
-                            placeholder='Optional'
-                        />
-                    </div>
-                    <br/>
-                    <br/>
-                    <label className='col-sm-4 control-label'>{'Callback URL'}</label>
-                    <div className='col-sm-7'>
-                        <textarea
-                            ref='callback'
-                            className='form-control'
-                            type='text'
-                            placeholder='Required'
-                            rows='5'
-                        />
-                        {callbackError}
-                    </div>
-                    <br/>
-                    <br/>
-                    <br/>
-                    <br/>
-                    <br/>
-                    {serverError}
-                    <a
-                        className='btn btn-sm theme pull-right'
-                        href='#'
-                        data-dismiss='modal'
-                        aria-label='Close'
-                    >
-                        {'Cancel'}
-                    </a>
-                    <a
-                        className='btn btn-sm btn-primary pull-right'
-                        onClick={this.register}
-                    >
-                        {'Register'}
-                    </a>
                 </div>
             );
         } else {
diff --git a/web/react/components/setting_item_max.jsx b/web/react/components/setting_item_max.jsx
index 774f98a43d..d6c4b0d4bf 100644
--- a/web/react/components/setting_item_max.jsx
+++ b/web/react/components/setting_item_max.jsx
@@ -35,8 +35,10 @@ export default class SettingItemMax extends React.Component {
         var widthClass;
         if (this.props.width === 'full') {
             widthClass = 'col-sm-12';
-        } else {
+        } else if (this.props.width === 'medium') {
             widthClass = 'col-sm-10 col-sm-offset-2';
+        } else {
+            widthClass = 'col-sm-9 col-sm-offset-3';
         }
 
         return (
diff --git a/web/react/components/user_settings/manage_outgoing_hooks.jsx b/web/react/components/user_settings/manage_outgoing_hooks.jsx
index 6e9b2205d0..4c56db0a1d 100644
--- a/web/react/components/user_settings/manage_outgoing_hooks.jsx
+++ b/web/react/components/user_settings/manage_outgoing_hooks.jsx
@@ -236,6 +236,7 @@ export default class ManageOutgoingHooks extends React.Component {
         return (
             <div key='addOutgoingHook'>
                 <label className='control-label'>{'Add a new outgoing webhook'}</label>
+                <div className='padding-top divider-light'></div>
                 <div className='padding-top'>
                     <div>
                         <label className='control-label'>{'Channel'}</label>
diff --git a/web/react/components/user_settings/user_settings_integrations.jsx b/web/react/components/user_settings/user_settings_integrations.jsx
index 4b1e5e532d..9bee743432 100644
--- a/web/react/components/user_settings/user_settings_integrations.jsx
+++ b/web/react/components/user_settings/user_settings_integrations.jsx
@@ -43,6 +43,7 @@ export default class UserSettingsIntegrationsTab extends React.Component {
                 incomingHooksSection = (
                     <SettingItemMax
                         title='Incoming Webhooks'
+                        width='medium'
                         inputs={inputs}
                         updateSection={(e) => {
                             this.updateSection('');
@@ -54,6 +55,7 @@ export default class UserSettingsIntegrationsTab extends React.Component {
                 incomingHooksSection = (
                     <SettingItemMin
                         title='Incoming Webhooks'
+                        width='medium'
                         describe='Manage your incoming webhooks (Developer feature)'
                         updateSection={() => {
                             this.updateSection('incoming-hooks');
@@ -72,6 +74,7 @@ export default class UserSettingsIntegrationsTab extends React.Component {
                 outgoingHooksSection = (
                     <SettingItemMax
                         title='Outgoing Webhooks'
+                        width='medium'
                         inputs={inputs}
                         updateSection={(e) => {
                             this.updateSection('');
@@ -83,6 +86,7 @@ export default class UserSettingsIntegrationsTab extends React.Component {
                 outgoingHooksSection = (
                     <SettingItemMin
                         title='Outgoing Webhooks'
+                        width='medium'
                         describe='Manage your outgoing webhooks'
                         updateSection={() => {
                             this.updateSection('outgoing-hooks');
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index c881f90730..d33cffa28c 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -33,6 +33,33 @@
     label {
         font-weight: 600;
     }
+    .no-padding--left {
+        padding-left: 0;
+    }
+    .padding-top {
+        padding-top: 7px;
+        &.x2 {
+            padding-top: 14px;
+        }
+        &.x3 {
+            padding-top: 21px;
+        }
+    }
+    .padding-bottom {
+        padding-bottom: 7px;
+        &.x2 {
+            padding-bottom: 14px;
+        }
+        &.x3 {
+            padding-bottom: 21px;
+        }
+        .control-label {
+            font-weight: 600;
+            &.text-left {
+                text-align: left;
+            }
+        }
+    }
     .settings-table {
         display: table;
         table-layout: fixed;
@@ -170,33 +197,6 @@
             .has-error {
                 color: #a94442;
             }
-            .no-padding--left {
-                padding-left: 0;
-            }
-            .padding-top {
-                padding-top: 7px;
-                &.x2 {
-                    padding-top: 14px;
-                }
-                &.x3 {
-                    padding-top: 21px;
-                }
-            }
-            .padding-bottom {
-                padding-bottom: 7px;
-                &.x2 {
-                    padding-bottom: 14px;
-                }
-                &.x3 {
-                    padding-bottom: 21px;
-                }
-                .control-label {
-                    font-weight: 600;
-                    &.text-left {
-                        text-align: left;
-                    }
-                }
-            }
 
             .file-status {
                 font-size: 13px;