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

Fixes unnecessary scrollbar when there's a quota status alert and... #2223

Merged
merged 1 commit into from
Oct 5, 2017
Merged

Fixes unnecessary scrollbar when there's a quota status alert and... #2223

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
14 changes: 4 additions & 10 deletions app/views/quota.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<div class="middle">
<div class="middle-content">
<div class="container-fluid mar-top-xl">
<div class="container-fluid">
<alerts alerts="alerts"></alerts>
<div class="row">
<div class="col-md-12">
<h1>
<span ng-if="clusterQuotas.length">Cluster </span>Quota
<span class="page-header-link">
Expand Down Expand Up @@ -68,7 +66,7 @@ <h3 class="text-center">Memory <small>Limit</small></h3>
</thead>
<tbody>
<tr ng-if='!quota.status.total.used' class="danger">
<td colspan="5">
<td colspan="4">
<span data-toggle="tooltip" title="Missing quota status" class="pficon pficon-error-circle-o" style="cursor: help;"></span>
Status has not been reported on this quota usage record. Any resources limited by this quota record can not be allocated.
</td>
Expand Down Expand Up @@ -159,7 +157,7 @@ <h3 class="text-center">Memory <small>Limit</small></h3>
</thead>
<tbody>
<tr ng-if='!quota.status.used' class="danger">
<td colspan="5">
<td colspan="3">
<span data-toggle="tooltip" title="Missing quota status" class="pficon pficon-error-circle-o" style="cursor: help;"></span>
Status has not been reported on this quota usage record. Any resources limited by this quota record can not be allocated.
</td>
Expand Down Expand Up @@ -243,8 +241,7 @@ <h2 ng-if="limitRanges.length">{{limitRange.metadata.name}}</h2>
</span>
</th>
</thead>
<tbody>
<tr ng-repeat-start="limit in limitRange.spec.limits"></tr>
<tbody ng-repeat="limit in limitRange.spec.limits">
<tr ng-repeat="(type, typeLimits) in limitsByType[limitRange.metadata.name][limit.type]">
<td>{{limit.type}} {{type | computeResourceLabel : true}}</td>
<td>{{(typeLimits.min | usageWithUnits : type) || "&mdash;"}}</td>
Expand All @@ -253,14 +250,11 @@ <h2 ng-if="limitRanges.length">{{limitRange.metadata.name}}</h2>
<td>{{(typeLimits["default"] | usageWithUnits : type) || "&mdash;"}}</td>
<td>{{typeLimits.maxLimitRequestRatio || "&mdash;"}}</td>
</tr>
<tr ng-repeat-end></tr>
</tbody>
</table>
</div>
</div>
</div>
</div><!-- /col-* -->
</div>
</div>
</div><!-- /middle-content -->
</div>
14 changes: 4 additions & 10 deletions dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12792,10 +12792,8 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
$templateCache.put('views/quota.html',
"<div class=\"middle\">\n" +
"<div class=\"middle-content\">\n" +
"<div class=\"container-fluid mar-top-xl\">\n" +
"<div class=\"container-fluid\">\n" +
"<alerts alerts=\"alerts\"></alerts>\n" +
"<div class=\"row\">\n" +
"<div class=\"col-md-12\">\n" +
"<h1>\n" +
"<span ng-if=\"clusterQuotas.length\">Cluster </span>Quota\n" +
"<span class=\"page-header-link\">\n" +
Expand Down Expand Up @@ -12858,7 +12856,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</thead>\n" +
"<tbody>\n" +
"<tr ng-if=\"!quota.status.total.used\" class=\"danger\">\n" +
"<td colspan=\"5\">\n" +
"<td colspan=\"4\">\n" +
"<span data-toggle=\"tooltip\" title=\"Missing quota status\" class=\"pficon pficon-error-circle-o\" style=\"cursor: help\"></span>\n" +
"Status has not been reported on this quota usage record. Any resources limited by this quota record can not be allocated.\n" +
"</td>\n" +
Expand Down Expand Up @@ -12940,7 +12938,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</thead>\n" +
"<tbody>\n" +
"<tr ng-if=\"!quota.status.used\" class=\"danger\">\n" +
"<td colspan=\"5\">\n" +
"<td colspan=\"3\">\n" +
"<span data-toggle=\"tooltip\" title=\"Missing quota status\" class=\"pficon pficon-error-circle-o\" style=\"cursor: help\"></span>\n" +
"Status has not been reported on this quota usage record. Any resources limited by this quota record can not be allocated.\n" +
"</td>\n" +
Expand Down Expand Up @@ -13015,8 +13013,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</span>\n" +
"</th>\n" +
"</thead>\n" +
"<tbody>\n" +
"<tr ng-repeat-start=\"limit in limitRange.spec.limits\"></tr>\n" +
"<tbody ng-repeat=\"limit in limitRange.spec.limits\">\n" +
"<tr ng-repeat=\"(type, typeLimits) in limitsByType[limitRange.metadata.name][limit.type]\">\n" +
"<td>{{limit.type}} {{type | computeResourceLabel : true}}</td>\n" +
"<td>{{(typeLimits.min | usageWithUnits : type) || \"&mdash;\"}}</td>\n" +
Expand All @@ -13025,16 +13022,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<td>{{(typeLimits[\"default\"] | usageWithUnits : type) || \"&mdash;\"}}</td>\n" +
"<td>{{typeLimits.maxLimitRequestRatio || \"&mdash;\"}}</td>\n" +
"</tr>\n" +
"<tr ng-repeat-end></tr>\n" +
"</tbody>\n" +
"</table>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
"</div>"
);

Expand Down