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

U4-10202 Make it more obvious when no content or media start nodes are selected the user has access to the root node.

Browse Source
This commit is contained in:
Mads Rasmussen
2017-08-01 16:18:57 +02:00
parent 6655be5f5e
commit 1c5bcbc5bb
9 changed files with 26 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI.Client/src/common/directives/components/umbnodepreview.directive.js
View File

@@ -115,8 +115,7 @@
allowEdit: "=?",
onOpen: "&?",
onRemove: "&?",
onEdit: "&?",
editLabelKey: "=?"
onEdit: "&?"
},
link: link
};

2
src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
View File

@@ -41,7 +41,7 @@
.umb-node-preview__name {
color: @black;
margin-top: 2px;
margin-top: 3px;
}
.umb-node-preview__description {

4
src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.html
View File

@@ -38,16 +38,16 @@
<div class="umb-user-group-picker-list-item__permission">
<span>
<span class="bold"><localize key="user_startnode">Content start node</localize>:</span>
<span ng-if="!userGroup.contentStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
<span ng-if="userGroup.contentStartNode">{{ userGroup.contentStartNode.name }}</span>
<span ng-if="!userGroup.contentStartNode">Content root</span>
</span>
</div>
<div class="umb-user-group-picker-list-item__permission">
<span>
<span class="bold"><localize key="user_mediastartnode">Media start node</localize>:</span>
<span ng-if="!userGroup.mediaStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
<span ng-if="userGroup.mediaStartNode">{{ userGroup.mediaStartNode.name }}</span>
<span ng-if="!userGroup.mediaStartNode">Media root</span>
</span>
</div>
</div>

2
src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html
View File

@@ -13,7 +13,7 @@
</div>
</div>
<div class="umb-node-preview__actions">
<a class="umb-node-preview__action" title="Open" href="" ng-if="allowEdit" ng-click="onEdit()"><localize key="{{editLabelKey}}">Edit</localize></a>
<a class="umb-node-preview__action" title="Open" href="" ng-if="allowEdit" ng-click="onEdit()"><localize key="general_edit">Edit</localize></a>
<a class="umb-node-preview__action" title="Open" href="" ng-if="allowOpen" ng-click="onOpen()"><localize key="general_open">Open</localize></a>
<a class="umb-node-preview__action umb-node-preview__action--red" title="Remove" href="" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></i></a>
<div>

6
src/Umbraco.Web.UI.Client/src/views/components/users/umb-user-group-preview.html
View File

@@ -17,8 +17,7 @@
<span>
<span class="bold"><localize key="user_startnode">Content start node</localize>:</span>
<span ng-if="!contentStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
<span ng-if="contentStartNode && contentStartNode != -1">{{ contentStartNode.name }}</span>
<span ng-if="contentStartNode == -1">Content root</span>
<span ng-if="contentStartNode">{{ contentStartNode.name }}</span>
</span>
</div>
@@ -26,8 +25,7 @@
<span>
<span class="bold"><localize key="user_mediastartnode">Media start node</localize>:</span>
<span ng-if="!mediaStartNode"><localize key="user_noStartNode">No start node selected</localize></span>
<span ng-if="mediaStartNode && mediaStartNode != -1">{{ mediaStartNode.name }}</span>
<span ng-if="mediaStartNode == -1">Media root</span>
<span ng-if="mediaStartNode">{{ mediaStartNode.name }}</span>
</span>
</div>

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

@@ -52,39 +52,44 @@
style="max-width: 100%;"
icon="vm.userGroup.contentStartNode.icon"
name="vm.userGroup.contentStartNode.name"
allow-edit="true"
allow-remove="true"
on-edit="vm.openContentPicker()"
on-remove="vm.clearStartNode('content')">
</umb-node-preview>
<umb-node-preview
<a href=""
ng-if="!vm.userGroup.contentStartNode"
style="max-width: 100%;"
name="vm.labels.noStartNode"
allow-edit="true"
edit-label-key="'general_add'"
on-edit="vm.openContentPicker()">
</umb-node-preview>
class="umb-node-preview-add"
ng-click="vm.openContentPicker()"
prevent-default>
<localize key="general_add">Add</localize>
</a>
</umb-control-group>
<umb-control-group label="@user_mediastartnode" description="@user_mediastartnodehelp">
<umb-node-preview
ng-if="vm.userGroup.mediaStartNode.id"
style="max-width: 100%;"
icon="vm.userGroup.mediaStartNode.icon"
name="vm.userGroup.mediaStartNode.name"
allow-edit="true"
allow-remove="true"
on-edit="vm.openMediaPicker()"
on-remove="vm.clearStartNode('media')">
</umb-node-preview>
<umb-node-preview
<a href=""
ng-if="!vm.userGroup.mediaStartNode"
style="max-width: 100%;"
name="vm.labels.noStartNode"
allow-edit="true"
edit-label-key="'general_add'"
on-edit="vm.openMediaPicker()">
</umb-node-preview>
class="umb-node-preview-add"
ng-click="vm.openMediaPicker()"
prevent-default>
<localize key="general_add">Add</localize>
</a>
</umb-control-group>

4
src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
View File

@@ -38,10 +38,6 @@
vm.loading = true;
localizationService.localize("user_noStartNode").then(function (name) {
vm.page.noStartNodeLabel = name;
});
var labelKeys = [
"general_saving",
"general_cancel",

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

@@ -106,13 +106,6 @@
allow-remove="!vm.user.isCurrentUser"
on-remove="vm.removeSelectedItem($index, vm.user.startContentIds)">
</umb-node-preview>
<umb-node-preview
ng-if="vm.user.startContentIds.length === 0"
style="max-width: 100%;"
name="vm.page.noStartNodeLabel"
allow-remove="false">
</umb-node-preview>
<a href=""
ng-if="!vm.user.isCurrentUser"
@@ -136,13 +129,6 @@
on-remove="vm.removeSelectedItem($index, vm.user.startMediaIds)">
</umb-node-preview>
<umb-node-preview
ng-if="vm.user.startMediaIds.length === 0"
style="max-width: 100%;"
name="vm.page.noStartNodeLabel"
allow-remove="false">
</umb-node-preview>
<a href=""
ng-if="!vm.user.isCurrentUser"
style="max-width: 100%;"

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

@@ -317,8 +317,8 @@
icon="group.icon"
name="group.name"
sections="group.sections"
content-start-nodes="group.startNodesContent"
media-start-nodes="group.startNodesMedia"
content-start-node="group.contentStartNode"
media-start-node="group.mediaStartNode"
allow-remove="true"
on-remove="vm.removeSelectedUserGroup($index, vm.newUser.userGroups)">
</umb-user-group-preview>