From 077d0e60ac0908c9d508e44b925af1447c0c9aea Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Wed, 20 Apr 2016 10:56:26 -0400
Subject: [PATCH] Removed the delete survey icon and added a DELETE SURVEY
 button next to the other buttons in the bottom right corner of the modal.

---
 .../survey-maker/survey-maker.block.less      | 19 ++++++++-----------
 .../src/partials/survey-maker-modal.html      |  4 +---
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less b/awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less
index eab9fe2548..027b1c53ae 100644
--- a/awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less
+++ b/awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less
@@ -97,19 +97,16 @@
     color: @default-icon;
 }
 .SurveyMaker-deleteButton {
-    font-size: 16px;
-    height: 30px;
-    min-width: 30px;
-    color: @list-action-icon;
-    background-color: @list-actn-bg;
-    border: none;
-    border-radius: 50%;
-    margin-right: 15px;
+    color:  @default-bg;
+    background-color: @default-err;
+    text-transform: uppercase;
+    padding-left:15px;
+    padding-right: 15px;
+    margin-left: 20px;
 }
-
 .SurveyMaker-deleteButton:hover {
-    background-color: @list-actn-del-bg-hov !important;
-    color: @list-actn-icn-hov;
+    background-color: @default-err-hov;
+    color: @default-bg;
 }
 .SurveyMaker-previewLabel {
     text-transform: uppercase;
diff --git a/awx/ui/client/src/partials/survey-maker-modal.html b/awx/ui/client/src/partials/survey-maker-modal.html
index 7d624302c2..ebbfe20c79 100644
--- a/awx/ui/client/src/partials/survey-maker-modal.html
+++ b/awx/ui/client/src/partials/survey-maker-modal.html
@@ -27,9 +27,6 @@
                 <div ng-show="!survey_enabled" class="ScheduleToggle-switch" ng-click="toggleSurveyEnabled()">OFF</div>
             </div>
         </div>
-        <button id="delete-survey" class="SurveyMaker-deleteButton" data-placement="top" ng-show="survey_exists" ng-click="showDeleteOverlay('survey')" aw-tool-tip="Delete survey" data-original-title="" title="">
-            <i class="fa fa-trash-o"></i>
-        </button>
         <div class="SurveyMaker-close">
             <button class="SurveyMaker-exit" ng-click="closeSurvey('survey-modal-dialog')"><i class="fa fa-times-circle"></i></button>
         </div>
@@ -86,6 +83,7 @@
                     <div class="Form-buttons">
                         <button id="survey-save-button" class="btn btn-sm Form-saveButton" ng-click="saveSurvey()" ng-disabled="survey_questions.length < 1 || !can_edit || editQuestionIndex !== null">SAVE</button>
                         <button id="survey-close-button" class="btn btn-sm Form-buttonDefault" ng-click="closeSurvey('survey-modal-dialog')">CANCEL</button>
+                        <button id="survey-delete-button" class="btn btn-sm SurveyMaker-deleteButton" ng-show="survey_exists" ng-click="showDeleteOverlay('survey')">DELETE SURVEY</button>
                     </div>
                 </div>
             </div>