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

Merge pull request #8849 from umbraco/v8/feature/property-label-on-top

Browse Source 
Feature: Property label on top
This commit is contained in:
Warren Buckley
2020-11-30 11:55:55 +00:00
committed by GitHub
parent 23a31f56e7 eeae4afe0b
commit 39d66bae47
33 changed files with 175 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
View File

@@ -8,6 +8,7 @@ using Umbraco.Core.Migrations.Upgrade.V_8_0_1;
using Umbraco.Core.Migrations.Upgrade.V_8_1_0;
using Umbraco.Core.Migrations.Upgrade.V_8_6_0;
using Umbraco.Core.Migrations.Upgrade.V_8_9_0;
using Umbraco.Core.Migrations.Upgrade.V_8_10_0;
namespace Umbraco.Core.Migrations.Upgrade
{
@@ -197,7 +198,10 @@ namespace Umbraco.Core.Migrations.Upgrade
// to 8.9.0
To<ExternalLoginTableUserData>("{B5838FF5-1D22-4F6C-BCEB-F83ACB14B575}");
// to 8.10.0...
To<AddPropertyTypeLabelOnTopColumn>("{D6A8D863-38EC-44FB-91EC-ACD6A668BD18}");
//FINAL
}
}

20
src/Umbraco.Core/Migrations/Upgrade/V_8_10_0/AddPropertyTypeLabelOnTopColumn.cs Normal file
View File

@@ -0,0 +1,20 @@
using System.Linq;
using Umbraco.Core.Persistence.Dtos;
namespace Umbraco.Core.Migrations.Upgrade.V_8_10_0
{
public class AddPropertyTypeLabelOnTopColumn : MigrationBase
{
public AddPropertyTypeLabelOnTopColumn(IMigrationContext context)
: base(context)
{ }
public override void Migrate()
{
var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToList();
AddColumnIfNotExists<PropertyTypeDto>(columns, "labelOnTop");
}
}
}

13
src/Umbraco.Core/Models/PropertyType.cs
View File

@@ -31,6 +31,7 @@ namespace Umbraco.Core.Models
private string _validationRegExp;
private string _validationRegExpMessage;
private ContentVariation _variations;
private bool _labelOnTop;
/// <summary>
/// Initializes a new instance of the <see cref="PropertyType"/> class.
@@ -205,6 +206,16 @@ namespace Umbraco.Core.Models
set => SetPropertyValueAndDetectChanges(value, ref _mandatoryMessage, nameof(MandatoryMessage));
}
/// <summary>
/// Gets or sets a value indicating whether the label of this property type should be displayed on top.
/// </summary>
[DataMember]
public bool LabelOnTop
{
get => _labelOnTop;
set => SetPropertyValueAndDetectChanges(value, ref _labelOnTop, nameof(LabelOnTop));
}
/// <summary>
/// Gets of sets the sort order of the property type.
/// </summary>
@@ -438,7 +449,7 @@ namespace Umbraco.Core.Models
base.PerformDeepClone(clone);
var clonedEntity = (PropertyType)clone;
//need to manually assign the Lazy value as it will not be automatically mapped
if (PropertyGroupId != null)
{

5
src/Umbraco.Core/Packaging/PackageDataInstallation.cs
View File

@@ -800,7 +800,10 @@ namespace Umbraco.Core.Packaging
SortOrder = sortOrder,
Variations = property.Element("Variations") != null
? (ContentVariation)Enum.Parse(typeof(ContentVariation), property.Element("Variations").Value)
: ContentVariation.Nothing
: ContentVariation.Nothing,
LabelOnTop = property.Element("LabelOnTop") != null
? property.Element("LabelOnTop").Value.ToLowerInvariant().Equals("true")
: false
};
if (property.Element("Key") != null)
propertyType.Key = new Guid(property.Element("Key").Value);

4
src/Umbraco.Core/Persistence/Dtos/PropertyTypeDto.cs
View File

