Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement truncate-long-text for service class description and long description. #2224

Merged
merged 1 commit into from
Oct 11, 2017
Merged

Implement truncate-long-text for service class description and long description. #2224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/styles/_components.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,7 @@ code.command {
}
}
}

.service-description .truncated-content {
white-space: pre-wrap;
}
16 changes: 14 additions & 2 deletions app/views/browse/service-instance.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,20 @@ <h1 class="contains-actions">
</dd>
<dt ng-if-start="serviceClass.spec.description || serviceClass.spec.externalMetadata.longDescription">Description:</dt>
<dd ng-if-end>
<p class="pre-wrap" ng-bind-html="serviceClass.spec.description | linkify : '_blank'"></p>
<p class="pre-wrap" ng-bind-html="serviceClass.spec.externalMetadata.longDescription | linkify : '_blank'"></p>
<p class="service-description"><truncate-long-text
limit="500"
content="serviceClass.spec.description"
use-word-boundary="true"
expandable="true"
linkify="true">
</truncate-long-text></p>
<p class="service-description"><truncate-long-text
limit="500"
content="serviceClass.spec.externalMetadata.longDescription"
use-word-boundary="true"
expandable="true"
linkify="true">
</truncate-long-text></p>
</dd>
</dl>
</div>
Expand Down
8 changes: 7 additions & 1 deletion app/views/overview/_service-instance-row.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,13 @@ <h3>
<div>
<div class="row">
<div class="col-sm-12" ng-if="row.serviceClass.spec.description">
<p class="pre-wrap" ng-bind-html="row.serviceClass.spec.description | linky"></p>
<p class="service-description"><truncate-long-text
limit="500"
content="row.serviceClass.spec.description"
use-word-boundary="true"
expandable="true"
linkify="true">
</truncate-long-text></p>
<div ng-if="row.serviceClass.spec.externalMetadata.documentationUrl || row.serviceClass.spec.externalMetadata.supportUrl">
<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>
<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>
Expand Down
9 changes: 6 additions & 3 deletions dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3699,8 +3699,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</dd>\n" +
"<dt ng-if-start=\"serviceClass.spec.description || serviceClass.spec.externalMetadata.longDescription\">Description:</dt>\n" +
"<dd ng-if-end>\n" +
"<p class=\"pre-wrap\" ng-bind-html=\"serviceClass.spec.description | linkify : '_blank'\"></p>\n" +
"<p class=\"pre-wrap\" ng-bind-html=\"serviceClass.spec.externalMetadata.longDescription | linkify : '_blank'\"></p>\n" +
"<p class=\"service-description\"><truncate-long-text limit=\"500\" content=\"serviceClass.spec.description\" use-word-boundary=\"true\" expandable=\"true\" linkify=\"true\">\n" +
"</truncate-long-text></p>\n" +
"<p class=\"service-description\"><truncate-long-text limit=\"500\" content=\"serviceClass.spec.externalMetadata.longDescription\" use-word-boundary=\"true\" expandable=\"true\" linkify=\"true\">\n" +
"</truncate-long-text></p>\n" +
"</dd>\n" +
"</dl>\n" +
"</div>\n" +
Expand Down Expand Up @@ -12440,7 +12442,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div>\n" +
"<div class=\"row\">\n" +
"<div class=\"col-sm-12\" ng-if=\"row.serviceClass.spec.description\">\n" +
"<p class=\"pre-wrap\" ng-bind-html=\"row.serviceClass.spec.description | linky\"></p>\n" +
"<p class=\"service-description\"><truncate-long-text limit=\"500\" content=\"row.serviceClass.spec.description\" use-word-boundary=\"true\" expandable=\"true\" linkify=\"true\">\n" +
"</truncate-long-text></p>\n" +
"<div ng-if=\"row.serviceClass.spec.externalMetadata.documentationUrl || row.serviceClass.spec.externalMetadata.supportUrl\">\n" +
"<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" +
"<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" +
Expand Down
1 change: 1 addition & 0 deletions dist/styles/main.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.