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

Aligns text for canceling/deleting a job on the jobs list & the stdout page

Browse Source
This commit is contained in:
Jared Tabor 2018-05-02 10:44:04 -07:00
parent cf0efe969e
commit 7a3fb02791
No known key found for this signature in database
GPG Key ID: 1B343EC4C3CF7E5C
6 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/features/jobs/jobsList.controller.js
View File

@ -132,7 +132,7 @@ function ListJobsController (
resourceName: $filter('sanitize')(job.name),
body: deleteModalBody,
action,
actionText: 'DELETE'
actionText: strings.get('DELETE'),
});
};
@ -174,7 +174,8 @@ function ListJobsController (
resourceName: $filter('sanitize')(job.name),
body: deleteModalBody,
action,
actionText: strings.get('OK')
actionText: strings.get('cancelJob.CANCEL_JOB'),
cancelText: strings.get('cancelJob.RETURN')
});
};

13
awx/ui/client/features/output/details.directive.js
View File

@ -442,9 +442,10 @@ function toggleLabels () {
}
function cancelJob () {
const actionText = strings.get('warnings.CANCEL_ACTION');
const hdr = strings.get('warnings.CANCEL_HEADER');
const warning = strings.get('warnings.CANCEL_BODY');
const actionText = strings.get('cancelJob.CANCEL_JOB');
const hdr = strings.get('cancelJob.HEADER');
const warning = strings.get('cancelJob.SUBMIT_REQUEST');
const cancelText = strings.get('cancelJob.RETURN');
const id = resource.model.get('id');
const name = $filter('sanitize')(resource.model.get('name'));
@ -467,13 +468,13 @@ function cancelJob () {
});
};
prompt({ hdr, resourceName, body, actionText, action });
prompt({ hdr, resourceName, body, actionText, action, cancelText });
}
function deleteJob () {
const actionText = strings.get('DELETE');
const hdr = strings.get('warnings.DELETE_HEADER');
const warning = strings.get('warnings.DELETE_BODY');
const hdr = strings.get('deleteResource.HEADER');
const warning = strings.get('deleteResource.CONFIRM', 'job');
const id = resource.model.get('id');
const name = $filter('sanitize')(resource.model.get('name'));

8
awx/ui/client/features/output/jobs.strings.js
View File

@ -8,14 +8,6 @@ function JobsStrings (BaseString) {
TITLE: t.s('JOBZ')
};
ns.warnings = {
CANCEL_ACTION: t.s('PROCEED'),
CANCEL_BODY: t.s('Are you sure you want to cancel this job?'),
CANCEL_HEADER: t.s('Cancel Job'),
DELETE_BODY: t.s('Are you sure you want to delete this job?'),
DELETE_HEADER: t.s('Delete Job'),
};
ns.status = {
RUNNING: t.s('The host status bar will update when the job is complete.'),
UNAVAILABLE: t.s('Host status information for this job is unavailable.'),

2
awx/ui/client/index.template.ejs
View File

@ -48,7 +48,7 @@
<div class="Modal-body" ng-bind-html="promptBody" id="prompt-body">
</div>
<div class="Modal-footer">
<a href="#" data-target="#prompt-modal" data-dismiss="modal" id="prompt_cancel_btn" class="btn Modal-defaultButton Modal-footerButton" translate>CANCEL</a>
<a href="#" data-target="#prompt-modal" data-dismiss="modal" id="prompt_cancel_btn" class="btn Modal-defaultButton Modal-footerButton" ng-bind="cancelActionText"></a>
<a href="" ng-hide="hideActionButton" ng-class="promptActionBtnClass" ng-click="promptAction()" id="prompt_action_btn" class="btn Modal-footerButton" ng-bind="promptActionText"></a>
</div>
</div>

5
awx/ui/client/lib/services/base-string.service.js
View File

@ -69,6 +69,7 @@ function BaseStringService (namespace) {
this.JSON = t.s('JSON');
this.DELETE = t.s('DELETE');
this.COPY = t.s('COPY');
this.YES = t.s('YES');
this.deleteResource = {
HEADER: t.s('Delete'),
@ -79,7 +80,9 @@ function BaseStringService (namespace) {
this.cancelJob = {
HEADER: t.s('Cancel'),
SUBMIT_REQUEST: t.s('Are you sure you want to submit the request to cancel this job?')
SUBMIT_REQUEST: t.s('Are you sure you want to submit the request to cancel this job?'),
CANCEL_JOB: t.s('Cancel Job'),
RETURN: t.s('Return')
};
this.error = {

7
awx/ui/client/src/shared/prompt-dialog.js
View File

@ -31,8 +31,8 @@
export default
angular.module('PromptDialog', ['Utilities'])
.factory('Prompt', [
function () {
.factory('Prompt', [ 'AppStrings',
function (strings) {
return function (params) {
var dialog = angular.element(document.getElementById('prompt-modal')),
@ -42,7 +42,8 @@ angular.module('PromptDialog', ['Utilities'])
scope.promptResourceName = params.resourceName;
scope.promptBody = params.body;
scope.promptAction = params.action;
scope.promptActionText = (params.actionText === null || params.actionText === undefined || params.actionText === '') ? 'YES' : params.actionText;
scope.promptActionText = (params.actionText === null || params.actionText === undefined || params.actionText === '') ? strings.get('YES') : params.actionText;
scope.cancelActionText = (params.cancelText === null || params.cancelText === undefined || params.cancelText === '') ? strings.get('CANCEL') : params.cancelText;
scope.hideActionButton = params.hideActionButton ? true : false;
local_backdrop = (params.backdrop === undefined) ? "static" : params.backdrop;