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

Fixes: U4-7337 Change Wording in Doctype Editor

Browse Source
This commit is contained in:
Simon Busborg
2016-01-04 11:18:34 +01:00
parent 460f0e7528
commit deb1f2f343
5 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.controller.js
View File

@@ -9,15 +9,18 @@
(function() {
'use strict';
function PermissionsController($scope, contentTypeResource, iconHelper, contentTypeHelper) {
function PermissionsController($scope, contentTypeResource, iconHelper, contentTypeHelper, localizationService) {
/* ----------- SCOPE VARIABLES ----------- */
var vm = this;
var childNodeSelectorOverlayTitle = "";
vm.contentTypes = [];
vm.selectedChildren = [];
vm.overlayTitle = "";
vm.addChild = addChild;
vm.removeChild = removeChild;
@@ -27,6 +30,8 @@
function init() {
childNodeSelectorOverlayTitle = localizationService.localize("contentTypeEditor_chooseChildNode").then(function (value) {return value;});
contentTypeResource.getAll().then(function(contentTypes){
vm.contentTypes = contentTypes;
@@ -47,7 +52,7 @@
function addChild($event) {
vm.childNodeSelectorOverlay = {
view: "itempicker",
title: "Choose child node",
title: childNodeSelectorOverlayTitle,
availableItems: vm.contentTypes,
selectedItems: vm.selectedChildren,
event: $event,

11
src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
View File

@@ -3,12 +3,13 @@
<div class="sub-view-columns">
<div class="sub-view-column-left">
<h5>Allow as root</h5>
<small>Allow editors to create content if this type in the root of the content tree</small>
<h5><localize key="contentTypeEditor_allowAsRootHeading" /></h5>
<small><localize key="contentTypeEditor_allowAsRootDescription" /></small>
</div>
<div class="sub-view-column-right">
<label class="checkbox no-indent" >
<input type="checkbox" ng-model="model.allowAsRoot" hotkey="alt+shift+r" /> Yes - allow content of this type in the root
<input type="checkbox" ng-model="model.allowAsRoot" hotkey="alt+shift+r" />
<localize key="contentTypeEditor_allowAsRootCheckbox" />
</label>
</div>
@@ -17,8 +18,8 @@
<div class="sub-view-columns">
<div class="sub-view-column-left">
<h5>Allowed child node types</h5>
<small>Allow content of these types to be created underneath content this type</small>
<h5><localize key="contentTypeEditor_childNodesHeading" /></h5>
<small><localize key="contentTypeEditor_childNodesDescription" /></small>
</div>
<div class="sub-view-column-right">

7
src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js
View File

@@ -1,11 +1,12 @@
(function() {
'use strict';
function PermissionsController($scope, mediaTypeResource, iconHelper, contentTypeHelper) {
function PermissionsController($scope, mediaTypeResource, iconHelper, contentTypeHelper, localizationService) {
/* ----------- SCOPE VARIABLES ----------- */
var vm = this;
var childNodeSelectorOverlayTitle = "";
vm.mediaTypes = [];
vm.selectedChildren = [];
@@ -19,6 +20,8 @@
function init() {
childNodeSelectorOverlayTitle = localizationService.localize("contentTypeEditor_chooseChildNode").then(function (value) {return value;});
mediaTypeResource.getAll().then(function(mediaTypes){
vm.mediaTypes = mediaTypes;
@@ -39,7 +42,7 @@
function addChild($event) {
vm.childNodeSelectorOverlay = {
view: "itempicker",
title: "Choose child node",
title: childNodeSelectorOverlayTitle,
availableItems: vm.mediaTypes,
selectedItems: vm.selectedChildren,
event: $event,

11
src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html
View File

@@ -3,12 +3,13 @@
<div class="sub-view-columns">
<div class="sub-view-column-left">
<h5>Allow as root</h5>
<small>Allow editors to create content if this type in the root of the content tree</small>
<h5><localize key="contentTypeEditor_allowAsRootHeading" /></h5>
<small><localize key="contentTypeEditor_allowAsRootDescription" /></small>
</div>
<div class="sub-view-column-right">
<label class="checkbox no-indent" >
<input type="checkbox" ng-model="model.allowAsRoot" hotkey="alt+shift+r" /> Yes - allow content of this type in the root
<input type="checkbox" ng-model="model.allowAsRoot" hotkey="alt+shift+r" />
<localize key="contentTypeEditor_allowAsRootCheckbox" />
</label>
</div>
@@ -17,8 +18,8 @@
<div class="sub-view-columns">
<div class="sub-view-column-left">
<h5>Allowed child node types</h5>
<small>Allow content of these types to be created underneath content this type</small>
<h5><localize key="contentTypeEditor_childNodesHeading" /></h5>
<small><localize key="contentTypeEditor_childNodesDescription" /></small>
</div>
<div class="sub-view-column-right">

11
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -918,6 +918,17 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="allowAllRowConfigurations">Allow all row configurations</key>
</area>
<area alias="contentTypeEditor">
<key alias="allowAsRootHeading">Allow as root</key>
<key alias="allowAsRootDescription">Allow editors to create content of this type in the root of the content tree</key>
<key alias="allowAsRootCheckbox">Yes - allow content of this type in the root</key>
<key alias="childNodesHeading">Allowed child node types</key>
<key alias="childNodesDescription">Allow content of the specified types to be created underneath content of this type</key>
<key alias="chooseChildNode">Choose child node</key>
</area>
<area alias="templateEditor">
<key alias="alternativeField">Alternative field</key>
<key alias="alternativeText">Alternative Text</key>