From d89696291fa174eb8ed20c4be64637c00b1206f6 Mon Sep 17 00:00:00 2001
From: Jessica McKellar <jesstess@zulip.com>
Date: Tue, 11 Feb 2014 15:11:05 -0500
Subject: [PATCH] Remove Notification (?) explanation popover.

(imported from commit f261f87c9571a76b8b0e2538ccb3bb4826ef449e)
---
 static/js/ui.js                               | 13 -------------
 static/templates/notification_docs.handlebars | 15 ---------------
 templates/zerver/settings.html                |  2 +-
 zerver/tests/frontend/node/templates.js       |  8 --------
 4 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 static/templates/notification_docs.handlebars

diff --git a/static/js/ui.js b/static/js/ui.js
index be68dc96bd..7e348e39b8 100644
--- a/static/js/ui.js
+++ b/static/js/ui.js
@@ -1530,19 +1530,6 @@ $(function () {
         $("#api_key_button_box").hide();
     });
 
-    var notification_docs = $("#notification-docs");
-    notification_docs.popover({"placement": "right",
-                               "content": templates.render('notification_docs', {}),
-                               "trigger": "manual"});
-    $("body").on("mouseover", "#notification-docs", function (e) {
-        notification_docs.popover('show');
-        e.stopPropagation();
-    });
-    $("body").on("mouseout", "#notification-docs", function (e) {
-        notification_docs.popover('hide');
-        e.stopPropagation();
-    });
-
     $('body').on('click', '.edit_content_button', function (e) {
         var row = current_msg_list.get_row(rows.id($(this).closest(".message_row")));
         message_edit.start(row);
diff --git a/static/templates/notification_docs.handlebars b/static/templates/notification_docs.handlebars
deleted file mode 100644
index 4943f89d44..0000000000
--- a/static/templates/notification_docs.handlebars
+++ /dev/null
@@ -1,15 +0,0 @@
-{{! Explanation of when notifications fire }}
-<div>
-
-<p>If enabled, you will get desktop notifications for the following:</p>
-
-<ul>
-<li>a private message</li>
-<li>a message that @-mentions you</li>
-<li>a message to a stream you have configured to show desktop notifications (via the streams page)</li>
-<li>any custom word alerts that you have configured</li>
-</ul>
-<br />
-<p>If the Zulip window is in focus and you can already see the message when it arrives, we won't notify you.</p>
-
-</div>
diff --git a/templates/zerver/settings.html b/templates/zerver/settings.html
index 7c39c17dbc..0956fd6c15 100644
--- a/templates/zerver/settings.html
+++ b/templates/zerver/settings.html
@@ -91,7 +91,7 @@
   <form action="/json/notify_settings/change" method="post"
         class="form-horizontal notify-settings">{% csrf_token %}
     <div id="notification-settings" class="settings-section">
-      <div class="settings-section-title"><i class="icon-vector-warning-sign settings-section-icon"></i>Notifications <i class="tiny icon-vector-question-sign" id="notification-docs"></i></div>
+      <div class="settings-section-title"><i class="icon-vector-warning-sign settings-section-icon"></i>Notifications</div>
       <div class="alert" id="notify-settings-status"></div>
       <div class="notification-settings-form">
         <h4>Stream messages</h4>
diff --git a/zerver/tests/frontend/node/templates.js b/zerver/tests/frontend/node/templates.js
index 489d8518bb..17ad89740b 100644
--- a/zerver/tests/frontend/node/templates.js
+++ b/zerver/tests/frontend/node/templates.js
@@ -388,14 +388,6 @@ function render(template_name, args) {
     assert.equal(title.text().trim(), 'You have a notification');
 }());
 
-(function notification_docs() {
-    var html = render('notification_docs');
-    global.write_test_output("notification_docs.handlebars", html);
-
-    var title = $(html).find("li:first");
-    assert.equal(title.text().trim(), 'a private message');
-}());
-
 (function sidebar_subject_list() {
     var args = {
         want_show_more_topics_links: true,