@@ -62,6 +62,10 @@ namespace Umbraco.Core.Persistence.Dtos
[Length(2000)]
public string Description { get; set; }
[Column("labelOnTop")]
[Constraint(Default = "0")]
public bool LabelOnTop { get; set; }
[Column("variations")]
[Constraint(Default = "1" /*ContentVariation.InvariantNeutral*/)]
public byte Variations { get; set; }

3
src/Umbraco.Core/Persistence/Dtos/PropertyTypeReadOnlyDto.cs
View File

@@ -44,6 +44,9 @@ namespace Umbraco.Core.Persistence.Dtos
[Column("Description")]
public string Description { get; set; }
[Column("labelOnTop")]
public bool LabelOnTop { get; set; }
/* cmsMemberType */
[Column("memberCanEdit")]
public bool CanEdit { get; set; }

3
src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
View File

@@ -132,7 +132,8 @@ namespace Umbraco.Core.Persistence.Factories
ValidationRegExp = propertyType.ValidationRegExp,
ValidationRegExpMessage = propertyType.ValidationRegExpMessage,
UniqueId = propertyType.Key,
Variations = (byte)propertyType.Variations
Variations = (byte)propertyType.Variations,
LabelOnTop = propertyType.LabelOnTop
};
if (tabId != default)

1
src/Umbraco.Core/Persistence/Mappers/PropertyTypeMapper.cs
View File

@@ -29,6 +29,7 @@ namespace Umbraco.Core.Persistence.Mappers
DefineMap<PropertyType, PropertyTypeDto>(nameof(PropertyType.SortOrder), nameof(PropertyTypeDto.SortOrder));
DefineMap<PropertyType, PropertyTypeDto>(nameof(PropertyType.ValidationRegExp), nameof(PropertyTypeDto.ValidationRegExp));
DefineMap<PropertyType, PropertyTypeDto>(nameof(PropertyType.ValidationRegExpMessage), nameof(PropertyTypeDto.ValidationRegExpMessage));
DefineMap<PropertyType, PropertyTypeDto>(nameof(PropertyType.LabelOnTop), nameof(PropertyTypeDto.LabelOnTop));
DefineMap<PropertyType, DataTypeDto>(nameof(PropertyType.PropertyEditorAlias), nameof(DataTypeDto.EditorAlias));
DefineMap<PropertyType, DataTypeDto>(nameof(PropertyType.ValueStorageType), nameof(DataTypeDto.DbType));
}

3
src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeCommonRepository.cs
View File

@@ -303,7 +303,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
SortOrder = dto.SortOrder,
ValidationRegExp = dto.ValidationRegExp,
ValidationRegExpMessage = dto.ValidationRegExpMessage,
Variations = (ContentVariation)dto.Variations
Variations = (ContentVariation)dto.Variations,
LabelOnTop = dto.LabelOnTop
};
}
}

2
src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
View File

@@ -204,7 +204,7 @@ namespace Umbraco.Core.PropertyEditors
/// <returns></returns>
/// <remarks>
/// By default this will attempt to automatically convert the string value to the value type supplied by ValueType.
///
///
/// If overridden then the object returned must match the type supplied in the ValueType, otherwise persisting the
/// value to the DB will fail when it tries to validate the value type.
/// </remarks>

2
src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
View File

@@ -363,6 +363,7 @@ namespace Umbraco.Core.Services.Implement
new XElement("MandatoryMessage", propertyType.MandatoryMessage),
new XElement("Validation", propertyType.ValidationRegExp),
new XElement("ValidationRegExpMessage", propertyType.ValidationRegExpMessage),
new XElement("LabelOnTop", propertyType.LabelOnTop),
new XElement("Description", new XCData(propertyType.Description)));
genericProperties.Add(genericProperty);
}
@@ -491,6 +492,7 @@ namespace Umbraco.Core.Services.Implement
new XElement("Tab", propertyGroup == null ? "" : propertyGroup.Name),
new XElement("SortOrder", propertyType.SortOrder),
new XElement("Mandatory", propertyType.Mandatory.ToString()),
new XElement("LabelOnTop", propertyType.LabelOnTop.ToString()),
propertyType.MandatoryMessage != null ? new XElement("MandatoryMessage", propertyType.MandatoryMessage) : null,
propertyType.ValidationRegExp != null ? new XElement("Validation", propertyType.ValidationRegExp) : null,
propertyType.ValidationRegExpMessage != null ? new XElement("ValidationRegExpMessage", propertyType.ValidationRegExpMessage) : null,

