Merge pull request #410 from ahgittin/feature/sensor-actions include sensor actions in GUI table, as icons, populated from renderer hints
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/2efd87ed Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/2efd87ed Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/2efd87ed Branch: refs/heads/0.5.0 Commit: 2efd87ed5e6c835390d46732bb424c512bf31439 Parents: 05508d1 29a8363 Author: Aled Sage <[email protected]> Authored: Mon Dec 3 07:25:34 2012 -0800 Committer: Aled Sage <[email protected]> Committed: Mon Dec 3 07:25:34 2012 -0800 ---------------------------------------------------------------------- .../src/main/webapp/assets/css/prettybrook.css | 41 ++++++++++---- .../webapp/assets/js/libs/brooklyn-utils.js | 5 ++ usage/jsgui/src/main/webapp/assets/js/router.js | 18 ++++--- .../assets/js/view/application-add-wizard.js | 47 ++++++++-------- .../assets/js/view/application-explorer.js | 11 ++-- .../webapp/assets/js/view/application-tree.js | 52 ++++++++++++------ .../src/main/webapp/assets/js/view/catalog.js | 21 ++++++-- .../webapp/assets/js/view/entity-activities.js | 57 +++++++++++--------- .../main/webapp/assets/js/view/entity-config.js | 2 +- .../webapp/assets/js/view/entity-details.js | 10 ++++ .../webapp/assets/js/view/entity-policies.js | 2 +- .../webapp/assets/js/view/entity-sensors.js | 27 ++++++---- .../src/main/webapp/assets/js/view/home.js | 8 +-- .../src/main/webapp/assets/js/view/viewutils.js | 3 +- .../assets/tpl/app-add-wizard/modal-wizard.html | 6 ++- .../main/webapp/assets/tpl/apps/activities.html | 11 ++-- .../assets/tpl/apps/activity-details.html | 12 +---- .../webapp/assets/tpl/apps/activity-row.html | 6 +-- .../src/main/webapp/assets/tpl/apps/page.html | 2 +- .../main/webapp/assets/tpl/apps/sensor-row.html | 19 ++++++- .../main/webapp/assets/tpl/apps/sensors.html | 2 +- .../webapp/assets/tpl/home/applications.html | 2 +- .../src/test/javascript/specs/home-spec.js | 2 +- .../specs/view/entity-details-spec.js | 2 +- 24 files changed, 232 insertions(+), 136 deletions(-) ----------------------------------------------------------------------
