Merge remote-tracking branch 'apache-gh/master'
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/af222b07 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/af222b07 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/af222b07 Branch: refs/heads/0.7.0-incubating Commit: af222b071a348799d9a5c7f521de325ecfb5eaef Parents: 0ccf922 2f5d777 Author: Alex Heneveld <[email protected]> Authored: Wed Jun 24 00:36:47 2015 -0700 Committer: Alex Heneveld <[email protected]> Committed: Wed Jun 24 00:36:47 2015 -0700 ---------------------------------------------------------------------- usage/jsgui/src/main/webapp/assets/css/base.css | 5 +++ .../webapp/assets/js/util/brooklyn-utils.js | 26 +++++++++++++++ .../assets/js/view/application-add-wizard.js | 4 +-- .../main/webapp/assets/js/view/entity-config.js | 33 +++++++++----------- .../webapp/assets/js/view/entity-sensors.js | 33 +++++++++----------- .../webapp/assets/tpl/apps/config-name.html | 12 ++++++- .../webapp/assets/tpl/apps/sensor-name.html | 12 ++++++- 7 files changed, 85 insertions(+), 40 deletions(-) ----------------------------------------------------------------------
