Skip to content

Commit c2b8d36

Browse files
committed
Implement truncate-long-text for service class description and long description
Fixes openshift#2072
1 parent 45d17ff commit c2b8d36

File tree

5 files changed

+32
-6
lines changed

5 files changed

+32
-6
lines changed

app/styles/_components.less

+4
Original file line numberDiff line numberDiff line change
@@ -209,3 +209,7 @@ code.command {
209209
}
210210
}
211211
}
212+
213+
.service-description .truncated-content {
214+
white-space: pre-wrap;
215+
}

app/views/browse/service-instance.html

+14-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,20 @@ <h1 class="contains-actions">
6969
</dd>
7070
<dt ng-if-start="serviceClass.spec.description || serviceClass.spec.externalMetadata.longDescription">Description:</dt>
7171
<dd ng-if-end>
72-
<p class="pre-wrap" ng-bind-html="serviceClass.spec.description | linkify : '_blank'"></p>
73-
<p class="pre-wrap" ng-bind-html="serviceClass.spec.externalMetadata.longDescription | linkify : '_blank'"></p>
72+
<p class="service-description"><truncate-long-text
73+
limit="500"
74+
content="serviceClass.description"
75+
use-word-boundary="true"
76+
expandable="true"
77+
linkify="true">
78+
</truncate-long-text></p>
79+
<p class="service-description"><truncate-long-text
80+
limit="500"
81+
content="serviceClass.externalMetadata.longDescription"
82+
use-word-boundary="true"
83+
expandable="true"
84+
linkify="true">
85+
</truncate-long-text></p>
7486
</dd>
7587
</dl>
7688
</div>

app/views/overview/_service-instance-row.html

+7-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,13 @@ <h3>
136136
<div>
137137
<div class="row">
138138
<div class="col-sm-12" ng-if="row.serviceClass.spec.description">
139-
<p class="pre-wrap" ng-bind-html="row.serviceClass.spec.description | linky"></p>
139+
<p class="service-description"><truncate-long-text
140+
limit="500"
141+
content="row.serviceClass.spec.description"
142+
use-word-boundary="true"
143+
expandable="true"
144+
linkify="true">
145+
</truncate-long-text></p>
140146
<div ng-if="row.serviceClass.spec.externalMetadata.documentationUrl || row.serviceClass.spec.externalMetadata.supportUrl">
141147
<a ng-if="row.serviceClass.spec.externalMetadata.documentationUrl" ng-href="{{row.serviceClass.spec.externalMetadata.documentationUrl}}" target="_blank" class="learn-more-link">View Documentation <i class="fa fa-external-link" aria-hidden="true"></i></a>
142148
<a ng-if="row.serviceClass.spec.externalMetadata.supportUrl" ng-href="{{row.serviceClass.spec.externalMetadata.supportUrl}}" target="_blank" class="learn-more-link">Get Support <i class="fa fa-external-link" aria-hidden="true"></i></a>

dist/scripts/templates.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -3699,8 +3699,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
36993699
"</dd>\n" +
37003700
"<dt ng-if-start=\"serviceClass.spec.description || serviceClass.spec.externalMetadata.longDescription\">Description:</dt>\n" +
37013701
"<dd ng-if-end>\n" +
3702-
"<p class=\"pre-wrap\" ng-bind-html=\"serviceClass.spec.description | linkify : '_blank'\"></p>\n" +
3703-
"<p class=\"pre-wrap\" ng-bind-html=\"serviceClass.spec.externalMetadata.longDescription | linkify : '_blank'\"></p>\n" +
3702+
"<p class=\"service-description\"><truncate-long-text limit=\"500\" content=\"serviceClass.description\" use-word-boundary=\"true\" expandable=\"true\" linkify=\"true\">\n" +
3703+
"</truncate-long-text></p>\n" +
3704+
"<p class=\"service-description\"><truncate-long-text limit=\"500\" content=\"serviceClass.externalMetadata.longDescription\" use-word-boundary=\"true\" expandable=\"true\" linkify=\"true\">\n" +
3705+
"</truncate-long-text></p>\n" +
37043706
"</dd>\n" +
37053707
"</dl>\n" +
37063708
"</div>\n" +
@@ -12440,7 +12442,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1244012442
"<div>\n" +
1244112443
"<div class=\"row\">\n" +
1244212444
"<div class=\"col-sm-12\" ng-if=\"row.serviceClass.spec.description\">\n" +
12443-
"<p class=\"pre-wrap\" ng-bind-html=\"row.serviceClass.spec.description | linky\"></p>\n" +
12445+
"<p class=\"service-description\"><truncate-long-text limit=\"500\" content=\"row.serviceClass.spec.description\" use-word-boundary=\"true\" expandable=\"true\" linkify=\"true\">\n" +
12446+
"</truncate-long-text></p>\n" +
1244412447
"<div ng-if=\"row.serviceClass.spec.externalMetadata.documentationUrl || row.serviceClass.spec.externalMetadata.supportUrl\">\n" +
1244512448
"<a ng-if=\"row.serviceClass.spec.externalMetadata.documentationUrl\" ng-href=\"{{row.serviceClass.spec.externalMetadata.documentationUrl}}\" target=\"_blank\" class=\"learn-more-link\">View Documentation <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a>\n" +
1244612449
"<a ng-if=\"row.serviceClass.spec.externalMetadata.supportUrl\" ng-href=\"{{row.serviceClass.spec.externalMetadata.supportUrl}}\" target=\"_blank\" class=\"learn-more-link\">Get Support <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a>\n" +

dist/styles/main.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)