Vertical alignment, safety, has not was.

This commit is contained in:
Simon MacMullen 2013-01-08 15:41:53 +00:00
parent 398b7e2b34
commit 007b0106c9
3 changed files with 31 additions and 11 deletions

View File

@ -136,6 +136,18 @@ function fmt_mirrors(queue) {
return res;
}
function fmt_sync_status(queue) {
var res = '<p><b>Syncing: ';
if (queue.messages == 0) {
res += '100';
}
else {
res += Math.round(100 * queue.sync_messages / queue.messages);
}
res += '%</b></p>';
return res;
}
function fmt_channel_mode(ch) {
if (ch.transactional) {
return '<acronym title="Transactional">T</acronym>';

View File

@ -67,13 +67,13 @@
<th>Mirrors</th>
<td>
<%
var was_unsynced_node = false;
var has_unsynced_node = false;
for (var i in queue.slave_nodes) {
var node = queue.slave_nodes[i];
%>
<%
if (jQuery.inArray(node, queue.synchronised_slave_nodes) == -1) {
was_unsynced_node = true;
has_unsynced_node = true;
%>
<%= fmt_node(node) %> <b>(unsynchronised)</b>
<% } else { %>
@ -82,14 +82,22 @@
<br/>
<% } %>
<% if (queue.status == 'syncing') { %>
<p><b>Syncing: <%= Math.round(100 * queue.sync_messages / queue.messages) %>%</b></p>
<form action="#/queues/actions" method="post">
<input type="hidden" name="vhost" value="<%= fmt_string(queue.vhost) %>"/>
<input type="hidden" name="name" value="<%= fmt_string(queue.name) %>"/>
<input type="hidden" name="action" value="cancel_sync"/>
<input type="submit" value="Cancel" id="action-button" />
</form>
<% } else if (was_unsynced_node) { %>
<table>
<tr>
<td>
<%= fmt_sync_status(queue) %>
</td>
<td>
<form action="#/queues/actions" method="post">
<input type="hidden" name="vhost" value="<%= fmt_string(queue.vhost) %>"/>
<input type="hidden" name="name" value="<%= fmt_string(queue.name) %>"/>
<input type="hidden" name="action" value="cancel_sync"/>
<input type="submit" value="Cancel" id="action-button" />
</form>
</td>
</tr>
</table>
<% } else if (has_unsynced_node) { %>
<form action="#/queues/actions" method="post">
<input type="hidden" name="vhost" value="<%= fmt_string(queue.vhost) %>"/>
<input type="hidden" name="name" value="<%= fmt_string(queue.name) %>"/>

View File

@ -57,7 +57,7 @@
<%= fmt_node(queue.node) %>
<%= fmt_mirrors(queue) %>
<% if (queue.status == 'syncing') { %>
<p><b>Syncing: <%= Math.round(100 * queue.sync_messages / queue.messages) %>%</b></p>
<%= fmt_sync_status(queue) %>
<% } %>
</td>
<% } %>