diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/nodepermissions/nodepermissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/nodepermissions/nodepermissions.controller.js index 030c220c6a..6ed73cf15e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/nodepermissions/nodepermissions.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/nodepermissions/nodepermissions.controller.js @@ -1,11 +1,16 @@ (function () { "use strict"; - function NodePermissionsController($scope) { + function NodePermissionsController($scope, localizationService) { var vm = this; function onInit() { + + // set default title + if(!$scope.model.title) { + $scope.model.title = localizationService.localize("actions_permissionsEdit") + $scope.model.node.name; + } } diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js index 83e0871ae6..f8a70cfc85 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js @@ -25,8 +25,20 @@ vm.loading = true; - localizationService.localize("general_cancel").then(function (name) { - vm.labels.cancel = name; + var labelKeys = [ + "general_cancel", + "defaultdialogs_selectContentStartNode", + "defaultdialogs_selectMediaStartNode", + "defaultdialogs_selectNode", + "general_groups" + ]; + + localizationService.localizeMany(labelKeys).then(function (values) { + vm.labels.cancel = values[0]; + vm.labels.selectContentStartNode = values[1]; + vm.labels.selectMediaStartNode = values[2]; + vm.labels.selectNode = values[3]; + vm.labels.groups = values[4]; }); if ($routeParams.create) { @@ -102,7 +114,7 @@ function openContentPicker() { vm.contentPicker = { - title: "Select content start node", + title: vm.labels.selectContentStartNode, view: "contentpicker", hideSubmitButton: true, hideHeader: false, @@ -127,7 +139,7 @@ function openMediaPicker() { vm.contentPicker = { - title: "Select media start node", + title: vm.labels.selectMediaStartNode, view: "treepicker", section: "media", treeAlias: "media", @@ -193,7 +205,7 @@ function openGranularPermissionsPicker() { vm.contentPicker = { - title: "Select node", + title: vm.labels.selectNode, view: "contentpicker", hideSubmitButton: true, show: true, @@ -223,7 +235,6 @@ } vm.nodePermissions = { - title: "Set permissions for " + node.name, view: "nodepermissions", node: node, show: true, @@ -242,7 +253,7 @@ return i.id === node.id; }); if (!found) { - vm.userGroup.assignedPermissions.push(node); + vm.userGroup.assignedPermissions.push(node); } } @@ -279,7 +290,7 @@ function makeBreadcrumbs() { vm.breadcrumbs = [ { - "name": "Groups", + "name": vm.labels.groups, "path": "/users/users/overview", "subView": "groups" }, diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html index 2110d8f1f0..69b5af89aa 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/group.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html @@ -22,10 +22,10 @@
-
Something
+
Access
- + - + - +
-
Default permissions
+
Default permissions
-
Granular permissions
+
Granular permissions
@@ -138,14 +138,14 @@
-
Users
+
Users
+ on-remove="vm.removeSelectedItem($index, vm.userGroup.users)">
-
Meta
+
Profile
- + - + - + Required @@ -67,10 +65,10 @@
-
Permissions
+
Access
- + - + - +
-
Status
+
Status:
-
Last login:
+
Last login:
{{ vm.user.lastLoginDate }} - The user has not logged in yet + {{ vm.user.name }} has not logged in yet
-
-
Invited by:
-
{{ vm.user.invitedBy }}
-
- -
-
Created by:
-
{{ vm.user.createdBy }}
-
-
@@ -220,7 +209,8 @@ button-style="[success,block]" state="vm.enableUserButtonState" action="vm.enableUser()" - label="Enable user" + label="Enable" + label-key="actions_enable" size="m">
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 1ea26e0585..80c495786d 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 @@ -61,7 +61,7 @@ @@ -71,7 +71,7 @@ type="button" size="xs" state="vm.enableUserButtonState" - label="Enable" + label-key="actions_enable" icon="icon-check" action="vm.enableUsers()"> @@ -81,7 +81,7 @@ type="button" size="xs" state="vm.disableUserButtonState" - label="Disable" + label-key="actions_disable" icon="icon-block" action="vm.disableUsers()"> @@ -94,7 +94,7 @@
- Users ({{vm.usersOptions.totalItems}}) + Users ({{vm.usersOptions.totalItems}})
@@ -206,10 +205,10 @@ - Name - User group - Last Login - Status + Name + User group + Last login + Status @@ -272,11 +271,15 @@

Invite User

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non libero vel turpis ultrices pharetra.

+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non libero vel turpis ultrices pharetra. +

Create user

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non libero vel turpis ultrices pharetra.

+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non libero vel turpis ultrices pharetra. +

@@ -298,7 +301,7 @@ -

{{vm.newUser.name | umbWordLimit:1}} has been created

+

+ {{vm.newUser.name | umbWordLimit:1}} has been created +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non libero vel turpis ultrices pharetra.

- +
@@ -400,7 +407,7 @@ ng-if="!vm.newUser.showPassword" type="button" action="vm.toggleNewUserPassword()" - label="Show" + label-key="general_show" size="xs"> @@ -408,7 +415,7 @@ ng-if="vm.newUser.showPassword" type="button" action="vm.toggleNewUserPassword()" - label="Hide" + label-key="general_hide" size="xs"> @@ -420,7 +427,7 @@ umb-clipboard-text="vm.newUser.resetPasswordValue" state="vm.page.copyPasswordButtonState" type="button" - label="Copy" + label-key="general_copy" size="xs"> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index b1bbeb1996..43f9afe14c 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -15,6 +15,7 @@ Delete Disable Empty recycle bin + Enable Export Document Type Import Document Type Import Package @@ -35,6 +36,7 @@ Rollback Send To Publish Send To Translation + Set group Sort Translate Update @@ -311,14 +313,17 @@ Opens the linked document in a new window or tab Link to media Link to file + Select content start node Select media Select icon Select item Select link Select macro Select content + Select media start node Select member Select member group + Select node Select sections Select users There are no parameters for this macro @@ -351,6 +356,7 @@ Confirm your password Name the %0%... Enter a name... + Enter an email... Label... Enter a description... Type to search... @@ -480,6 +486,7 @@ Groups Height Help + Hide Icon Import Inner margin @@ -511,6 +518,7 @@ Open On or + Order by Password Path Placeholder ID @@ -535,6 +543,7 @@ Show page on Send Size Sort + Status Submit Type Type to search... @@ -1465,6 +1474,7 @@ To manage your website, simply open the Umbraco back office and start adding con Error checking for update. Please review trace-stack for further information + Access Administrator Category field Change Your Password @@ -1480,10 +1490,13 @@ To manage your website, simply open the Umbraco back office and start adding con Excerpt field Go to user profile Language + Last login Login Start Node in Media Library + Start Nodes in Media Library Sections Disable Umbraco Access + has not logged in yet Old password Password Reset password @@ -1498,8 +1511,13 @@ To manage your website, simply open the Umbraco back office and start adding con Replace child node permissions You are currently modifying permissions for the pages: Select pages to modify their permissions + Default permissions + Granular permissions + Profile Search all children Start Node in Content + Start Nodes in Content + has been created Name User permissions User group permissions