CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-15 21:03:26 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Move all of the "alerts" into a row in our navbar.

Browse Source 
This is literally a pure "move HTML" operation; no actual code
changes.

This will make them always visible, even when we're in skinny mode
(and will also make more room for our list-of-streams-and-people
sidebar on the left.)

This does have the side-effect that the errors cover up the rest of
the application (in particular, the floating narrowbar). I don't view
this as the end of the world, though the more robust solution would be
for navbar-spacer to grow when the navbar does, and for everything
else to be correspondingly pushed down.

You can visualize an extreme version of what this looks like with
   $(".alert").show()
in the Javascript console.

This fixes Trac #720.

(imported from commit 7a3b12aebcca389465bd1e5852cef5d08fafe3e7)
This commit is contained in:
Waseem Daher 2013-01-31 15:48:05 -05:00
parent c3c79f5423
commit f3bbb7b294
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
templates/zephyr/index.html
View File

@ -190,6 +190,34 @@ var people_list = [
</div>
</div>
</div>
<div class="row">
<div class="alert alert_sidebar alert-error home-error-bar" id="connection-error">
<strong>Can't receive messages</strong>
&mdash; retrying soon. <a class="cursor_pointer" onclick="restart_get_updates({dont_block: true});">Try now</a>.
</div>
<div class="alert alert_sidebar alert-error home-error-bar" id="zephyr-mirror-error">
<strong>Messages you send are not being mirrored to MIT zephyr</strong>
&mdash; Please check that you are still running the MIT
Zephyr mirroring bot. <a class="cursor_pointer" onclick="restart_get_updates({dont_block: true});">Check now</a>
</div>
<div class="alert alert_sidebar alert-error home-error-bar" id="reloading-application">
</div>
<div class="alert alert_sidebar" id="home-error"></div>
<div class="alert alert_sidebar" id="stream-dne">
<p>The stream <span class="streamname" id="stream-dne-name"></span> does not exist.</p>
<button type="button" id="create-it" class="btn btn-primary">Create and send</button>
<button type="button" class="btn" onClick="$('#stream-dne').stop(true).fadeOut(500);">
Cancel message
</button>
</div>
<div class="alert alert_sidebar" id="stream-nosub">
<p>You're not subscribed to the stream <span class="streamname" id="stream-nosub-name"></span>.</p>
<button type="button" id="sub-it" class="btn btn-primary">Subscribe and send</button>
<button type="button" class="btn" onClick="$('#stream-nosub').stop(true).fadeOut(500);">
Cancel message
</button>
</div>
</div>
</div>
</div>
</div>
@ -218,33 +246,6 @@ var people_list = [
<i class="icon-user"></i> New private message
</button>
</div>
<div class="alert alert_sidebar alert-error home-error-bar" id="connection-error">
<strong>Can't receive messages</strong>
&mdash; retrying soon. <a class="cursor_pointer" onclick="restart_get_updates({dont_block: true});">Try now</a>.
</div>
<div class="alert alert_sidebar alert-error home-error-bar" id="zephyr-mirror-error">
<strong>Messages you send are not being mirrored to MIT zephyr</strong>
&mdash; Please check that you are still running the MIT
Zephyr mirroring bot. <a class="cursor_pointer" onclick="restart_get_updates({dont_block: true});">Check now</a>
</div>
<div class="alert alert_sidebar alert-error home-error-bar" id="reloading-application">
</div>
<div class="alert alert_sidebar" id="home-error"></div>
<div class="alert alert_sidebar" id="stream-dne">
<p>The stream <span class="streamname" id="stream-dne-name"></span> does not exist.</p>
<button type="button" id="create-it" class="btn btn-primary">Create and send</button>
<button type="button" class="btn" onClick="$('#stream-dne').stop(true).fadeOut(500);">
Cancel message
</button>
</div>
<div class="alert alert_sidebar" id="stream-nosub">
<p>You're not subscribed to the stream <span class="streamname" id="stream-nosub-name"></span>.</p>
<button type="button" id="sub-it" class="btn btn-primary">Subscribe and send</button>
<button type="button" class="btn" onClick="$('#stream-nosub').stop(true).fadeOut(500);">
Cancel message
</button>
</div>
</div>
</div>
</div><!--/sidebar-->