Pagination

Changed collection name in pagination widget to '(X items)'.
This commit is contained in:
Chris Houseknecht 2014-07-25 16:02:14 -04:00 committed by Luke Sneeringer
parent a03309b52a
commit 5dd0ae14e4
2 changed files with 3 additions and 4 deletions

View File

@ -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) {

View File

@ -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";