From a1fdb95b0b18d1c67d18932f45bb93953ffac5ac Mon Sep 17 00:00:00 2001
From: chouseknecht <chouse@ansibleworks.com>
Date: Mon, 22 Jul 2013 11:04:04 -0400
Subject: [PATCH] AC-232 final tweaks

---
 awx/ui/static/css/ansible-ui.css       | 8 +++-----
 awx/ui/static/js/forms/JobEventData.js | 2 +-
 awx/ui/static/js/helpers/Events.js     | 3 +++
 awx/ui/templates/ui/index.html         | 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/awx/ui/static/css/ansible-ui.css b/awx/ui/static/css/ansible-ui.css
index 3388537bb5..a7749777eb 100644
--- a/awx/ui/static/css/ansible-ui.css
+++ b/awx/ui/static/css/ansible-ui.css
@@ -614,10 +614,6 @@
  }
 
  .modal-input-xxlarge {
-   width: 460px;
- }
-
- .modal-input-xxxlarge {
    width: 98%;
  }
 
@@ -629,13 +625,15 @@
    margin-top: 0;
  }
 
-
 .modal-backdrop,
 .modal-backdrop.fade.in {
   opacity: 0.6;
   filter: alpha(opacity=60);
 }
 
+.modal-body .ui-accordion .ui-accordion-content {
+  padding: 10px; 
+}
 
 
 /* overrides to TB modal */
diff --git a/awx/ui/static/js/forms/JobEventData.js b/awx/ui/static/js/forms/JobEventData.js
index a50f9643cd..edd0a179ab 100644
--- a/awx/ui/static/js/forms/JobEventData.js
+++ b/awx/ui/static/js/forms/JobEventData.js
@@ -21,7 +21,7 @@ angular.module('JobEventDataDefinition', [])
                 type: 'textarea',
                 readonly: true,
                 rows: 18,
-                'class': 'modal-input-xxxlarge nowrap'
+                'class': 'modal-input-xxlarge'
                 } 
             }
             
diff --git a/awx/ui/static/js/helpers/Events.js b/awx/ui/static/js/helpers/Events.js
index 753c14adb3..dae73ecab4 100644
--- a/awx/ui/static/js/helpers/Events.js
+++ b/awx/ui/static/js/helpers/Events.js
@@ -181,6 +181,7 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
                            case 'results':
                            case 'module_name': 
                            case 'module_args':
+                           case 'rc':
                            delete form.fields[fld];
                            break;
                        }
@@ -201,6 +202,7 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
                         case 'stdout':
                         case 'stderr':
                         case 'msg':
+                        case 'rc':
                             if (data['event_data'] && data['event_data']['res'] && data['event_data']['res'][fld] == undefined) {
                                delete form.fields[fld];
                             }
@@ -273,6 +275,7 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
                     var scope = generator.inject(JobEventDataForm, { mode: 'edit', modal: true, related: false, 
                         modal_selector: '#form-modal2', modal_body_id: 'form-modal2-body' });
                     generator.reset();
+                    scope.formModalInfo = 'View JSON';
                     scope.formModal2Action = function() {
                         $('#form-modal2').modal("hide");
                         }
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index 31a434d25d..2e55183540 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -188,8 +188,8 @@
       </div>
       <div class="modal-body" id="form-modal-body"></div>
       <div class="modal-footer">
-        <a href="" ng-bind="formModalInfo" ng-show="formModalInfo !== undefined && formModalInfo != ''" ng-click="formModalInfoAction()" 
-            class="btn btn-small pull-left"></a>
+        <a href="" ng-show="formModalInfo !== undefined && formModalInfo != ''" ng-click="formModalInfoAction()" 
+            class="btn btn-small pull-left"><i class="icon-zoom-in"></i> <span ng-bind="formModalInfo"></span></a>
         <a href="#" ng-show="formModalCancelShow" data-target="#form-modal" data-dismiss="modal" class="btn btn">Cancel</a>
         <a href="" ng-bind="formModalActionLabel" ng-click="formModalAction()" class="btn btn-primary"></a>
       </div>
@@ -204,7 +204,7 @@
       <div class="modal-body" id="form-modal2-body"></div>
       <div class="modal-footer">
         <a href="" ng-bind="formModal2Info" ng-show="formModal2Info !== undefined && formModal2Info != ''" ng-click="formModal2InfoAction()" 
-            class="btn btn-small pull-left"></a>
+            class="btn btn-small pull-left"><i class="icon-zoom-in"></i> <span ng-bind="formModal2Info"></span></a>
         <a href="#" ng-show="formModal2CancelShow" data-target="#form-modal2" data-dismiss="modal" class="btn btn">Cancel</a>
         <a href="" ng-bind="formModal2ActionLabel" ng-click="formModal2Action()" class="btn btn-primary"></a>
       </div>