Merge pull request #2223 from rhamilto/issue-2213

Merged by openshift-bot
openshift · Oct 5, 2017 · b642a34 · b642a34
2 parents 5638978 + d8ec8f4
commit b642a34
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/app/views/quota.html b/app/views/quota.html
@@ -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">
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -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" +
@@ -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" +
@@ -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" +
@@ -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" +
@@ -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>"
   );