Merge remote-tracking branch 'apache/master' into mobile-app
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/d66da341 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/d66da341 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/d66da341 Branch: refs/heads/0.7.0-incubating Commit: d66da34126c4c8cf8541a5efa9de2674f2c423a7 Parents: 2a6fa4e cbb51c2 Author: Sam Corbett <[email protected]> Authored: Fri Feb 6 17:05:59 2015 +0000 Committer: Sam Corbett <[email protected]> Committed: Fri Feb 6 17:05:59 2015 +0000 ---------------------------------------------------------------------- .gitattributes | 6 + LICENSE | 292 + NOTICE | 5 + usage/jsgui/.gitignore | 1 + usage/jsgui/pom.xml | 59 +- usage/jsgui/src/build/.gitattributes | 2 + usage/jsgui/src/main/dev/info.txt | 15 - .../src/main/dev/js/libs/jquery.dataTables.js | 12099 ----------------- usage/jsgui/src/main/dev/js/libs/jquery.js | 9404 ------------- usage/jsgui/src/main/dev/js/libs/moment.js | 1662 --- usage/jsgui/src/main/webapp/LICENSE | 176 + usage/jsgui/src/main/webapp/assets/css/base.css | 78 +- .../src/main/webapp/assets/css/brooklyn.css | 4 + .../assets/images/main-menu-tab-active.png | Bin 974 -> 1051 bytes .../assets/img/magnifying-glass-right-icon.png | Bin 0 -> 958 bytes usage/jsgui/src/main/webapp/assets/js/config.js | 13 +- .../jsgui/src/main/webapp/assets/js/libs/URI.js | 2 +- .../main/webapp/assets/js/libs/ZeroClipboard.js | 7 +- .../webapp/assets/js/libs/ZeroClipboard.swf | Bin 1891 -> 0 bytes .../src/main/webapp/assets/js/libs/bootstrap.js | 36 +- .../webapp/assets/js/libs/brooklyn-utils.js | 115 - .../main/webapp/assets/js/libs/brooklyn-view.js | 74 - .../src/main/webapp/assets/js/libs/brooklyn.js | 53 - .../assets/js/libs/dataTables.extensions.js | 4 +- .../assets/js/libs/handlebars-1.0.rc.1.js | 3 + .../webapp/assets/js/libs/jquery.slideto.min.js | 6 + .../webapp/assets/js/libs/json-formatter.js | 88 - .../src/main/webapp/assets/js/libs/moment.js | 1662 +++ .../main/webapp/assets/js/libs/moment.min.js | 6 - .../main/webapp/assets/js/libs/swagger-ui.js | 334 +- .../src/main/webapp/assets/js/libs/swagger.js | 2 + .../webapp/assets/js/model/entity-summary.js | 1 + .../src/main/webapp/assets/js/model/entity.js | 15 + .../src/main/webapp/assets/js/model/location.js | 6 +- .../main/webapp/assets/js/model/task-summary.js | 2 +- usage/jsgui/src/main/webapp/assets/js/router.js | 78 +- .../webapp/assets/js/util/brooklyn-utils.js | 180 + .../main/webapp/assets/js/util/brooklyn-view.js | 352 + .../src/main/webapp/assets/js/util/brooklyn.js | 86 + .../webapp/assets/js/view/activity-details.js | 37 +- .../webapp/assets/js/view/add-child-invoke.js | 61 + .../src/main/webapp/assets/js/view/apidoc.js | 4 +- .../assets/js/view/application-add-wizard.js | 126 +- .../webapp/assets/js/view/application-tree.js | 20 +- .../js/view/catalog-add-location-modal.js | 115 - .../src/main/webapp/assets/js/view/catalog.js | 167 +- .../webapp/assets/js/view/change-name-invoke.js | 57 + .../webapp/assets/js/view/effector-invoke.js | 12 +- .../webapp/assets/js/view/entity-activities.js | 2 +- .../webapp/assets/js/view/entity-advanced.js | 177 + .../main/webapp/assets/js/view/entity-config.js | 521 +- .../webapp/assets/js/view/entity-details.js | 28 +- .../webapp/assets/js/view/entity-lifecycle.js | 54 - .../webapp/assets/js/view/entity-policies.js | 92 +- .../webapp/assets/js/view/entity-sensors.js | 77 +- .../webapp/assets/js/view/entity-summary.js | 93 +- .../webapp/assets/js/view/expunge-invoke.js | 63 - .../main/webapp/assets/js/view/ha-summary.js | 33 +- .../src/main/webapp/assets/js/view/home.js | 36 +- .../assets/js/view/policy-config-invoke.js | 83 +- .../main/webapp/assets/js/view/policy-new.js | 82 + .../main/webapp/assets/js/view/script-groovy.js | 1 + .../src/main/webapp/assets/js/view/viewutils.js | 14 +- .../assets/tpl/app-add-wizard/create.html | 8 + .../tpl/app-add-wizard/deploy-location-row.html | 4 +- .../webapp/assets/tpl/apps/add-child-modal.html | 35 + .../main/webapp/assets/tpl/apps/advanced.html | 75 + .../assets/tpl/apps/change-name-modal.html | 29 + .../webapp/assets/tpl/apps/config-name.html | 24 + .../src/main/webapp/assets/tpl/apps/config.html | 6 +- .../main/webapp/assets/tpl/apps/details.html | 6 +- .../webapp/assets/tpl/apps/expunge-modal.html | 38 - .../main/webapp/assets/tpl/apps/lifecycle.html | 40 - .../src/main/webapp/assets/tpl/apps/param.html | 4 +- .../assets/tpl/apps/policy-config-modal.html | 41 - .../main/webapp/assets/tpl/apps/policy-new.html | 37 + .../tpl/apps/policy-parameter-config.html | 30 + .../src/main/webapp/assets/tpl/apps/policy.html | 10 +- .../main/webapp/assets/tpl/apps/summary.html | 39 +- .../assets/tpl/catalog/add-catalog-entry.html | 1 + .../assets/tpl/catalog/add-location-modal.html | 66 - .../webapp/assets/tpl/catalog/add-location.html | 37 + .../assets/tpl/catalog/details-entity.html | 49 +- .../assets/tpl/catalog/details-location.html | 8 +- .../assets/tpl/catalog/location-config.html | 24 - .../webapp/assets/tpl/catalog/nav-entry.html | 2 +- .../src/main/webapp/assets/tpl/help/page.html | 4 +- .../webapp/assets/tpl/home/applications.html | 19 +- .../assets/tpl/home/server-not-ha-master.html | 4 +- .../src/main/webapp/assets/tpl/labs/page.html | 2 +- .../main/webapp/assets/tpl/lib/basic-modal.html | 29 + .../lib/config-key-type-value-input-pair.html | 23 + .../main/webapp/assets/tpl/script/groovy.html | 2 +- .../main/webapp/assets/tpl/script/swagger.html | 3 + usage/jsgui/src/main/webapp/index.html | 9 +- .../jsgui/BrooklynJavascriptGuiLauncher.java | 6 + .../BrooklynJavascriptGuiLauncherTest.java | 13 +- usage/jsgui/src/test/javascript/config.txt | 27 +- .../src/test/javascript/specs/brooklyn-spec.js | 54 +- .../javascript/specs/brooklyn-utils-spec.js | 18 + .../src/test/javascript/specs/library-spec.js | 12 +- .../src/test/javascript/specs/router-spec.js | 8 +- .../specs/view/effector-invoke-spec.js | 5 + .../specs/view/entity-details-spec.js | 8 +- 104 files changed, 5049 insertions(+), 24693 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/d66da341/usage/jsgui/src/main/webapp/index.html ----------------------------------------------------------------------
