mirror of
https://github.com/zulip/zulip.git
synced 2025-11-07 23:43:43 +00:00
When a narrow would have no messages and just be grey, show a notice instead.
(imported from commit 2b2b653805cb1ebdb545f83b20c01f1d6cbde9b7)
This commit is contained in:
@@ -27,7 +27,7 @@
|
|||||||
<div class="message_list" id="main_div">
|
<div class="message_list" id="main_div">
|
||||||
<div id="loading_more_messages_indicator"></div>
|
<div id="loading_more_messages_indicator"></div>
|
||||||
<div id="page_loading_indicator"></div>
|
<div id="page_loading_indicator"></div>
|
||||||
<div id="first_run_message">
|
<div id="first_run_message" class="empty_feed_notice">
|
||||||
<h4>Welcome to Humbug</h4>
|
<h4>Welcome to Humbug</h4>
|
||||||
<p>See, the thing about it is... there aren't any messages
|
<p>See, the thing about it is... there aren't any messages
|
||||||
here for you right now. I'm sure someone will eventually send
|
here for you right now. I'm sure someone will eventually send
|
||||||
@@ -37,6 +37,12 @@
|
|||||||
and <a href="#" onclick="compose.start('stream');return false;">
|
and <a href="#" onclick="compose.start('stream');return false;">
|
||||||
compose a new stream message</a>.</p>
|
compose a new stream message</a>.</p>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="empty_narrow_message" class="empty_feed_notice">
|
||||||
|
<h4>Nothing's been sent here yet!</h4>
|
||||||
|
|
||||||
|
<p>Why not <a href="#" onclick="compose.start('stream'); return false;">
|
||||||
|
start the conversation</a>?</p>
|
||||||
|
</div>
|
||||||
<table class="message_table focused_table" id="zhome">
|
<table class="message_table focused_table" id="zhome">
|
||||||
<tbody>
|
<tbody>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -337,6 +337,8 @@ exports.deactivate = function () {
|
|||||||
filter_function = false;
|
filter_function = false;
|
||||||
current_operators = false;
|
current_operators = false;
|
||||||
|
|
||||||
|
util.hide_empty_narrow_message();
|
||||||
|
|
||||||
$("#main_div").removeClass('narrowed_view');
|
$("#main_div").removeClass('narrowed_view');
|
||||||
$("#searchbox").removeClass('narrowed_view');
|
$("#searchbox").removeClass('narrowed_view');
|
||||||
$("#zfilt").removeClass('focused_table');
|
$("#zfilt").removeClass('focused_table');
|
||||||
|
|||||||
@@ -91,6 +91,14 @@ exports.destroy_first_run_message = function () {
|
|||||||
$('#first_run_message').remove();
|
$('#first_run_message').remove();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
exports.show_empty_narrow_message = function () {
|
||||||
|
$('#empty_narrow_message').show();
|
||||||
|
};
|
||||||
|
|
||||||
|
exports.hide_empty_narrow_message = function () {
|
||||||
|
$('#empty_narrow_message').hide();
|
||||||
|
};
|
||||||
|
|
||||||
// Takes a one-argument function. Returns a variant of that
|
// Takes a one-argument function. Returns a variant of that
|
||||||
// function which caches result values.
|
// function which caches result values.
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -574,6 +574,13 @@ function add_messages(messages, msg_list, opts) {
|
|||||||
prepended = true;
|
prepended = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((msg_list === narrowed_msg_list) && !msg_list.empty()) {
|
||||||
|
// If adding some new messages to the message tables caused
|
||||||
|
// our current narrow to no longer be empty, hide the empty
|
||||||
|
// feed placeholder text.
|
||||||
|
util.hide_empty_narrow_message();
|
||||||
|
}
|
||||||
|
|
||||||
if (msg_list === all_msg_list && opts.update_unread_counts) {
|
if (msg_list === all_msg_list && opts.update_unread_counts) {
|
||||||
process_unread_counts(messages, false);
|
process_unread_counts(messages, false);
|
||||||
}
|
}
|
||||||
@@ -711,6 +718,13 @@ function load_old_messages(anchor, num_before, num_after, msg_list, cont, for_na
|
|||||||
function process_result(messages) {
|
function process_result(messages) {
|
||||||
$('#connection-error').hide();
|
$('#connection-error').hide();
|
||||||
|
|
||||||
|
if ((messages.length === 0) && (current_msg_list === narrowed_msg_list) &&
|
||||||
|
narrowed_msg_list.empty()) {
|
||||||
|
// Even after trying to load more messages, we have no
|
||||||
|
// messages to display in this narrow.
|
||||||
|
util.show_empty_narrow_message();
|
||||||
|
}
|
||||||
|
|
||||||
if (messages.length !== 0 && !cont_will_add_messages) {
|
if (messages.length !== 0 && !cont_will_add_messages) {
|
||||||
add_messages(messages, msg_list);
|
add_messages(messages, msg_list);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -981,11 +981,15 @@ table.floating_recipient {
|
|||||||
overflow-y: scroll;
|
overflow-y: scroll;
|
||||||
}
|
}
|
||||||
|
|
||||||
#first_run_message {
|
.empty_feed_notice {
|
||||||
padding: 1em 4em;
|
padding: 1em 4em;
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
#first_run_message h4 {
|
.empty_feed_notice h4 {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
#empty_narrow_message p {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user