External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-22 16:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Latest UI changes. Add button labels on all pages.

Browse Source
This commit is contained in:
chouseknecht
2013-05-24 07:43:06 -04:00
parent 8b919b666f
commit b4709c5138
33 changed files with 2351 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ansibleworks/ui/static/js/helpers/refresh-related.js
View File

@@ -23,10 +23,8 @@ angular.module('RefreshRelatedHelper', ['RestServices', 'Utilities'])
var iterator = params.iterator;
var url = params.url;
url.replace(/page_size\=\d+/,''); //stop repeatedly appending page_size
Rest.setUrl(url);
Rest.get({ params: { page_size: scope[iterator + 'PageSize'] }})
Rest.get()
.success( function(data, status, headers, config) {
scope[set] = data['results'];
scope[iterator + 'NextUrl'] = data.next;

11
ansibleworks/ui/static/js/helpers/related-paginate.js
View File

@@ -23,7 +23,7 @@ angular.module('RelatedPaginateHelper', ['RefreshRelatedHelper'])
for (var key in relatedSets){
scope[relatedSets[key].iterator + 'Page'] = 0;
scope[relatedSets[key].iterator + 'PageSize'] = 20;
scope[relatedSets[key].iterator + 'PageSize'] = 10;
}
scope.nextSet = function(set, iterator) {
@@ -38,15 +38,18 @@ angular.module('RelatedPaginateHelper', ['RefreshRelatedHelper'])
scope.changePageSize = function(set, iterator) {
// Called when a new page size is selected
var defaultUrl;
var url;
scope[iterator + 'Page'] = 0;
for (var key in relatedSets) {
if (key == set) {
defaultUrl = relatedSets[key].url;
url = relatedSets[key].url;
break;
}
}
RefreshRelated({ scope: scope, set: set, iterator: iterator, url: defaultUrl });
url = url.replace(/\/\?.*$/,'/');
url += (scope[iterator + 'SearchParams']) ? scope[iterator + 'SearchParams'] + '&page_size=' + scope[iterator + 'PageSize' ] :
'?page_size=' + scope[iterator + 'PageSize' ];
RefreshRelated({ scope: scope, set: set, iterator: iterator, url: url });
}
}
}]);

8
ansibleworks/ui/static/js/helpers/related-search.js
View File

@@ -69,13 +69,15 @@ angular.module('RelatedSearchHelper', ['RestServices', 'Utilities','RefreshRelat
}
}
if (scope[model + 'SearchValue'] != '' && scope[model + 'SearchValue'] != undefined) {
url += '?' + scope[model + 'SearchField'] +
scope[model + 'SearchParams'] = '?' + scope[model + 'SearchField'] +
'__' + scope[model + 'SearchType'] + '=' + escape(scope[model + 'SearchValue']);
url += (default_order) ? '&order_by=' + escape(default_order) : '';
scope[model + 'SearchParams'] += (default_order) ? '&order_by=' + escape(default_order) : '';
}
else {
url += (default_order) ? '?order_by=' + escape(default_order) : '';
scope[model + 'SearchParams'] = (default_order) ? '?order_by=' + escape(default_order) : '';
}
url += scope[model + 'SearchParams'];
url += (scope[model + 'PageSize']) ? '&page_size=' + scope[iterator + 'PageSize'] : "";
RefreshRelated({ scope: scope, set: set, iterator: iterator, url: url });
}
}