From e06f2661f86c7702d7fcc266773192db187335d9 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Mon, 23 Jan 2017 16:19:20 -0500 Subject: [PATCH] conditional stdout resize tooltip text related to #4785 --- .../src/job-results/job-results.controller.js | 9 +++++++++ .../client/src/job-results/job-results.partial.html | 3 ++- .../adhoc/standard-out-adhoc.partial.html | 2 +- .../standard-out-inventory-sync.partial.html | 2 +- .../standard-out-management-jobs.partial.html | 2 +- .../scm-update/standard-out-scm-update.partial.html | 2 +- .../src/standard-out/standard-out.controller.js | 12 ++++++++++-- .../workflow-results/workflow-results.controller.js | 13 ++++++++++++- .../workflow-results/workflow-results.partial.html | 3 ++- 9 files changed, 39 insertions(+), 9 deletions(-) diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js index 0215c816fb..b4b79a7533 100644 --- a/awx/ui/client/src/job-results/job-results.controller.js +++ b/awx/ui/client/src/job-results/job-results.controller.js @@ -6,6 +6,9 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy // download stdout tooltip text $scope.standardOutTooltip = i18n._('Download Output'); + // stdout full screen toggle tooltip text + $scope.toggleStdoutFullscreenTooltip = i18n._("Expand Output"); + // this allows you to manage the timing of rest-call based events as // filters are updated. see processPage for more info var currentContext = 1; @@ -152,6 +155,12 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy $scope.stdoutFullScreen = false; $scope.toggleStdoutFullscreen = function() { $scope.stdoutFullScreen = !$scope.stdoutFullScreen; + + if ($scope.stdoutFullScreen === true) { + $scope.toggleStdoutFullscreenTooltip = i18n._("Collapse Output"); + } else if ($scope.stdoutFullScreen === false) { + $scope.toggleStdoutFullscreenTooltip = i18n._("Expand Output"); + } }; $scope.deleteJob = function() { diff --git a/awx/ui/client/src/job-results/job-results.partial.html b/awx/ui/client/src/job-results/job-results.partial.html index 7b5fab2920..41cc7dc886 100644 --- a/awx/ui/client/src/job-results/job-results.partial.html +++ b/awx/ui/client/src/job-results/job-results.partial.html @@ -476,7 +476,8 @@ diff --git a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html index 66b790bb74..d06a66dd1b 100644 --- a/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html +++ b/awx/ui/client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html @@ -130,7 +130,7 @@
STANDARD OUT
- diff --git a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html index 680c004f4d..5ec35cc675 100644 --- a/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html +++ b/awx/ui/client/src/standard-out/management-jobs/standard-out-management-jobs.partial.html @@ -71,7 +71,7 @@
STANDARD OUT
-
diff --git a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html index f5a4e2a78d..0f24a79aec 100644 --- a/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html +++ b/awx/ui/client/src/standard-out/scm-update/standard-out-scm-update.partial.html @@ -95,7 +95,7 @@
STANDARD OUT
- diff --git a/awx/ui/client/src/standard-out/standard-out.controller.js b/awx/ui/client/src/standard-out/standard-out.controller.js index 2edfa68abd..64f34cb68f 100644 --- a/awx/ui/client/src/standard-out/standard-out.controller.js +++ b/awx/ui/client/src/standard-out/standard-out.controller.js @@ -12,7 +12,7 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams, ClearScope, GetBasePath, Rest, ProcessErrors, Empty, GetChoices, LookUpName, - ParseTypeChange, ParseVariableString, RelaunchJob, DeleteJob, Wait) { + ParseTypeChange, ParseVariableString, RelaunchJob, DeleteJob, Wait, i18n) { ClearScope(); @@ -22,6 +22,7 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams, // This scope variable controls whether or not the left panel is shown and the right panel // is expanded to take up the full screen $scope.stdoutFullScreen = false; + $scope.toggleStdoutFullscreenTooltip = i18n._("Expand Output"); // Listen for job status updates that may come across via sockets. We need to check the payload // to see whethere the updated job is the one that we're currently looking at. @@ -227,6 +228,13 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams, // Click binding for the expand/collapse button on the standard out log $scope.toggleStdoutFullscreen = function() { $scope.stdoutFullScreen = !$scope.stdoutFullScreen; + + if ($scope.stdoutFullScreen === true) { + $scope.toggleStdoutFullscreenTooltip = i18n._("Collapse Output"); + } else if ($scope.stdoutFullScreen === false) { + $scope.toggleStdoutFullscreenTooltip = i18n._("Expand Output"); + + } }; $scope.deleteJob = function() { @@ -259,4 +267,4 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams, JobStdoutController.$inject = [ '$rootScope', '$scope', '$state', '$stateParams', 'ClearScope', 'GetBasePath', 'Rest', 'ProcessErrors', 'Empty', 'GetChoices', 'LookUpName', 'ParseTypeChange', - 'ParseVariableString', 'RelaunchJob', 'DeleteJob', 'Wait']; + 'ParseVariableString', 'RelaunchJob', 'DeleteJob', 'Wait', 'i18n']; diff --git a/awx/ui/client/src/workflow-results/workflow-results.controller.js b/awx/ui/client/src/workflow-results/workflow-results.controller.js index 58dfc3a92f..9522aa0e9f 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.controller.js +++ b/awx/ui/client/src/workflow-results/workflow-results.controller.js @@ -9,6 +9,7 @@ export default ['workflowData', 'WorkflowService', 'count', '$state', + 'i18n', function(workflowData, workflowResultsService, workflowDataOptions, @@ -19,7 +20,8 @@ export default ['workflowData', ParseVariableString, WorkflowService, count, - $state + $state, + i18n ) { var getTowerLinks = function() { @@ -64,6 +66,9 @@ export default ['workflowData', $scope.count = count.val; $scope.showManualControls = false; + // stdout full screen toggle tooltip text + $scope.toggleStdoutFullscreenTooltip = i18n._("Expand Output"); + // turn related api browser routes into tower routes getTowerLinks(); @@ -103,6 +108,12 @@ export default ['workflowData', $scope.toggleStdoutFullscreen = function() { $scope.stdoutFullScreen = !$scope.stdoutFullScreen; + + if ($scope.stdoutFullScreen === true) { + $scope.toggleStdoutFullscreenTooltip = i18n._("Collapse Output"); + } else if ($scope.stdoutFullScreen === false) { + $scope.toggleStdoutFullscreenTooltip = i18n._("Expand Output"); + } }; $scope.deleteJob = function() { diff --git a/awx/ui/client/src/workflow-results/workflow-results.partial.html b/awx/ui/client/src/workflow-results/workflow-results.partial.html index 62ae426237..f63021037a 100644 --- a/awx/ui/client/src/workflow-results/workflow-results.partial.html +++ b/awx/ui/client/src/workflow-results/workflow-results.partial.html @@ -219,7 +219,8 @@