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

init localise on users and groups

Browse Source
This commit is contained in:
Mads Rasmussen
2017-07-28 13:25:29 +02:00
parent 43bb9ab69b
commit 47290cd801
6 changed files with 96 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.UI.Client/src/views/common/overlays/nodepermissions/nodepermissions.controller.js
View File

@@ -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;
}
}

27
src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
View File

@@ -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"
},

16
src/Umbraco.Web.UI.Client/src/views/users/group.html
View File

@@ -22,10 +22,10 @@
<div class="umb-package-details__main-content">
<div class="test-group">
<div class="test-group-title">Something</div>
<div class="test-group-title"><localize key="user_access">Access</localize></div>
<div class="test-group-content block-form">
<umb-control-group style="margin-bottom: 20px;" label="Sections" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit.">
<umb-control-group style="margin-bottom: 20px;" label="@main_sections" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit.">
<umb-node-preview
style="max-width: 100%;"
ng-repeat="section in vm.userGroup.sections"
@@ -44,7 +44,7 @@
</a>
</umb-control-group>
<umb-control-group style="margin-bottom: 20px;" label="Content start node" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit.">
<umb-control-group style="margin-bottom: 20px;" label="@user_startnode" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit.">
<umb-node-preview
ng-if="vm.userGroup.contentStartNode.id"
style="max-width: 100%;"
@@ -64,7 +64,7 @@
</a>
</umb-control-group>
<umb-control-group label="Media start node" description="Donec quis lacinia ligula. Suspendisse ultrices risus ante">
<umb-control-group label="@user_mediastartnode" description="Donec quis lacinia ligula. Suspendisse ultrices risus ante">
<umb-node-preview
ng-if="vm.userGroup.mediaStartNode.id"
style="max-width: 100%;"
@@ -88,7 +88,7 @@
</div>
<div class="test-group">
<div class="test-group-title">Default permissions</div>
<div class="test-group-title"><localize key="user_permissionsDefault">Default permissions</localize></div>
<div class="test-group-content block-form">
<umb-control-group
ng-repeat="(category, permissions) in vm.userGroup.defaultPermissions"
@@ -104,7 +104,7 @@
</div>
<div class="test-group">
<div class="test-group-title">Granular permissions</div>
<div class="test-group-title"><localize key="user_permissionsGranular">Granular permissions</localize></div>
<div class="test-group-content block-form">
<umb-control-group label="Nodes" description="Donec quis lacinia ligula. Suspendisse ultrices risus ante">
@@ -138,14 +138,14 @@
<div class="umb-package-details__section">
<div class="umb-package-details__section-title">Users</div>
<div class="umb-package-details__section-title"><localize key="sections_users">Users</localize></div>
<umb-user-preview
ng-repeat="user in vm.userGroup.users"
name="user.name"
avatars="user.avatars"
allow-remove="true"
on-remove="vm.removeSelectedItem($index, vm.userGroup.users)">
on-remove="vm.removeSelectedItem($index, vm.userGroup.users)">
</umb-user-preview>
<a href=""

40
src/Umbraco.Web.UI.Client/src/views/users/user.html
View File

