Skip to content

Commit aee5168

Browse files
cdcabreracdcabrera
committed
DEV Modal Updates
Modal styling and html
1 parent bdf9e60 commit aee5168

File tree

2 files changed

+29
-86
lines changed

2 files changed

+29
-86
lines changed

‎app/views/directives/edit-environment-from.html

Lines changed: 23 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -88,65 +88,33 @@
8888
<div class="dialog-title">
8989
<h3>Value Details</h3>
9090
</div>
91-
<div class="dialog-body">
91+
<div class="modal-body">
92+
<h4>{{$ctrl.overlayPaneEntryDetails.metadata.name}}
93+
<small class="muted">- {{$ctrl.overlayPaneEntryDetails.kind | humanizeKind : true}}</small></h4>
9294

93-
<div ng-if="$ctrl.overlayPaneEntryDetails.kind === 'ConfigMap'">
94-
<h4>{{$ctrl.overlayPaneEntryDetails.metadata.name}} <small class="muted">- Config Map</small></h4>
95-
96-
<div ng-if="!($ctrl.overlayPaneEntryDetails.data | hashSize)" class="empty-state-message text-center">
97-
The config map has no items.
98-
</div>
99-
100-
<div ng-if="$ctrl.overlayPaneEntryDetails.data | hashSize" class="table-responsive scroll-shadows-horizontal">
101-
<table class="table table-bordered table-bordered-columns config-map-table key-value-table">
102-
<tbody>
103-
<tr ng-repeat="(prop, value) in $ctrl.overlayPaneEntryDetails.data">
104-
<td class="key">{{prop}}</td>
105-
<td class="value">
106-
<truncate-long-text
107-
content="value"
108-
limit="1024"
109-
newline-limit="20"
110-
expandable="true">
111-
</truncate-long-text>
112-
</td>
113-
</tr>
114-
</tbody>
115-
</table>
116-
</div>
117-
<annotations annotations="$ctrl.overlayPaneEntryDetails.metadata.annotations"></annotations>
95+
<div ng-if="!($ctrl.overlayPaneEntryDetails.data | hashSize)" class="empty-state-message text-center">
96+
The {{$ctrl.overlayPaneEntryDetails.kind | humanizeKind : true}} has no items.
11897
</div>
11998

120-
<div ng-if="$ctrl.overlayPaneEntryDetails.kind === 'Secret'">
121-
<h4>{{$ctrl.overlayPaneEntryDetails.metadata.name}} <small class="muted">- Secret</small></h4>
122-
123-
<div ng-repeat="(secretDataName, secretData) in $ctrl.decodedSecretData" class="image-source-item">
124-
<div ng-switch="secretDataName">
125-
<div ng-switch-when=".dockercfg">
126-
<ng-include src=" 'views/_config-file-params.html' "></ng-include>
127-
</div>
99+
<div ng-if="$ctrl.overlayPaneEntryDetails.data | hashSize" class="table-responsive scroll-shadows-horizontal">
100+
<table class="table table-bordered table-bordered-columns config-map-table key-value-table">
101+
<tbody>
102+
<tr ng-repeat="(prop, value) in $ctrl.overlayPaneEntryDetails.data">
103+
<td class="key">{{prop}}</td>
104+
<td class="value">
105+
<truncate-long-text
106+
ng-if="$ctrl.overlayPaneEntryDetails.kind === 'ConfigMap'"
107+
content="value"
108+
limit="1024"
109+
newline-limit="20"
110+
expandable="true">
111+
</truncate-long-text>
128112

129-
<div ng-switch-when=".dockerconfigjson">
130-
<ng-include src=" 'views/_config-file-params.html' "></ng-include>
131-
</div>
132-
133-
<div ng-switch-default>
134-
<dt ng-attr-title="{{secretDataName}}">{{secretDataName}}</dt>
135-
<dd ng-if="$ctrl.showSecret">
136-
<copy-to-clipboard
137-
clipboard-text="secretData"
138-
multiline="secretData | isMultiline : true"
139-
display-wide="true">
140-
</copy-to-clipboard>
141-
<div ng-if="$ctrl.decodedSecretData.$$nonprintable[secretDataName]" class="help-block">
142-
This secret value contains non-printable characters and is displayed as a Base64-encoded string.
143-
</div>
144-
</dd>
145-
<dd ng-if="!$ctrl.showSecret">*****</dd>
146-
</div>
147-
148-
</div>
149-
</div>
113+
<span ng-if="$ctrl.overlayPaneEntryDetails.kind === 'Secret'">&#42;&#42;&#42;&#42;&#42;</span>
114+
</td>
115+
</tr>
116+
</tbody>
117+
</table>
150118
</div>
151119
</div>
152120
<div class="modal-footer">

