Merge pull request #4622 from kensible/3.1-audit-list-round2

Fixing audit bugs
2026-01-18 13:11:19 -03:30 · 2017-01-10 12:04:01 -05:00 · 2017-01-10 12:04:01 -05:00 · dca57b27e8
commit dca57b27e8
parent 6e6fd254dd 52c861503b
18 changed files with 53 additions and 37 deletions
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@ -44,11 +44,10 @@
    color: @list-header-txt;
    font-size: 14px;
    font-weight: bold;
-    padding-bottom: 25px;
-    min-height: 45px;
    word-break: break-all;
    max-width: 90%;
    word-wrap: break-word;
+    margin-bottom: 20px;
 }

 .Form-secondaryTitle{
--- a/awx/ui/client/src/access/add-rbac.block.less
+++ b/awx/ui/client/src/access/add-rbac.block.less
@ -51,6 +51,10 @@
    padding-top: 20px;
 }

+.AddPermissions-list {
+    margin-bottom: 20px;
+}
+
 .AddPermissions-list .List-searchRow {
    height: 0px;
 }
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-azure.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-azure.form.js
@ -38,8 +38,8 @@
         buttons: {
             reset: {
                 ngClick: 'vm.resetAllConfirm()',
-                 label: i18n._('Reset All'),
-                 class: 'Form-button--left Form-cancelButton'
+                 label: i18n._('Revert all to default'),
+                 class: 'Form-resetAll'
             },
             cancel: {
                 ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-org.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-org.form.js
@ -28,8 +28,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-team.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-team.form.js
@ -28,8 +28,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github.form.js
@ -24,8 +24,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-google-oauth2.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-google-oauth2.form.js
@ -36,8 +36,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js
@ -84,8 +84,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js
@ -29,8 +29,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js
@ -56,8 +56,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/configuration.block.less
+++ b/awx/ui/client/src/configuration/configuration.block.less
@ -12,6 +12,19 @@
    float: right
 }

+.Form-resetAll {
+    border: none;
+    padding: 0;
+    background-color: @white;
+    margin-right: auto;
+    color: @default-link;
+    font-size: 12px;
+
+    &:hover {
+        color: @default-link-hov;
+    }
+}
+
 .Form-tab {
    min-width: 77px;
 }
--- a/awx/ui/client/src/configuration/jobs-form/configuration-jobs.form.js
+++ b/awx/ui/client/src/configuration/jobs-form/configuration-jobs.form.js
@ -64,8 +64,8 @@
         buttons: {
             reset: {
                 ngClick: 'vm.resetAllConfirm()',
-                 label: i18n._('Reset All'),
-                 class: 'Form-button--left Form-cancelButton'
+                 label: i18n._('Revert all to default'),
+                 class: 'Form-resetAll'
             },
             cancel: {
                 ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/system-form/sub-forms/system-activity-stream.form.js
+++ b/awx/ui/client/src/configuration/system-form/sub-forms/system-activity-stream.form.js
@ -22,8 +22,8 @@
         buttons: {
             reset: {
                 ngClick: 'vm.resetAllConfirm()',
-                 label: i18n._('Reset All'),
-                 class: 'Form-button--left Form-cancelButton'
+                 label: i18n._('Revert all to default'),
+                 class: 'Form-resetAll'
             },
             cancel: {
                 ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js
+++ b/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js
@ -48,8 +48,8 @@
         buttons: {
             reset: {
                 ngClick: 'vm.resetAllConfirm()',
-                 label: i18n._('Reset All'),
-                 class: 'Form-button--left Form-cancelButton'
+                 label: i18n._('Revert all to default'),
+                 class: 'Form-resetAll'
             },
             cancel: {
                 ngClick: 'vm.formCancel()',
--- 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
@ -26,8 +26,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js
+++ b/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js
@ -32,8 +32,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/lists/Projects.js
+++ b/awx/ui/client/src/lists/Projects.js
@ -61,6 +61,14 @@ export default
        },

        actions: {
+            refresh: {
+                mode: 'all',
+                awToolTip: i18n._("Refresh the page"),
+                ngClick: "refresh()",
+                ngShow: "socketStatus === 'error'",
+                actionClass: 'btn List-buttonDefault',
+                buttonContent: i18n._('REFRESH')
+            },
            add: {
                mode: 'all', // One of: edit, select, all
                ngClick: 'addProject()',
@ -68,14 +76,6 @@ export default
                actionClass: 'btn List-buttonSubmit',
                buttonContent: '&#43; ' + i18n._('ADD'),
                ngShow: "canAdd"
-            },
-            refresh: {
-                mode: 'all',
-                awToolTip: i18n._("Refresh the page"),
-                ngClick: "refresh()",
-                ngShow: "socketStatus == 'error'",
-                actionClass: 'btn List-buttonDefault',
-                buttonContent: i18n._('REFRESH')
            }
        },

--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@ -81,7 +81,7 @@
                        <div id="alert-modal-msg" class="alert" ng-bind-html="alertBody"></div>
                    </div>
                    <div class="modal-footer">
-                        <a href="#" ng-hide="disableButtons" data-target="#form-modal" data-dismiss="modal" id="alert_ok_btn" class="btn btn-primary">{% trans 'OK' %}</a>
+                        <a href="#" ng-hide="disableButtons" data-target="#form-modal" data-dismiss="modal" id="alert_ok_btn" class="btn btn-default">{% trans 'OK' %}</a>
                    </div>
                </div>
                <!-- modal-content -->