vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Prevent the logs view table from normally growing too large

Browse source
This commit is contained in:
Joseph Schorr 2014-08-12 14:30:59 -04:00
parent ab68126d8a
commit 8db889e2d4
3 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
static/css/quay.css
View file

@ -565,6 +565,14 @@ i.toggle-icon:hover {
line-height: 25px; line-height: 25px;
} }
.logs-view-element .log .log-description code {
max-width: 300px;
display: inline-block;
vertical-align: middle;
overflow: hidden;
text-overflow: ellipsis;
}
.logs-view-element .log-performer { .logs-view-element .log-performer {
white-space: nowrap; white-space: nowrap;
} }
@ -3168,6 +3176,10 @@ p.editable:hover i {
display: inline-block; display: inline-block;
} }
.table-container {
max-width: 100%;
}
.billing-invoices-element .invoice-title { .billing-invoices-element .invoice-title {
padding: 6px; padding: 6px;
cursor: pointer; cursor: pointer;

2
static/directives/logs-view.html
View file

@ -38,6 +38,7 @@
</div> </div>
</div> </div>
<div class="table-container">
<table class="table"> <table class="table">
<thead> <thead>
<th>Description</th> <th>Description</th>
@ -79,3 +80,4 @@
</table> </table>
</div> </div>
</div> </div>
</div>

14
static/js/app.js
View file

@ -399,14 +399,18 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
$provide.factory('UtilService', ['$sanitize', function($sanitize) { $provide.factory('UtilService', ['$sanitize', function($sanitize) {
var utilService = {}; var utilService = {};
utilService.textToSafeHtml = function(text) { utilService.escapeHtmlString = function(text) {
var adjusted = text.replace(/&/g, "&amp;") var adjusted = text.replace(/&/g, "&amp;")
.replace(/</g, "&lt;") .replace(/</g, "&lt;")
.replace(/>/g, "&gt;") .replace(/>/g, "&gt;")
.replace(/"/g, "&quot;") .replace(/"/g, "&quot;")
.replace(/'/g, "&#039;"); .replace(/'/g, "&#039;");
return $sanitize(adjusted); return adjusted;
};
utilService.textToSafeHtml = function(text) {
return $sanitize(utilService.escapeHtmlString(text));
}; };
return utilService; return utilService;
@ -526,7 +530,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
return builderService; return builderService;
}]); }]);
$provide.factory('StringBuilderService', ['$sce', function($sce) { $provide.factory('StringBuilderService', ['$sce', 'UtilService', function($sce, UtilService) {
var stringBuilderService = {}; var stringBuilderService = {};
stringBuilderService.buildString = function(value_or_func, metadata) { stringBuilderService.buildString = function(value_or_func, metadata) {
@ -581,6 +585,8 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
if (key.indexOf('image') >= 0) { if (key.indexOf('image') >= 0) {
value = value.substr(0, 12); value = value.substr(0, 12);
} }
var safe = UtilService.escapeHtmlString(value);
var markedDown = getMarkedDown(value); var markedDown = getMarkedDown(value);
markedDown = markedDown.substr('<p>'.length, markedDown.length - '<p></p>'.length); markedDown = markedDown.substr('<p>'.length, markedDown.length - '<p></p>'.length);
@ -589,7 +595,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
markedDown = '<i class="fa fa-' + icon + '"></i>' + markedDown; markedDown = '<i class="fa fa-' + icon + '"></i>' + markedDown;
} }
description = description.replace('{' + key + '}', '<code>' + markedDown + '</code>'); description = description.replace('{' + key + '}', '<code title="' + safe + '">' + markedDown + '</code>');
} }
} }
return $sce.trustAsHtml(description.replace('\n', '<br>')); return $sce.trustAsHtml(description.replace('\n', '<br>'));