@@ -21,10 +21,10 @@
<div class="umb-package-details__main-content">
<div class="test-group">
<div class="test-group-title">Meta</div>
<div class="test-group-title"><localize key="user_profile">Profile</localize></div>
<div class="test-group-content block-form">
<umb-control-group label="Email" description="Orci varius natoque penatibus et magnis dis parturient montes">
<umb-control-group label="@general_email" description="Orci varius natoque penatibus et magnis dis parturient montes">
<input type="text"
localize="placeholder"
placeholder="@placeholders_entername"
@@ -38,8 +38,7 @@
<span class="help-inline" val-msg-for="email" val-toggle-msg="valServerField"></span>
</umb-control-group>
<umb-control-group label="Username" description="Orci varius natoque penatibus et magnis dis parturient montes"
ng-if="!vm.emailIsUsername">
<umb-control-group label="@general_username" description="Orci varius natoque penatibus et magnis dis parturient montes" ng-if="!vm.emailIsUsername">
<input type="text"
localize="placeholder"
placeholder="@placeholders_entername"
@@ -53,12 +52,11 @@
<span class="help-inline" val-msg-for="username" val-toggle-msg="valServerField"></span>
</umb-control-group>
<umb-control-group label="Language" description="Orci varius natoque penatibus et magnis dis parturient montes">
<umb-control-group label="@user_language" description="Orci varius natoque penatibus et magnis dis parturient montes">
<select class="input-block-level" ng-model="vm.user.culture" ng-options="key as value for (key, value) in vm.user.availableCultures"
name="culture"
required
val-server-field="Culture">
<option value="">Select language</option>
</select>
<span class="help-inline" val-msg-for="culture" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
<span class="help-inline" val-msg-for="culture" val-toggle-msg="valServerField"></span>
@@ -67,10 +65,10 @@
</div>
<div class="test-group" ng-if="!vm.user.isCurrentUser">
<div class="test-group-title">Permissions</div>
<div class="test-group-title"><localize key="user_access">Access</localize></div>
<div class="test-group-content block-form">
<umb-control-group style="margin-bottom: 25px;" label="Groups" description="Aliquam laoreet metus porta nisi pellentesque">
<umb-control-group style="margin-bottom: 25px;" label="@general_groups" description="Aliquam laoreet metus porta nisi pellentesque">
<umb-user-group-preview ng-repeat="userGroup in vm.user.userGroups"
icon="userGroup.icon"
@@ -92,7 +90,7 @@
</umb-control-group>
<umb-control-group style="margin-bottom: 25px;" label="Content start nodes" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit.">
<umb-control-group style="margin-bottom: 25px;" label="@user_startnodes" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit.">
<umb-node-preview style="max-width: 100%;"
ng-repeat="node in vm.user.startContentIds"
@@ -112,7 +110,7 @@
</umb-control-group>
<umb-control-group label="Media start nodes" description="Donec quis lacinia ligula. Suspendisse ultrices risus ante">
<umb-control-group label="@user_mediastartnodes" description="Donec quis lacinia ligula. Suspendisse ultrices risus ante">
<umb-node-preview style="max-width: 100%;"
ng-repeat="node in vm.user.startMediaIds"
@@ -174,7 +172,7 @@
</div>
<div class="umb-package-details__information-item">
<div class="umb-package-details__information-item-label">Status</div>
<div class="umb-package-details__information-item-label"><localize key="general_status">Status</localize>:</div>
<div class="umb-package-details__information-item-content">
<umb-badge style="margin-top: 4px;"
size="s"
@@ -185,23 +183,13 @@
</div>
<div class="umb-package-details__information-item">
<div class="umb-package-details__information-item-label">Last login:</div>
<div class="umb-package-details__information-item-label"><localize key="user_lastLogin">Last login</localize>:</div>
<div class="umb-package-details__information-item-content">
<span ng-if="vm.user.lastLoginDate">{{ vm.user.lastLoginDate }}</span>
<span ng-if="!vm.user.lastLoginDate">The user has not logged in yet</span>
<span ng-if="!vm.user.lastLoginDate">{{ vm.user.name }} <localize key="user_noLogin">has not logged in yet</localize></span>
</div>
</div>
<div class="umb-package-details__information-item" ng-if="vm.user.invitedBy">
<div class="umb-package-details__information-item-label">Invited by:</div>
<div class="umb-package-details__information-item-content">{{ vm.user.invitedBy }}</div>
</div>
<div class="umb-package-details__information-item" ng-if="vm.user.createdBy">
<div class="umb-package-details__information-item-label">Created by:</div>
<div class="umb-package-details__information-item-content">{{ vm.user.createdBy }}</div>
</div>
<div style="margin-top: 20px;">
<div style="margin-bottom: 10px;">
<umb-button ng-if="vm.user.userDisplayState.key === 'Active' && !vm.user.isCurrentUser"
@@ -209,7 +197,8 @@
button-style="[danger,block]"
action="vm.disableUser()"
state="vm.disableUserButtonState"
label="Disable user"
label="Disable"
label-key="actions_disable"
size="m">
</umb-button>
</div>
@@ -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">
</umb-button>
</div>

