Merge lp:~bac/launchpad/bug-770342 into lp:launchpad

[Brad Crittenden]

[r=benji][bug=770342] Change the title of the overlay when unmuting.

= Summary =

The unmute overlay was titled "Subscribe" which is confusing.

== Proposed fix ==

Change the title when unmuting.

== Pre-implementation notes ==

None.

== Implementation details ==

Make the title a parameter to the method to create the overlay.

== Tests ==

None.

== Demo and Q/A ==

Mute a direct bug subscription then unmute it.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/bugs/javascript/bugtask_index_portlets.js

[Benji York (benji)]

This branch looks good.

review: Approve (code)

=== modified file 'lib/lp/bugs/javascript/bugtask_index_portlets.js'
--- lib/lp/bugs/javascript/bugtask_index_portlets.js	2011-04-28 16:08:29 +0000
+++ lib/lp/bugs/javascript/bugtask_index_portlets.js	2011-04-28 20:58:30 +0000
@@ -294,10 +294,10 @@
 /**
  * Creates and shows a new subscription overlay for the given subscription.
  */
-function create_new_subscription_overlay(subscription) {
+function create_new_subscription_overlay(subscription, header_text) {
     remove_subscription_overlay();
     subscription_overlay = setup_advanced_subscription_overlay(
-        subscription);
+        subscription, header_text);
     load_and_show_advanced_subscription_overlay(
         subscription, subscription_overlay);
 }
@@ -324,7 +324,8 @@
             mute_subscription.enable_spinner('Muting...');
             mute_current_user(mute_subscription);
         } else {
-            create_new_subscription_overlay(mute_subscription);
+            create_new_subscription_overlay(
+                mute_subscription, "Unmute subscription");
         }
     });
 }
@@ -449,7 +450,8 @@
             subscription.set('is_team', false);
             var parent = e.target.get('parentNode');
             if (namespace.use_advanced_subscriptions) {
-                create_new_subscription_overlay(subscription);
+                create_new_subscription_overlay(
+                    subscription, "Subscribe to bug");
             } else {
                 // Look for the false conditions of subscription, which
                 // is_direct_subscription, etc. don't report correctly,
@@ -655,9 +657,10 @@
  * @method setup_advanced_subscription_overlay
  * @param subscription {Object} A Y.lp.bugs.subscriber.Subscription object.
  */
-function setup_advanced_subscription_overlay(subscription) {
+function setup_advanced_subscription_overlay(subscription, text) {
+    var header = Y.Node.create('<h2 />').set('text', text);
     var subscription_overlay = new Y.lazr.FormOverlay({
-        headerContent: '<h2>Subscribe to bug</h2>',
+        headerContent: header,
         form_submit_button:
             Y.Node.create(submit_button_html),
         form_cancel_button: