Skip to content

Commit 8818e16

Browse files
committed
Implement truncate-long-text for service class description and long description
Fixes openshift#2072
1 parent 5638978 commit 8818e16

File tree

5 files changed

+40
-6
lines changed

5 files changed

+40
-6
lines changed

Diff for: 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+
}

Diff for: app/views/browse/service-instance.html

+20-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,26 @@ <h1 class="contains-actions">
6767
</dd>
6868
<dt ng-if-start="serviceClass.description || serviceClass.externalMetadata.longDescription">Description:</dt>
6969
<dd ng-if-end>
70-
<p class="pre-wrap" ng-bind-html="serviceClass.description | linkify : '_blank'"></p>
71-
<p class="pre-wrap" ng-bind-html="serviceClass.externalMetadata.longDescription | linkify : '_blank'"></p>
70+
71+
<p class="service-description"><truncate-long-text
72+
limit="500"
73+
content="serviceClass.description"
74+
use-word-boundary="true"
75+
expandable="true"
76+
linkify="true">
77+
</truncate-long-text></p>
78+
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>
86+
87+
88+
<!-- <p class="pre-wrap" ng-bind-html="serviceClass.description | linkify : '_blank'"></p> -->
89+
<!-- <p class="pre-wrap" ng-bind-html="serviceClass.externalMetadata.longDescription | linkify : '_blank'"></p> -->
7290
</dd>
7391
</dl>
7492
</div>

Diff for: 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.description">
139-
<p class="pre-wrap" ng-bind-html="row.serviceClass.description | linky"></p>
139+
<p class="service-description"><truncate-long-text
140+
limit="500"
141+
content="row.serviceClass.description"
142+
use-word-boundary="true"
143+
expandable="true"
144+
linkify="true">
145+
</truncate-long-text></p>
140146
<div ng-if="row.serviceClass.externalMetadata.documentationUrl || row.serviceClass.externalMetadata.supportUrl">
141147
<a ng-if="row.serviceClass.externalMetadata.documentationUrl" ng-href="{{row.serviceClass.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.externalMetadata.supportUrl" ng-href="{{row.serviceClass.externalMetadata.supportUrl}}" target="_blank" class="learn-more-link">Get Support <i class="fa fa-external-link" aria-hidden="true"></i></a>

Diff for: dist/scripts/templates.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -3697,8 +3697,12 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
36973697
"</dd>\n" +
36983698
"<dt ng-if-start=\"serviceClass.description || serviceClass.externalMetadata.longDescription\">Description:</dt>\n" +
36993699
"<dd ng-if-end>\n" +
3700-
"<p class=\"pre-wrap\" ng-bind-html=\"serviceClass.description | linkify : '_blank'\"></p>\n" +
3701-
"<p class=\"pre-wrap\" ng-bind-html=\"serviceClass.externalMetadata.longDescription | linkify : '_blank'\"></p>\n" +
3700+
"<p class=\"service-description\"><truncate-long-text limit=\"500\" content=\"serviceClass.description\" use-word-boundary=\"true\" expandable=\"true\" linkify=\"true\">\n" +
3701+
"</truncate-long-text></p>\n" +
3702+
"<p class=\"service-description\"><truncate-long-text limit=\"500\" content=\"serviceClass.externalMetadata.longDescription\" use-word-boundary=\"true\" expandable=\"true\" linkify=\"true\">\n" +
3703+
"</truncate-long-text></p>\n" +
3704+
"\n" +
3705+
"\n" +
37023706
"</dd>\n" +
37033707
"</dl>\n" +
37043708
"</div>\n" +
@@ -12429,7 +12433,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1242912433
"<div>\n" +
1243012434
"<div class=\"row\">\n" +
1243112435
"<div class=\"col-sm-12\" ng-if=\"row.serviceClass.description\">\n" +
12432-
"<p class=\"pre-wrap\" ng-bind-html=\"row.serviceClass.description | linky\"></p>\n" +
12436+
"<p class=\"service-description\"><truncate-long-text limit=\"500\" content=\"row.serviceClass.description\" use-word-boundary=\"true\" expandable=\"true\" linkify=\"true\">\n" +
12437+
"</truncate-long-text></p>\n" +
1243312438
"<div ng-if=\"row.serviceClass.externalMetadata.documentationUrl || row.serviceClass.externalMetadata.supportUrl\">\n" +
1243412439
"<a ng-if=\"row.serviceClass.externalMetadata.documentationUrl\" ng-href=\"{{row.serviceClass.externalMetadata.documentationUrl}}\" target=\"_blank\" class=\"learn-more-link\">View Documentation <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a>\n" +
1243512440
"<a ng-if=\"row.serviceClass.externalMetadata.supportUrl\" ng-href=\"{{row.serviceClass.externalMetadata.supportUrl}}\" target=\"_blank\" class=\"learn-more-link\">Get Support <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a>\n" +

Diff for: 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)