From 0c0ab177ceb555af3221e790ef658225a2ff38a1 Mon Sep 17 00:00:00 2001
From: chouseknecht <chouse@ansibleworks.com>
Date: Mon, 22 Jul 2013 10:37:10 -0400
Subject: [PATCH] AC-232 put the RC back in the output/results section. Changed
 label on output/results to Results. Added nowrap class to allow horizontal
 scrolling in textareas

---
 awx/ui/static/css/ansible-ui.css          |  4 ++++
 awx/ui/static/js/controllers/JobEvents.js |  6 +++---
 awx/ui/static/js/forms/JobEventData.js    |  2 +-
 awx/ui/static/js/helpers/Events.js        | 18 +++++++++---------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/awx/ui/static/css/ansible-ui.css b/awx/ui/static/css/ansible-ui.css
index e1246c999e..3388537bb5 100644
--- a/awx/ui/static/css/ansible-ui.css
+++ b/awx/ui/static/css/ansible-ui.css
@@ -24,6 +24,10 @@
     border-color: #e3e3e3;
  }
 
+ .nowrap {
+    white-space: nowrap;
+ }
+
 /* Attempt to make button heights consistent. For some reason success, info, etc. are
    taller than plain .btn */
  
diff --git a/awx/ui/static/js/controllers/JobEvents.js b/awx/ui/static/js/controllers/JobEvents.js
index d9096173e0..260502fa2e 100644
--- a/awx/ui/static/js/controllers/JobEvents.js
+++ b/awx/ui/static/js/controllers/JobEvents.js
@@ -44,7 +44,7 @@ function JobEventsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
               rows = (rows > 10) ? 10 : rows;
               found = true;
               html += "<label>Traceback:</label>\n";
-              html += "<textarea readonly class=\"input-xxlarge\" rows=\"" + rows + "\">" + eventData.res + "</textarea>\n";
+              html += "<textarea readonly class=\"input-xxlarge nowrap\" rows=\"" + rows + "\">" + eventData.res + "</textarea>\n";
            }
            else {
               for (var fld in eventData.res) {
@@ -64,7 +64,7 @@ function JobEventsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
                        n = eventData['res'][fld].match(/\n/g);
                        rows = (n) ? n.length : 1;
                        rows = (rows > 10) ? 10 : rows;
-                       html += "<textarea readonly class=\"input-xxlarge\" rows=\"" + rows + "\">" + eventData.res[fld] + "</textarea>\n";
+                       html += "<textarea readonly class=\"input-xxlarge nowrap\" rows=\"" + rows + "\">" + eventData.res[fld] + "</textarea>\n";
                        found = true;
                   }
                   if ( fld == "results" && Array.isArray(eventData.res[fld]) && eventData.res[fld].length > 0 ) {
@@ -78,7 +78,7 @@ function JobEventsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
                      rows = (rows > 10) ? 10 : rows;
                      if (txt !== '') {
                         html += "<label>Results:</label>\n";
-                        html += "<textarea readonly class=\"input-xxlarge\" rows=\"" + rows + "\">" + txt + "</textarea>\n";
+                        html += "<textarea readonly class=\"input-xxlarge nowrap\" rows=\"" + rows + "\">" + txt + "</textarea>\n";
                         found = true;
                      }
                   } 
diff --git a/awx/ui/static/js/forms/JobEventData.js b/awx/ui/static/js/forms/JobEventData.js
index 718f51ab8f..a50f9643cd 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'
+                'class': 'modal-input-xxxlarge nowrap'
                 } 
             }
             
diff --git a/awx/ui/static/js/helpers/Events.js b/awx/ui/static/js/helpers/Events.js
index 13de0f6e95..753c14adb3 100644
--- a/awx/ui/static/js/helpers/Events.js
+++ b/awx/ui/static/js/helpers/Events.js
@@ -71,7 +71,7 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
                     label: 'Return Code',
                     type: 'text',
                     readonly: true,
-                    section: 'Event',
+                    section: 'Results',
                     'class': 'span1',
                     ngShow: "rc !== ''"
                     }, 
@@ -79,8 +79,8 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
                     label: false,
                     type: 'textarea',
                     readonly: true,
-                    section: 'Output',
-                    'class': 'modal-input-xxlarge',
+                    section: 'Results',
+                    'class': 'modal-input-xxlarge nowrap',
                     ngShow: "msg !== ''",
                     rows: 10
                     },
@@ -88,8 +88,8 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
                     label: false,
                     type: 'textarea',
                     readonly: true,
-                    section: 'Output',
-                    'class': 'modal-input-xxlarge',
+                    section: 'Results',
+                    'class': 'modal-input-xxlarge nowrap',
                     ngShow: "stdout !== ''",
                     rows: 10
                     },
@@ -97,8 +97,8 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
                     label: false,
                     type: 'textarea',
                     readonly: true,
-                    section: 'Output',
-                    'class': 'modal-input-xxlarge',
+                    section: 'Results',
+                    'class': 'modal-input-xxlarge nowrap',
                     ngShow: "stderr !== ''",
                     rows: 10
                     },
@@ -106,7 +106,7 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
                     label: false,
                     type: 'textarea',
                     readonly: true,
-                     'class': 'modal-input-xxlarge',
+                     'class': 'modal-input-xxlarge nowrap',
                     ngShow: "results !== ''",
                     rows: 10
                     },
@@ -122,7 +122,7 @@ angular.module('EventsHelper', ['RestServices', 'Utilities', 'JobEventDataDefini
                     type: 'textarea',
                     readonly: true,
                     section: 'Traceback',
-                    'class': 'modal-input-xxlarge',
+                    'class': 'modal-input-xxlarge nowrap',
                     ngShow: "traceback !== ''",
                     rows: 10
                     },