Rename info items and reformat a bit.

deps/rabbitmq_management/priv/www/js/help.js

@@ -67,13 +67,12 @@ HELP = {
     'channel-prefetch':
       'Channel prefetch counts. \
        <p> \
-         Each channel has two prefetch counts: A per-consumer count, which \
+         Each channel can have two prefetch counts: A per-consumer count, which \
          will limit each new consumer created on the channel, and a global \
          count, which is shared between all consumers on the channel.\
        </p> \
        <p> \
-         This column shows <i>per-consumer limit</i> | <i>channel global \
-         limit</i>. In each case, 0 means "no limit" \
+         This column shows one, the other, or both limits if they are set. \
        </p>',
 
     'file-descriptors':

deps/rabbitmq_management/priv/www/js/tmpl/channel.ejs

@@ -42,12 +42,12 @@
     <td><%= fmt_object_state(channel) %></td>
   </tr>
   <tr>
-    <th>Per-channel (global) prefetch count</th>
+    <th>Prefetch count</th>
     <td><%= channel.prefetch_count %></td>
   </tr>
   <tr>
-    <th>Per-consumer prefetch count</th>
-    <td><%= channel.consumer_prefetch_count %></td>
+    <th>Global prefetch count</th>
+    <td><%= channel.global_prefetch_count %></td>
   </tr>
 </table>
 

deps/rabbitmq_management/priv/www/js/tmpl/channels-list.ejs

@@ -97,7 +97,12 @@
       <% } %>
     </td>
     <td class="c">
-      <%= channel.consumer_prefetch_count %> | <%= channel.prefetch_count %>
+      <% if (channel.prefetch_count != 0) { %>
+        <%= channel.prefetch_count %><br/>
+      <% } %>
+      <% if (channel.global_prefetch_count != 0) { %>
+        <%= channel.global_prefetch_count %> (global)
+      <% } %>
     </td>
     <td class="c"><%= channel.messages_unacknowledged %></td>
     <td class="c"><%= channel.messages_unconfirmed %></td>