1
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -132,6 +132,7 @@
<Compile Include="Migrations\Upgrade\V_8_0_0\Models\ContentTypeDto80.cs" />
<Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyDataDto80.cs" />
<Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyTypeDto80.cs" />
<Compile Include="Migrations\Upgrade\V_8_10_0\AddPropertyTypeLabelOnTopColumn.cs" />
<Compile Include="Migrations\Upgrade\V_8_9_0\ExternalLoginTableUserData.cs" />
<Compile Include="Models\Blocks\BlockEditorDataConverter.cs" />
<Compile Include="Models\Blocks\BlockEditorData.cs" />

19
src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
View File

@@ -215,6 +215,7 @@ namespace Umbraco.Tests.Models.Mapping
{
Assert.AreEqual(propTypes.ElementAt(j).Id, result.PropertyTypes.ElementAt(j).Id);
Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.PropertyTypes.ElementAt(j).DataTypeId);
Assert.AreEqual(propTypes.ElementAt(j).LabelOnTop, result.PropertyTypes.ElementAt(j).LabelOnTop);
}
}
@@ -449,6 +450,7 @@ namespace Umbraco.Tests.Models.Mapping
{
Assert.AreEqual(propTypes[j].Id, result.Groups.ElementAt(i).Properties.ElementAt(j).Id);
Assert.AreEqual(propTypes[j].DataTypeId, result.Groups.ElementAt(i).Properties.ElementAt(j).DataTypeId);
Assert.AreEqual(propTypes[j].LabelOnTop, result.Groups.ElementAt(i).Properties.ElementAt(j).LabelOnTop);
}
}
@@ -639,6 +641,7 @@ namespace Umbraco.Tests.Models.Mapping
Assert.AreEqual(basic.Validation.MandatoryMessage, result.MandatoryMessage);
Assert.AreEqual(basic.Validation.Pattern, result.ValidationRegExp);
Assert.AreEqual(basic.Validation.PatternMessage, result.ValidationRegExpMessage);
Assert.AreEqual(basic.LabelOnTop, result.LabelOnTop);
}
[Test]
@@ -677,6 +680,7 @@ namespace Umbraco.Tests.Models.Mapping
Assert.AreEqual(basic.Validation.MandatoryMessage, result.MandatoryMessage);
Assert.AreEqual(basic.Validation.Pattern, result.ValidationRegExp);
Assert.AreEqual(basic.Validation.PatternMessage, result.ValidationRegExpMessage);
Assert.AreEqual(basic.LabelOnTop, result.LabelOnTop);
}
[Test]
@@ -1074,7 +1078,8 @@ namespace Umbraco.Tests.Models.Mapping
Pattern = string.Empty
},
SortOrder = 0,
DataTypeId = 555
DataTypeId = 555,
LabelOnTop = true
}
}
}
@@ -1120,7 +1125,8 @@ namespace Umbraco.Tests.Models.Mapping
Pattern = string.Empty
},
SortOrder = 0,
DataTypeId = 555
DataTypeId = 555,
LabelOnTop = true
}
}
},
@@ -1144,7 +1150,8 @@ namespace Umbraco.Tests.Models.Mapping
Pattern = string.Empty
},
SortOrder = 0,
DataTypeId = 555
DataTypeId = 555,
LabelOnTop = false
}
}
@@ -1198,7 +1205,8 @@ namespace Umbraco.Tests.Models.Mapping
Pattern = string.Empty
},
SortOrder = 0,
DataTypeId = 555
DataTypeId = 555,
LabelOnTop = true
}
}
},
@@ -1222,7 +1230,8 @@ namespace Umbraco.Tests.Models.Mapping
Pattern = string.Empty
},
SortOrder = 0,
DataTypeId = 555
DataTypeId = 555,
LabelOnTop = false
}
}

