From 5dd0ae14e41d793796dbe1e952b45200bf293f8f Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chouse@ansible.com>
Date: Fri, 25 Jul 2014 16:02:14 -0400
Subject: [PATCH] Pagination Changed collection name in pagination widget to
 '(X items)'.

---
 awx/ui/static/js/app.js                        | 4 ++--
 awx/ui/static/lib/ansible/generator-helpers.js | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/awx/ui/static/js/app.js b/awx/ui/static/js/app.js
index 632931109a..91a3608742 100644
--- a/awx/ui/static/js/app.js
+++ b/awx/ui/static/js/app.js
@@ -573,7 +573,7 @@ angular.module('Tower', [
                 // monitor socket status
                 checkCount = 0;
                 setInterval(function() {
-                    if (sock.checkStatus() === 'error' || checkCount > 3) {
+                    if (sock.checkStatus() === 'error' || checkCount > 2) {
                         // there's an error or we're stuck in a 'connecting' state. attempt to reconnect
                         $log.debug('socket status: ' + sock.checkStatus());
                         $log.debug('attempting new socket connection');
@@ -587,7 +587,7 @@ angular.module('Tower', [
                     else {
                         checkCount = 0;
                     }
-                }, 5000);
+                }, 3000);
             });
 
             if (!$AnsibleConfig) {
diff --git a/awx/ui/static/lib/ansible/generator-helpers.js b/awx/ui/static/lib/ansible/generator-helpers.js
index 26f5fcec9d..3d3714a793 100644
--- a/awx/ui/static/lib/ansible/generator-helpers.js
+++ b/awx/ui/static/lib/ansible/generator-helpers.js
@@ -832,8 +832,7 @@ angular.module('GeneratorHelpers', [])
             html += "</div>\n";
             html += "<div class=\"col-lg-4 col-md-4\" ng-hide=\"" + iterator + "_mode == 'lookup'\">\n";
             html += "<div class=\"page-label\">\n";
-            html += "Page {{ " + iterator + "_page }} of {{ " + iterator + "_num_pages }} for {{ " + iterator + "_total_rows | number:0 }} " +
-                set.replace(/^(completed|queued|running)_/,'').replace(/^home_/,'').replace(/\_/g,' ');
+            html += "Page {{ " + iterator + "_page }} of {{ " + iterator + "_num_pages }} ({{ " + iterator + "_total_rows | number:0 }} items)";
             html += "</div>\n";
             html += "</div>\n";
             html += "</div>\n";