From e21c3e1cb7d143fbe9fa58b30d15c818a5ecb99e Mon Sep 17 00:00:00 2001
From: Cynthia Lin <cynthialin1004@gmail.com>
Date: Thu, 20 Jul 2017 16:04:12 -0700
Subject: [PATCH] settings: Nest PM content setting in Desktop notification
 setting.

Fixes #5879
---
 static/js/settings_notifications.js                    | 10 ++++++++++
 .../settings/notification-settings.handlebars          |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/static/js/settings_notifications.js b/static/js/settings_notifications.js
index 9668afe47e..54eb4045f8 100644
--- a/static/js/settings_notifications.js
+++ b/static/js/settings_notifications.js
@@ -74,6 +74,16 @@ exports.set_up = function () {
             }
         });
     });
+
+    $("#enable_desktop_notifications").change(function () {
+        if (this.checked) {
+            $("#pm_content_in_desktop_notifications").removeAttr("disabled");
+            $("#pm_content_in_desktop_notifications_label").parent().removeClass("control-label-disabled");
+        } else {
+            $("#pm_content_in_desktop_notifications").attr("disabled", true);
+            $("#pm_content_in_desktop_notifications_label").parent().addClass("control-label-disabled");
+        }
+    });
 };
 
 function _update_page() {
diff --git a/static/templates/settings/notification-settings.handlebars b/static/templates/settings/notification-settings.handlebars
index b37f108d2c..6b5361acf5 100644
--- a/static/templates/settings/notification-settings.handlebars
+++ b/static/templates/settings/notification-settings.handlebars
@@ -60,16 +60,17 @@
                 </label>
             </div>
 
-            <div class="input-group">
+            <div class="input-group disableable {{#unless page_params.enable_desktop_notifications}}control-label-disabled{{/unless}}">
                 <label class="checkbox">
                     <input type="checkbox" name="pm_content_in_desktop_notifications"
                               id="pm_content_in_desktop_notifications"
+                           {{#unless page_params.enable_desktop_notifications}}disabled="disabled"{{/unless}}
                            {{#if page_params.pm_content_in_desktop_notifications}}
                            checked="checked"
                            {{/if}} />
                     <span></span>
                 </label>
-                <label for="pm_content_in_desktop_notifications" class="inline-block">
+                <label for="pm_content_in_desktop_notifications" id="pm_content_in_desktop_notifications_label" class="inline-block">
                     {{t "Include content of private messages in desktop notifications" }}
                 </label>
             </div>