Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 735FA200C1C for ; Wed, 15 Feb 2017 10:28:01 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 71FA5160B70; Wed, 15 Feb 2017 09:28:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9974A160B5E for ; Wed, 15 Feb 2017 10:28:00 +0100 (CET) Received: (qmail 77071 invoked by uid 500); 15 Feb 2017 09:27:44 -0000 Mailing-List: contact commits-help@eagle.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@eagle.apache.org Delivered-To: mailing list commits@eagle.apache.org Received: (qmail 77058 invoked by uid 99); 15 Feb 2017 09:27:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Feb 2017 09:27:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 84EF4DFC31; Wed, 15 Feb 2017 09:27:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hao@apache.org To: commits@eagle.apache.org Message-Id: <453456d109ba4e15944e1c6f6d1e4b63@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: eagle git commit: [EAGLE-896] Add site filter for policy definition and remove inputstreams column Date: Wed, 15 Feb 2017 09:27:44 +0000 (UTC) archived-at: Wed, 15 Feb 2017 09:28:01 -0000 Repository: eagle Updated Branches: refs/heads/master 67c170f93 -> 83d9c8277 [EAGLE-896] Add site filter for policy definition and remove inputstreams column Add site filter for policy definition and remove inputstreams column https://issues.apache.org/jira/browse/EAGLE-896 Author: zombieJ Closes #802 from zombieJ/EAGLE-896. Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/83d9c827 Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/83d9c827 Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/83d9c827 Branch: refs/heads/master Commit: 83d9c8277b32003fceacf755df37ada1963c536c Parents: 67c170f Author: zombieJ Authored: Wed Feb 15 17:27:38 2017 +0800 Committer: Hao Chen Committed: Wed Feb 15 17:27:38 2017 +0800 ---------------------------------------------------------------------- .../app/dev/partials/alert/policyList.html | 22 +++++++++++--------- .../src/main/webapp/app/dev/public/css/main.css | 20 ++++++++++++++++++ .../webapp/app/dev/public/js/ctrls/alertCtrl.js | 21 ++++++++++++++++++- 3 files changed, 52 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/eagle/blob/83d9c827/eagle-server/src/main/webapp/app/dev/partials/alert/policyList.html ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/partials/alert/policyList.html b/eagle-server/src/main/webapp/app/dev/partials/alert/policyList.html index 6502b19..6351674 100644 --- a/eagle-server/src/main/webapp/app/dev/partials/alert/policyList.html +++ b/eagle-server/src/main/webapp/app/dev/partials/alert/policyList.html @@ -24,13 +24,22 @@
+ + +
- @@ -43,13 +52,6 @@ -
NameInput Streams Description Action
{{item.name}} -
    -
  • - {{stream}} -
  • -
-
{{item.description}}
@@ -68,13 +70,13 @@
-
+

No Policy yet

You have not create policy yet. Click here to create a new policy.

-
+
http://git-wip-us.apache.org/repos/asf/eagle/blob/83d9c827/eagle-server/src/main/webapp/app/dev/public/css/main.css ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/public/css/main.css b/eagle-server/src/main/webapp/app/dev/public/css/main.css index 8583513..594e248 100644 --- a/eagle-server/src/main/webapp/app/dev/public/css/main.css +++ b/eagle-server/src/main/webapp/app/dev/public/css/main.css @@ -286,6 +286,26 @@ ul.stepGuide li > .title { width: initial; } +.box-body .nav-pills { + margin-bottom: 10px; +} +.box-body .nav-pills.with-border { + padding-bottom: 10px; + border-bottom: 1px solid #f4f4f4; +} + +.box-body .nav-pills > li { + border-radius: 3px; + overflow: hidden; +} + +.box-body .nav-pills > li > span, +.box-body .nav-pills > li > a { + display: inline-block; + border: 0; + padding: 5px 10px; +} + /* ======================================================================== * = Tab = * ======================================================================== */ http://git-wip-us.apache.org/repos/asf/eagle/blob/83d9c827/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertCtrl.js ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertCtrl.js b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertCtrl.js index 4ddff52..4b5cdf7 100644 --- a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertCtrl.js +++ b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/alertCtrl.js @@ -116,13 +116,32 @@ // ====================================================================================== eagleControllers.controller('policyListCtrl', function ($scope, $wrapState, PageConfig, Entity, Policy) { PageConfig.title = "Policies"; + $scope.loading = false; + var originPolicyList = []; $scope.policyList = []; + $scope.siteFilter = ''; + + $scope.updateSiteFilter = function (siteId) { + if (siteId !== undefined) $scope.siteFilter = siteId; + + if ($scope.siteFilter) { + $scope.policyList = $.grep(originPolicyList, function (policy) { + return policy.definition.siteId === $scope.siteFilter; + }); + } else { + $scope.policyList = originPolicyList; + } + }; function updateList() { var list = Entity.queryMetadata("policies"); + $scope.loading = true; + list._then(function () { - $scope.policyList = list; + $scope.loading = false; + originPolicyList = list; + $scope.updateSiteFilter(); }); } updateList();