53
src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
View File

@@ -61,7 +61,7 @@
<umb-button ng-if="vm.allowSetUserGroup"
type="button"
size="xs"
label="Set group"
label-key="actions_setGroup"
icon="icon-users"
action="vm.openBulkUserGroupPicker()">
</umb-button>
@@ -71,7 +71,7 @@
type="button"
size="xs"
state="vm.enableUserButtonState"
label="Enable"
label-key="actions_enable"
icon="icon-check"
action="vm.enableUsers()">
</umb-button>
@@ -81,7 +81,7 @@
type="button"
size="xs"
state="vm.disableUserButtonState"
label="Disable"
label-key="actions_disable"
icon="icon-block"
action="vm.disableUsers()">
</umb-button>
@@ -94,7 +94,7 @@
<div style="margin-bottom: 20px;" class="flex items-center">
<div style="font-size: 16px;">
<span class="bold">Users</span> <span ng-if="vm.usersOptions.totalItems">({{vm.usersOptions.totalItems}})</span>
<span class="bold"><localize key="sections_users">Users</localize></span> <span ng-if="vm.usersOptions.totalItems">({{vm.usersOptions.totalItems}})</span>
</div>
<div class="flex" style="margin-left: auto;">
@@ -102,7 +102,7 @@
<!-- State filter -->
<div style="position: relative;" ng-if="vm.userStatesFilter.length > 0">
<a class="btn btn-link dropdown-toggle flex" href="" ng-click="vm.toggleFilter('state')">
<span>Status:</span>
<span><localize key="general_status">Status</localize>:</span>
<span class="bold truncate dib" style="margin-left: 5px; margin-right: 3px; max-width: 150px;">{{ vm.getFilterName(vm.userStatesFilter) }}</span>
<span class="caret"></span>
</a>
@@ -136,7 +136,7 @@
<!-- Order By -->
<div style="position: relative;">
<a class="btn btn-link dropdown-toggle flex" href="" ng-click="vm.toggleFilter('orderBy')">
<span>Order by:</span>
<span><localize key="general_orderBy">Order by</localize>:</span>
<span class="bold" style="margin-left: 2px;">{{ vm.getSortLabel(vm.usersOptions.orderBy, vm.usersOptions.orderDirection) }} </span>
<span class="caret"></span>
</a>
@@ -156,7 +156,7 @@
position="center">
<localize key="general_searchNoResult"></localize>
</umb-empty-state>
<!-- Layout: Cards -->
<div class="umb-user-cards" ng-if="vm.activeLayout.path === '1' && vm.loading === false">
<a href="" class="umb-user-card" ng-repeat="user in vm.users" ng-click="vm.clickUser(user)">
@@ -184,14 +184,13 @@
</div>
<div class="umb-user-card__last-login">
<div ng-if="user.formattedLastLogin">
<div>Last login on</div>
<div><localize key="user_lastLogin">Last login</localize></div>
{{ user.formattedLastLogin }}
</div>
<div ng-if="!user.formattedLastLogin">
<div>{{ user.name | umbWordLimit:1 }} has</div>
not logged in yet
<div>{{ user.name | umbWordLimit:1 }} <localize key="user_noLogin">has not logged in yet</localize></div>
</div>
</div>
</div>
</div>
</a>
</div>
@@ -206,10 +205,10 @@
<a href="" style="text-decoration: none;" ng-click="vm.selectAll()"><umb-checkmark checked="vm.areAllSelected()" size="xs"></umb-checkmark></a>
</th>
<th style="width: 70px;"></th>
<th>Name</th>
<th>User group</th>
<th>Last Login</th>
<th>Status</th>
<th><localize key="general_name">Name</localize></th>
<th><localize key="user_usergroup">User group</localize></th>
<th><localize key="user_lastLogin">Last login</localize></th>
<th><localize key="general_status">Status</localize></th>
</tr>
</thead>
<tbody>
@@ -272,11 +271,15 @@
<div>
<div ng-if="vm.usersViewState === 'inviteUser'">
<h3 class="bold" style="margin-bottom: 0;"><localize key="user_inviteUser">Invite User</localize></h3>
<p style="line-height: 1.6em; margin-bottom: 15px;">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non libero vel turpis ultrices pharetra.</p>
<p style="line-height: 1.6em; margin-bottom: 15px;">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non libero vel turpis ultrices pharetra.
</p>
</div>
<div ng-if="vm.usersViewState === 'createUser'">
<h3 class="bold" style="margin-bottom: 0;"><localize key="user_createUser">Create user</localize></h3>
<p style="line-height: 1.6em; margin-bottom: 15px;">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non libero vel turpis ultrices pharetra.</p>
<p style="line-height: 1.6em; margin-bottom: 15px;">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non libero vel turpis ultrices pharetra.
</p>
</div>
</div>
@@ -298,7 +301,7 @@
<input type="email"
name="email"
localize="placeholder"
placeholder="@placeholders_email"
placeholder="@placeholders_enteremail"
class="input-block-level"
ng-model="vm.newUser.email"
required
@@ -383,12 +386,16 @@
checked="vm.usersViewState === 'createUserSuccess'"
size="m">
</umb-checkmark>
<h3 class="bold" style="margin: 0 0 0 10px;">{{vm.newUser.name | umbWordLimit:1}} has been created</h3>
<h3 class="bold" style="margin: 0 0 0 10px;">
{{vm.newUser.name | umbWordLimit:1}} <localize key="user_userCreated">has been created</localize>
</h3>
</div>
<p style="line-height: 1.6em; margin-bottom: 20px;">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non libero vel turpis ultrices pharetra.</p>
<div>
<label class="bold">Password</label>
<label class="bold">
<localize key="placeholders_password">Password</localize>
</label>
<div class="flex items-center justify-between" style="background-color: #f3f3f5; padding: 10px 20px; border-radius: 3px; margin-bottom: 30px;">
@@ -400,7 +407,7 @@
ng-if="!vm.newUser.showPassword"
type="button"
action="vm.toggleNewUserPassword()"
label="Show"
label-key="general_show"
size="xs">
</umb-button>
@@ -408,7 +415,7 @@
ng-if="vm.newUser.showPassword"
type="button"
action="vm.toggleNewUserPassword()"
label="Hide"
label-key="general_hide"
size="xs">
</umb-button>
@@ -420,7 +427,7 @@
umb-clipboard-text="vm.newUser.resetPasswordValue"
state="vm.page.copyPasswordButtonState"
type="button"
label="Copy"
label-key="general_copy"
size="xs">
</umb-button>