14
src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
View File

@@ -348,6 +348,7 @@ namespace Umbraco.Tests.Persistence.Repositories
Assert.That(contentType.Path.Contains(","), Is.True);
Assert.That(contentType.SortOrder, Is.GreaterThan(0));
Assert.That(contentType.PropertyGroups.ElementAt(0).Name == "testGroup", Is.True);
var groupId = contentType.PropertyGroups.ElementAt(0).Id;
@@ -355,6 +356,7 @@ namespace Umbraco.Tests.Persistence.Repositories
Assert.AreEqual("gen", propertyTypes[0].Alias); // just to be sure
Assert.IsNull(propertyTypes[0].PropertyGroupId);
Assert.IsTrue(propertyTypes.Skip(1).All((x => x.PropertyGroupId.Value == groupId)));
Assert.That(propertyTypes.Single(x=> x.Alias == "title").LabelOnTop, Is.True);
}
}
@@ -377,7 +379,8 @@ namespace Umbraco.Tests.Persistence.Repositories
Description = "Optional Subtitle",
Mandatory = false,
SortOrder = 1,
DataTypeId = -88
DataTypeId = -88,
LabelOnTop = true
});
repository.Save(contentType);
@@ -389,6 +392,8 @@ namespace Umbraco.Tests.Persistence.Repositories
Assert.That(dirty, Is.False);
Assert.That(contentType.Thumbnail, Is.EqualTo("Doc2.png"));
Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "subtitle"), Is.True);
Assert.That(contentType.PropertyTypes.Single(x => x.Alias == "subtitle").LabelOnTop, Is.True);
}
@@ -467,7 +472,8 @@ namespace Umbraco.Tests.Persistence.Repositories
Pattern = ""
},
SortOrder = 1,
DataTypeId = -88
DataTypeId = -88,
LabelOnTop = true
}
});
@@ -476,6 +482,7 @@ namespace Umbraco.Tests.Persistence.Repositories
// just making sure
Assert.AreEqual(mapped.Thumbnail, "Doc2.png");
Assert.IsTrue(mapped.PropertyTypes.Any(x => x.Alias == "subtitle"));
Assert.IsTrue(mapped.PropertyTypes.Single(x => x.Alias == "subtitle").LabelOnTop);
repository.Save(mapped);
@@ -490,6 +497,9 @@ namespace Umbraco.Tests.Persistence.Repositories
Assert.That(dirty, Is.False);
Assert.That(contentType.Thumbnail, Is.EqualTo("Doc2.png"));
Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "subtitle"), Is.True);
Assert.That(contentType.PropertyTypes.Single(x => x.Alias == "subtitle").LabelOnTop, Is.True);
foreach (var propertyType in contentType.PropertyTypes)
{
Assert.IsTrue(propertyType.HasIdentity);

6
src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
View File

@@ -41,8 +41,8 @@ namespace Umbraco.Tests.TestHelpers.Entities
};
var contentCollection = new PropertyTypeCollection(true);
contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext) { Alias = "title", Name = "Title", Description = "", Mandatory = false, SortOrder = 1, DataTypeId = Constants.DataTypes.Textbox });
contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext) { Alias = "bodyText", Name = "Body Text", Description = "", Mandatory = false, SortOrder = 2, DataTypeId = Constants.DataTypes.RichtextEditor });
contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext) { Alias = "title", Name = "Title", Description = "", Mandatory = false, SortOrder = 1, DataTypeId = Constants.DataTypes.Textbox, LabelOnTop = true });
contentCollection.Add(new PropertyType("test", ValueStorageType.Ntext) { Alias = "bodyText", Name = "Body Text", Description = "", Mandatory = false, SortOrder = 2, DataTypeId = Constants.DataTypes.RichtextEditor, LabelOnTop = false });
var metaCollection = new PropertyTypeCollection(true);
metaCollection.Add(new PropertyType("test", ValueStorageType.Ntext) { Alias = "keywords", Name = "Meta Keywords", Description = "", Mandatory = false, SortOrder = 1, DataTypeId = Constants.DataTypes.Textbox });
@@ -213,7 +213,7 @@ namespace Umbraco.Tests.TestHelpers.Entities
contentType.Trashed = false;
var contentCollection = new PropertyTypeCollection(true);
contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext) { Alias = RandomAlias("title", randomizeAliases), Name = "Title", Description = "", Mandatory = false, SortOrder = 1, DataTypeId = -88 });
contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext) { Alias = RandomAlias("title", randomizeAliases), Name = "Title", Description = "", Mandatory = false, SortOrder = 1, DataTypeId = -88, LabelOnTop = true });
contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.TinyMce, ValueStorageType.Ntext) { Alias = RandomAlias("bodyText", randomizeAliases), Name = "Body Text", Description = "", Mandatory = false, SortOrder = 2, DataTypeId = -87 });
contentCollection.Add(new PropertyType(Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext) { Alias = RandomAlias("author", randomizeAliases) , Name = "Author", Description = "Name of the author", Mandatory = false, SortOrder = 3, DataTypeId = -88 });

