From 1fb5ab8a081729f2fe3cb85fdead91edbb53dd43 Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Fri, 29 Jul 2011 12:58:18 +0100 Subject: [PATCH] Get rid of those irritating clearing elements. --- .../rabbitmq_management/priv/www/css/main.css | 4 +-- deps/rabbitmq_management/priv/www/index.html | 1 - .../priv/www/js/formatters.js | 2 +- .../priv/www/js/tmpl/channel.ejs | 2 -- .../priv/www/js/tmpl/connection.ejs | 2 -- .../priv/www/js/tmpl/exchange.ejs | 3 -- .../priv/www/js/tmpl/messages.ejs | 1 - .../priv/www/js/tmpl/node.ejs | 1 - .../priv/www/js/tmpl/overview.ejs | 31 ++++++++++--------- .../priv/www/js/tmpl/queue.ejs | 26 +++++++--------- .../priv/www/js/tmpl/user.ejs | 1 - .../priv/www/js/tmpl/vhost.ejs | 1 - 12 files changed, 30 insertions(+), 45 deletions(-) diff --git a/deps/rabbitmq_management/priv/www/css/main.css b/deps/rabbitmq_management/priv/www/css/main.css index 4770e17baf..df29a696e9 100644 --- a/deps/rabbitmq_management/priv/www/css/main.css +++ b/deps/rabbitmq_management/priv/www/css/main.css @@ -1,5 +1,4 @@ body { font: 12px Verdana,sans-serif; color: #484848; padding: 8px 35px; } -.br { clear: both; display: block; } #logo { width: 204px; height: 37px; margin-bottom: 20px; background: url(../img/rabbitmqlogo.png); } #login { float: right; color: #444; } #login p { padding: 0; margin: 0; } @@ -7,7 +6,7 @@ body { font: 12px Verdana,sans-serif; color: #484848; padding: 8px 35px; } #menu ul { float: left; padding: 0; margin: 0; } #menu li { float: left; list-style-type: none; padding: 0 2em 0 0; } #menu li a { display: block; padding: 0.5em; } -#menu { border-bottom: 1px solid #FF8C00; } +#menu { border-bottom: 1px solid #FF8C00; overflow: auto; width: 100%; } #main { clear: both; } #menu a { color: #444; font-weight: bold; text-decoration: none; } #main a { color: #444; font-weight: bold; text-decoration: none; color: black; } @@ -16,6 +15,7 @@ body { font: 12px Verdana,sans-serif; color: #484848; padding: 8px 35px; } h1 { font-size: 2em; font-weight: normal; padding: 0; } b, dt { color: black; font-weight: normal; } +div.box, div.section, div.section-hidden { overflow: auto; width: 100%; } .help { color: #888; cursor: pointer; } diff --git a/deps/rabbitmq_management/priv/www/index.html b/deps/rabbitmq_management/priv/www/index.html index b7db49cd73..8a01a2f2fe 100644 --- a/deps/rabbitmq_management/priv/www/index.html +++ b/deps/rabbitmq_management/priv/www/index.html @@ -34,7 +34,6 @@
  • Users
  • Virtual Hosts
    • -
    diff --git a/deps/rabbitmq_management/priv/www/js/formatters.js b/deps/rabbitmq_management/priv/www/js/formatters.js index 9730f8ee51..e01b746e7a 100644 --- a/deps/rabbitmq_management/priv/www/js/formatters.js +++ b/deps/rabbitmq_management/priv/www/js/formatters.js @@ -199,7 +199,7 @@ function fmt_table_short(table) { function fmt_table_long(table) { return '' + fmt_table_body(table, '') + - '
    '; + ''; } function fmt_table_body(table, x) { diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/channel.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/channel.ejs index d08dc7a318..e573b06e5d 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/channel.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/channel.ejs @@ -63,7 +63,6 @@ <%= fmt_idle_long(channel) %> - @@ -95,7 +94,6 @@ - <% } %> diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/connection.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/connection.ejs index 6d98ae1968..1581676f1b 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/connection.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/connection.ejs @@ -75,7 +75,6 @@ <% } %> - @@ -126,7 +125,6 @@ <% } %> - <% } %> diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/exchange.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/exchange.ejs index 5f9a66a2e6..014299117e 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/exchange.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/exchange.ejs @@ -19,7 +19,6 @@ <% } %> - @@ -45,7 +44,6 @@ - <% } %> @@ -145,7 +143,6 @@ - <% } %> diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/messages.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/messages.ejs index bcbdabb942..ee92e89560 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/messages.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/messages.ejs @@ -33,7 +33,6 @@ - <% } diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/node.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/node.ejs index 3ddb41e354..61e1cd7a9b 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/node.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/node.ejs @@ -101,7 +101,6 @@ <%= node.processors %> - diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs index ab3679cc86..1b48d324ef 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/overview.ejs @@ -5,27 +5,29 @@
    <% if (overview.statistics_db_node != 'not_running') { %>

    Queued messages

    -
    - Ready - <%= overview.queue_totals.messages_ready %> +
    +
    + Ready + <%= overview.queue_totals.messages_ready %> +
    +
    + Unacknowledged + <%= overview.queue_totals.messages_unacknowledged %> +
    +
    + Total + <%= overview.queue_totals.messages %> +
    -
    - Unacknowledged - <%= overview.queue_totals.messages_unacknowledged %> -
    -
    - Total - <%= overview.queue_totals.messages %> -
    - <% if (statistics_level == 'fine') { %>

    Message rates

    - <%= message_rates(overview.message_stats) %> +
    + <%= message_rates(overview.message_stats) %> +
    <% } %> <% } else { %> Totals not available <% } %> -
    @@ -263,7 +265,6 @@ set force_fine_statistics to true in the rabbitmq_management_agent application

    - <% } %> diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs index 7cd8e62e04..38c728252f 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/queue.ejs @@ -4,19 +4,20 @@

    Overview

    Messages

    -
    - Ready - <%= fmt_string(queue.messages_ready) %> -
    -
    - Unacknowledged - <%= fmt_string(queue.messages_unacknowledged) %> -
    -
    +
    +
    + Ready + <%= fmt_string(queue.messages_ready) %> +
    +
    + Unacknowledged + <%= fmt_string(queue.messages_unacknowledged) %> +
    +
    Total <%= fmt_string(queue.messages) %> +
    -

    Details

    @@ -73,7 +74,6 @@ <% } %>
    -
    @@ -99,7 +99,6 @@ - <% } %> @@ -171,7 +170,6 @@
    - @@ -191,7 +189,5 @@ - - diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/user.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/user.ejs index 0d0db5ab24..96f4c4a41a 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/user.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/user.ejs @@ -20,7 +20,6 @@ <%= fmt_boolean(user.password_hash.length > 0) %> - diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/vhost.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/vhost.ejs index 2795a1fde7..8a619fccdb 100644 --- a/deps/rabbitmq_management/priv/www/js/tmpl/vhost.ejs +++ b/deps/rabbitmq_management/priv/www/js/tmpl/vhost.ejs @@ -16,7 +16,6 @@ <%= fmt_boolean(vhost.tracing) %> -