-
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
index 9a28627aa1..292ca3f975 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js
@@ -9,7 +9,7 @@
(function () {
"use strict";
- function ListViewGridLayoutController($scope, $routeParams, mediaHelper, mediaResource, $location, listViewHelper, mediaTypeHelper) {
+ function ListViewGridLayoutController($scope, mediaHelper, $location, listViewHelper, mediaTypeHelper) {
var vm = this;
var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
@@ -115,7 +115,7 @@
function selectFolder(folder, $event, $index) {
listViewHelper.selectHandler(folder, $index, $scope.folders, $scope.selection, $event);
}
-
+
function goToItem(item, $event, $index) {
$location.path($scope.entityType + '/' + $scope.entityType + '/edit/' + item.id);
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
index b796da8d0f..f26f077e66 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
@@ -19,7 +19,7 @@
vm.activeDrag = false;
vm.isRecycleBin = $scope.contentId === '-21' || $scope.contentId === '-20';
vm.acceptedMediatypes = [];
-
+
vm.selectItem = selectItem;
vm.clickItem = clickItem;
vm.selectAll = selectAll;
@@ -55,7 +55,7 @@
function clickItem(item) {
// if item.id is 2147483647 (int.MaxValue) use item.key
$location.path($scope.entityType + '/' + $scope.entityType + '/edit/' + (item.id === 2147483647 ? item.key : item.id));
- }
+ }
function isSortDirection(col, direction) {
return listViewHelper.setSortingDirection(col, direction, $scope.options);
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index 941d72b8c9..f2cf4e6fd8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -1,7 +1,9 @@
(function () {
"use strict";
- function UsersController($scope, $timeout, $location, $routeParams, usersResource, userGroupsResource, userService, localizationService, contentEditingHelper, usersHelper, formHelper, notificationsService, dateHelper, editorService) {
+ function UsersController($scope, $timeout, $location, $routeParams, usersResource,
+ userGroupsResource, userService, localizationService, usersHelper, formHelper,
+ dateHelper, editorService, $cookies) {
var vm = this;
var localizeSaving = localizationService.localize("general_saving");
@@ -63,10 +65,18 @@
"selected": true
}
];
-
- // Set card layout to active by default
- vm.activeLayout = vm.layouts[0];
-
+
+ var cookieUmbUserLayout = $cookies.get("umbUserLayout");
+
+ if (cookieUmbUserLayout) {
+ vm.activeLayout = vm.layouts.find(x => x.path === cookieUmbUserLayout);
+ }
+ if (vm.activeLayout === undefined) {
+ // Set card layout to active by default
+ vm.activeLayout = vm.layouts[0];
+ }
+
+
// Don't show the invite button if no email is configured
if (Umbraco.Sys.ServerVariables.umbracoSettings.showUserInvite) {
vm.defaultButton = {
@@ -96,9 +106,11 @@
vm.toggleFilter = toggleFilter;
vm.setUsersViewState = setUsersViewState;
vm.selectLayout = selectLayout;
+ vm.isSelectable = isSelectable;
vm.selectUser = selectUser;
vm.clearSelection = clearSelection;
vm.clickUser = clickUser;
+ vm.getEditPath = getEditPath;
vm.disableUsers = disableUsers;
vm.enableUsers = enableUsers;
vm.unlockUsers = unlockUsers;
@@ -199,11 +211,19 @@
});
selectedLayout.active = true;
vm.activeLayout = selectedLayout;
+
+ var expireDate = new Date();
+ expireDate.setDate(expireDate.getDate() + 365);
+ $cookies.put("umbUserLayout", selectedLayout.path, {path: "/", expires: expireDate});
}
-
+
+ function isSelectable(user) {
+ return !user.isCurrentUser;
+ }
+
function selectUser(user) {
- if (user.isCurrentUser) {
+ if (!isSelectable(user)) {
return;
}
@@ -226,9 +246,26 @@
});
vm.selection = [];
}
+
+ function clickUser(user, $event) {
+
+ $event.stopPropagation();
+
+ if ($event) {
+ // targeting a new tab/window?
+ if ($event.ctrlKey ||
+ $event.shiftKey ||
+ $event.metaKey || // apple
+ ($event.button && $event.button === 1) // middle click, >IE9 + everyone else
+ ) {
+ // yes, let the link open itself
+ return;
+ }
+ }
+
+ goToUser(user);
+ $event.preventDefault();
- function clickUser(user) {
- goToUser(user.id);
}
function disableUsers() {
@@ -551,8 +588,16 @@
vm.page.copyPasswordButtonState = "init";
}
- function goToUser(userId) {
- $location.path('users/users/user/' + userId).search("create", null).search("invite", null);
+ function goToUser(user) {
+ $location.path(pathToUser(user)).search("create", null).search("invite", null);
+ }
+
+ function getEditPath(user) {
+ return pathToUser(user) + "?mculture=" + $location.search().mculture;
+ }
+
+ function pathToUser(user) {
+ return "/users/users/user/" + user.id;
}
// helpers
@@ -569,7 +614,7 @@
vm.usersOptions.pageSize = data.pageSize;
vm.usersOptions.totalItems = data.totalItems;
vm.usersOptions.totalPages = data.totalPages;
-
+
formatDates(vm.users);
setUserDisplayState(vm.users);
vm.userStatesFilter = usersHelper.getUserStatesFilter(data.userStates);
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index cefc3c5c86..26bc478b08 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -191,18 +191,18 @@
-
+
-
-
- {{ user.userDisplayState.name }}
-
+
+ {{ user.userDisplayState.name }}
+
+
{{user.name}}
-
+
{{ userGroup.name }},
@@ -226,60 +226,65 @@
-
-
-
- |
+ |
- |
- Name |
- User group |
- Last login |
- Status |
-
-
-
-
+
+ Name
+ User group
+ Last login
+ Status
+
+
+
+
-
+ ng-class="{'-selected': user.selected, '-selectable': vm.isSelectable(user)}"
+ class="umb-table-row umb-user-table-row">
+ |
-
-
-
- |
-
{{user.name}} |
-
{{ userGroup.name }}, |
-
{{ user.formattedLastLogin }} |
-
+
+
+
+ {{ userGroup.name }},
+ {{ user.formattedLastLogin }}
+
{{ user.userDisplayState.name }}
- |
-
-
-
+
+
+
+
@@ -490,7 +495,7 @@
type="button"
button-style="action"
label-key="user_goToProfile"
- action="vm.goToUser(vm.newUser.id);"
+ action="vm.goToUser(vm.newUser);"
size="m">