10
src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
View File

@@ -323,12 +323,12 @@
filterAvailableCompositions(selectedContentType, newSelection).then(function () {
deferred.resolve({ selectedContentType, newSelection });
// TODO: Here we could probably re-enable selection if we previously showed a throbber or something
}, function () {
}, function () {
deferred.reject();
});
}
return deferred.promise;
return deferred.promise;
}
};
@@ -353,7 +353,7 @@
}),
//get where used document types
whereUsedContentTypeResource(scope.model.id).then(function (whereUsed) {
//pass to the dialog model the content type eg documentType or mediaType
//pass to the dialog model the content type eg documentType or mediaType
scope.compositionsDialogModel.section = scope.contentType;
//pass the list of 'where used' document types
scope.compositionsDialogModel.whereCompositionUsed = whereUsed;
@@ -566,6 +566,7 @@
property.isSensitiveValue = propertyModel.isSensitiveValue;
property.allowCultureVariant = propertyModel.allowCultureVariant;
property.allowSegmentVariant = propertyModel.allowSegmentVariant;
property.labelOnTop = propertyModel.labelOnTop;
// update existing data types
if (model.updateSameDataTypes) {
@@ -647,7 +648,8 @@
mandatoryMessage: null,
pattern: null,
patternMessage: null
}
},
labelOnTop: false
};
// check if there already is an init property

6
src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
View File

