Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AFE9211C6D for ; Tue, 19 Aug 2014 10:31:04 +0000 (UTC) Received: (qmail 25664 invoked by uid 500); 19 Aug 2014 10:31:04 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 25639 invoked by uid 500); 19 Aug 2014 10:31:04 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 25630 invoked by uid 99); 19 Aug 2014 10:31:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Aug 2014 10:31:04 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 19 Aug 2014 10:30:41 +0000 Received: (qmail 25280 invoked by uid 99); 19 Aug 2014 10:30:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Aug 2014 10:30:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8567193D9E7; Tue, 19 Aug 2014 10:30:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sjcorbett@apache.org To: commits@brooklyn.incubator.apache.org Date: Tue, 19 Aug 2014 10:30:47 -0000 Message-Id: <055ac43b9a7b49e99740140a0e25bad1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [9/9] git commit: This closes #116 X-Virus-Checked: Checked by ClamAV on apache.org This closes #116 Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/226f55fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/226f55fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/226f55fa Branch: refs/heads/master Commit: 226f55fa5678f3533a187cb646c8f57be107cfcb Parents: 21a037f ee59971 Author: Sam Corbett Authored: Tue Aug 19 11:03:41 2014 +0100 Committer: Sam Corbett Committed: Tue Aug 19 11:03:41 2014 +0100 ---------------------------------------------------------------------- usage/jsgui/src/main/webapp/assets/css/base.css | 7 + usage/jsgui/src/main/webapp/assets/js/config.js | 1 + .../webapp/assets/js/libs/brooklyn-utils.js | 34 +- .../main/webapp/assets/js/libs/brooklyn-view.js | 74 ++++ .../src/main/webapp/assets/js/libs/brooklyn.js | 15 +- usage/jsgui/src/main/webapp/assets/js/router.js | 61 ++-- .../src/main/webapp/assets/js/view/catalog.js | 359 +++++++++++++------ .../webapp/assets/js/view/effector-invoke.js | 2 +- .../assets/tpl/catalog/add-catalog-entry.html | 33 ++ .../webapp/assets/tpl/catalog/add-entity.html | 30 ++ .../assets/tpl/catalog/details-entity.html | 10 +- .../assets/tpl/catalog/details-generic.html | 27 +- .../webapp/assets/tpl/catalog/nav-entry.html | 2 +- .../main/webapp/assets/tpl/catalog/page.html | 53 +-- usage/jsgui/src/test/javascript/config.txt | 1 + .../src/test/javascript/specs/brooklyn-spec.js | 81 +++++ .../javascript/specs/brooklyn-utils-spec.js | 51 ++- .../main/java/brooklyn/rest/api/CatalogApi.java | 15 +- 18 files changed, 632 insertions(+), 224 deletions(-) ----------------------------------------------------------------------