Merge lp:~hatch/juju-gui/bundle-label-1246462 into lp:juju-gui/experimental

[Jeff Pihach]

Adds basket name to bundle token title

https://codereview.appspot.com/20410043/

[Jeff Pihach (hatch)]

Reviewers: mp+193478_code.launchpad.net,

Message:
Please take a look.

Description:
Adds basket name to bundle token title

https://code.launchpad.net/~hatch/juju-gui/bundle-label-1246462/+merge/193478

(do not edit description out of merge proposal)

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

Affected files (+5, -1 lines):
   A [revision details]
   M app/templates/bundle-token.handlebars
   M app/widgets/token.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: app/templates/bundle-token.handlebars
=== modified file 'app/templates/bundle-token.handlebars'
--- app/templates/bundle-token.handlebars 2013-10-30 13:23:16 +0000
+++ app/templates/bundle-token.handlebars 2013-10-31 19:01:36 +0000
@@ -22,7 +22,7 @@
          </div>
      </span>
      <span class="title">
- {{ name }}
+ {{basket_name}}:{{ name }}
      </span>
      <span class="metadata">
          <div><strong>{{serviceCount}} {{pluralize 'service' serviceCount}}
| {{unitCount}} {{pluralize 'unit' unitCount}}</strong></div>

Index: app/widgets/token.js
=== modified file 'app/widgets/token.js'
--- app/widgets/token.js 2013-10-25 17:18:05 +0000
+++ app/widgets/token.js 2013-10-31 19:01:36 +0000
@@ -183,6 +183,8 @@

    }, {
      ATTRS: {
+
+ basket_name: {},
        /**
          Bundle charm metadata

[Madison Scott-Clary (makyo)]

LGTM~

https://codereview.appspot.com/20410043/

[Gary Poster (gary)]

LGTM. QAOK if we can increase max-width of #subapp-browser #bws-sidebar
.bws-content .yui3-token .title to 170px in your branch. Seems like it
would fit and looks a lot better. :-) Thank you!

https://codereview.appspot.com/20410043/

[Jeff Pihach (hatch)]

Thanks for the reviews! token title width was increased to 170, it looks
much better.

https://codereview.appspot.com/20410043/

[Jeff Pihach (hatch)]

*** Submitted:

Adds basket name to bundle token title

R=matthew.scott, gary.poster
CC=
https://codereview.appspot.com/20410043

https://codereview.appspot.com/20410043/

=== modified file 'app/templates/bundle-token.handlebars'
--- app/templates/bundle-token.handlebars	2013-10-30 13:23:16 +0000
+++ app/templates/bundle-token.handlebars	2013-10-31 19:04:42 +0000
@@ -22,7 +22,7 @@
         </div>
     </span>
     <span class="title">
-        {{ name }}
+        {{basket_name}}:{{ name }}
     </span>
     <span class="metadata">
         <div><strong>{{serviceCount}} {{pluralize 'service' serviceCount}} | {{unitCount}} {{pluralize 'unit' unitCount}}</strong></div>

=== modified file 'app/widgets/token.js'
--- app/widgets/token.js	2013-10-25 17:18:05 +0000
+++ app/widgets/token.js	2013-10-31 19:04:42 +0000
@@ -183,6 +183,8 @@
 
   }, {
     ATTRS: {
+
+      basket_name: {},
       /**
         Bundle charm metadata