@@ -83,7 +83,7 @@
});
var saveProperties = _.map(realProperties, function (p) {
var saveProperty = _.pick(p, 'id', 'alias', 'description', 'validation', 'label', 'sortOrder', 'dataTypeId', 'groupId', 'memberCanEdit', 'showOnMemberProfile', 'isSensitiveData', 'allowCultureVariant', 'allowSegmentVariant');
var saveProperty = _.pick(p, 'id', 'alias', 'description', 'validation', 'label', 'sortOrder', 'dataTypeId', 'groupId', 'memberCanEdit', 'showOnMemberProfile', 'isSensitiveData', 'allowCultureVariant', 'allowSegmentVariant', 'labelOnTop');
return saveProperty;
});
@@ -404,7 +404,7 @@
if (displayModel.variants && displayModel.variants.length > 1) {
// Collect all invariant properties from the variants that are either the
// default language variant or the default segment variant.
var defaultVariants = _.filter(displayModel.variants, function (variant) {
var defaultVariants = _.filter(displayModel.variants, function (variant) {
var isDefaultLanguage = variant.language && variant.language.isDefault;
var isDefaultSegment = variant.segment == null;
@@ -433,7 +433,7 @@
return variant !== defaultVariant;
});
// now assign this same invariant property instance to the same index of the other variants property array
// now assign this same invariant property instance to the same index of the other variants property array
_.each(otherVariants, function (variant) {
_.each(invariantProps, function (invProp) {
var tab = variant.tabs[invProp.tabIndex];

23
src/Umbraco.Web.UI.Client/src/less/main.less
View File

@@ -228,6 +228,7 @@ umb-property:last-of-type .umb-control-group {
padding-top: 5px;
padding-bottom: 0;
text-align: left;
margin-bottom: 5px;
.control-label {
width: auto;
@@ -237,7 +238,7 @@ umb-property:last-of-type .umb-control-group {
.control-description {
max-width:480px;// avoiding description becoming too wide when its placed on top of property.
margin-bottom: 10px;
margin-bottom: 5px;
}
}
@media (max-width: 767px) {
@@ -245,9 +246,27 @@ umb-property:last-of-type .umb-control-group {
.form-horizontal .umb-control-group .control-header {
float: none;
width: 100%;
&::after {
content: "";
display: table;
clear: both;
}
}
}
.form-horizontal .umb-control-group.--label-on-top > .umb-el-wrap {
& > .control-header {
float: none;
width: 100%;
&::after {
content: "";
display: table;
clear: both;
}
}
& > .controls {
margin-left: 0;
}
}
/* LABELS*/

36
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.controller.js
View File

@@ -35,6 +35,7 @@
vm.toggleShowOnMemberProfile = toggleShowOnMemberProfile;
vm.toggleMemberCanEdit = toggleMemberCanEdit;
vm.toggleIsSensitiveData = toggleIsSensitiveData;
vm.toggleLabelOnTop = toggleLabelOnTop;
function onInit() {
@@ -42,23 +43,24 @@
vm.showSensitiveData = user.userGroups.indexOf("sensitiveData") != -1;
});
//make the default the same as the content type
//make the default the same as the content type
if (!$scope.model.property.dataTypeId) {
$scope.model.property.allowCultureVariant = $scope.model.contentTypeAllowCultureVariant;
}
loadValidationTypes();
}
function loadValidationTypes() {
var labels = [
"validation_validateAsEmail",
"validation_validateAsNumber",
"validation_validateAsUrl",
"validation_validateAsEmail",
"validation_validateAsNumber",
"validation_validateAsUrl",
"validation_enterCustomValidation",
"validation_fieldIsMandatory"
"validation_fieldIsMandatory",
"contentTypeEditor_displaySettingsLabelOnTop"
];
localizationService.localizeMany(labels)
@@ -69,6 +71,7 @@
vm.labels.validateAsUrl = data[2];
vm.labels.customValidation = data[3];
vm.labels.fieldIsMandatory = data[4];
vm.labels.displaySettingsLabelOnTop = data[5];
vm.validationTypes = [
{
@@ -121,7 +124,7 @@
$scope.model.updateSameDataTypes = model.updateSameDataTypes;
vm.focusOnMandatoryField = true;
// update property
property.config = model.property.config;
property.editor = model.property.editor;
@@ -179,7 +182,7 @@
if(event && event.keyCode === 13) {
submit();
}
}
}
function submit() {
if($scope.model.submit) {
@@ -245,28 +248,31 @@
return !settingValue;
}
function toggleAllowCultureVariants() {
function toggleAllowCultureVariants() {
$scope.model.property.allowCultureVariant = toggleValue($scope.model.property.allowCultureVariant);
}
function toggleAllowSegmentVariants() {
function toggleAllowSegmentVariants() {
$scope.model.property.allowSegmentVariant = toggleValue($scope.model.property.allowSegmentVariant);
}
function toggleValidation() {
$scope.model.property.validation.mandatory = toggleValue($scope.model.property.validation.mandatory);
$scope.model.property.validation.mandatory = toggleValue($scope.model.property.validation.mandatory);
}
function toggleShowOnMemberProfile() {
$scope.model.property.showOnMemberProfile = toggleValue($scope.model.property.showOnMemberProfile);
$scope.model.property.showOnMemberProfile = toggleValue($scope.model.property.showOnMemberProfile);
}
function toggleMemberCanEdit() {
$scope.model.property.memberCanEdit = toggleValue($scope.model.property.memberCanEdit);
$scope.model.property.memberCanEdit = toggleValue($scope.model.property.memberCanEdit);
}
function toggleIsSensitiveData() {
$scope.model.property.isSensitiveData = toggleValue($scope.model.property.isSensitiveData);
$scope.model.property.isSensitiveData = toggleValue($scope.model.property.isSensitiveData);
}
function toggleLabelOnTop() {
$scope.model.property.labelOnTop = toggleValue($scope.model.property.labelOnTop);
}
onInit();

15
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
View File

@@ -135,6 +135,21 @@
ng-if="vm.showValidationPattern"
ng-keypress="vm.submitOnEnter($event)" />
</div>
<div class="umb-control-group clearfix" ng-if="!model.property.locked">
<h5><localize key="contentTypeEditor_displaySettingsHeadline"></localize></h5>
<umb-toggle data-element="displaySettings_labelOnTop"
checked="model.property.labelOnTop"
on-click="vm.toggleLabelOnTop()"
label-on="{{vm.labels.displaySettingsLabelOnTop}}"
label-off="{{vm.labels.displaySettingsLabelOnTop}}"
show-labels="true"
label-position="right"
class="mb1">
</umb-toggle>
</div>
<div class="umb-control-group clearfix -no-border" ng-if="model.contentType === 'documentType' && model.contentTypeAllowCultureVariant">

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

@@ -1,7 +1,7 @@
<div class="umb-property">
<ng-form name="propertyForm">
<div class="control-group umb-control-group"
ng-class="{hidelabel:vm.property.hideLabel, 'umb-control-group__listview': vm.property.alias === '_umb_containerView'}">
ng-class="{'hidelabel':vm.property.hideLabel, '--label-on-top':vm.property.labelOnTop, 'umb-control-group__listview': vm.property.alias === '_umb_containerView'}">
<val-property-msg></val-property-msg>

2
src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
View File

@@ -1438,6 +1438,8 @@ Mange hilsner fra Umbraco robotten
<key alias="elementDescription">En Element-type er tiltænkt brug i f.eks. Nested Content, ikke i indholdstræet.</key>
<key alias="elementDoesNotSupport">Dette benyttes ikke for en Element-type</key>
<key alias="propertyHasChanges">Du har lavet ændringer til denne egenskab. Er du sikker på at du vil kassere dem?</key>
<key alias="displaySettingsHeadline">Visning</key>
<key alias="displaySettingsLabelOnTop">Flyt label over editoren</key>
</area>
<area alias="languages">
<key alias="addLanguage">Tilføj sprog</key>

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

@@ -1696,6 +1696,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="elementCannotToggle">A document type cannot be changed to an Element type once it has been used to create one or more content items.</key>
<key alias="elementDoesNotSupport">This is not applicable for an Element type</key>
<key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
<key alias="displaySettingsHeadline">Appearance</key>
<key alias="displaySettingsLabelOnTop">Display label on top of editor.</key>
</area>
<area alias="languages">
<key alias="addLanguage">Add language</key>

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

@@ -1716,6 +1716,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="elementCannotToggle">A document type cannot be changed to an element type once it has been used to create one or more content items.</key>
<key alias="elementDoesNotSupport">This is not applicable for an element type</key>
<key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
<key alias="displaySettingsHeadline">Appearance</key>
<key alias="displaySettingsLabelOnTop">Display label on top of editor.</key>
</area>
<area alias="languages">
<key alias="addLanguage">Add language</key>

3
src/Umbraco.Web/Models/ContentEditing/ContentPropertyDisplay.cs
View File

@@ -33,6 +33,9 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "hideLabel")]
public bool HideLabel { get; set; }
[DataMember(Name = "labelOnTop")]
public bool LabelOnTop { get; set; }
[DataMember(Name = "validation")]
public PropertyTypeValidation Validation { get; set; }

2
src/Umbraco.Web/Models/ContentEditing/ContentPropertyDto.cs
View File

@@ -18,6 +18,8 @@ namespace Umbraco.Web.Models.ContentEditing
public bool IsRequired { get; set; }
public bool LabelOnTop { get; set; }
public string IsRequiredMessage { get; set; }
public string ValidationRegExp { get; set; }

3
src/Umbraco.Web/Models/ContentEditing/PropertyTypeBasic.cs
View File

@@ -65,5 +65,8 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "allowSegmentVariant")]
public bool AllowSegmentVariant { get; set; }
[DataMember(Name = "labelOnTop")]
public bool LabelOnTop { get; set; }
}
}

1
src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs
View File

@@ -39,6 +39,7 @@ namespace Umbraco.Web.Models.Mapping
dest.Description = originalProp.PropertyType.Description;
dest.Label = originalProp.PropertyType.Name;
dest.HideLabel = valEditor.HideLabel;
dest.LabelOnTop = originalProp.PropertyType.LabelOnTop;
//add the validation information
dest.Validation.Mandatory = originalProp.PropertyType.Mandatory;

1
src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs
View File

@@ -27,6 +27,7 @@ namespace Umbraco.Web.Models.Mapping
dest.Description = property.PropertyType.Description;
dest.Label = property.PropertyType.Name;
dest.DataType = DataTypeService.GetDataType(property.PropertyType.DataTypeId);
dest.LabelOnTop = property.PropertyType.LabelOnTop;
}
}
}

2
src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs
View File

@@ -38,7 +38,7 @@ namespace Umbraco.Web.Models.Mapping
target.Id = source.Id;
target.IsActive = true;
target.Label = source.Name;
}
}
private void Map(Property source, ContentPropertyBasic target, MapperContext context)
{

3
src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
View File

@@ -242,6 +242,7 @@ namespace Umbraco.Web.Models.Mapping
target.Alias = source.Alias;
target.Description = source.Description;
target.SortOrder = source.SortOrder;
target.LabelOnTop = source.LabelOnTop;
}
// no MapAll - take care
@@ -353,6 +354,7 @@ namespace Umbraco.Web.Models.Mapping
target.Label = source.Label;
target.SortOrder = source.SortOrder;
target.Validation = source.Validation;
target.LabelOnTop = source.LabelOnTop;
}
// Umbraco.Code.MapAll -Editor -View -Config -ContentTypeId -ContentTypeName -Locked -DataTypeIcon -DataTypeName
@@ -373,6 +375,7 @@ namespace Umbraco.Web.Models.Mapping
target.MemberCanViewProperty = source.MemberCanViewProperty;
target.SortOrder = source.SortOrder;
target.Validation = source.Validation;
target.LabelOnTop = source.LabelOnTop;
}
// Umbraco.Code.MapAll -CreatorId -Level -SortOrder -Variations

1
src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
View File

@@ -222,6 +222,7 @@ namespace Umbraco.Web.Models.Mapping
Id = p.Id,
Alias = p.Alias,
Description = p.Description,
LabelOnTop = p.LabelOnTop,
Editor = p.PropertyEditorAlias,
Validation = new PropertyTypeValidation
{

2
src/Umbraco.Web/PropertyEditors/BlockEditorPropertyEditor.cs
View File

@@ -46,7 +46,7 @@ namespace Umbraco.Web.PropertyEditors
internal class BlockEditorPropertyValueEditor : DataValueEditor, IDataValueReference
{
private readonly PropertyEditorCollection _propertyEditors;
private readonly IDataTypeService _dataTypeService;
private readonly IDataTypeService _dataTypeService;
private readonly ILogger _logger;
private readonly BlockEditorValues _blockEditorValues;