18
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -15,6 +15,7 @@
<key alias="delete">Delete</key>
<key alias="disable">Disable</key>
<key alias="emptyTrashcan">Empty recycle bin</key>
<key alias="enable">Enable</key>
<key alias="exportDocumentType">Export Document Type</key>
<key alias="importDocumentType">Import Document Type</key>
<key alias="importPackage">Import Package</key>
@@ -35,6 +36,7 @@
<key alias="rollback">Rollback</key>
<key alias="sendtopublish">Send To Publish</key>
<key alias="sendToTranslate">Send To Translation</key>
<key alias="setGroup">Set group</key>
<key alias="sort">Sort</key>
<key alias="translate">Translate</key>
<key alias="update">Update</key>
@@ -311,14 +313,17 @@
<key alias="openInNewWindow">Opens the linked document in a new window or tab</key>
<key alias="linkToMedia">Link to media</key>
<key alias="linkToFile">Link to file</key>
<key alias="selectContentStartNode">Select content start node</key>
<key alias="selectMedia">Select media</key>
<key alias="selectIcon">Select icon</key>
<key alias="selectItem">Select item</key>
<key alias="selectLink">Select link</key>
<key alias="selectMacro">Select macro</key>
<key alias="selectContent">Select content</key>
<key alias="selectMediaStartNode">Select media start node</key>
<key alias="selectMember">Select member</key>
<key alias="selectMemberGroup">Select member group</key>
<key alias="selectNode">Select node</key>
<key alias="selectSections">Select sections</key>
<key alias="selectUsers">Select users</key>
<key alias="noMacroParams">There are no parameters for this macro</key>
@@ -351,6 +356,7 @@
<key alias="confirmPassword">Confirm your password</key>
<key alias="nameentity">Name the %0%...</key>
<key alias="entername">Enter a name...</key>
<key alias="enteremail">Enter an email...</key>
<key alias="label">Label...</key>
<key alias="enterDescription">Enter a description...</key>
<key alias="search">Type to search...</key>
@@ -480,6 +486,7 @@
<key alias="groups">Groups</key>
<key alias="height">Height</key>
<key alias="help">Help</key>
<key alias="hide">Hide</key>
<key alias="icon">Icon</key>
<key alias="import">Import</key>
<key alias="innerMargin">Inner margin</key>
@@ -511,6 +518,7 @@
<key alias="open">Open</key>
<key alias="on">On</key>
<key alias="or">or</key>
<key alias="orderBy">Order by</key>
<key alias="password">Password</key>
<key alias="path">Path</key>
<key alias="placeHolderID">Placeholder ID</key>
@@ -535,6 +543,7 @@
<key alias="showPageOnSend">Show page on Send</key>
<key alias="size">Size</key>
<key alias="sort">Sort</key>
<key alias="status">Status</key>
<key alias="submit">Submit</key>
<key alias="type">Type</key>
<key alias="typeToSearch">Type to search...</key>
@@ -1465,6 +1474,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="updateNoServerError">Error checking for update. Please review trace-stack for further information</key>
</area>
<area alias="user">
<key alias="access">Access</key>
<key alias="administrators">Administrator</key>
<key alias="categoryField">Category field</key>
<key alias="changePassword">Change Your Password</key>
@@ -1480,10 +1490,13 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="excerptField">Excerpt field</key>
<key alias="goToProfile">Go to user profile</key>
<key alias="language">Language</key>
<key alias="lastLogin">Last login</key>
<key alias="loginname">Login</key>
<key alias="mediastartnode">Start Node in Media Library</key>
<key alias="mediastartnodes">Start Nodes in Media Library</key>
<key alias="modules">Sections</key>
<key alias="noConsole">Disable Umbraco Access</key>
<key alias="noLogin">has not logged in yet</key>
<key alias="oldPassword">Old password</key>
<key alias="password">Password</key>
<key alias="resetPassword">Reset password</key>
@@ -1498,8 +1511,13 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="permissionReplaceChildren">Replace child node permissions</key>
<key alias="permissionSelectedPages">You are currently modifying permissions for the pages:</key>
<key alias="permissionSelectPages">Select pages to modify their permissions</key>
<key alias="permissionsDefault">Default permissions</key>
<key alias="permissionsGranular">Granular permissions</key>
<key alias="profile">Profile</key>
<key alias="searchAllChildren">Search all children</key>
<key alias="startnode">Start Node in Content</key>
<key alias="startnodes">Start Nodes in Content</key>
<key alias="userCreated">has been created</key>
<key alias="username">Name</key>
<key alias="userPermissions">User permissions</key>
<key alias="userGroupPermissions">User group permissions</key>