From e6b738e17709fb446294d471dba9dbbc90be1446 Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chouse@ansible.com>
Date: Tue, 22 Jul 2014 13:27:30 -0400
Subject: [PATCH] Event viewer- ignore jinja variables Brought forward change
 from 1.4.11 to keep angular from attempting to bind to jinja vars that might
 appear in task names or pre formated output. Removed use of transparent
 background from jqueryui overrides.

---
 awx/ui/static/js/helpers/EventViewer.js     | 7 +++----
 awx/ui/static/js/helpers/LogViewer.js       | 6 +++---
 awx/ui/static/less/jquery-ui-overrides.less | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/awx/ui/static/js/helpers/EventViewer.js b/awx/ui/static/js/helpers/EventViewer.js
index e05688af0d..e2902f16cc 100644
--- a/awx/ui/static/js/helpers/EventViewer.js
+++ b/awx/ui/static/js/helpers/EventViewer.js
@@ -146,7 +146,6 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
             scope.removeEventReady = scope.$on('EventReady', function(e, data) {
                 var btns;
                 scope.events = data;
-
                 // find and show the selected event
                 data.every(function(row, idx) {
                     if (parseInt(row.id,10) === parseInt(event_id,10)) {
@@ -412,7 +411,7 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
                                     ">" + obj[key] + "</a>";
                             }
                             else {
-                                html += obj[key];
+                                html += "<span ng-non-bindable>" + obj[key] + "</span>";
                             }
 
                             html += "</td></tr>\n";
@@ -454,7 +453,7 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
                 fld_id = params.fld_id,
                 html;
             html = "<div class=\"form-group\">\n" +
-                "<textarea id=\"" + fld_id + "\" class=\"form-control mono-space\" rows=\"12\" readonly>" + val + "</textarea>" +
+                "<textarea ng-non-bindable id=\"" + fld_id + "\" class=\"form-control mono-space\" rows=\"12\" readonly>" + val + "</textarea>" +
                 "</div>\n";
             $('#' + container_id).empty().html(html);
         };
@@ -465,7 +464,7 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
             var id = params.id,
                 val = params.val,
                 html;
-            html = "<pre>" + val + "</pre>\n";
+            html = "<pre ng-non-bindable>" + val + "</pre>\n";
             $('#' + id).empty().html(html);
         };
     }]);
diff --git a/awx/ui/static/js/helpers/LogViewer.js b/awx/ui/static/js/helpers/LogViewer.js
index 1c42349301..36222cad18 100644
--- a/awx/ui/static/js/helpers/LogViewer.js
+++ b/awx/ui/static/js/helpers/LogViewer.js
@@ -346,7 +346,7 @@ angular.module('LogViewerHelper', ['ModalDialog', 'Utilities', 'FormGenerator',
                 fld_id = params.fld_id,
                 html;
             html = "<div class=\"form-group\">\n" +
-                "<textarea id=\"" + fld_id + "\" class=\"form-control mono-space\" rows=\"12\" readonly>" + val + "</textarea>" +
+                "<textarea id=\"" + fld_id + "\" ng-non-bindable class=\"form-control mono-space\" rows=\"12\" readonly>" + val + "</textarea>" +
                 "</div>\n";
             $('#' + container_id).empty().html(html);
         };
@@ -357,7 +357,7 @@ angular.module('LogViewerHelper', ['ModalDialog', 'Utilities', 'FormGenerator',
             var id = params.id,
                 val = params.val,
                 html;
-            html = "<pre>" + val + "</pre>\n";
+            html = "<pre ng-non-bindable>" + val + "</pre>\n";
             $('#' + id).empty().html(html);
         };
     }])
@@ -370,7 +370,7 @@ angular.module('LogViewerHelper', ['ModalDialog', 'Utilities', 'FormGenerator',
             html = "<table class=\"table logviewer-status\">\n";
             for (key in vars) {
                 html += "<tr><td class=\"fld-label col-md-4 col-sm-3 col-xs-3 break\">" + key + "</td>" +
-                    "<td class=\"break\">" + vars[key] + "</td></tr>\n";
+                    "<td ng-non-bindable class=\"break\">" + vars[key] + "</td></tr>\n";
             }
             html += "</table>\n";
             $('#' + id).empty().html(html);
diff --git a/awx/ui/static/less/jquery-ui-overrides.less b/awx/ui/static/less/jquery-ui-overrides.less
index db946bcac7..7aad8334aa 100644
--- a/awx/ui/static/less/jquery-ui-overrides.less
+++ b/awx/ui/static/less/jquery-ui-overrides.less
@@ -91,7 +91,7 @@ table.ui-datepicker-calendar {
 
 .ui-widget-content {
     background-image: none;
-    background-color: transparent;
+    background-color: @white;
 
     a,
     a:visited,
@@ -127,7 +127,7 @@ table.ui-datepicker-calendar {
 .ui-state-active,
 .ui-state-default {
     background-image: none;
-    background-color: transparent;
+    background-color: @white;
     border: 1px solid @well-border;
 }