Merge lp:~hatch/juju-gui/bundle-topo-names into lp:juju-gui/experimental

[Jeff Pihach]

Removes the service names from the bundle topology

https://codereview.appspot.com/16080043/

[Jeff Pihach (hatch)]

Reviewers: mp+192353_code.launchpad.net,

Message:
Please take a look.

Description:
Removes the service names from the bundle topology

To QA, open a bundle details view and the bundle
topology should not have service names on each icon.

https://code.launchpad.net/~hatch/juju-gui/bundle-topo-names/+merge/192353

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/16080043/

Affected files (+2, -5 lines):
   A [revision details]
   M app/views/topology/bundle.js
   M test/test_bundle_module.js

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: test/test_bundle_module.js
=== modified file 'test/test_bundle_module.js'
--- test/test_bundle_module.js 2013-10-10 00:05:02 +0000
+++ test/test_bundle_module.js 2013-10-23 16:03:22 +0000
@@ -79,8 +79,6 @@

            // We should have the two rendered services
            assert.equal(container.all('.service').size(), 2);
- assert.deepEqual(container.all('tspan.name').get('text'), [
- 'mysql', 'wordpress']);
            var service = svg.select('.service');

            // Sizing

Index: app/views/topology/bundle.js
=== modified file 'app/views/topology/bundle.js'
--- app/views/topology/bundle.js 2013-10-18 16:47:34 +0000
+++ app/views/topology/bundle.js 2013-10-23 16:03:22 +0000
@@ -137,9 +137,6 @@
                  width: 96,
                  height: 96
                });
- node.append('text').append('tspan')
- .attr('class', 'name')
- .text(function(d) { return d.displayName; });
      },

      /**

[Gary Poster (gary)]

LGTM QA OK thank you!

https://codereview.appspot.com/16080043/

[Jeff Pihach (hatch)]

*** Submitted:

Removes the service names from the bundle topology

R=gary.poster
CC=
https://codereview.appspot.com/16080043

https://codereview.appspot.com/16080043/

=== modified file 'app/views/topology/bundle.js'
--- app/views/topology/bundle.js	2013-10-18 16:47:34 +0000
+++ app/views/topology/bundle.js	2013-10-23 16:08:01 +0000
@@ -137,9 +137,6 @@
                 width: 96,
                 height: 96
               });
-      node.append('text').append('tspan')
-        .attr('class', 'name')
-        .text(function(d) { return d.displayName; });
     },
 
     /**

=== modified file 'test/test_bundle_module.js'
--- test/test_bundle_module.js	2013-10-10 00:05:02 +0000
+++ test/test_bundle_module.js	2013-10-23 16:08:01 +0000
@@ -79,8 +79,6 @@
 
           // We should have the two rendered services
           assert.equal(container.all('.service').size(), 2);
-          assert.deepEqual(container.all('tspan.name').get('text'), [
-            'mysql', 'wordpress']);
           var service = svg.select('.service');
 
           // Sizing