You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2018/10/04 19:53:29 UTC
[trafficcontrol] 02/14: Added headers and fixed filtering
This is an automated email from the ASF dual-hosted git repository.
mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit d933b200f5301139db5f031fe908bb3dd71cd0d3
Author: cgillo000 <ch...@cable.comcast.com>
AuthorDate: Tue Sep 11 08:45:19 2018 -0600
Added headers and fixed filtering
---
.../deliveryServices/WidgetDeliveryServicesController.js | 7 ++-----
.../widget/deliveryServices/_widget.deliveryServices.scss | 10 ++++++++++
.../deliveryServices/widget.deliveryServices.tpl.html | 13 +++++++++++--
3 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/traffic_portal/app/src/common/modules/widget/deliveryServices/WidgetDeliveryServicesController.js b/traffic_portal/app/src/common/modules/widget/deliveryServices/WidgetDeliveryServicesController.js
index 26eadea..f0ef484 100644
--- a/traffic_portal/app/src/common/modules/widget/deliveryServices/WidgetDeliveryServicesController.js
+++ b/traffic_portal/app/src/common/modules/widget/deliveryServices/WidgetDeliveryServicesController.js
@@ -17,10 +17,7 @@
* under the License.
*/
-var WidgetDeliveryServicesController = function($scope, $interval, deliveryServiceService, locationUtils, propertiesModel) {
-
- var interval,
- autoRefresh = propertiesModel.properties.dashboard.autoRefresh;
+var WidgetDeliveryServicesController = function($scope, deliveryServiceService, locationUtils) {
var getDeliveryServices = function() {
deliveryServiceService.getDeliveryServices()
@@ -47,5 +44,5 @@ var WidgetDeliveryServicesController = function($scope, $interval, deliveryServi
};
-WidgetDeliveryServicesController.$inject = ['$scope', '$interval', 'deliveryServiceService', 'locationUtils', 'propertiesModel'];
+WidgetDeliveryServicesController.$inject = ['$scope', 'deliveryServiceService', 'locationUtils'];
module.exports = WidgetDeliveryServicesController;
diff --git a/traffic_portal/app/src/common/modules/widget/deliveryServices/_widget.deliveryServices.scss b/traffic_portal/app/src/common/modules/widget/deliveryServices/_widget.deliveryServices.scss
index f594c45..32452b9 100644
--- a/traffic_portal/app/src/common/modules/widget/deliveryServices/_widget.deliveryServices.scss
+++ b/traffic_portal/app/src/common/modules/widget/deliveryServices/_widget.deliveryServices.scss
@@ -25,6 +25,16 @@
background-color: transparent;
}
+ .widgetTable {
+ width: 100%;
+ max-width: 100%;
+ margin-bottom:5px;
+
+ .thead {
+ vertical-align: bottom;
+ }
+ }
+
.delivery-services-health {
height: 45px;
diff --git a/traffic_portal/app/src/common/modules/widget/deliveryServices/widget.deliveryServices.tpl.html b/traffic_portal/app/src/common/modules/widget/deliveryServices/widget.deliveryServices.tpl.html
index 1d7cc05..cc6ec31 100644
--- a/traffic_portal/app/src/common/modules/widget/deliveryServices/widget.deliveryServices.tpl.html
+++ b/traffic_portal/app/src/common/modules/widget/deliveryServices/widget.deliveryServices.tpl.html
@@ -30,7 +30,16 @@ under the License.
No matching delivery services
</div>
<div class="list-group">
- <a class="delivery-services-health list-group-item" ng-repeat="ds in deliveryServices">
+ <table class="delivery-services-table widgetTable">
+ <thead>
+ <tr class="headings">
+ <th style="width:33%;">Display Nanme</th>
+ <th>Tenant</th>
+ <th>Origin</th>
+ </tr>
+ </thead>
+ </table>
+ <a class="delivery-services-health list-group-item" ng-repeat="ds in deliveryServices | filter:search:strict | offsetFilter:(currentDeliveryServicesPage-1)*deliveryServicesPerPage | limitTo:deliveryServicesPerPage">
<div class="row">
<table class="delivery-services-table table">
<tbody>
@@ -50,7 +59,7 @@ under the License.
<uib-pagination class="delivery-services-pagination pagination-md" boundary-links="true" max-size="2" total-items="(deliveryServices | filter:search:strict).length" items-per-page="deliveryServicesPerPage" ng-model="currentDeliveryServicesPage" previous-text="‹" next-text="›" first-text="«" last-text="»"></uib-pagination>
</div>
<div class="input-group delivery-services-search-form">
- <input type="text" class="filter-input form-control" placeholder="Filter delivery services..." ng-model="search.name">
+ <input type="text" class="filter-input form-control" placeholder="Filter delivery services..." ng-model="search.displayName">
<span class="filter-input-group-btn input-group-btn">
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
</span>