diff --git a/awx/ui/client/legacy/styles/codemirror.less b/awx/ui/client/legacy/styles/codemirror.less index 68317c844d..8050905d31 100644 --- a/awx/ui/client/legacy/styles/codemirror.less +++ b/awx/ui/client/legacy/styles/codemirror.less @@ -37,15 +37,6 @@ // Disabled textarea[disabled="disabled"] + div[id*="-container"]{ - .CodeMirror { - cursor: not-allowed; - } - - .CodeMirror.cm-s-default, - .CodeMirror-line { - background-color: @ebgrey; - } - .CodeMirror-gutters { border-color: @b7grey; } @@ -55,12 +46,4 @@ textarea[disabled="disabled"] + div[id*="-container"]{ background-color: @default-bg; color: @default-interface-txt; } - - .CodeMirror-lines { - cursor: default; - } - - .CodeMirror-cursors { - display: none; - } } diff --git a/awx/ui/client/lib/components/code-mirror/_index.less b/awx/ui/client/lib/components/code-mirror/_index.less index 770546b151..7e6b6dfe83 100644 --- a/awx/ui/client/lib/components/code-mirror/_index.less +++ b/awx/ui/client/lib/components/code-mirror/_index.less @@ -18,6 +18,11 @@ flex: 1 0 auto; } +.atCodeMirror-labelRightSide{ + display: flex; + align-items: center; +} + .atCodeMirror-labelText{ text-transform: uppercase; color: #707070; @@ -74,3 +79,8 @@ margin-left: 10px; } } + +.atCodeMirror-badge{ + display: initial; + margin-right: 20px; +} \ No newline at end of file diff --git a/awx/ui/client/lib/components/code-mirror/code-mirror.directive.js b/awx/ui/client/lib/components/code-mirror/code-mirror.directive.js index 6d74f2a6aa..0c3e908679 100644 --- a/awx/ui/client/lib/components/code-mirror/code-mirror.directive.js +++ b/awx/ui/client/lib/components/code-mirror/code-mirror.directive.js @@ -13,8 +13,12 @@ function atCodeMirrorController ( ParseVariableString ) { const vm = this; - function init (vars) { + if ($scope.disabled === 'true') { + $scope.disabled = true; + } else if ($scope.disabled === 'false') { + $scope.disabled = false; + } $scope.variables = ParseVariableString(_.cloneDeep(vars)); $scope.parseType = ParseType; const options = { diff --git a/awx/ui/client/lib/components/code-mirror/code-mirror.strings.js b/awx/ui/client/lib/components/code-mirror/code-mirror.strings.js index 0dae4bc6a5..3180e908b2 100644 --- a/awx/ui/client/lib/components/code-mirror/code-mirror.strings.js +++ b/awx/ui/client/lib/components/code-mirror/code-mirror.strings.js @@ -9,8 +9,8 @@ function CodeMirrorStrings (BaseString) { VARIABLES: t.s('VARIABLES'), EXPAND: t.s('EXPAND'), YAML: t.s('YAML'), - JSON: t.s('JSON') - + JSON: t.s('JSON'), + READONLY: t.s('READ ONLY') }; ns.tooltip = { diff --git a/awx/ui/client/lib/components/code-mirror/modal/code-mirror-modal.directive.js b/awx/ui/client/lib/components/code-mirror/modal/code-mirror-modal.directive.js index 6a1837272c..317fe2749e 100644 --- a/awx/ui/client/lib/components/code-mirror/modal/code-mirror-modal.directive.js +++ b/awx/ui/client/lib/components/code-mirror/modal/code-mirror-modal.directive.js @@ -16,8 +16,12 @@ function atCodeMirrorModalController ( ParseVariableString ) { const vm = this; - function resize () { + if ($scope.disabled === 'true') { + $scope.disabled = true; + } else if ($scope.disabled === 'false') { + $scope.disabled = false; + } const editor = $(`${CodeMirrorModalID} .CodeMirror`)[0].CodeMirror; const height = $(ModalHeight).height() - $(ModalHeader).height() - $(ModalFooter).height() - 100; @@ -30,6 +34,11 @@ function atCodeMirrorModalController ( } function init () { + if ($scope.disabled === 'true') { + $scope.disabled = true; + } else if ($scope.disabled === 'false') { + $scope.disabled = false; + } $(CodeMirrorModalID).modal('show'); $scope.extra_variables = ParseVariableString(_.cloneDeep($scope.variables)); $scope.parseType = ParseType; diff --git a/awx/ui/client/lib/components/code-mirror/modal/code-mirror-modal.partial.html b/awx/ui/client/lib/components/code-mirror/modal/code-mirror-modal.partial.html index 056672a2b5..86dd87b5a5 100644 --- a/awx/ui/client/lib/components/code-mirror/modal/code-mirror-modal.partial.html +++ b/awx/ui/client/lib/components/code-mirror/modal/code-mirror-modal.partial.html @@ -42,7 +42,10 @@ -
+
+
+ {{ vm.strings.get('label.READONLY')}} +