From 8ddaee9e00b8ff1ec111eb72cccca24ca020c606 Mon Sep 17 00:00:00 2001 From: Per Ploug Krogslund Date: Wed, 7 Aug 2013 13:45:55 +0200 Subject: [PATCH] basic indent on content editor --- .../src/views/content/edit.html | 168 +++++++++--------- .../listview/listview.controller.js | 13 +- 2 files changed, 94 insertions(+), 87 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html index 5473fcf9e4..4b3e1b3f82 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html @@ -1,91 +1,97 @@ - - - - + -
-
- + -
- Publish + + - - - +
+
+ - -
-
-
-
+
+ Publish - - - - - - + + + - - + +
+
+
+
- - - - - - - - - - - - + + + - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js index b49b79de2a..5beee82d0c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js @@ -48,26 +48,27 @@ angular.module("umbraco") with simple values */ $scope.reloadView = function(id) { - contentResource.getChildren(id, $scope.options).then(function(data) { - $scope.listViewResultSet = data; + contentResource.getChildren(id, $scope.options).then(function(data) { + $scope.listViewResultSet = data; $scope.pagination = []; + for (var i = $scope.listViewResultSet.totalPages - 1; i >= 0; i--) { $scope.pagination[i] = { index: i, name: i + 1 }; - }; - + } + if ($scope.options.pageNumber > $scope.listViewResultSet.totalPages) { $scope.options.pageNumber = $scope.listViewResultSet.totalPages; } + }); - }; if($routeParams.id){ $scope.pagination = new Array(100); $scope.listViewAllowedTypes = contentTypeResource.getAllowedTypes($routeParams.id); - $scope.reloadView($routeParams.id); + $scope.reloadView($routeParams.id); } });