activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1436488 - in /activemq/activemq-apollo/trunk/apollo-web/src/main: scala/org/apache/activemq/apollo/web/WebModule.scala webapp/console/index.html webapp/console/js/app.js
Date Mon, 21 Jan 2013 17:03:19 GMT
Author: chirino
Date: Mon Jan 21 17:03:19 2013
New Revision: 1436488

URL: http://svn.apache.org/viewvc?rev=1436488&view=rev
Log:
Direct users to the new ajaxy console by default.

Modified:
    activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/WebModule.scala
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/index.html
    activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/js/app.js

Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/WebModule.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/WebModule.scala?rev=1436488&r1=1436487&r2=1436488&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/WebModule.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/WebModule.scala
Mon Jan 21 17:03:19 2013
@@ -80,6 +80,6 @@ object DefaultWebModule extends WebModul
 
   )
 
-  def root_redirect: String = "broker"
+  def root_redirect: String = "console/index.html"
 
 }
\ No newline at end of file

Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/index.html
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/index.html?rev=1436488&r1=1436487&r2=1436488&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/index.html (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/index.html Mon Jan 21
17:03:19 2013
@@ -354,7 +354,7 @@
                         <th>Acks</th>
                         <th>Nacks</th>
                         <th>Ack Rate</th>
-                        <th>Status</th>
+                        <th>Waiting On</th>
                       </tr>
                       {{#each App.destination.consumers}}
                       <tr>
@@ -408,8 +408,8 @@
                 <tr><td><strong>Connection Counter: </strong>{{App.connector.connection_counter}}</td></tr>
                 <tr><td><strong>Outbound Messages: </strong>{{App.connector.messages_sent}}</td></tr>
                 <tr><td><strong>Inbound Messages: </strong>{{App.connector.messages_received}}</td></tr>
-                <tr><td><strong>Data Transferred In: </strong>{{App.connector.read_counter}}</td></tr>
-                <tr><td><strong>Data Transferred Out: </strong>{{App.connector.write_counter}}</td></tr>
+                <tr><td><strong>Data Transferred In: </strong>{{memory
App.connector.read_counter}}</td></tr>
+                <tr><td><strong>Data Transferred Out: </strong>{{memory
App.connector.write_counter}}</td></tr>
                 </tbody>
               </table>
             </div>
@@ -432,7 +432,7 @@
               {{#each App.ConnectionsController}}
               <tr>
                 <td>{{view Ember.Checkbox checkedBinding="checked"}}</td>
-                <td><i class=" icon-zoom-in"></i>{{[1]}}</td><td>{{[2]}}</td><td>{{[3]}}</td><td>{{[4]}}</td><td>{{[5]}}</td><td>{{[6]}}</td><td>{{[7]}}</td>
+                <td><i class=" icon-zoom-in"></i>{{[1]}}</td><td>{{[2]}}</td><td>{{[3]}}</td><td>{{memory
[4]}}</td><td>{{memory [5]}}</td><td>{{[6]}}</td><td>{{[7]}}</td>
               </tr>
               {{/each}}
               </tbody>

Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/js/app.js
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/js/app.js?rev=1436488&r1=1436487&r2=1436488&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/js/app.js (original)
+++ activemq/activemq-apollo/trunk/apollo-web/src/main/webapp/console/js/app.js Mon Jan 21
17:03:19 2013
@@ -63,6 +63,10 @@ Ember.Handlebars.registerHelper('memory'
           }
         }
         size = size.toFixed(2);
+      } else {
+        if( (""+size).indexOf(".") !== -1 ) {
+          size = size.toFixed(2);
+        }
       }
       return size+" "+units;
     }
@@ -79,6 +83,7 @@ App = Em.Application.create({
       }
     }, 2000);
     this._super();
+    App.LoginController.refresh();
   },
 
   auto_refresh: function() {
@@ -489,7 +494,7 @@ App.DestinationController = Em.Controlle
         data.state_date = date_to_string(data.state_since);
         data.metrics.enqueue_date = date_to_string(data.metrics.enqueue_ts);
         data.metrics.dequeue_date = date_to_string(data.metrics.dequeue_ts);
-        data.metrics.nak_date = date_to_string(data.metrics.nak_ts);
+        data.metrics.nack_date = date_to_string(data.metrics.nack_ts);
         data.metrics.expired_date = date_to_string(data.metrics.expired_ts);
         data.producers.forEach(function(value){
           value.enqueue_date = date_to_string(value.enqueue_ts);



Mime
View raw message