External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-21 06:28:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1616 from mabashian/survey-maker-delete

Browse Source 
Delete Survey icon moved to button
This commit is contained in:
Michael Abashian 2016-04-21 09:41:50 -04:00
commit b00e7b2039
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less
View File

@ -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;

4
awx/ui/client/src/partials/survey-maker-modal.html
View File

@ -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>