Merge lp:~gary/juju-gui/ghostDeploy into lp:juju-gui/experimental
Proposed by
Gary Poster
Status: | Merged |
---|---|
Merged at revision: | 1050 |
Proposed branch: | lp:~gary/juju-gui/ghostDeploy |
Merge into: | lp:juju-gui/experimental |
Diff against target: |
167 lines (+42/-15) 6 files modified
app/store/env/sandbox.js (+11/-3) app/templates/service-constraints-viewlet.handlebars (+1/-1) app/templates/service-relations-viewlet.handlebars (+1/-0) app/views/ghost-inspector.js (+5/-0) app/views/topology/service.js (+20/-5) app/views/viewlets/inspector-header.js (+4/-6) |
To merge this branch: | bzr merge lp:~gary/juju-gui/ghostDeploy |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email: mp+185933@code.launchpad.net |
Description of the change
Inspector shows up after ghost inspector
- Per UX, after ghost inspector finishes, real inspector starts
- Changed new service creation to not bounce the box around
- Made a couple of other small tweaks for sandbox edge cases and capitalization
To post a comment you must log in.
Reviewers: mp+185933_ code.launchpad. net,
Message:
Please take a look.
Description:
Inspector shows up after ghost inspector
- Per UX, after ghost inspector finishes, real inspector starts
- Changed new service creation to not bounce the box around
- Made a couple of other small tweaks for sandbox edge cases and
capitalization
https:/ /code.launchpad .net/~gary/ juju-gui/ ghostDeploy/ +merge/ 185933
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/13246050/
Affected files (+44, -15 lines): env/sandbox. js service- constraints- viewlet. handlebars service- relations- viewlet. handlebars ghost-inspector .js topology/ service. js viewlets/ inspector- header. js
A [revision details]
M app/store/
M app/templates/
M app/templates/
M app/views/
M app/views/
M app/views/
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>
Index: app/templates/ service- constraints- viewlet. handlebars service- constraints- viewlet. handlebars' service- constraints- viewlet. handlebars 2013-09-16 service- constraints- viewlet. handlebars 2013-09-16 settings- constraints" > view-container" > view-content" > constraints- viewlet} }
=== modified file 'app/templates/
--- app/templates/
07:36:24 +0000
+++ app/templates/
20:09:02 +0000
@@ -1,6 +1,6 @@
<div class="
<div class="
- <h2>Constraints for New Units</h2>
+ <h2>Constraints for new units</h2>
<div class="
{{> service-
</div>
Index: app/templates/ service- relations- viewlet. handlebars service- relations- viewlet. handlebars' service- relations- viewlet. handlebars 2013-09-07 14:53:02 service- relations- viewlet. handlebars 2013-09-16 20:09:02 view-container settings-config"> "aggregateRelat ions">< /div>
=== modified file 'app/templates/
--- app/templates/
+0000
+++ app/templates/
+0000
@@ -1,3 +1,4 @@
<div class="
+ <h2>Relations</h2>
<div data-bind=
</div>
Index: app/views/ ghost-inspector .js ghost-inspector .js' ghost-inspector .js 2013-09-16 07:00:29 +0000 ghost-inspector .js 2013-09-16 21:09:30 +0000
=== modified file 'app/views/
--- app/views/
+++ app/views/
@@ -300,6 +300,11 @@
});
+ // This flag is used twice in the service topology module as a marker
+ // to know that it should not move the service or the canvas around
+ // (as opposed to services received from the environment).
+ ghostService.
+ this.options.
}
};
Index: app/store/ env/sandbox. js env/sandbox. js' env/sandbox. js 2013-09-13 16:55:51 +0000 env/sandbox. js 2013-09-16 20:09:02 +0000 'state' ).db; getById( attrs.service) ; getById( service. get('charm' ));
=== modified file 'app/store/
--- app/store/
+++ app/store/
@@ -852,13 +852,21 @@
'Series': function(attrs, self) {
var db = self.get(
var service = db.services.
- var charm = db.charms.
- ...