‎dist/scripts/templates.js

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6651,51 +6651,26 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
66516651
"<div class=\"dialog-title\">\n" +
66526652
"<h3>Value Details</h3>\n" +
66536653
"</div>\n" +
6654-
"<div class=\"dialog-body\">\n" +
6655-
"<div ng-if=\"$ctrl.overlayPaneEntryDetails.kind === 'ConfigMap'\">\n" +
6656-
"<h4>{{$ctrl.overlayPaneEntryDetails.metadata.name}} <small class=\"muted\">- Config Map</small></h4>\n" +
6654+
"<div class=\"modal-body\">\n" +
6655+
"<h4>{{$ctrl.overlayPaneEntryDetails.metadata.name}}\n" +
6656+
"<small class=\"muted\">- {{$ctrl.overlayPaneEntryDetails.kind | humanizeKind : true}}</small></h4>\n" +
66576657
"<div ng-if=\"!($ctrl.overlayPaneEntryDetails.data | hashSize)\" class=\"empty-state-message text-center\">\n" +
6658-
"The config map has no items.\n" +
6658+
"The {{$ctrl.overlayPaneEntryDetails.kind | humanizeKind : true}} has no items.\n" +
66596659
"</div>\n" +
66606660
"<div ng-if=\"$ctrl.overlayPaneEntryDetails.data | hashSize\" class=\"table-responsive scroll-shadows-horizontal\">\n" +
66616661
"<table class=\"table table-bordered table-bordered-columns config-map-table key-value-table\">\n" +
66626662
"<tbody>\n" +
66636663
"<tr ng-repeat=\"(prop, value) in $ctrl.overlayPaneEntryDetails.data\">\n" +
66646664
"<td class=\"key\">{{prop}}</td>\n" +
66656665
"<td class=\"value\">\n" +
6666-
"<truncate-long-text content=\"value\" limit=\"1024\" newline-limit=\"20\" expandable=\"true\">\n" +
6666+
"<truncate-long-text ng-if=\"$ctrl.overlayPaneEntryDetails.kind === 'ConfigMap'\" content=\"value\" limit=\"1024\" newline-limit=\"20\" expandable=\"true\">\n" +
66676667
"</truncate-long-text>\n" +
6668+
"<span ng-if=\"$ctrl.overlayPaneEntryDetails.kind === 'Secret'\">&#42;&#42;&#42;&#42;&#42;</span>\n" +
66686669
"</td>\n" +
66696670
"</tr>\n" +
66706671
"</tbody>\n" +
66716672
"</table>\n" +
66726673
"</div>\n" +
6673-
"<annotations annotations=\"$ctrl.overlayPaneEntryDetails.metadata.annotations\"></annotations>\n" +
6674-
"</div>\n" +
6675-
"<div ng-if=\"$ctrl.overlayPaneEntryDetails.kind === 'Secret'\">\n" +
6676-
"<h4>{{$ctrl.overlayPaneEntryDetails.metadata.name}} <small class=\"muted\">- Secret</small></h4>\n" +
6677-
"<div ng-repeat=\"(secretDataName, secretData) in $ctrl.decodedSecretData\" class=\"image-source-item\">\n" +
6678-
"<div ng-switch=\"secretDataName\">\n" +
6679-
"<div ng-switch-when=\".dockercfg\">\n" +
6680-
"<ng-include src=\" 'views/_config-file-params.html' \"></ng-include>\n" +
6681-
"</div>\n" +
6682-
"<div ng-switch-when=\".dockerconfigjson\">\n" +
6683-
"<ng-include src=\" 'views/_config-file-params.html' \"></ng-include>\n" +
6684-
"</div>\n" +
6685-
"<div ng-switch-default>\n" +
6686-
"<dt ng-attr-title=\"{{secretDataName}}\">{{secretDataName}}</dt>\n" +
6687-
"<dd ng-if=\"$ctrl.showSecret\">\n" +
6688-
"<copy-to-clipboard clipboard-text=\"secretData\" multiline=\"secretData | isMultiline : true\" display-wide=\"true\">\n" +
6689-
"</copy-to-clipboard>\n" +
6690-
"<div ng-if=\"$ctrl.decodedSecretData.$$nonprintable[secretDataName]\" class=\"help-block\">\n" +
6691-
"This secret value contains non-printable characters and is displayed as a Base64-encoded string.\n" +
6692-
"</div>\n" +
6693-
"</dd>\n" +
6694-
"<dd ng-if=\"!$ctrl.showSecret\">*****</dd>\n" +
6695-
"</div>\n" +
6696-
"</div>\n" +
6697-
"</div>\n" +
6698-
"</div>\n" +
66996674
"</div>\n" +
67006675
"<div class=\"modal-footer\">\n" +
67016676
"<button ng-click=\"$ctrl.closeOverlayPanel()\" type=\"button\" class=\"btn btn-primary pull-right\">Close</button>\n" +

0 commit comments

Comments
 (0)