paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 19:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Document how our desktop notifications work.

Browse Source 
(imported from commit 991d7541283d7d8d17836f5322abb0da780eba25)
This commit is contained in:
Tim Abbott
2013-07-15 17:50:53 -04:00
parent 0975cfadf1
commit 84a97f5c41
4 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
templates/zephyr/settings.html
View File

@@ -84,11 +84,12 @@
</div> </div>
<hr class="settings_separator"> <hr class="settings_separator">
<h2>Notification settings</h2> <h2>Notification settings <i class="tiny icon-vector-question-sign" id="notification-docs"></i></h2>
<div id="notification-settings"> <div id="notification-settings">
<div class="control-group"> <div class="control-group">
<label for="enable_desktop_notifications" class="control-label"> <label for="enable_desktop_notifications" class="control-label">
Desktop notifications</label> Desktop
notifications </label>
<div class="controls"> <div class="controls">
<input type="checkbox" name="enable_desktop_notifications" id="enable_desktop_notifications" <input type="checkbox" name="enable_desktop_notifications" id="enable_desktop_notifications"
{% if user_profile.enable_desktop_notifications %} {% if user_profile.enable_desktop_notifications %}
@@ -98,7 +99,7 @@
</div> </div>
<div class="control-group"> <div class="control-group">
<label for="enable_sounds" class="control-label"> <label for="enable_sounds" class="control-label">
Audible notifications for messages</label> Audible notifications</label>
<div class="controls"> <div class="controls">
<input type="checkbox" name="enable_sounds" id="enable_sounds" <input type="checkbox" name="enable_sounds" id="enable_sounds"
{% if user_profile.enable_sounds %} {% if user_profile.enable_sounds %}
@@ -109,7 +110,7 @@
<div class="control-group"> <div class="control-group">
<label for="enable_offline_email_notifications" class="control-label"> <label for="enable_offline_email_notifications" class="control-label">
Notify on PMs and @-mentions when offline</label> Email notifications when offline</label>
<div class="controls"> <div class="controls">
<input type="checkbox" name="enable_offline_email_notifications" id="enable_offline_email_notifications" <input type="checkbox" name="enable_offline_email_notifications" id="enable_offline_email_notifications"
{% if user_profile.enable_offline_email_notifications %} {% if user_profile.enable_offline_email_notifications %}

13
zephyr/static/js/ui.js
View File

@@ -1261,6 +1261,19 @@ $(function () {
ui.wait_for_gravatar(); ui.wait_for_gravatar();
}); });
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_subject', function (e) { $('body').on('click', '.edit_subject', function (e) {
var row = rows.get(rows.id($(this).closest(".recipient_row")), var row = rows.get(rows.id($(this).closest(".recipient_row")),
current_msg_list.table_name); current_msg_list.table_name);

4
zephyr/static/styles/zephyr.css
View File

@@ -783,6 +783,10 @@ background-color: #feffe0;
font-size: 80%; font-size: 80%;
} }
.tiny {
font-size: 60%;
}
.actions_hovered .message_time, .actions_hovered .info { .actions_hovered .message_time, .actions_hovered .info {
color: #0088CC; color: #0088CC;
cursor: pointer; cursor: pointer;

14
zephyr/static/templates/notification_docs.handlebars Normal file
View File

@@ -0,0 +1,14 @@
{{! 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>
</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>