yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #432 from AndyButland/u4-5138

Browse Source 
U4 5138 - fixed a couple of issues with list view styling and function
This commit is contained in:
Shannon Deminick
2014-07-24 15:24:51 -07:00
parent 1e8f016234 8445c9c29b
commit 7ab8ea4da4
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/less/listview.less
View File

@@ -166,6 +166,10 @@
color: @black;
}
.umb-listview .pagination ul > li.disabled > a, .umb-listview .pagination ul > li.disabled > a:hover {
color: @grayLight;
}
/* TEMP */
.umb-listview .table-striped tbody td {

5
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
View File

@@ -80,7 +80,7 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
contentResource.getChildren(id, $scope.options).then(function (data) {
$scope.listViewResultSet = data;
$scope.pagination = [];
$scope.pagination = [];
for (var i = $scope.listViewResultSet.totalPages - 1; i >= 0; i--) {
$scope.pagination[i] = { index: i, name: i + 1 };
@@ -94,7 +94,8 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
};
//assign debounce method to the search to limit the queries
$scope.search = _.debounce(function() {
$scope.search = _.debounce(function () {
$scope.options.pageNumber = 1;
$scope.reloadView($scope.contentId);
}, 100);

18
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
View File

@@ -95,18 +95,22 @@
</div>
<div class="pagination pagination-right">
<ul>
<li><a href="#" ng-click="prev()" prevent-default>
<localize key="general_previous">Previous</localize>
</a></li>
<li ng-class="{disabled:options.pageNumber <= 1}">
<a href="#" ng-click="prev()" prevent-default>
<localize key="general_previous">Previous</localize>
</a>
</li>
<li ng-repeat="pgn in pagination track by $index"
ng-class="{active:$index==options.offset}">
ng-class="{active:$index + 1 == options.pageNumber}">
<a href="#" ng-click="goToPage($index)" prevent-default>{{$index + 1}}</a>
</li>
<li><a href="#" ng-click="next()" prevent-default>
<localize key="general_next">Next</localize>
</a></li>
<li ng-class="{disabled:options.pageNumber >= listViewResultSet.totalPages}">
<a href="#" ng-click="next()" prevent-default>
<localize key="general_next">Next</localize>
</a>
</li>
</ul>
</div>