diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs index 640db2163a..4c9b19f1a9 100644 --- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs +++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/DocumentRepository.cs @@ -673,19 +673,6 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement edited = true; } - // To establish the new value of "edited" we compare all properties publishedValue to editedValue and look - // for differences. - // - // If we SaveAndPublish but the publish fails (e.g. already scheduled for release) - // we have lost the publishedValue on IContent (in memory vs database) so we cannot correctly make that comparison. - // - // This is a slight change to behaviour, historically a publish, followed by change & save, followed by undo change & save - // would change edited back to false. - if (!publishing && editedSnapshot) - { - edited = true; - } - if (entity.ContentType.VariesByCulture()) { // names also impact 'edited' diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs index 74e2aba112..0190d5d400 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentTypeControllerBase.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Net.Mime; using System.Text; @@ -16,12 +17,11 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.BackOffice.Filters; using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Extensions; -using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers { /// - /// Am abstract API controller providing functionality used for dealing with content and media types + /// Am abstract API controller providing functionality used for dealing with content and media types /// [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] [PrefixlessBodyModelValidator] @@ -39,13 +39,15 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers IUmbracoMapper umbracoMapper, ILocalizedTextService localizedTextService) { - _editorValidatorCollection = editorValidatorCollection ?? throw new ArgumentNullException(nameof(editorValidatorCollection)); + _editorValidatorCollection = editorValidatorCollection ?? + throw new ArgumentNullException(nameof(editorValidatorCollection)); CultureDictionary = cultureDictionary ?? throw new ArgumentNullException(nameof(cultureDictionary)); ContentTypeService = contentTypeService ?? throw new ArgumentNullException(nameof(contentTypeService)); MediaTypeService = mediaTypeService ?? throw new ArgumentNullException(nameof(mediaTypeService)); MemberTypeService = memberTypeService ?? throw new ArgumentNullException(nameof(memberTypeService)); UmbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper)); - LocalizedTextService = localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService)); + LocalizedTextService = + localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService)); } protected ICultureDictionary CultureDictionary { get; } @@ -56,22 +58,26 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers public ILocalizedTextService LocalizedTextService { get; } /// - /// Returns the available composite content types for a given content type + /// Returns the available composite content types for a given content type /// /// /// - /// This is normally an empty list but if additional content type aliases are passed in, any content types containing those aliases will be filtered out - /// along with any content types that have matching property types that are included in the filtered content types + /// This is normally an empty list but if additional content type aliases are passed in, any content types containing + /// those aliases will be filtered out + /// along with any content types that have matching property types that are included in the filtered content types /// /// - /// This is normally an empty list but if additional property type aliases are passed in, any content types that have these aliases will be filtered out. - /// This is required because in the case of creating/modifying a content type because new property types being added to it are not yet persisted so cannot - /// be looked up via the db, they need to be passed in. + /// This is normally an empty list but if additional property type aliases are passed in, any content types that have + /// these aliases will be filtered out. + /// This is required because in the case of creating/modifying a content type because new property types being added to + /// it are not yet persisted so cannot + /// be looked up via the db, they need to be passed in. /// /// /// Whether the composite content types should be applicable for an element type /// - protected ActionResult>> PerformGetAvailableCompositeContentTypes(int contentTypeId, + protected ActionResult>> PerformGetAvailableCompositeContentTypes( + int contentTypeId, UmbracoObjectTypes type, string[] filterContentTypes, string[] filterPropertyTypes, @@ -89,26 +95,38 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers if (contentTypeId > 0) { source = ContentTypeService.Get(contentTypeId); - if (source == null) return NotFound(); + if (source == null) + { + return NotFound(); + } } + allContentTypes = ContentTypeService.GetAll().Cast().ToArray(); break; case UmbracoObjectTypes.MediaType: if (contentTypeId > 0) { - source =MediaTypeService.Get(contentTypeId); - if (source == null) return NotFound(); + source = MediaTypeService.Get(contentTypeId); + if (source == null) + { + return NotFound(); + } } - allContentTypes =MediaTypeService.GetAll().Cast().ToArray(); + + allContentTypes = MediaTypeService.GetAll().Cast().ToArray(); break; case UmbracoObjectTypes.MemberType: if (contentTypeId > 0) { source = MemberTypeService.Get(contentTypeId); - if (source == null) return NotFound(); + if (source == null) + { + return NotFound(); + } } + allContentTypes = MemberTypeService.GetAll().Cast().ToArray(); break; @@ -116,16 +134,20 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers throw new ArgumentOutOfRangeException("The entity type was not a content type"); } - var availableCompositions = ContentTypeService.GetAvailableCompositeContentTypes(source, allContentTypes, filterContentTypes, filterPropertyTypes, isElement); + ContentTypeAvailableCompositionsResults availableCompositions = + ContentTypeService.GetAvailableCompositeContentTypes(source, allContentTypes, filterContentTypes, + filterPropertyTypes, isElement); - - var currCompositions = source == null ? new IContentTypeComposition[] { } : source.ContentTypeComposition.ToArray(); + IContentTypeComposition[] currCompositions = + source == null ? new IContentTypeComposition[] { } : source.ContentTypeComposition.ToArray(); var compAliases = currCompositions.Select(x => x.Alias).ToArray(); - var ancestors = availableCompositions.Ancestors.Select(x => x.Alias); + IEnumerable ancestors = availableCompositions.Ancestors.Select(x => x.Alias); return availableCompositions.Results - .Select(x => new Tuple(UmbracoMapper.Map(x.Composition), x.Allowed)) + .Select(x => + new Tuple(UmbracoMapper.Map(x.Composition), + x.Allowed)) .Select(x => { //we need to ensure that the item is enabled if it is already selected @@ -139,9 +161,10 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers //translate the name x.Item1.Name = TranslateItem(x.Item1.Name); - var contentType = allContentTypes.FirstOrDefault(c => c.Key == x.Item1.Key); - var containers = GetEntityContainers(contentType, type)?.ToArray(); - var containerPath = $"/{(containers != null && containers.Any() ? $"{string.Join("/", containers.Select(c => c.Name))}/" : null)}"; + IContentTypeComposition contentType = allContentTypes.FirstOrDefault(c => c.Key == x.Item1.Key); + EntityContainer[] containers = GetEntityContainers(contentType, type)?.ToArray(); + var containerPath = + $"/{(containers != null && containers.Any() ? $"{string.Join("/", containers.Select(c => c.Name))}/" : null)}"; x.Item1.AdditionalData["containerPath"] = containerPath; return x; @@ -149,7 +172,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers .ToList(); } - private IEnumerable GetEntityContainers(IContentTypeComposition contentType, UmbracoObjectTypes type) + private IEnumerable GetEntityContainers(IContentTypeComposition contentType, + UmbracoObjectTypes type) { if (contentType == null) { @@ -170,12 +194,13 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } /// - /// Returns a list of content types where a particular composition content type is used + /// Returns a list of content types where a particular composition content type is used /// /// Type of content Type, eg documentType or mediaType /// Id of composition content type /// - protected ActionResult> PerformGetWhereCompositionIsUsedInContentTypes(int contentTypeId, UmbracoObjectTypes type) + protected ActionResult> PerformGetWhereCompositionIsUsedInContentTypes( + int contentTypeId, UmbracoObjectTypes type) { var id = 0; @@ -190,7 +215,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers break; case UmbracoObjectTypes.MediaType: - source =MediaTypeService.Get(contentTypeId); + source = MediaTypeService.Get(contentTypeId); break; case UmbracoObjectTypes.MemberType: @@ -202,7 +227,9 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } if (source == null) + { return NotFound(); + } id = source.Id; } @@ -216,7 +243,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers break; case UmbracoObjectTypes.MediaType: - composedOf =MediaTypeService.GetComposedOf(id); + composedOf = MediaTypeService.GetComposedOf(id); break; case UmbracoObjectTypes.MemberType: @@ -242,10 +269,14 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers protected string TranslateItem(string text) { if (text == null) + { return null; + } if (text.StartsWith("#") == false) + { return text; + } text = text.Substring(1); return CultureDictionary[text].IfNullOrWhiteSpace(text); @@ -261,18 +292,22 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers where TPropertyType : PropertyTypeBasic { var ctId = Convert.ToInt32(contentTypeSave.Id); - var ct = ctId > 0 ? getContentType(ctId) : null; - if (ctId > 0 && ct == null) return NotFound(); + TContentType ct = ctId > 0 ? getContentType(ctId) : null; + if (ctId > 0 && ct == null) + { + return NotFound(); + } //Validate that there's no other ct with the same alias // it in fact cannot be the same as any content type alias (member, content or media) because // this would interfere with how ModelsBuilder works and also how many of the published caches // works since that is based on aliases. - var allAliases = ContentTypeService.GetAllContentTypeAliases(); + IEnumerable allAliases = ContentTypeService.GetAllContentTypeAliases(); var exists = allAliases.InvariantContains(contentTypeSave.Alias); if (exists && (ctId == 0 || !ct.Alias.InvariantEquals(contentTypeSave.Alias))) { - ModelState.AddModelError("Alias", LocalizedTextService.Localize("editcontenttype", "aliasAlreadyExists")); + ModelState.AddModelError("Alias", + LocalizedTextService.Localize("editcontenttype", "aliasAlreadyExists")); } // execute the external validators @@ -280,13 +315,14 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers if (ModelState.IsValid == false) { - var err = CreateModelStateValidationEror(ctId, contentTypeSave, ct); + TContentTypeDisplay err = + CreateModelStateValidationEror(ctId, contentTypeSave, ct); return ValidationProblem(err); } //filter out empty properties contentTypeSave.Groups = contentTypeSave.Groups.Where(x => x.Name.IsNullOrWhiteSpace() == false).ToList(); - foreach (var group in contentTypeSave.Groups) + foreach (PropertyGroupBasic group in contentTypeSave.Groups) { group.Properties = group.Properties.Where(x => x.Alias.IsNullOrWhiteSpace() == false).ToList(); } @@ -302,12 +338,22 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } catch (Exception ex) { - var responseEx = CreateInvalidCompositionResponseException(ex, contentTypeSave, ct, ctId); - if (responseEx != null) return ValidationProblem(responseEx); + TContentTypeDisplay responseEx = + CreateInvalidCompositionResponseException( + ex, contentTypeSave, ct, ctId); + if (responseEx != null) + { + return ValidationProblem(responseEx); + } } - var exResult = CreateCompositionValidationExceptionIfInvalid(contentTypeSave, ct); - if (exResult != null) return ValidationProblem(exResult); + TContentTypeDisplay exResult = + CreateCompositionValidationExceptionIfInvalid( + contentTypeSave, ct); + if (exResult != null) + { + return ValidationProblem(exResult); + } saveContentType(ct); @@ -329,7 +375,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers allowIfselfAsChildSortOrder = contentTypeSave.AllowedContentTypes.IndexOf(0); allowItselfAsChild = contentTypeSave.AllowedContentTypes.Any(x => x == 0); - contentTypeSave.AllowedContentTypes = contentTypeSave.AllowedContentTypes.Where(x => x > 0).ToList(); + contentTypeSave.AllowedContentTypes = + contentTypeSave.AllowedContentTypes.Where(x => x > 0).ToList(); } //save as new @@ -342,15 +389,24 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } catch (Exception ex) { - var responseEx = CreateInvalidCompositionResponseException(ex, contentTypeSave, ct, ctId); + TContentTypeDisplay responseEx = + CreateInvalidCompositionResponseException( + ex, contentTypeSave, ct, ctId); if (responseEx is null) + { throw ex; + } return ValidationProblem(responseEx); } - var exResult = CreateCompositionValidationExceptionIfInvalid(contentTypeSave, newCt); - if (exResult != null) return ValidationProblem(exResult); + TContentTypeDisplay exResult = + CreateCompositionValidationExceptionIfInvalid( + contentTypeSave, newCt); + if (exResult != null) + { + return ValidationProblem(exResult); + } //set id to null to ensure its handled as a new type contentTypeSave.Id = null; @@ -364,30 +420,33 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers { newCt.AllowedContentTypes = newCt.AllowedContentTypes.Union( - new []{ new ContentTypeSort(newCt.Id, allowIfselfAsChildSortOrder) } + new[] { new ContentTypeSort(newCt.Id, allowIfselfAsChildSortOrder) } ); saveContentType(newCt); } + return newCt; } } private void ValidateExternalValidators(ModelStateDictionary modelState, object model) { - var modelType = model.GetType(); + Type modelType = model.GetType(); - var validationResults = _editorValidatorCollection - .Where(x => x.ModelType == modelType) - .SelectMany(x => x.Validate(model)) - .Where(x => !string.IsNullOrWhiteSpace(x.ErrorMessage) && x.MemberNames.Any()); + IEnumerable validationResults = _editorValidatorCollection + .Where(x => x.ModelType == modelType) + .SelectMany(x => x.Validate(model)) + .Where(x => !string.IsNullOrWhiteSpace(x.ErrorMessage) && x.MemberNames.Any()); - foreach (var r in validationResults) - foreach (var m in r.MemberNames) - modelState.AddModelError(m, r.ErrorMessage); + foreach (ValidationResult r in validationResults) + foreach (var m in r.MemberNames) + { + modelState.AddModelError(m, r.ErrorMessage); + } } /// - /// Move + /// Move /// /// /// @@ -398,13 +457,13 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers Func getContentType, Func>> doMove) { - var toMove = getContentType(move.Id); + TContentType toMove = getContentType(move.Id); if (toMove == null) { return NotFound(); } - var result = doMove(toMove, move.ParentId); + Attempt> result = doMove(toMove, move.ParentId); if (result.Success) { return Content(toMove.Path, MediaTypeNames.Text.Plain, Encoding.UTF8); @@ -424,7 +483,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } /// - /// Move + /// Move /// /// /// @@ -435,13 +494,13 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers Func getContentType, Func>> doCopy) { - var toMove = getContentType(move.Id); + TContentType toMove = getContentType(move.Id); if (toMove == null) { return NotFound(); } - var result = doCopy(toMove, move.ParentId); + Attempt> result = doCopy(toMove, move.ParentId); if (result.Success) { return Content(toMove.Path, MediaTypeNames.Text.Plain, Encoding.UTF8); @@ -461,33 +520,39 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } /// - /// Validates the composition and adds errors to the model state if any are found then throws an error response if there are errors + /// Validates the composition and adds errors to the model state if any are found then throws an error response if + /// there are errors /// /// /// /// - private TContentTypeDisplay CreateCompositionValidationExceptionIfInvalid(TContentTypeSave contentTypeSave, TContentType composition) + private TContentTypeDisplay CreateCompositionValidationExceptionIfInvalid(TContentTypeSave contentTypeSave, TContentType composition) where TContentTypeSave : ContentTypeSave where TPropertyType : PropertyTypeBasic where TContentTypeDisplay : ContentTypeCompositionDisplay { - var service = GetContentTypeService(); - var validateAttempt = service.ValidateComposition(composition); + IContentTypeBaseService service = GetContentTypeService(); + Attempt validateAttempt = service.ValidateComposition(composition); if (validateAttempt == false) { // if it's not successful then we need to return some model state for the property type and property group // aliases that are duplicated - var duplicatePropertyTypeAliases = validateAttempt.Result.Distinct(); - var invalidPropertyGroupAliases = (validateAttempt.Exception as InvalidCompositionException)?.PropertyGroupAliases ?? Array.Empty(); + IEnumerable duplicatePropertyTypeAliases = validateAttempt.Result.Distinct(); + var invalidPropertyGroupAliases = + (validateAttempt.Exception as InvalidCompositionException)?.PropertyGroupAliases ?? + Array.Empty(); - AddCompositionValidationErrors(contentTypeSave, duplicatePropertyTypeAliases, invalidPropertyGroupAliases); + AddCompositionValidationErrors(contentTypeSave, + duplicatePropertyTypeAliases, invalidPropertyGroupAliases); - var display = UmbracoMapper.Map(composition); + TContentTypeDisplay display = UmbracoMapper.Map(composition); //map the 'save' data on top display = UmbracoMapper.Map(contentTypeSave, display); display.Errors = ModelState.ToErrorDictionary(); return display; } + return null; } @@ -495,30 +560,42 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers where T : IContentTypeComposition { if (typeof(T).Implements()) + { return ContentTypeService as IContentTypeBaseService; + } + if (typeof(T).Implements()) + { return MediaTypeService as IContentTypeBaseService; + } + if (typeof(T).Implements()) + { return MemberTypeService as IContentTypeBaseService; + } + throw new ArgumentException("Type " + typeof(T).FullName + " does not have a service."); } /// - /// Adds errors to the model state if any invalid aliases are found then throws an error response if there are errors + /// Adds errors to the model state if any invalid aliases are found then throws an error response if there are errors /// /// /// /// /// - private void AddCompositionValidationErrors(TContentTypeSave contentTypeSave, IEnumerable duplicatePropertyTypeAliases, IEnumerable invalidPropertyGroupAliases) + private void AddCompositionValidationErrors(TContentTypeSave contentTypeSave, + IEnumerable duplicatePropertyTypeAliases, IEnumerable invalidPropertyGroupAliases) where TContentTypeSave : ContentTypeSave where TPropertyType : PropertyTypeBasic { foreach (var propertyTypeAlias in duplicatePropertyTypeAliases) { // Find the property type relating to these - var property = contentTypeSave.Groups.SelectMany(x => x.Properties).Single(x => x.Alias == propertyTypeAlias); - var group = contentTypeSave.Groups.Single(x => x.Properties.Contains(property)); + TPropertyType property = contentTypeSave.Groups.SelectMany(x => x.Properties) + .Single(x => x.Alias == propertyTypeAlias); + PropertyGroupBasic group = + contentTypeSave.Groups.Single(x => x.Properties.Contains(property)); var propertyIndex = group.Properties.IndexOf(property); var groupIndex = contentTypeSave.Groups.IndexOf(group); @@ -529,7 +606,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers foreach (var propertyGroupAlias in invalidPropertyGroupAliases) { // Find the property group relating to these - var group = contentTypeSave.Groups.Single(x => x.Alias == propertyGroupAlias); + PropertyGroupBasic group = + contentTypeSave.Groups.Single(x => x.Alias == propertyGroupAlias); var groupIndex = contentTypeSave.Groups.IndexOf(group); var key = $"Groups[{groupIndex}].Name"; ModelState.AddModelError(key, "Different group types aren't allowed between compositions"); @@ -537,7 +615,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } /// - /// If the exception is an InvalidCompositionException create a response exception to be thrown for validation errors + /// If the exception is an InvalidCompositionException create a response exception to be thrown for validation errors /// /// /// @@ -547,7 +625,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers /// /// /// - private TContentTypeDisplay CreateInvalidCompositionResponseException( + private TContentTypeDisplay CreateInvalidCompositionResponseException( Exception ex, TContentTypeSave contentTypeSave, TContentType ct, int ctId) where TContentTypeDisplay : ContentTypeCompositionDisplay where TContentTypeSave : ContentTypeSave @@ -562,23 +641,27 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers { invalidCompositionException = (InvalidCompositionException)ex.InnerException; } + if (invalidCompositionException != null) { - AddCompositionValidationErrors(contentTypeSave, invalidCompositionException.PropertyTypeAliases, invalidCompositionException.PropertyGroupAliases); + AddCompositionValidationErrors(contentTypeSave, + invalidCompositionException.PropertyTypeAliases, invalidCompositionException.PropertyGroupAliases); return CreateModelStateValidationEror(ctId, contentTypeSave, ct); } + return null; } /// - /// Used to throw the ModelState validation results when the ModelState is invalid + /// Used to throw the ModelState validation results when the ModelState is invalid /// /// /// /// /// /// - private TContentTypeDisplay CreateModelStateValidationEror(int ctId, TContentTypeSave contentTypeSave, TContentType ct) + private TContentTypeDisplay CreateModelStateValidationEror(int ctId, + TContentTypeSave contentTypeSave, TContentType ct) where TContentTypeDisplay : ContentTypeCompositionDisplay where TContentTypeSave : ContentTypeSave { diff --git a/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs b/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs index 2add065d70..91af372434 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/EntityController.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; +using System.Dynamic; using System.Globalization; using System.Linq; +using System.Linq.Expressions; using System.Reflection; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -13,6 +15,7 @@ using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Models.ContentEditing; using Umbraco.Cms.Core.Models.Entities; using Umbraco.Cms.Core.Models.Membership; +using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Models.TemplateQuery; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Security; @@ -26,20 +29,22 @@ using Umbraco.Cms.Web.BackOffice.ModelBinders; using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Cms.Web.Common.ModelBinders; using Umbraco.Extensions; -using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers { /// - /// The API controller used for getting entity objects, basic name, icon, id representation of umbraco objects that are based on CMSNode + /// The API controller used for getting entity objects, basic name, icon, id representation of umbraco objects that are + /// based on CMSNode /// /// - /// - /// This controller allows resolving basic entity data for various entities without placing the hard restrictions on users that may not have access - /// to the sections these entities entities exist in. This is to allow pickers, etc... of data to work for all users. In some cases such as accessing - /// Members, more explicit security checks are done. - /// - /// Some objects such as macros are not based on CMSNode + /// + /// This controller allows resolving basic entity data for various entities without placing the hard restrictions + /// on users that may not have access + /// to the sections these entities entities exist in. This is to allow pickers, etc... of data to work for all + /// users. In some cases such as accessing + /// Members, more explicit security checks are done. + /// + /// Some objects such as macros are not based on CMSNode /// [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] [ParameterSwapControllerActionSelector(nameof(GetAncestors), "id", typeof(int), typeof(Guid))] @@ -51,26 +56,28 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers [ParameterSwapControllerActionSelector(nameof(GetUrl), "id", typeof(int), typeof(Udi))] public class EntityController : UmbracoAuthorizedJsonController { - private readonly ITreeService _treeService; - private readonly UmbracoTreeSearcher _treeSearcher; - private readonly SearchableTreeCollection _searchableTreeCollection; - private readonly IPublishedContentQuery _publishedContentQuery; - private readonly IShortStringHelper _shortStringHelper; - private readonly IEntityService _entityService; - private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor; - private readonly IPublishedUrlProvider _publishedUrlProvider; - private readonly IContentService _contentService; - private readonly IUmbracoMapper _umbracoMapper; - private readonly IDataTypeService _dataTypeService; - private readonly ISqlContext _sqlContext; - private readonly ILocalizedTextService _localizedTextService; - private readonly IFileService _fileService; - private readonly IContentTypeService _contentTypeService; - private readonly IMediaTypeService _mediaTypeService; - private readonly IMacroService _macroService; - private readonly IUserService _userService; - private readonly ILocalizationService _localizationService; + private static readonly string[] _postFilterSplitStrings = { "=", "==", "!=", "<>", ">", "<", ">=", "<=" }; + private readonly AppCaches _appCaches; + private readonly IBackOfficeSecurityAccessor _backofficeSecurityAccessor; + private readonly IContentService _contentService; + private readonly IContentTypeService _contentTypeService; + private readonly IDataTypeService _dataTypeService; + private readonly IEntityService _entityService; + private readonly IFileService _fileService; + private readonly ILocalizationService _localizationService; + private readonly ILocalizedTextService _localizedTextService; + private readonly IMacroService _macroService; + private readonly IMediaTypeService _mediaTypeService; + private readonly IPublishedContentQuery _publishedContentQuery; + private readonly IPublishedUrlProvider _publishedUrlProvider; + private readonly SearchableTreeCollection _searchableTreeCollection; + private readonly IShortStringHelper _shortStringHelper; + private readonly ISqlContext _sqlContext; + private readonly UmbracoTreeSearcher _treeSearcher; + private readonly ITreeService _treeService; + private readonly IUmbracoMapper _umbracoMapper; + private readonly IUserService _userService; public EntityController( ITreeService treeService, @@ -102,7 +109,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers publishedContentQuery ?? throw new ArgumentNullException(nameof(publishedContentQuery)); _shortStringHelper = shortStringHelper ?? throw new ArgumentNullException(nameof(shortStringHelper)); _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService)); - _backofficeSecurityAccessor = backofficeSecurityAccessor ?? throw new ArgumentNullException(nameof(backofficeSecurityAccessor)); + _backofficeSecurityAccessor = backofficeSecurityAccessor ?? + throw new ArgumentNullException(nameof(backofficeSecurityAccessor)); _publishedUrlProvider = publishedUrlProvider ?? throw new ArgumentNullException(nameof(publishedUrlProvider)); _contentService = contentService ?? throw new ArgumentNullException(nameof(contentService)); @@ -121,17 +129,18 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } - /// - /// Returns an Umbraco alias given a string + /// Returns an Umbraco alias given a string /// /// /// /// public dynamic GetSafeAlias(string value, bool camelCase = true) { - var returnValue = string.IsNullOrWhiteSpace(value) ? string.Empty : value.ToSafeAlias(_shortStringHelper, camelCase); - dynamic returnObj = new System.Dynamic.ExpandoObject(); + var returnValue = string.IsNullOrWhiteSpace(value) + ? string.Empty + : value.ToSafeAlias(_shortStringHelper, camelCase); + dynamic returnObj = new ExpandoObject(); returnObj.alias = returnValue; returnObj.original = value; returnObj.camelCase = camelCase; @@ -140,41 +149,47 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } /// - /// Searches for results based on the entity type + /// Searches for results based on the entity type /// /// /// /// - /// A starting point for the search, generally a node id, but for members this is a member type alias + /// A starting point for the search, generally a node id, but for members this is a member type alias /// /// If set used to look up whether user and group start node permissions will be ignored. /// [HttpGet] - public IEnumerable Search(string query, UmbracoEntityTypes type, string searchFrom = null, Guid? dataTypeKey = null) + public IEnumerable Search(string query, UmbracoEntityTypes type, string searchFrom = null, + Guid? dataTypeKey = null) { // NOTE: Theoretically you shouldn't be able to see member data if you don't have access to members right? ... but there is a member picker, so can't really do that if (string.IsNullOrEmpty(query)) + { return Enumerable.Empty(); + } //TODO: This uses the internal UmbracoTreeSearcher, this instead should delgate to the ISearchableTree implementation for the type - var ignoreUserStartNodes = dataTypeKey.HasValue && _dataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeKey.Value); + var ignoreUserStartNodes = dataTypeKey.HasValue && + _dataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeKey.Value); return ExamineSearch(query, type, searchFrom, ignoreUserStartNodes); } /// - /// Searches for all content that the user is allowed to see (based on their allowed sections) + /// Searches for all content that the user is allowed to see (based on their allowed sections) /// /// /// /// - /// Even though a normal entity search will allow any user to search on a entity type that they may not have access to edit, we need - /// to filter these results to the sections they are allowed to edit since this search function is explicitly for the global search - /// so if we showed entities that they weren't allowed to edit they would get errors when clicking on the result. - /// - /// The reason a user is allowed to search individual entity types that they are not allowed to edit is because those search - /// methods might be used in things like pickers in the content editor. + /// Even though a normal entity search will allow any user to search on a entity type that they may not have access to + /// edit, we need + /// to filter these results to the sections they are allowed to edit since this search function is explicitly for the + /// global search + /// so if we showed entities that they weren't allowed to edit they would get errors when clicking on the result. + /// The reason a user is allowed to search individual entity types that they are not allowed to edit is because those + /// search + /// methods might be used in things like pickers in the content editor. /// [HttpGet] public IDictionary SearchAll(string query) @@ -182,16 +197,22 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers var result = new Dictionary(); if (string.IsNullOrEmpty(query)) + { return result; + } var allowedSections = _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.AllowedSections.ToArray(); - foreach (var searchableTree in _searchableTreeCollection.SearchableApplicationTrees.OrderBy(t => t.Value.SortOrder)) + foreach (KeyValuePair searchableTree in _searchableTreeCollection + .SearchableApplicationTrees.OrderBy(t => t.Value.SortOrder)) { if (allowedSections.Contains(searchableTree.Value.AppAlias)) { - var tree = _treeService.GetByAlias(searchableTree.Key); - if (tree == null) continue; //shouldn't occur + Tree tree = _treeService.GetByAlias(searchableTree.Key); + if (tree == null) + { + continue; //shouldn't occur + } result[Tree.GetRootNodeDisplayName(tree, _localizedTextService)] = new TreeSearchResult { @@ -203,49 +224,52 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers }; } } + return result; } /// - /// Gets the path for a given node ID + /// Gets the path for a given node ID /// /// /// /// public IConvertToActionResult GetPath(int id, UmbracoEntityTypes type) { - var foundContentResult = GetResultForId(id, type); - var foundContent = foundContentResult.Value; + ActionResult foundContentResult = GetResultForId(id, type); + EntityBasic foundContent = foundContentResult.Value; if (foundContent is null) { return foundContentResult; } - return new ActionResult>(foundContent.Path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).Select( - s => int.Parse(s, CultureInfo.InvariantCulture))); + return new ActionResult>(foundContent.Path + .Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).Select( + s => int.Parse(s, CultureInfo.InvariantCulture))); } /// - /// Gets the path for a given node ID + /// Gets the path for a given node ID /// /// /// /// public IConvertToActionResult GetPath(Guid id, UmbracoEntityTypes type) { - var foundContentResult = GetResultForKey(id, type); - var foundContent = foundContentResult.Value; + ActionResult foundContentResult = GetResultForKey(id, type); + EntityBasic foundContent = foundContentResult.Value; if (foundContent is null) { return foundContentResult; } - return new ActionResult>(foundContent.Path.Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).Select( - s => int.Parse(s, CultureInfo.InvariantCulture))); + return new ActionResult>(foundContent.Path + .Split(Constants.CharArrays.Comma, StringSplitOptions.RemoveEmptyEntries).Select( + s => int.Parse(s, CultureInfo.InvariantCulture))); } /// - /// Gets the path for a given node ID + /// Gets the path for a given node ID /// /// /// @@ -262,16 +286,19 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } /// - /// Gets the URL of an entity + /// Gets the URL of an entity /// /// UDI of the entity to fetch URL for /// The culture to fetch the URL for /// The URL or path to the item public IActionResult GetUrl(Udi id, string culture = "*") { - var intId = _entityService.GetId(id); + Attempt intId = _entityService.GetId(id); if (!intId.Success) + { return NotFound(); + } + UmbracoEntityTypes entityType; switch (id.EntityType) { @@ -287,19 +314,20 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers default: return NotFound(); } + return GetUrl(intId.Result, entityType, culture); } /// - /// Get entity URLs by UDIs + /// Get entity URLs by UDIs /// /// - /// A list of UDIs to lookup items by + /// A list of UDIs to lookup items by /// /// The culture to fetch the URL for /// Dictionary mapping Udi -> Url /// - /// We allow for POST because there could be quite a lot of Ids. + /// We allow for POST because there could be quite a lot of Ids. /// [HttpGet] [HttpPost] @@ -320,7 +348,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers return guidUdi.EntityType switch { - Constants.UdiEntityType.Document => _publishedUrlProvider.GetUrl(guidUdi.Guid, culture: culture ?? ClientCulture()), + Constants.UdiEntityType.Document => _publishedUrlProvider.GetUrl(guidUdi.Guid, + culture: culture ?? ClientCulture()), // NOTE: If culture is passed here we get an empty string rather than a media item URL WAT Constants.UdiEntityType.Media => _publishedUrlProvider.GetMediaUrl(guidUdi.Guid, culture: null), _ => null @@ -328,21 +357,18 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } return udis - .Select(udi => new { - Udi = udi, - Url = MediaOrDocumentUrl(udi) - }).ToDictionary(x => x.Udi, x => x.Url); + .Select(udi => new { Udi = udi, Url = MediaOrDocumentUrl(udi) }).ToDictionary(x => x.Udi, x => x.Url); } /// - /// Gets the URL of an entity + /// Gets the URL of an entity /// /// Int id of the entity to fetch URL for /// The type of entity such as Document, Media, Member /// The culture to fetch the URL for /// The URL or path to the item /// - /// We are not restricting this with security because there is no sensitive data + /// We are not restricting this with security because there is no sensitive data /// public IActionResult GetUrl(int id, UmbracoEntityTypes type, string culture = null) { @@ -361,7 +387,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } } - var ancestors = GetResultForAncestors(id, type); + IEnumerable ancestors = GetResultForAncestors(id, type); //if content, skip the first node for replicating NiceUrl defaults if (type == UmbracoEntityTypes.Document) @@ -376,7 +402,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers /// - /// Gets an entity by a xpath query + /// Gets an entity by a xpath query /// /// /// @@ -388,48 +414,53 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers if (type != UmbracoEntityTypes.Document) + { throw new ArgumentException("Get by query is only compatible with entities of type Document"); + } var q = ParseXPathQuery(query, nodeContextId); - var node = _publishedContentQuery.ContentSingleAtXPath(q); + IPublishedContent node = _publishedContentQuery.ContentSingleAtXPath(q); if (node == null) + { return null; + } return GetById(node.Id, type); } // PP: Work in progress on the query parser - private string ParseXPathQuery(string query, int id) - { - return UmbracoXPathPathSyntaxParser.ParseXPathQuery( - xpathExpression: query, - nodeContextId: id, - getPath: nodeid => + private string ParseXPathQuery(string query, int id) => + UmbracoXPathPathSyntaxParser.ParseXPathQuery( + query, + id, + nodeid => { - var ent = _entityService.Get(nodeid); + IEntitySlim ent = _entityService.Get(nodeid); return ent.Path.Split(Constants.CharArrays.Comma).Reverse(); }, - publishedContentExists: i => _publishedContentQuery.Content(i) != null); - } + i => _publishedContentQuery.Content(i) != null); [HttpGet] public ActionResult GetUrlAndAnchors(Udi id, string culture = "*") { - var intId = _entityService.GetId(id); + Attempt intId = _entityService.GetId(id); if (!intId.Success) + { return NotFound(); + } return GetUrlAndAnchors(intId.Result, culture); } + [HttpGet] public UrlAndAnchors GetUrlAndAnchors(int id, string culture = "*") { culture = culture ?? ClientCulture(); var url = _publishedUrlProvider.GetUrl(id, culture: culture); - var anchorValues = _contentService.GetAnchorValuesFromRTEs(id, culture); + IEnumerable anchorValues = _contentService.GetAnchorValuesFromRTEs(id, culture); return new UrlAndAnchors(url, anchorValues); } @@ -437,137 +468,13 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers [HttpPost] public IEnumerable GetAnchors(AnchorsModel model) { - var anchorValues = _contentService.GetAnchorValuesFromRTEContent(model.RteContent); + IEnumerable anchorValues = _contentService.GetAnchorValuesFromRTEContent(model.RteContent); return anchorValues; } - - #region GetById - - /// - /// Gets an entity by it's id - /// - /// - /// - /// - public ActionResult GetById(int id, UmbracoEntityTypes type) - { - return GetResultForId(id, type); - } - - /// - /// Gets an entity by it's key - /// - /// - /// - /// - public ActionResult GetById(Guid id, UmbracoEntityTypes type) - { - return GetResultForKey(id, type); - } - - /// - /// Gets an entity by it's UDI - /// - /// - /// - /// - public ActionResult GetById(Udi id, UmbracoEntityTypes type) - { - var guidUdi = id as GuidUdi; - if (guidUdi != null) - { - return GetResultForKey(guidUdi.Guid, type); - } - - return NotFound(); - } - #endregion - - #region GetByIds - /// - /// Get entities by integer ids - /// - /// - /// - /// - /// - /// We allow for POST because there could be quite a lot of Ids - /// - [HttpGet] - [HttpPost] - public ActionResult> GetByIds([FromJsonPath]int[] ids, [FromQuery]UmbracoEntityTypes type) - { - if (ids == null) - { - return NotFound(); - } - - return new ActionResult>(GetResultForIds(ids, type)); - } - - /// - /// Get entities by GUID ids - /// - /// - /// - /// - /// - /// We allow for POST because there could be quite a lot of Ids - /// - [HttpGet] - [HttpPost] - public ActionResult> GetByIds([FromJsonPath]Guid[] ids, [FromQuery]UmbracoEntityTypes type) - { - if (ids == null) - { - return NotFound(); - } - - return new ActionResult>(GetResultForKeys(ids, type)); - } - - /// - /// Get entities by UDIs - /// - /// - /// A list of UDIs to lookup items by, all UDIs must be of the same UDI type! - /// - /// - /// - /// - /// We allow for POST because there could be quite a lot of Ids. - /// - [HttpGet] - [HttpPost] - public ActionResult> GetByIds([FromJsonPath]Udi[] ids, [FromQuery]UmbracoEntityTypes type) - { - if (ids == null) - { - return NotFound(); - } - - if (ids.Length == 0) - { - return Enumerable.Empty().ToList(); - } - - //all udi types will need to be the same in this list so we'll determine by the first - //currently we only support GuidUdi for this method - - var guidUdi = ids[0] as GuidUdi; - if (guidUdi != null) - { - return new ActionResult>(GetResultForKeys(ids.Select(x => ((GuidUdi)x).Guid).ToArray(), type)); - } - - return NotFound(); - } - #endregion - public IEnumerable GetChildren(int id, UmbracoEntityTypes type, Guid? dataTypeKey = null) { - var objectType = ConvertToObjectType(type); + UmbracoObjectTypes? objectType = ConvertToObjectType(type); if (objectType.HasValue) { //TODO: Need to check for Object types that support hierarchy here, some might not. @@ -577,11 +484,15 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeKey); // root is special: we reduce it to start nodes if the user's start node is not the default, then we need to return their start nodes - if (id == Constants.System.Root && startNodes.Length > 0 && startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes) + if (id == Constants.System.Root && startNodes.Length > 0 && + startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes) { - var nodes = _entityService.GetAll(objectType.Value, startNodes).ToArray(); + IEntitySlim[] nodes = _entityService.GetAll(objectType.Value, startNodes).ToArray(); if (nodes.Length == 0) + { return Enumerable.Empty(); + } + var pr = new List(nodes.Select(_umbracoMapper.Map)); return pr; } @@ -592,6 +503,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers .WhereNotNull() .Select(_umbracoMapper.Map); } + //now we need to convert the unknown ones switch (type) { @@ -599,12 +511,13 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers case UmbracoEntityTypes.User: case UmbracoEntityTypes.Macro: default: - throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + type); + throw new NotSupportedException("The " + typeof(EntityController) + + " does not currently support data for the type " + type); } } /// - /// Get paged child entities by id + /// Get paged child entities by id /// /// /// @@ -648,7 +561,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers //the EntityService can search paged members from the root intId = -1; - return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter, dataTypeKey); + return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter, + dataTypeKey); } //the EntityService cannot search members of a certain type, this is currently not supported and would require @@ -657,16 +571,14 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers //TODO: We should really fix this in the EntityService but if we don't we should allow the ISearchableTree for the members controller // to be used for this search instead of the built in/internal searcher - var searchResult = _treeSearcher.ExamineSearch(filter ?? "", type, pageSize, pageNumber - 1, out long total, null, id); + IEnumerable searchResult = _treeSearcher.ExamineSearch(filter ?? "", type, pageSize, + pageNumber - 1, out var total, null, id); - return new PagedResult(total, pageNumber, pageSize) - { - Items = searchResult - }; + return new PagedResult(total, pageNumber, pageSize) { Items = searchResult }; } /// - /// Get paged child entities by id + /// Get paged child entities by id /// /// /// @@ -687,11 +599,16 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers Guid? dataTypeKey = null) { if (pageNumber <= 0) + { return NotFound(); - if (pageSize <= 0) - return NotFound(); + } - var objectType = ConvertToObjectType(type); + if (pageSize <= 0) + { + return NotFound(); + } + + UmbracoObjectTypes? objectType = ConvertToObjectType(type); if (objectType.HasValue) { IEnumerable entities; @@ -702,14 +619,25 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeKey); // root is special: we reduce it to start nodes if the user's start node is not the default, then we need to return their start nodes - if (id == Constants.System.Root && startNodes.Length > 0 && startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes) + if (id == Constants.System.Root && startNodes.Length > 0 && + startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes) { if (pageNumber > 0) + { return new PagedResult(0, 0, 0); - var nodes = _entityService.GetAll(objectType.Value, startNodes).ToArray(); + } + + IEntitySlim[] nodes = _entityService.GetAll(objectType.Value, startNodes).ToArray(); if (nodes.Length == 0) + { return new PagedResult(0, 0, 0); - if (pageSize < nodes.Length) pageSize = nodes.Length; // bah + } + + if (pageSize < nodes.Length) + { + pageSize = nodes.Length; // bah + } + var pr = new PagedResult(nodes.Length, pageNumber, pageSize) { Items = nodes.Select(_umbracoMapper.Map) @@ -718,7 +646,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } // else proceed as usual - entities = _entityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, out totalRecords, + entities = _entityService.GetPagedChildren(id, objectType.Value, pageNumber - 1, pageSize, + out totalRecords, filter.IsNullOrWhiteSpace() ? null : _sqlContext.Query().Where(x => x.Name.Contains(filter)), @@ -735,7 +664,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers { Items = entities.Select(source => { - var target = _umbracoMapper.Map(source, context => + EntityBasic target = _umbracoMapper.Map(source, context => { context.SetCulture(culture); context.SetCulture(culture); @@ -758,7 +687,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers case UmbracoEntityTypes.User: case UmbracoEntityTypes.Macro: default: - throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + type); + throw new NotSupportedException("The " + typeof(EntityController) + + " does not currently support data for the type " + type); } } @@ -767,9 +697,11 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers switch (type) { case UmbracoEntityTypes.Document: - return _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.CalculateContentStartNodeIds(_entityService, _appCaches); + return _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.CalculateContentStartNodeIds( + _entityService, _appCaches); case UmbracoEntityTypes.Media: - return _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.CalculateMediaStartNodeIds(_entityService, _appCaches); + return _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.CalculateMediaStartNodeIds( + _entityService, _appCaches); default: return Array.Empty(); } @@ -786,14 +718,19 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers Guid? dataTypeKey = null) { if (pageNumber <= 0) + { return NotFound(); + } + if (pageSize <= 0) + { return NotFound(); + } // re-normalize since NULL can be passed in filter = filter ?? string.Empty; - var objectType = ConvertToObjectType(type); + UmbracoObjectTypes? objectType = ConvertToObjectType(type); if (objectType.HasValue) { IEnumerable entities; @@ -803,20 +740,23 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers { // root is special: we reduce it to start nodes - int[] aids = GetStartNodes(type); + var aids = GetStartNodes(type); var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeKey); entities = aids == null || aids.Contains(Constants.System.Root) || ignoreUserStartNodes - ? _entityService.GetPagedDescendants(objectType.Value, pageNumber - 1, pageSize, out totalRecords, + ? _entityService.GetPagedDescendants(objectType.Value, pageNumber - 1, pageSize, + out totalRecords, _sqlContext.Query().Where(x => x.Name.Contains(filter)), - Ordering.By(orderBy, orderDirection), includeTrashed: false) - : _entityService.GetPagedDescendants(aids, objectType.Value, pageNumber - 1, pageSize, out totalRecords, + Ordering.By(orderBy, orderDirection), false) + : _entityService.GetPagedDescendants(aids, objectType.Value, pageNumber - 1, pageSize, + out totalRecords, _sqlContext.Query().Where(x => x.Name.Contains(filter)), Ordering.By(orderBy, orderDirection)); } else { - entities = _entityService.GetPagedDescendants(id, objectType.Value, pageNumber - 1, pageSize, out totalRecords, + entities = _entityService.GetPagedDescendants(id, objectType.Value, pageNumber - 1, pageSize, + out totalRecords, _sqlContext.Query().Where(x => x.Name.Contains(filter)), Ordering.By(orderBy, orderDirection)); } @@ -843,20 +783,26 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers case UmbracoEntityTypes.User: case UmbracoEntityTypes.Macro: default: - throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + type); + throw new NotSupportedException("The " + typeof(EntityController) + + " does not currently support data for the type " + type); } } - private bool IsDataTypeIgnoringUserStartNodes(Guid? dataTypeKey) => dataTypeKey.HasValue && _dataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeKey.Value); + private bool IsDataTypeIgnoringUserStartNodes(Guid? dataTypeKey) => dataTypeKey.HasValue && + _dataTypeService + .IsDataTypeIgnoringUserStartNodes( + dataTypeKey.Value); - public IEnumerable GetAncestors(int id, UmbracoEntityTypes type, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormCollection queryStrings) - { - return GetResultForAncestors(id, type, queryStrings); - } + public IEnumerable GetAncestors(int id, UmbracoEntityTypes type, + [ModelBinder(typeof(HttpQueryStringModelBinder))] + FormCollection queryStrings) => + GetResultForAncestors(id, type, queryStrings); - public ActionResult> GetAncestors(Guid id, UmbracoEntityTypes type, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormCollection queryStrings) + public ActionResult> GetAncestors(Guid id, UmbracoEntityTypes type, + [ModelBinder(typeof(HttpQueryStringModelBinder))] + FormCollection queryStrings) { - var entity = _entityService.Get(id); + IEntitySlim entity = _entityService.Get(id); if (entity is null) { return NotFound(); @@ -866,22 +812,24 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } /// - /// Searches for results based on the entity type + /// Searches for results based on the entity type /// /// /// /// /// If set to true, user and group start node permissions will be ignored. /// - private IEnumerable ExamineSearch(string query, UmbracoEntityTypes entityType, string searchFrom = null, bool ignoreUserStartNodes = false) + private IEnumerable ExamineSearch(string query, UmbracoEntityTypes entityType, + string searchFrom = null, bool ignoreUserStartNodes = false) { var culture = ClientCulture(); - return _treeSearcher.ExamineSearch(query, entityType, 200, 0, out _, culture, searchFrom, ignoreUserStartNodes); + return _treeSearcher.ExamineSearch(query, entityType, 200, 0, out _, culture, searchFrom, + ignoreUserStartNodes); } private IEnumerable GetResultForChildren(int id, UmbracoEntityTypes entityType) { - var objectType = ConvertToObjectType(entityType); + UmbracoObjectTypes? objectType = ConvertToObjectType(entityType); if (objectType.HasValue) { // TODO: Need to check for Object types that support hierarchic here, some might not. @@ -890,6 +838,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers .WhereNotNull() .Select(MapEntities()); } + //now we need to convert the unknown ones switch (entityType) { @@ -897,30 +846,37 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers case UmbracoEntityTypes.User: case UmbracoEntityTypes.Macro: default: - throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType); + throw new NotSupportedException("The " + typeof(EntityController) + + " does not currently support data for the type " + entityType); } } - private IEnumerable GetResultForAncestors(int id, UmbracoEntityTypes entityType, FormCollection queryStrings = null) + private IEnumerable GetResultForAncestors(int id, UmbracoEntityTypes entityType, + FormCollection queryStrings = null) { - var objectType = ConvertToObjectType(entityType); + UmbracoObjectTypes? objectType = ConvertToObjectType(entityType); if (objectType.HasValue) { // TODO: Need to check for Object types that support hierarchic here, some might not. - var ids = _entityService.Get(id).Path.Split(Constants.CharArrays.Comma).Select(s => int.Parse(s, CultureInfo.InvariantCulture)).Distinct().ToArray(); + var ids = _entityService.Get(id).Path.Split(Constants.CharArrays.Comma) + .Select(s => int.Parse(s, CultureInfo.InvariantCulture)).Distinct().ToArray(); - var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(queryStrings?.GetValue("dataTypeId")); + var ignoreUserStartNodes = + IsDataTypeIgnoringUserStartNodes(queryStrings?.GetValue("dataTypeId")); if (ignoreUserStartNodes == false) { int[] aids = null; switch (entityType) { case UmbracoEntityTypes.Document: - aids = _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.CalculateContentStartNodeIds(_entityService, _appCaches); + aids = _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser + .CalculateContentStartNodeIds(_entityService, _appCaches); break; case UmbracoEntityTypes.Media: - aids = _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.CalculateMediaStartNodeIds(_entityService, _appCaches); + aids = + _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.CalculateMediaStartNodeIds( + _entityService, _appCaches); break; } @@ -935,12 +891,14 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers lids.Add(i); continue; } + if (aids.Contains(i)) { lids.Add(i); ok = true; } } + ids = lids.ToArray(); } } @@ -954,6 +912,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers .OrderBy(x => x.Level) .Select(MapEntities(culture)); } + //now we need to convert the unknown ones switch (entityType) { @@ -963,28 +922,33 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers case UmbracoEntityTypes.User: case UmbracoEntityTypes.Macro: default: - throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType); + throw new NotSupportedException("The " + typeof(EntityController) + + " does not currently support data for the type " + entityType); } } private IEnumerable GetResultForKeys(Guid[] keys, UmbracoEntityTypes entityType) { if (keys.Length == 0) + { return Enumerable.Empty(); + } - var objectType = ConvertToObjectType(entityType); + UmbracoObjectTypes? objectType = ConvertToObjectType(entityType); if (objectType.HasValue) { - var entities = _entityService.GetAll(objectType.Value, keys) + IEnumerable entities = _entityService.GetAll(objectType.Value, keys) .WhereNotNull() .Select(MapEntities()); // entities are in "some" order, put them back in order var xref = entities.ToDictionary(x => x.Key); - var result = keys.Select(x => xref.ContainsKey(x) ? xref[x] : null).Where(x => x != null); + IEnumerable result = keys.Select(x => xref.ContainsKey(x) ? xref[x] : null) + .Where(x => x != null); return result; } + //now we need to convert the unknown ones switch (entityType) { @@ -994,28 +958,33 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers case UmbracoEntityTypes.User: case UmbracoEntityTypes.Macro: default: - throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType); + throw new NotSupportedException("The " + typeof(EntityController) + + " does not currently support data for the type " + entityType); } } private IEnumerable GetResultForIds(int[] ids, UmbracoEntityTypes entityType) { if (ids.Length == 0) + { return Enumerable.Empty(); + } - var objectType = ConvertToObjectType(entityType); + UmbracoObjectTypes? objectType = ConvertToObjectType(entityType); if (objectType.HasValue) { - var entities = _entityService.GetAll(objectType.Value, ids) + IEnumerable entities = _entityService.GetAll(objectType.Value, ids) .WhereNotNull() .Select(MapEntities()); // entities are in "some" order, put them back in order var xref = entities.ToDictionary(x => x.Id); - var result = ids.Select(x => xref.ContainsKey(x) ? xref[x] : null).Where(x => x != null); + IEnumerable result = ids.Select(x => xref.ContainsKey(x) ? xref[x] : null) + .Where(x => x != null); return result; } + //now we need to convert the unknown ones switch (entityType) { @@ -1025,22 +994,25 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers case UmbracoEntityTypes.User: case UmbracoEntityTypes.Macro: default: - throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType); + throw new NotSupportedException("The " + typeof(EntityController) + + " does not currently support data for the type " + entityType); } } private ActionResult GetResultForKey(Guid key, UmbracoEntityTypes entityType) { - var objectType = ConvertToObjectType(entityType); + UmbracoObjectTypes? objectType = ConvertToObjectType(entityType); if (objectType.HasValue) { - var found = _entityService.Get(key, objectType.Value); + IEntitySlim found = _entityService.Get(key, objectType.Value); if (found == null) { return NotFound(); } + return _umbracoMapper.Map(found); } + //now we need to convert the unknown ones switch (entityType) { @@ -1055,22 +1027,25 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers case UmbracoEntityTypes.Macro: default: - throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType); + throw new NotSupportedException("The " + typeof(EntityController) + + " does not currently support data for the type " + entityType); } } private ActionResult GetResultForId(int id, UmbracoEntityTypes entityType) { - var objectType = ConvertToObjectType(entityType); + UmbracoObjectTypes? objectType = ConvertToObjectType(entityType); if (objectType.HasValue) { - var found = _entityService.Get(id, objectType.Value); + IEntitySlim found = _entityService.Get(id, objectType.Value); if (found == null) { return NotFound(); } + return MapEntity(found); } + //now we need to convert the unknown ones switch (entityType) { @@ -1085,7 +1060,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers case UmbracoEntityTypes.Macro: default: - throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType); + throw new NotSupportedException("The " + typeof(EntityController) + + " does not currently support data for the type " + entityType); } } @@ -1116,145 +1092,151 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } /// - /// /// /// The type of entity. - /// Optional filter - Format like: "BoolVariable==true&IntVariable>=6". Invalid filters are ignored. + /// + /// Optional filter - Format like: "BoolVariable==true&IntVariable>=6". Invalid filters are + /// ignored. + /// /// - public IEnumerable GetAll(UmbracoEntityTypes type, string postFilter) - { - return GetResultForAll(type, postFilter); - } + public IEnumerable GetAll(UmbracoEntityTypes type, string postFilter) => + GetResultForAll(type, postFilter); /// - /// Gets the result for the entity list based on the type + /// Gets the result for the entity list based on the type /// /// /// A string where filter that will filter the results dynamically with linq - optional /// private IEnumerable GetResultForAll(UmbracoEntityTypes entityType, string postFilter = null) { - var objectType = ConvertToObjectType(entityType); + UmbracoObjectTypes? objectType = ConvertToObjectType(entityType); if (objectType.HasValue) { // TODO: Should we order this by something ? - var entities = _entityService.GetAll(objectType.Value).WhereNotNull().Select(MapEntities()); + IEnumerable entities = + _entityService.GetAll(objectType.Value).WhereNotNull().Select(MapEntities()); return ExecutePostFilter(entities, postFilter); } + //now we need to convert the unknown ones switch (entityType) { case UmbracoEntityTypes.Template: - var templates = _fileService.GetTemplates(); - var filteredTemplates = ExecutePostFilter(templates, postFilter); + IEnumerable templates = _fileService.GetTemplates(); + IEnumerable filteredTemplates = ExecutePostFilter(templates, postFilter); return filteredTemplates.Select(MapEntities()); case UmbracoEntityTypes.Macro: //Get all macros from the macro service - var macros = _macroService.GetAll().WhereNotNull().OrderBy(x => x.Name); - var filteredMacros = ExecutePostFilter(macros, postFilter); + IOrderedEnumerable macros = _macroService.GetAll().WhereNotNull().OrderBy(x => x.Name); + IEnumerable filteredMacros = ExecutePostFilter(macros, postFilter); return filteredMacros.Select(MapEntities()); case UmbracoEntityTypes.PropertyType: //get all document types, then combine all property types into one list - var propertyTypes = _contentTypeService.GetAll().Cast() - .Concat(_mediaTypeService.GetAll()) - .ToArray() - .SelectMany(x => x.PropertyTypes) - .DistinctBy(composition => composition.Alias); - var filteredPropertyTypes = ExecutePostFilter(propertyTypes, postFilter); + IEnumerable propertyTypes = _contentTypeService.GetAll() + .Cast() + .Concat(_mediaTypeService.GetAll()) + .ToArray() + .SelectMany(x => x.PropertyTypes) + .DistinctBy(composition => composition.Alias); + IEnumerable filteredPropertyTypes = ExecutePostFilter(propertyTypes, postFilter); return _umbracoMapper.MapEnumerable(filteredPropertyTypes); case UmbracoEntityTypes.PropertyGroup: //get all document types, then combine all property types into one list - var propertyGroups = _contentTypeService.GetAll().Cast() - .Concat(_mediaTypeService.GetAll()) - .ToArray() - .SelectMany(x => x.PropertyGroups) - .DistinctBy(composition => composition.Name); - var filteredpropertyGroups = ExecutePostFilter(propertyGroups, postFilter); + IEnumerable propertyGroups = _contentTypeService.GetAll() + .Cast() + .Concat(_mediaTypeService.GetAll()) + .ToArray() + .SelectMany(x => x.PropertyGroups) + .DistinctBy(composition => composition.Name); + IEnumerable filteredpropertyGroups = ExecutePostFilter(propertyGroups, postFilter); return _umbracoMapper.MapEnumerable(filteredpropertyGroups); case UmbracoEntityTypes.User: - var users = _userService.GetAll(0, int.MaxValue, out _); - var filteredUsers = ExecutePostFilter(users, postFilter); + IEnumerable users = _userService.GetAll(0, int.MaxValue, out _); + IEnumerable filteredUsers = ExecutePostFilter(users, postFilter); return _umbracoMapper.MapEnumerable(filteredUsers); case UmbracoEntityTypes.Stylesheet: if (!postFilter.IsNullOrWhiteSpace()) + { throw new NotSupportedException("Filtering on stylesheets is not currently supported"); + } return _fileService.GetStylesheets().Select(MapEntities()); case UmbracoEntityTypes.Script: if (!postFilter.IsNullOrWhiteSpace()) + { throw new NotSupportedException("Filtering on scripts is not currently supported"); + } return _fileService.GetScripts().Select(MapEntities()); case UmbracoEntityTypes.PartialView: if (!postFilter.IsNullOrWhiteSpace()) + { throw new NotSupportedException("Filtering on partial views is not currently supported"); + } return _fileService.GetPartialViews().Select(MapEntities()); case UmbracoEntityTypes.Language: if (!postFilter.IsNullOrWhiteSpace()) + { throw new NotSupportedException("Filtering on languages is not currently supported"); + } return _localizationService.GetAllLanguages().Select(MapEntities()); case UmbracoEntityTypes.DictionaryItem: if (!postFilter.IsNullOrWhiteSpace()) + { throw new NotSupportedException("Filtering on dictionary items is not currently supported"); + } return GetAllDictionaryItems(); default: - throw new NotSupportedException("The " + typeof(EntityController) + " does not currently support data for the type " + entityType); + throw new NotSupportedException("The " + typeof(EntityController) + + " does not currently support data for the type " + entityType); } } private IEnumerable ExecutePostFilter(IEnumerable entities, string postFilter) { - if (postFilter.IsNullOrWhiteSpace()) return entities; + if (postFilter.IsNullOrWhiteSpace()) + { + return entities; + } var postFilterConditions = postFilter.Split(Constants.CharArrays.Ampersand); foreach (var postFilterCondition in postFilterConditions) { - var queryCondition = BuildQueryCondition(postFilterCondition); + QueryCondition queryCondition = BuildQueryCondition(postFilterCondition); if (queryCondition != null) { - var whereClauseExpression = queryCondition.BuildCondition("x"); + Expression> whereClauseExpression = queryCondition.BuildCondition("x"); entities = entities.Where(whereClauseExpression.Compile()); } - } + return entities; } - private static readonly string[] _postFilterSplitStrings = new[] - { - "=", - "==", - "!=", - "<>", - ">", - "<", - ">=", - "<=" - }; - private static QueryCondition BuildQueryCondition(string postFilter) { var postFilterParts = postFilter.Split(_postFilterSplitStrings, 2, StringSplitOptions.RemoveEmptyEntries); @@ -1280,26 +1262,21 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers return null; } - var type = typeof(T); - var property = type.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance); + Type type = typeof(T); + PropertyInfo property = type.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance); if (property == null) { return null; } - var queryCondition = new QueryCondition() + var queryCondition = new QueryCondition { - Term = new OperatorTerm() - { - Operator = binaryOperator - }, + Term = new OperatorTerm { Operator = binaryOperator }, ConstraintValue = constraintValue, - Property = new PropertyModel() + Property = new PropertyModel { - Alias = propertyName, - Name = propertyName, - Type = property.PropertyType.Name + Alias = propertyName, Name = propertyName, Type = property.PropertyType.Name } }; @@ -1320,14 +1297,141 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers private string ClientCulture() => Request.ClientCulture(); + + #region GetById + + /// + /// Gets an entity by it's id + /// + /// + /// + /// + public ActionResult GetById(int id, UmbracoEntityTypes type) => GetResultForId(id, type); + + /// + /// Gets an entity by it's key + /// + /// + /// + /// + public ActionResult GetById(Guid id, UmbracoEntityTypes type) => GetResultForKey(id, type); + + /// + /// Gets an entity by it's UDI + /// + /// + /// + /// + public ActionResult GetById(Udi id, UmbracoEntityTypes type) + { + var guidUdi = id as GuidUdi; + if (guidUdi != null) + { + return GetResultForKey(guidUdi.Guid, type); + } + + return NotFound(); + } + + #endregion + + #region GetByIds + + /// + /// Get entities by integer ids + /// + /// + /// + /// + /// + /// We allow for POST because there could be quite a lot of Ids + /// + [HttpGet] + [HttpPost] + public ActionResult> GetByIds([FromJsonPath] int[] ids, + [FromQuery] UmbracoEntityTypes type) + { + if (ids == null) + { + return NotFound(); + } + + return new ActionResult>(GetResultForIds(ids, type)); + } + + /// + /// Get entities by GUID ids + /// + /// + /// + /// + /// + /// We allow for POST because there could be quite a lot of Ids + /// + [HttpGet] + [HttpPost] + public ActionResult> GetByIds([FromJsonPath] Guid[] ids, + [FromQuery] UmbracoEntityTypes type) + { + if (ids == null) + { + return NotFound(); + } + + return new ActionResult>(GetResultForKeys(ids, type)); + } + + /// + /// Get entities by UDIs + /// + /// + /// A list of UDIs to lookup items by, all UDIs must be of the same UDI type! + /// + /// + /// + /// + /// We allow for POST because there could be quite a lot of Ids. + /// + [HttpGet] + [HttpPost] + public ActionResult> GetByIds([FromJsonPath] Udi[] ids, + [FromQuery] UmbracoEntityTypes type) + { + if (ids == null) + { + return NotFound(); + } + + if (ids.Length == 0) + { + return Enumerable.Empty().ToList(); + } + + //all udi types will need to be the same in this list so we'll determine by the first + //currently we only support GuidUdi for this method + + var guidUdi = ids[0] as GuidUdi; + if (guidUdi != null) + { + return new ActionResult>( + GetResultForKeys(ids.Select(x => ((GuidUdi)x).Guid).ToArray(), type)); + } + + return NotFound(); + } + + #endregion + #region Methods to get all dictionary items + private IEnumerable GetAllDictionaryItems() { var list = new List(); - foreach (var dictionaryItem in _localizationService.GetRootDictionaryItems().OrderBy(DictionaryItemSort())) + foreach (IDictionaryItem dictionaryItem in _localizationService.GetRootDictionaryItems() + .OrderBy(DictionaryItemSort())) { - var item = _umbracoMapper.Map(dictionaryItem); + EntityBasic item = _umbracoMapper.Map(dictionaryItem); list.Add(item); GetChildItemsForList(dictionaryItem, list); } @@ -1339,15 +1443,16 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers private void GetChildItemsForList(IDictionaryItem dictionaryItem, ICollection list) { - foreach (var childItem in _localizationService.GetDictionaryItemChildren(dictionaryItem.Key).OrderBy(DictionaryItemSort())) + foreach (IDictionaryItem childItem in _localizationService.GetDictionaryItemChildren(dictionaryItem.Key) + .OrderBy(DictionaryItemSort())) { - var item = _umbracoMapper.Map(childItem); + EntityBasic item = _umbracoMapper.Map(childItem); list.Add(item); GetChildItemsForList(childItem, list); } } - #endregion + #endregion } } diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs index e28d67a5dd..24f128e410 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MemberGroupController.cs @@ -12,21 +12,20 @@ using Umbraco.Cms.Core.Services; using Umbraco.Cms.Web.Common.Attributes; using Umbraco.Cms.Web.Common.Authorization; using Umbraco.Extensions; -using Constants = Umbraco.Cms.Core.Constants; namespace Umbraco.Cms.Web.BackOffice.Controllers { /// - /// An API controller used for dealing with member groups + /// An API controller used for dealing with member groups /// [PluginController(Constants.Web.Mvc.BackOfficeApiArea)] [Authorize(Policy = AuthorizationPolicies.TreeAccessMemberGroups)] [ParameterSwapControllerActionSelector(nameof(GetById), "id", typeof(int), typeof(Guid), typeof(Udi))] public class MemberGroupController : UmbracoAuthorizedJsonController { + private readonly ILocalizedTextService _localizedTextService; private readonly IMemberGroupService _memberGroupService; private readonly IUmbracoMapper _umbracoMapper; - private readonly ILocalizedTextService _localizedTextService; public MemberGroupController( IMemberGroupService memberGroupService, @@ -35,11 +34,12 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers { _memberGroupService = memberGroupService ?? throw new ArgumentNullException(nameof(memberGroupService)); _umbracoMapper = umbracoMapper ?? throw new ArgumentNullException(nameof(umbracoMapper)); - _localizedTextService = localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService)); + _localizedTextService = + localizedTextService ?? throw new ArgumentNullException(nameof(localizedTextService)); } /// - /// Gets the member group json for the member group id + /// Gets the member group json for the member group id /// /// /// @@ -56,7 +56,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } /// - /// Gets the member group json for the member group guid + /// Gets the member group json for the member group guid /// /// /// @@ -72,7 +72,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } /// - /// Gets the member group json for the member group udi + /// Gets the member group json for the member group udi /// /// /// @@ -100,7 +100,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers [HttpPost] public IActionResult DeleteById(int id) { - var memberGroup = _memberGroupService.GetById(id); + IMemberGroup memberGroup = _memberGroupService.GetById(id); if (memberGroup == null) { return NotFound(); @@ -112,7 +112,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers public IEnumerable GetAllGroups() => _memberGroupService.GetAll() - .Select(_umbracoMapper.Map); + .Select(_umbracoMapper.Map); public MemberGroupDisplay GetEmpty() { @@ -123,18 +123,21 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers public bool IsMemberGroupNameUnique(int id, string oldName, string newName) { if (newName == oldName) + { return true; // name hasn't changed + } - var memberGroup = _memberGroupService.GetByName(newName); + IMemberGroup memberGroup = _memberGroupService.GetByName(newName); if (memberGroup == null) + { return true; // no member group found + } return memberGroup.Id == id; } public ActionResult PostSave(MemberGroupSave saveModel) { - var id = int.Parse(saveModel.Id.ToString(), CultureInfo.InvariantCulture); IMemberGroup memberGroup = id > 0 ? _memberGroupService.GetById(id) : new MemberGroup(); if (memberGroup == null) @@ -157,7 +160,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers } else { - var display = _umbracoMapper.Map(memberGroup); + MemberGroupDisplay display = _umbracoMapper.Map(memberGroup); display.AddErrorNotification( _localizedTextService.Localize("speechBubbles", "memberGroupNameDuplicate"), string.Empty); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js index e1639dde26..9bd1909960 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/umbfocuslock.directive.js @@ -35,9 +35,6 @@ // List of elements that can be focusable within the focus lock var focusableElementsSelector = '[role="button"], a[href]:not([disabled]):not(.ng-hide), button:not([disabled]):not(.ng-hide), textarea:not([disabled]):not(.ng-hide), input:not([disabled]):not(.ng-hide), select:not([disabled]):not(.ng-hide)'; - // Grab the body element so we can add the tabbing class on it when needed - var bodyElement = document.querySelector('body'); - function getDomNodes(){ infiniteEditorsWrapper = document.querySelector('.umb-editors'); if(infiniteEditorsWrapper) { @@ -47,7 +44,10 @@ function getFocusableElements(targetElm) { var elm = targetElm ? targetElm : target; - focusableElements = elm.querySelectorAll(focusableElementsSelector); + + // Filter out elements that are children of parents with the .ng-hide class + focusableElements = [...elm.querySelectorAll(focusableElementsSelector)].filter(elm => !elm.closest('.ng-hide')); + // Set first and last focusable elements firstFocusableElement = focusableElements[0]; lastFocusableElement = focusableElements[focusableElements.length - 1]; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js index 47441326d7..7870267995 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js @@ -118,7 +118,7 @@ Use this directive to render a ui component for selecting child items to a paren (function() { 'use strict'; - function ChildSelectorDirective() { + function ChildSelectorDirective(overlayService, localizationService) { function link(scope, el, attr, ctrl) { @@ -126,10 +126,30 @@ Use this directive to render a ui component for selecting child items to a paren scope.dialogModel = {}; scope.showDialog = false; - scope.removeChild = (selectedChild, $index) => { - if (scope.onRemove) { - scope.onRemove(selectedChild, $index); - } + scope.removeChild = (selectedChild, $index, event) => { + const dialog = { + view: "views/components/overlays/umb-template-remove-confirm.html", + layout: selectedChild, + submitButtonLabelKey: "defaultdialogs_yesRemove", + submitButtonStyle: "danger", + submit: function () { + if(scope.onRemove) { + scope.onRemove(selectedChild, $index); + overlayService.close(); + } + }, + close: function () { + overlayService.close(); + } + }; + + localizationService.localize("general_delete").then(value => { + dialog.title = value; + overlayService.open(dialog); + }); + + event.preventDefault(); + event.stopPropagation(); }; scope.addChild = $event => { diff --git a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js index b7b19dd771..fe802a8a28 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/editor.service.js @@ -214,13 +214,14 @@ When building a custom infinite editor view you can use the same components as a * Method to tell editors that they are begin blurred. */ function blur() { - - /* keyboard shortcuts will be overwritten by the new infinite editor + if (isEnabled === true) { + /* keyboard shortcuts will be overwritten by the new infinite editor so we need to store the shortcuts for the current editor so they can be rebound when the infinite editor closes */ - unbindKeyboardShortcuts(); - isEnabled = false; + unbindKeyboardShortcuts(); + isEnabled = false; + } } /** * @ngdoc method diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less index 80f13fbf1f..83071a0d93 100644 --- a/src/Umbraco.Web.UI.Client/src/less/gridview.less +++ b/src/Umbraco.Web.UI.Client/src/less/gridview.less @@ -621,7 +621,6 @@ } .preview-rows { - display: inline-block; position: relative; box-sizing: border-box; @@ -675,9 +674,9 @@ } .preview-rows.columns { - min-height: 18px; + min-height: 16px; line-height: 11px; - padding: 1px; + padding: 0 1px 1px 1px; &.prevalues-rows { min-height: 30px; diff --git a/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-template-remove-confirm.html b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-template-remove-confirm.html new file mode 100644 index 0000000000..17b853fcbc --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-template-remove-confirm.html @@ -0,0 +1,15 @@ +
+ +
+ You are removing the child node {{model.layout.name}}. +
+ +

+ + Removing a child node will limit the editors options to create different content types beneath a node. + +

+ + Are you sure you want to remove? + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html index 47b2f96ba5..c7c8db041b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html @@ -24,8 +24,8 @@ {{selectedChild.name}}
-
diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/create.html b/src/Umbraco.Web.UI.Client/src/views/dataTypes/create.html index 46e70ccbf4..e78e70092b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/dataTypes/create.html @@ -1,66 +1,70 @@
-
-
-
-
Create an item under {{currentNode.name}}
+
+
+
+
+ Create an item under + {{currentNode.name}} +
-
    -
  • - -
    • -
  • - +
    • +
  • + -
    • -
-
- -
- -
- -
+ + +
+
-
-
-
-
- - - -
-
-
- - - - -
-
+
+
+
+ +
+
+
+
+ + + +
+
+
+ + + + +
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/documentTypes/create.controller.js index 694192d86a..b89066363c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documentTypes/create.controller.js @@ -8,102 +8,102 @@ */ function DocumentTypesCreateController($scope, $location, navigationService, contentTypeResource, formHelper, appState) { - $scope.model = { - allowCreateFolder: $scope.currentNode.parentId === null || $scope.currentNode.nodeType === 'container', - folderName: '', - creatingFolder: false - }; + $scope.model = { + allowCreateFolder: $scope.currentNode.parentId === null || $scope.currentNode.nodeType === 'container', + folderName: '', + creatingFolder: false + }; - var disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates; - $scope.model.disableTemplates = disableTemplates; + var disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates; + $scope.model.disableTemplates = disableTemplates; - var node = $scope.currentNode; + var node = $scope.currentNode; - $scope.showCreateFolder = function () { - $scope.model.creatingFolder = true; - }; + $scope.showCreateFolder = function () { + $scope.model.creatingFolder = true; + }; - $scope.createContainer = function () { + $scope.createContainer = function () { - if (formHelper.submitForm({ scope: $scope, formCtrl: $scope.createFolderForm })) { + if (formHelper.submitForm({scope: $scope, formCtrl: $scope.createFolderForm})) { - contentTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) { + contentTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) { - navigationService.hideMenu(); - - var currPath = node.path ? node.path : '-1'; - - navigationService.syncTree({ - tree: 'documentTypes', - path: currPath + ',' + folderId, - forceReload: true, - activate: true - }); - - formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm }); - - var section = appState.getSectionState('currentSection'); - - }, function (err) { - - formHelper.resetForm({ scope: $scope, formCtrl: $scope.createFolderForm, hasErrors: true }); - $scope.error = err; - - }); - } - }; - - function createDocType(config) { - - $location.search('create', null); - $location.search('notemplate', null); - $location.search('iscomposition', null); - $location.search('iselement', null); - $location.search('icon', null); - - var icon = null; - - if (config.icon != undefined && config.icon != null) { - icon = config.icon; - if (config.color) { - icon += ' ' + config.color; - } - } - - $location - .path('/settings/documentTypes/edit/' + node.id) - .search('create', 'true') - .search('notemplate', config.notemplate ? 'true' : null) - .search('iscomposition', config.iscomposition ? 'true' : null) - .search('iselement', config.iselement ? 'true' : null) - .search('icon', icon); navigationService.hideMenu(); + + var currPath = node.path ? node.path : '-1'; + + navigationService.syncTree({ + tree: 'documentTypes', + path: currPath + ',' + folderId, + forceReload: true, + activate: true + }); + + formHelper.resetForm({scope: $scope, formCtrl: $scope.createFolderForm}); + + var section = appState.getSectionState('currentSection'); + + }, function (err) { + + formHelper.resetForm({scope: $scope, formCtrl: $scope.createFolderForm, hasErrors: true}); + $scope.error = err; + + }); + } + }; + + function createDocType(config) { + + $location.search('create', null); + $location.search('notemplate', null); + $location.search('iscomposition', null); + $location.search('iselement', null); + $location.search('icon', null); + + var icon = null; + + if (config.icon != undefined && config.icon != null) { + icon = config.icon; + if (config.color) { + icon += ' ' + config.color; + } } + $location + .path('/settings/documentTypes/edit/' + node.id) + .search('create', 'true') + .search('notemplate', config.notemplate ? 'true' : null) + .search('iscomposition', config.iscomposition ? 'true' : null) + .search('iselement', config.iselement ? 'true' : null) + .search('icon', icon); + navigationService.hideMenu(); + } - // Disabling logic for creating document type with template if disableTemplates is set to true - if (!disableTemplates) { - $scope.createDocType = function (icon) { - createDocType({ icon }); - }; - } - $scope.createComponent = function (icon) { - createDocType({ notemplate: true, icon }); + // Disabling logic for creating document type with template if disableTemplates is set to true + if (!disableTemplates) { + $scope.createDocType = function (icon) { + createDocType({icon}); }; + } - $scope.createComposition = function (icon) { - createDocType({ notemplate: true, iscomposition: true, iselement: true, icon }); - }; + $scope.createComponent = function (icon) { + createDocType({notemplate: true, icon}); + }; - $scope.createElement = function (icon) { - createDocType({ notemplate: true, iselement: true, icon }); - }; + $scope.createComposition = function (icon) { + createDocType({notemplate: true, iscomposition: true, iselement: true, icon}); + }; - $scope.close = function() { - const showMenu = true; - navigationService.hideDialog(showMenu); - }; + $scope.createElement = function (icon) { + createDocType({notemplate: true, iselement: true, icon}); + }; + + $scope.close = function () { + const showMenu = true; + navigationService.hideDialog(showMenu); + }; } angular.module('umbraco').controller('Umbraco.Editors.DocumentTypes.CreateController', DocumentTypesCreateController); diff --git a/src/Umbraco.Web.UI.Client/src/views/documentTypes/importdocumenttype.html b/src/Umbraco.Web.UI.Client/src/views/documentTypes/importdocumenttype.html index 75919d8c74..347f94039c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documentTypes/importdocumenttype.html +++ b/src/Umbraco.Web.UI.Client/src/views/documentTypes/importdocumenttype.html @@ -1,58 +1,61 @@ 
-
-
-
-

- - To import a document type, find the '.udt' file on your computer by clicking the 'Browse' button and click 'Import' (you'll be asked for confirmation on the next screen) - -

+
+
+
+

+ + To import a document type, find the '.udt' file on your computer by clicking the 'Browse' button and click + 'Import' (you'll be asked for confirmation on the next screen) + +

-
+ - - -
+ + + -
Please choose a .udt file to import
+
Please choose a .udt file to import
-
-
- - Name: - - {{vm.model.name}} -
- - Alias: - - {{vm.model.alias}} -
-
- -
-
- {{vm.model.name}} has been imported! -
-
+
+
+ + Name + : + + {{vm.model.name}} +
+ + Alias + : + + {{vm.model.alias}} +
+
+ +
+
+ {{vm.model.name}} has been imported! +
+
-
- - -
+
+ + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.html b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.html index afa987f0af..18732e828b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/mediaTypes/create.html @@ -1,72 +1,76 @@
-
-
+
+
-
-
Create an item under {{currentNode.name}}
+
+
+ Create an item under + {{currentNode.name}} +
-
    -
  • - -
    • -
  • - -
    • -
-
-
- -
- + +
  • + +
    • + +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +
    {{error.errorMsg}}
    +
    {{error.data.message}}
    +
    +
    + + + +
    -
    - -
    - -
    -
    -
    -
    -
    {{error.errorMsg}}
    -
    {{error.data.message}}
    -
    -
    - - - - -
    -
    -
    - - - - -
    - -
    +
    +
    + + + + +
    + +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/create.html index e4670174e0..23461c4c28 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/partialViewMacros/create.html @@ -1,97 +1,107 @@ -
    +
    -
    -
    +
    +
    -
    - -
    +
    + +
    -
    Create an item under {{currentNode.name}}
    +
    + Create an item under + {{currentNode.name}} +
    -
      -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    -
    - - -
    - -
    Select snippet
    - -
      -
    • - -
      • -
    -
    -
    +
      +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    - -
    - + +
    + +
    + Select snippet +
    + +
      +
    • + +
      • +
    +
    -
    -
    -
    - -
    -
    -
    -
    {{vm.createFolderError.data.message}}
    -
    -
    - - - - - -
    -
    -
    - - - - -
    -
    + +
    +
    +
    + +
    +
    +
    + +
    +
    +
    +
    {{vm.createFolderError.data.message}}
    +
    +
    + + + + + +
    +
    +
    + + + + +
    +
    +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/partialViews/create.html b/src/Umbraco.Web.UI.Client/src/views/partialViews/create.html index 17ee8b0190..aa627b45cb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialViews/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/partialViews/create.html @@ -1,87 +1,95 @@ -
    +
    -
    -
    +
    +
    -
    +
    -
    Create an item under {{currentNode.name}}
    +
    + Create an item under + {{currentNode.name}} +
    - -
    -
      -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    -
    - - -
    -
      -
    • - -
      • -
    -
    -
    + +
    +
      +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    - -
    - + +
    +
      +
    • + +
      • +
    +
    -
    -
    -
    - -
    -
    -
    -
    {{vm.createFolderError.data.message}}
    -
    -
    - - - - -
    -
    -
    - - - - -
    -
    + +
    +
    +
    + +
    +
    +
    + +
    +
    +
    +
    {{vm.createFolderError.data.message}}
    +
    +
    + + + + +
    +
    +
    + + + + +
    +
    +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.controller.js index e2331c27cd..3cb3596261 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.controller.js @@ -1,13 +1,18 @@ function imageFilePickerController($scope, editorService) { + var vm = this; + vm.model = $scope.model; - $scope.add = function() { + vm.add = add; + vm.remove = remove; + + function add() { var mediaPickerOptions = { view: "mediapicker", multiPicker: false, disableFolderSelect: true, onlyImages: true, submit: function (model) { - $scope.model.value = model.selection[0].image; + vm.model.value = model.selection[0].image; editorService.close(); }, @@ -18,8 +23,8 @@ function imageFilePickerController($scope, editorService) { editorService.mediaPicker(mediaPickerOptions); }; - $scope.remove = function () { - $scope.model.value = null; + function remove() { + vm.model.value = null; }; } diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html index fd9075f907..4affd5de42 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/imagepicker.html @@ -1,23 +1,21 @@ -
    +
    +
    +
      +
    • + -
        -
      • - +
        + +
        +
        • -
        - -
        - -
      - - - +
      • +
    +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less index 47b1d00ca2..11d70f4397 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umb-block-list-property-editor.less @@ -79,7 +79,6 @@ ng-form.ng-invalid-val-server-match-settings > .umb-block-list__block > .umb-blo } .umb-block-list__block--actions { position: absolute; - z-index:999999999;// We always want to be on top of custom view, but we need to make sure we still are behind relevant Umbraco CMS UI. ToDo: Needs further testing. top: 10px; right: 10px; font-size: 0; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js index 7c8c1e64fb..1269a4c28b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js @@ -44,14 +44,15 @@ function contentPickerController($scope, $q, $routeParams, $location, entityReso function validate() { if ($scope.contentPickerForm) { //Validate! - if ($scope.model.config && $scope.model.config.minNumber && parseInt($scope.model.config.minNumber) > $scope.renderModel.length) { + var hasItemsOrMandatory = $scope.renderModel.length !== 0 || ($scope.model.validation && $scope.model.validation.mandatory); + if (hasItemsOrMandatory && $scope.minNumberOfItems > $scope.renderModel.length) { $scope.contentPickerForm.minCount.$setValidity("minCount", false); } else { $scope.contentPickerForm.minCount.$setValidity("minCount", true); } - if ($scope.model.config && $scope.model.config.maxNumber && parseInt($scope.model.config.maxNumber) < $scope.renderModel.length) { + if ($scope.maxNumberOfItems < $scope.renderModel.length) { $scope.contentPickerForm.maxCount.$setValidity("maxCount", false); } else { @@ -145,6 +146,10 @@ function contentPickerController($scope, $q, $routeParams, $location, entityReso $scope.umbProperty.setPropertyActions(propertyActions); } + + // use these to avoid the nested property lookups/null-checks + $scope.minNumberOfItems = $scope.model.config.minNumber ? parseInt($scope.model.config.minNumber) : 0; + $scope.maxNumberOfItems = $scope.model.config.maxNumber ? parseInt($scope.model.config.maxNumber) : 0; } //Umbraco persists boolean for prevalues as "0" or "1" so we need to convert that! @@ -194,7 +199,7 @@ function contentPickerController($scope, $q, $routeParams, $location, entityReso dialogOptions.dataTypeKey = $scope.model.dataTypeKey; // if we can't pick more than one item, explicitly disable multiPicker in the dialog options - if ($scope.model.config.maxNumber && parseInt($scope.model.config.maxNumber) === 1) { + if ($scope.maxNumberOfItems === 1) { dialogOptions.multiPicker = false; } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html index 8ebbaae91f..e93637c671 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html @@ -19,7 +19,7 @@
    - -
    +
    - - Add between {{model.config.minNumber}} and {{model.config.maxNumber}} items - - You can only have {{model.config.maxNumber}} items selected + + Add between {{minNumberOfItems}} and {{maxNumberOfItems}} items + + You can only have {{maxNumberOfItems}} items selected - - Add {{model.config.minNumber - renderModel.length}} item(s) - - You can only have {{model.config.maxNumber}} items selected + + Add {{minNumberOfItems - renderModel.length}} item(s) + + You can only have {{maxNumberOfItems}} items selected - - Add up to {{model.config.maxNumber}} items - - You can only have {{model.config.maxNumber}} items selected + + Add up to {{maxNumberOfItems}} items + + You can only have {{maxNumberOfItems}} items selected - - Add at least {{model.config.minNumber}} item(s) + + Add at least {{minNumberOfItems}} item(s)
    @@ -70,12 +70,12 @@
    - You need to add at least {{model.config.minNumber}} items + You need to add at least {{minNumberOfItems}} items
    - You can only have {{model.config.maxNumber}} items selected + You can only have {{maxNumberOfItems}} items selected
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js index c0bc493cd3..0dc5b68d09 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js @@ -125,8 +125,29 @@ angular.module("umbraco") editorService.open(layoutConfigOverlay); } - function deleteTemplate(index) { - $scope.model.value.templates.splice(index, 1); + function deleteTemplate(template, index, event) { + + const dialog = { + view: "views/propertyEditors/grid/overlays/layoutdeleteconfirm.html", + layout: template, + submitButtonLabelKey: "contentTypeEditor_yesDelete", + submitButtonStyle: "danger", + submit: function (model) { + $scope.model.value.templates.splice(index, 1); + overlayService.close(); + }, + close: function () { + overlayService.close(); + } + }; + + localizationService.localize("general_delete").then(value => { + dialog.title = value; + overlayService.open(dialog); + }); + + event.preventDefault(); + event.stopPropagation(); } /**************** @@ -167,7 +188,6 @@ angular.module("umbraco") } function deleteLayout(layout, index, event) { - const dialog = { view: "views/propertyeditors/grid/overlays/rowdeleteconfirm.html", layout: layout, diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html index 993b57b23e..9fcd43d834 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html @@ -31,7 +31,7 @@

    {{template.name}}

    - diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/overlays/layoutdeleteconfirm.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/overlays/layoutdeleteconfirm.html new file mode 100644 index 0000000000..4fedf61865 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/overlays/layoutdeleteconfirm.html @@ -0,0 +1,14 @@ +
    +
    + You are deleting the layout {{model.layout.name}}. +
    + +

    + + Modifying layout will result in loss of data for any existing content that is based on this configuration. + +

    + + Are you sure you want to delete? + +
    diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html index 5db348dbff..9e022d0e0f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/includeproperties.prevalues.html @@ -18,8 +18,8 @@ - Alias - Header + Alias + Header Template @@ -32,14 +32,16 @@
    - (system field) + (systemField)
    - Required + + Required + @@ -53,8 +55,8 @@ - @@ -63,5 +65,4 @@
    - -
    +
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/relationTypes/create.html b/src/Umbraco.Web.UI.Client/src/views/relationTypes/create.html index 72918c6414..4e4711cc09 100644 --- a/src/Umbraco.Web.UI.Client/src/views/relationTypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/relationTypes/create.html @@ -1,69 +1,72 @@ -
    +
    -
    -
    -
    - - - - + +
    +
    + + + + - - -

    -
      -
    • - -
      • -
    • - -
      • -
    -     + + +

    + +

    +
      +
    • + +
      • +
    • + +
      • +
    +     - - - - + + + + - - - - -
    -
    -
    - - - - -
    - + + + + +
    +
    +
    + + + + +
    +
    diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index 16a19d3042..e1ea44225e 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -161,7 +161,7 @@ Brugeren har afpubliceret indholdet Brugeren har afpubliceret indholdet for sprogene: %0% Brugeren har gemt og udgivet indholdet - Brugeren har gemt og udgivet indholdet for sprogene: %0% + Brugeren har gemt og udgivet indholdet for sprogene: %0% Brugeren har gemt indholdet Brugeren har gemt indholdet for sprogene: %0% Brugeren har flyttet indholdet @@ -226,8 +226,12 @@ Dette medie har ikke noget link Intet indhold kan tilføjes for dette element Egenskaber - Dette dokument er udgivet, men ikke synligt da den overliggende side '%0%' ikke er udgivet! - Dette sprog er udgivet, men ikke synligt, da den overliggende side '%0%' ikke er udgivet! + Dette dokument er udgivet, men ikke synligt da den overliggende side '%0%' ikke er + udgivet! + + Dette sprog er udgivet, men ikke synligt, da den overliggende side '%0%' ikke + er udgivet! + Ups: dette dokument er udgivet, men er ikke i cachen (intern fejl) Kunne ikke hente URL'en Dette dokument er udgivet, men dets URL ville kollidere med indholdet %0% @@ -236,14 +240,18 @@ Udgivet Udgivet (Ventede ændringer) Udgivelsesstatus - Udgiv med undersider for at udgive %0% og alle sider under og dermed gøre deres indhold offentligt tilgængelige.]]> - Udgiv med undersider for at udgive de valgte sprog og de samme sprog for sider under og dermed gøre deres indhold offentligt tilgængelige.]]> + + Udgiv med undersider for at udgive %0% og alle sider under og dermed gøre deres indhold offentligt tilgængelige.]]> + + Udgiv med undersider for at udgive de valgte sprog og de samme sprog for sider under og dermed gøre deres indhold offentligt tilgængelige.]]> Udgivelsesdato Afpubliceringsdato Fjern dato Vælg dato Sorteringsrækkefølgen er opdateret - For at sortere, træk siderne eller klik på en af kolonnehovederne. Du kan vælge flere sider ved at holde "shift" eller "control" nede mens du vælger. + For at sortere, træk siderne eller klik på en af kolonnehovederne. Du kan vælge flere sider + ved at holde "shift" eller "control" nede mens du vælger. + Statistik Titel (valgfri) Alternativ tekst (valgfri) @@ -265,24 +273,33 @@ Undersider Åben i vindue Dette oversætter til den følgende tid på serveren: - Hvad betyder det?]]> + + Hvad betyder det?]]> Er du sikker på, at du vil slette dette element? Er du sikker på, at du vil slette alle elementer? - Egenskaben %0% anvender editoren %1% som ikke er understøttet af Nested Content. + Egenskaben %0% anvender editoren %1% som ikke er understøttet af Nested + Content. + Der er ikke konfigureret nogen indholdstyper for denne egenskab. Tilføj element type Vælg element type - Vælg gruppen, hvis værdier skal vises. Hvis dette er efterladt blankt vil den første gruppe på element typen bruges. + Vælg gruppen, hvis værdier skal vises. Hvis dette er efterladt blankt vil + den første gruppe på element typen bruges. + Tilføj en ny tekstboks Fjern denne tekstboks Indholdsrod Inkluder ikke-udgivet indhold. - Denne værdi er skjult.Hvis du har brug for adgang til at se denne værdi, bedes du kontakte din web-administrator. + Denne værdi er skjult.Hvis du har brug for adgang til at se denne værdi, bedes du + kontakte din web-administrator. + Denne værdi er skjult. Hvilke sprog vil du gerne udgive? Hvilke sprog vil du gerne sende til godkendelse? Hvilke sprog vil du gerne planlægge? - Vælg sproget du vil afpublicere. Afpublicering af et obligatorisk sprog vil afpublicere alle sprog. + Vælg sproget du vil afpublicere. Afpublicering af et obligatorisk sprog vil + afpublicere alle sprog. + Nulstil fokuspunkt Alle nye varianter vil blive gemt. De følgende varianter er krævet for at en udgivelse kan finde sted: @@ -302,7 +319,9 @@ Indholdsskabelon oprettet En indholdsskabelon blev oprettet fra '%0%' En anden indholdsskabelon med samme navn eksisterer allerede - En indholdskabelon er foruddefineret indhold, som en redaktør kan vælge at bruge som grundlag for at oprette nyt indhold + En indholdskabelon er foruddefineret indhold, som en redaktør kan vælge at bruge + som grundlag for at oprette nyt indhold + Klik for at uploade @@ -313,7 +332,9 @@ Overordnet og destinations mappe kan ikke være den samme Oprettelse af mappen under parent med id %0% fejlede Omdøbning af mappen med id %0% fejlede - Træk dine filer ind i dropzonen for, at uploade dem til mediebiblioteket. + Træk dine filer ind i dropzonen for, at uploade dem til + mediebiblioteket. + Upload er ikke tiladt på denne lokation @@ -339,26 +360,43 @@ Vælg den dokumenttype, du vil oprette en indholdsskabelon til Angiv et navn for mappen Vælg en type og skriv en titel - "dokumenttyper".]]> - Document Types within the Settings section.]]> - Den valgte side i træet tillader ikke at sider oprettes under den. + + "dokumenttyper".]]> + + Document Types within the Settings section.]]> + Den valgte side i træet tillader ikke at sider oprettes under + den. + Rediger tilladelser for denne dokumenttype. Opret en ny dokumenttype - Dokumenttyper inde i Indstillinger sektionen, ved at ændre Tillad på rodniveau indestillingen under Permissions.]]> - "media typer".]]> - Det valgte medie i træet tillader ikke at medier oprettes under det. + + Dokumenttyper inde i Indstillinger sektionen, ved at ændre Tillad på rodniveau indestillingen under Permissions.]]> + + "media typer".]]> + Det valgte medie i træet tillader ikke at medier oprettes under det. + Rediger tilladelser for denne medietype. Dokumenttype uden skabelon Dokumenttype med skabelon - Definerer en indholdsside, der kan oprettes af redaktørerne i indholdstræet, og som er kan tilgås direkte på en URL. + Definerer en indholdsside, der kan oprettes af redaktørerne i + indholdstræet, og som er kan tilgås direkte på en URL. + Dokumenttype - Definerer en indholdskomponent, der kan oprettes af redaktørerne i indholdstræet og benyttes i sammenhæng med andet indhold, men som ikke kan tilgås direkte på en URL. + Definerer en indholdskomponent, der kan oprettes af redaktørerne i + indholdstræet og benyttes i sammenhæng med andet indhold, men som ikke kan tilgås direkte på en URL. + Element-type - Definerer skabelonen for et sæt at egenskaber, der kan anvendes som skema i avancerede felter som f.eks. 'Block List' eller 'Nested Content'. + Definerer skabelonen for et sæt at egenskaber, der kan anvendes som skema i + avancerede felter som f.eks. 'Block List' eller 'Nested Content'. + Komposition - Definerer et sæt genbrugbare egenskaber, der kan inkluderes i definitionen af andre dokumenttyper - f.eks. et sæt 'Almindelige side-data'. + Definerer et sæt genbrugbare egenskaber, der kan inkluderes i definitionen af + andre dokumenttyper - f.eks. et sæt 'Almindelige side-data'. + Mappe - Benyttes til at organisere dokumenttyper, element-typer og kompositioner i dokumenttype-træet. + Benyttes til at organisere dokumenttyper, element-typer og kompositioner i + dokumenttype-træet. + Ny mappe Ny datatype Ny JavaScript-fil @@ -373,7 +411,8 @@ Til dit website - Skjul - Hvis Umbraco ikke starter, kan det skyldes at din browser ikke tillader pop-up vinduer + Hvis Umbraco ikke starter, kan det skyldes at din browser ikke tillader pop-up vinduer + er åbnet i nyt vindue Genstart Besøg @@ -383,11 +422,14 @@ Bliv Kassér ændringer Du har ikke-gemte ændringer - Er du sikker på du vil navigere væk fra denne side? - du har ikke-gemte ændringer + Er du sikker på du vil navigere væk fra denne side? - du har ikke-gemte + ændringer + Udgivelse vil gøre de valgte sider synlige på sitet. Afpublicering vil fjerne de valgte sider og deres undersider fra sitet. Afpublicering vil fjerne denne side og alle dets undersider fra websitet. - Du har ikke-gemte ændringer. Hvis du ændrer dokumenttype, kasseres ændringerne. + Du har ikke-gemte ændringer. Hvis du ændrer dokumenttype, kasseres ændringerne. + Færdig @@ -437,7 +479,9 @@ Indsæt makro Indsæt tabel Dette vil slette sproget - Ændring af kulturen for et sprog kan forsage en krævende opration og vil resultere i indholds cache og indeksering vil blive genlavet + Ændring af kulturen for et sprog kan forsage en krævende opration og vil + resultere i indholds cache og indeksering vil blive genlavet + Sidst redigeret Link Internt link: @@ -449,16 +493,23 @@ Sæt rettigheder for Sæt rettigheder for %0% for brugergruppe %1% Vælg de brugergrupper, du vil angive tilladelser til - Elementerne i papirkurven slettes. Luk venligst ikke dette vindue mens sletningen foregår + Elementerne i papirkurven slettes. Luk venligst ikke dette vindue mens sletningen + foregår + Papirkurven er nu tom Når elementer slettes fra papirkurven, slettes de for altid - regexlib.com's webservice oplever i øjeblikket problemer, vi ikke har kontrol over. Beklager ulejligheden. ]]> - Søg efter et regulært udtryk for at tilføje validering til et formularfelt. Eksempel: 'e-mail', 'postnr.', 'URL' + + regexlib.com's webservice oplever i øjeblikket problemer, vi ikke har kontrol over. Beklager ulejligheden. ]]> + Søg efter et regulært udtryk for at tilføje validering til et formularfelt. Eksempel: + 'e-mail', 'postnr.', 'URL' + Fjern makro Obligatorisk Sitet er genindekseret Sitet er nu genudgivet - Websitets cache vil blive genopfrisket. Alt udgivet indhold vil blive opdateret, mens upubliceret indhold vil forblive upubliceret. + Websitets cache vil blive genopfrisket. Alt udgivet indhold vil blive opdateret, mens + upubliceret indhold vil forblive upubliceret. + Antal kolonner Antal rækker Klik på billedet for at se den fulde størrelse @@ -500,7 +551,9 @@ Vælg editor Vælg konfiguration Vælg snippet - Dette vil slette noden og alle dets sprog. Hvis du kun vil slette et sprog, så afpublicér det i stedet. + Dette vil slette noden og alle dets sprog. Hvis du kun vil slette et sprog, så + afpublicér det i stedet. + %0%]]> %0% fra gruppen]]> Ja, fjern @@ -520,7 +573,9 @@ Konfigurerede søgere - Viser egenskaber og værktøjer til enhver konfigureret søger (dvs. som en multi-indekssøger) + Viser egenskaber og værktøjer til enhver konfigureret søger (dvs. som en + multi-indekssøger) + Feltværdier Sundhedstilstand Indeksets sundhedstilstand, og hvis det kan læses @@ -528,7 +583,9 @@ Indeksinfo Viser indeksets egenskaber Administrer Examine indekserne - Giver dig mulighed for at se detaljerne for hvert indeks og giver nogle værktøjer til styring af indeksørerne + Giver dig mulighed for at se detaljerne for hvert indeks og giver nogle + værktøjer til styring af indeksørerne + Genopbyg indeks @@ -542,7 +599,9 @@ Værktøjer til at administrere indekset felter Indexet skal bygges igen, for at kunne læses - Processen tager længere tid end forventet. Kontrollér Umbraco loggen for at se om der er sket fejl under operationen + Processen tager længere tid end forventet. Kontrollér Umbraco loggen for at se om + der er sket fejl under operationen + Dette index kan ikke genbygges for det ikke har nogen IIndexPopulator @@ -594,16 +653,25 @@ Vælg den mappe, der skal flyttes til i træstrukturen nedenfor blev flyttet under - %0% fjernes egnskaber og egnskabernes data fra følgende elementer]]> - I understand this action will delete the properties and data based on this Data Type + + %0% fjernes egnskaber og egnskabernes data fra følgende elementer]]> + I understand this action will delete the properties and data based on this Data + Type + - Dine data er blevet gemt, men før du kan udgive denne side er der nogle fejl der skal rettes: - Den nuværende membership-provider understøtter ikke skift af kodeord (EnablePasswordRetrieval skal være true) + Dine data er blevet gemt, men før du kan udgive denne side er der nogle fejl der + skal rettes: + + Den nuværende membership-provider understøtter ikke skift af kodeord + (EnablePasswordRetrieval skal være true) + %0% der findes allerede Der var fejl i dokumentet: Der var fejl i formularen: - Kodeordet skal være på minimum %0% tegn og indeholde mindst %1% alfanumeriske karakterer + Kodeordet skal være på minimum %0% tegn og indeholde mindst %1% alfanumeriske + karakterer + %0% skal være et heltal %0% under %1% er et obligatorisk felt og skal udfyldes %0% er et obligatorisk felt og skal udfyldes @@ -613,13 +681,17 @@ Der skete en fejl på severen Denne filttype er blevet deaktiveret af administratoren - OBS! Selvom CodeMirror er slået til i konfigurationen, så er den deaktiveret i Internet Explorer fordi den ikke er stabil nok. + OBS! Selvom CodeMirror er slået til i konfigurationen, så er den deaktiveret i + Internet Explorer fordi den ikke er stabil nok. + Du skal udfylde både Alias & Navn på den nye egenskabstype! Der mangler læse/skrive rettigheder til bestemte filer og mapper Fejl ved indlæsning af Partial View script (fil: %0%) Skriv venligst en titel Du skal vælge en type - Du er ved at gøre billedet større end originalen. Det vil forringe kvaliteten af billedet. Ønsker du at fortsætte? + Du er ved at gøre billedet større end originalen. Det vil forringe + kvaliteten af billedet. Ønsker du at fortsætte? + Startnode er slettet, kontakt systemadministrator Du skal markere noget indhold, før du kan ændre stylen Der er ingen aktive styles eller formatteringer på denne side @@ -781,6 +853,8 @@ Artikler Videoer Avatar til + Overskrift + system felt Blå @@ -820,48 +894,77 @@ Installeringsprogrammet kan ikke forbinde til databasen. - Kunne ikke gemme web.config filen. Du bedes venligst manuelt ændre database forbindelses strengen. + Kunne ikke gemme web.config filen. Du bedes venligst manuelt ændre database + forbindelses strengen. + Din database er blevet fundet og identificeret som Database konfiguration installér knappen for at installere Umbraco %0% databasen ]]> - Næste for at fortsætte.]]> + + Næste for at fortsætte.]]> Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.

    For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.

    Klik på Forsøg igen knappen når du er færdig.
    Mere information om at redigere web.config her.

    ]]>     - Kontakt venligst din ISP hvis det er nødvendigt. Hvis du installerer på en lokal maskine eller server kan du muligvis få informationerne fra din systemadministrator.]]> - Tryk på Opgradér knappen for at opgradere din database til Umbraco %0%

    Bare rolig - intet indhold vil blive slettet og alt vil stadig fungere bagefter!

    ]]>     - Tryk på Næste for at fortsætte.]]> - Næste for at fortsætte med konfigurationsguiden.]]> - Normalbrugerens adgangskode er nødt til at blive ændret!]]> - Normalbrugeren er blevet gjort utjenstdygtig eller har ikke adgang til Umbraco!

    Du behøver ikke foretage yderligere handlinger. Tryk på Næste for at fortsætte.

    ]]>     - Normalbrugerens adgangskode er på succesfuld vis blevet ændret siden installationen!

    Du behøver ikke foretage yderligere handlinger. Tryk på Næste for at fortsætte.

    ]]>     + + Kontakt venligst din ISP hvis det er nødvendigt. Hvis du installerer på en lokal maskine eller server kan du muligvis få informationerne fra din systemadministrator.]]> + + Tryk på Opgradér knappen for at opgradere din database til Umbraco %0%

    Bare rolig - intet indhold vil blive slettet og alt vil stadig fungere bagefter!

    ]]>     + + Tryk på Næste for at fortsætte.]]> + + Næste for at fortsætte med konfigurationsguiden.]]> + + Normalbrugerens adgangskode er nødt til at blive ændret!]]> + + Normalbrugeren er blevet gjort utjenstdygtig eller har ikke adgang til Umbraco!

    Du behøver ikke foretage yderligere handlinger. Tryk på Næste for at fortsætte.

    ]]>     + + Normalbrugerens adgangskode er på succesfuld vis blevet ændret siden installationen!

    Du behøver ikke foretage yderligere handlinger. Tryk på Næste for at fortsætte.

    ]]>     Adgangskoden er blevet ændret! Få en fremragende start, se vores videoer - Ved at klikke på næste knappen (eller ved at ændre UmbracoConfigurationStatus i web.config filen), accepterer du licensaftalen for denne software, som specificeret i boksen nedenfor. Bemærk venligst at denne Umbraco distribution består af to forskellige licenser, MIT's Open Source Licens for frameworket og Umbraco Freeware Licensen som dækker UI'en. + Ved at klikke på næste knappen (eller ved at ændre UmbracoConfigurationStatus i web.config + filen), accepterer du licensaftalen for denne software, som specificeret i boksen nedenfor. Bemærk venligst at + denne Umbraco distribution består af to forskellige licenser, MIT's Open Source Licens for frameworket og Umbraco + Freeware Licensen som dækker UI'en. + Endnu ikke installeret Berørte filer og foldere Flere informationer om at opsætte rettigheder for Umbraco her - Du er nødt til at give ASP.NET 'modify' rettigheder på følgende filer/foldere - Dine rettighedsindstillinger er næsten perfekte!

    Du kan køre Umbraco uden problemer, men du vil ikke være i stand til at installere pakker, som er anbefalet for at få fuldt udbytte af Umbraco.]]>     + Du er nødt til at give ASP.NET 'modify' rettigheder på følgende + filer/foldere + + + Dine rettighedsindstillinger er næsten perfekte!

    Du kan køre Umbraco uden problemer, men du vil ikke være i stand til at installere pakker, som er anbefalet for at få fuldt udbytte af Umbraco.]]>     Hvorledes besluttes Klik her for at læse tekstversionen - video tutorials om at opsætte folderrettigheder for Umbraco eller læs tekstversionen.]]> - Dine rettighedsindstillinger kan være et problem!

    Du kan afvikle Umbraco uden problemer, men du vil ikke være i stand til at oprette foldere eller installere pakker, hvilket er anbefalet for at få fuldt udbytte af Umbraco.]]>     - Dine rettighedsindstillinger er ikke klar til Umbraco!

    For at afvikle Umbraco er du nødt til at opdatere dine rettighedsindstillinger.]]>     - Dine rettighedsindstillinger er perfekte!

    Du er nu parat til at afvikle Umbraco og installere pakker!]]>     + + video tutorials om at opsætte folderrettigheder for Umbraco eller læs tekstversionen.]]> + + Dine rettighedsindstillinger kan være et problem!

    Du kan afvikle Umbraco uden problemer, men du vil ikke være i stand til at oprette foldere eller installere pakker, hvilket er anbefalet for at få fuldt udbytte af Umbraco.]]>     + + Dine rettighedsindstillinger er ikke klar til Umbraco!

    For at afvikle Umbraco er du nødt til at opdatere dine rettighedsindstillinger.]]>     + + Dine rettighedsindstillinger er perfekte!

    Du er nu parat til at afvikle Umbraco og installere pakker!]]>     Løser folder problem - Følg dette link for mere information om udfordringer med ASP.NET og oprettelse af foldere + Følg dette link for mere information om udfordringer med ASP.NET og + oprettelse af foldere + Sætter folderrettigheder op - Umbraco har behov for 'write/modify' adgang til bestemte foldere, for at kunne gemme filer som billeder og PDF'er. Umbraco gemmer også midlertidige data (eksempelvis cachen) for at forbedre ydelsen på dit website. + Umbraco har behov for 'write/modify' adgang til bestemte foldere, for at kunne gemme + filer som billeder og PDF'er. Umbraco gemmer også midlertidige data (eksempelvis cachen) for at forbedre ydelsen + på dit website. + Jeg har lyst til at begynde på bar bund - lær hvordan) Du kan stadig vælge at installere Runway senere. Gå venligst til Udvikler-sektionen og vælg Pakker.]]> + + lær hvordan) Du kan stadig vælge at installere Runway senere. Gå venligst til Udvikler-sektionen og vælg Pakker.]]> Du har lige opsat en ren Umbraco-platform. Hvad ønsker du nu at gøre? Runway er installeret - Dette er vores liste over anbefalede moduler. Kryds dem af du ønsker at installere eller se den fulde liste af moduler ]]> + + Dette er vores liste over anbefalede moduler. Kryds dem af du ønsker at installere eller se den fulde liste af moduler ]]> Kun anbefalet for erfarne brugere Jeg ønsker at begynder med et simpelt website - "Runway" er et simpelt website som stiller nogle basale dokumenttyper og skabeloner til rådighed. Installeringsprogrammet kan automatisk opsætte Runway for dig, men du kan nemt redigere, udvide eller fjerne det. Det er ikke nødvendigt og du kan sagtens bruge Umbraco uden. Men Runway tilbyder et fundament, som er baseret på 'Best Practices', som får dig igang hurtigere end nogensinde før. Hvis du vælger at installere Runway, kan du efter eget valg vælge de grundlæggende byggesten kaldet 'Runway Modules' til at forbedre dine Runway-sider.

    Inkluderet med Runway:Home Page, Getting Started page, Installing Modules page.
    Valgfri Moduler: Top Navigation, Sitemap, Contact, Gallery.

    ]]>     + + "Runway" er et simpelt website som stiller nogle basale dokumenttyper og skabeloner til rådighed. Installeringsprogrammet kan automatisk opsætte Runway for dig, men du kan nemt redigere, udvide eller fjerne det. Det er ikke nødvendigt og du kan sagtens bruge Umbraco uden. Men Runway tilbyder et fundament, som er baseret på 'Best Practices', som får dig igang hurtigere end nogensinde før. Hvis du vælger at installere Runway, kan du efter eget valg vælge de grundlæggende byggesten kaldet 'Runway Modules' til at forbedre dine Runway-sider.

    Inkluderet med Runway:Home Page, Getting Started page, Installing Modules page.
    Valgfri Moduler: Top Navigation, Sitemap, Contact, Gallery.

    ]]>     Hvad er Runway Skridt 1/5: Acceptér licens Skridt 2/5: Database-konfiguration @@ -869,18 +972,23 @@ Skridt 4/5: Kontrollér Umbraco sikkerhed Skridt 5/5: Umbraco er parat til at få dig igang Tak fordi du valgte Umbraco - Gennemse dit nye site Du installerede Runway, så hvorfor ikke se hvordan dit nye website ser ud.]]> - Yderligere hjælpe og informationer Få hjælp fra vores prisvindende fællesskab, gennemse dokumentationen eller se nogle gratis videoer om hvordan du opsætter et simpelt site, hvordan du bruger pakker og en 'quick guide' til Umbraco terminologier]]> + + Gennemse dit nye site Du installerede Runway, så hvorfor ikke se hvordan dit nye website ser ud.]]> + + Yderligere hjælpe og informationer Få hjælp fra vores prisvindende fællesskab, gennemse dokumentationen eller se nogle gratis videoer om hvordan du opsætter et simpelt site, hvordan du bruger pakker og en 'quick guide' til Umbraco terminologier]]> Umbraco %0% er installeret og klar til brug - /web.config filen og opdatére 'AppSetting' feltet UmbracoConfigurationStatus i bunden til '%0%'.]]> + + /web.config filen og opdatére 'AppSetting' feltet UmbracoConfigurationStatus i bunden til '%0%'.]]> komme igang med det samme ved at klikke på "Start Umbraco" knappen nedenfor.
    Hvis du er ny med Umbraco, kan du finde masser af ressourcer på vores 'getting started' sider. ]]>     - Start UmbracoFor at administrere dit website skal du blot åbne Umbraco administrationen og begynde at tilføje indhold, opdatere skabelonerne og stylesheets'ene eller tilføje ny funktionalitet.]]> + + Start UmbracoFor at administrere dit website skal du blot åbne Umbraco administrationen og begynde at tilføje indhold, opdatere skabelonerne og stylesheets'ene eller tilføje ny funktionalitet.]]> Forbindelse til databasen fejlede. Umbraco Version 3 Umbraco Version 4 Se - Umbraco %0% for en frisk installation eller for en opgradering fra version 3.0.

    Tryk på Næste for at begynde på guiden.]]>     + + Umbraco %0% for en frisk installation eller for en opgradering fra version 3.0.

    Tryk på Næste for at begynde på guiden.]]>     Culture Code @@ -901,10 +1009,15 @@ Log ind nedenfor Log ind med Din session er udløbet - © 2001 - %0%
    umbraco.com

    ]]>     + + © 2001 - %0%
    umbraco.com

    ]]>     Glemt adgangskode? - En e-mail vil blive sendt til den angivne adresse med et link til at nulstille din adgangskode - En e-mail med instruktioner for nulstilling af adgangskoden vil blive sendt til den angivne adresse, hvis det matcher vores optegnelser + En e-mail vil blive sendt til den angivne adresse med et link til at + nulstille din adgangskode + + En e-mail med instruktioner for nulstilling af adgangskoden vil blive + sendt til den angivne adresse, hvis det matcher vores optegnelser + Vis adgangskode Skjul adgangskode Tilbage til login formular @@ -912,7 +1025,8 @@ Din adgangskode er blevet opdateret Det link, du har klikket på, er ugyldigt eller udløbet Umbraco: Nulstil adgangskode - Dit brugernavn til at logge på Umbraco backoffice er: %0%

    Klik her for at nulstille din adgangskode eller kopier/indsæt denne URL i din browser:

    %1%

    ]]>     + + Dit brugernavn til at logge på Umbraco backoffice er: %0%

    Klik her for at nulstille din adgangskode eller kopier/indsæt denne URL i din browser:

    %1%

    ]]>     Skrivebord @@ -930,7 +1044,9 @@ Det nuværende element kan ikke lægges under denne pga. sin type Det nuværende element kan ikke ligge under en af dens undersider Dette element må ikke findes på rodniveau - Denne handling er ikke tilladt fordi du ikke har de fornødne rettigheder på et eller flere af under-dokumenterne + Denne handling er ikke tilladt fordi du ikke har de fornødne rettigheder på et eller flere af + under-dokumenterne + Relater det kopierede element til originalen @@ -969,13 +1085,15 @@ Mange hilsner fra Umbraco robotten Denne pakke har ingen konfigurationsvisning Der er ikke blevet oprettet nogle pakker endnu Du har ingen pakker installeret - 'Pakker' øverst til højre på din skærm]]> + + 'Pakker' øverst til højre på din skærm]]> Pakkeindhold Licens Søg efter pakker Resultater for Vi kunne ikke finde resultater for - Prøv venligst at søge efter en anden pakke eller gennemse kategorierne + Prøv venligst at søge efter en anden pakke eller gennemse kategorierne + Populære Nye udgivelser har @@ -989,14 +1107,18 @@ Mange hilsner fra Umbraco robotten Downloads Likes Kompatibilitet - Denne pakke er kompatibel med de følgende versioner af Umbraco, som rapporteret af community-medlemmer. Fuld kompatibilitet kan ikke garanteres for versioner rapporteret nedenfor 100% + Denne pakke er kompatibel med de følgende versioner af Umbraco, som + rapporteret af community-medlemmer. Fuld kompatibilitet kan ikke garanteres for versioner rapporteret nedenfor + 100% + Eksterne kilder Forfatter Dokumentation Pakke meta data Pakkenavn Pakken indeholder ingen elementer -
    Du kan roligt fjerne denne fra systemet ved at klikke på "Fjern pakke" nedenfor.]]>     + +
    Du kan roligt fjerne denne fra systemet ved at klikke på "Fjern pakke" nedenfor.]]>     Pakkevalg Pakke læs mig Pakke opbevaringsbase @@ -1010,9 +1132,13 @@ Mange hilsner fra Umbraco robotten Indsæt med fuld formattering (Anbefales ikke) - Den tekst du er ved at indsætte indeholder specialtegn eller formattering. Dette kan skyldes at du kopierer fra f.eks. Microsoft Word. Umbraco kan fjerne denne specialformattering automatisk så indholdet er mere velegnet til visning på en webside. + Den tekst du er ved at indsætte indeholder specialtegn eller formattering. Dette kan + skyldes at du kopierer fra f.eks. Microsoft Word. Umbraco kan fjerne denne specialformattering automatisk så + indholdet er mere velegnet til visning på en webside. + Indsæt som ren tekst, dvs. fjern al formattering - Indsæt, men fjern formattering som ikke bør være på en webside (Anbefales) + Indsæt, men fjern formattering som ikke bør være på en webside (Anbefales) + Gruppebaseret beskyttelse @@ -1026,7 +1152,8 @@ Mange hilsner fra Umbraco robotten Log ind-side Vælg siden der indeholder log ind-formularen Fjern beskyttelse... - %0%?]]> + + %0%?]]> Vælg siderne der indeholder log ind-formularer og fejlmeddelelser %0%]]> %0%]]> @@ -1046,7 +1173,8 @@ Mange hilsner fra Umbraco robotten - %0% kunne ikke udgives, fordi et 3. parts modul annullerede handlingen + %0% kunne ikke udgives, fordi et 3. parts modul annullerede handlingen + Medtag ikke-udgivede undersider Publicerer - vent venligst... @@ -1054,7 +1182,8 @@ Mange hilsner fra Umbraco robotten %0% er nu publiceret %0% og alle undersider er nu publiceret Publicér alle undersider - ok for at udgive %0% og derved gøre indholdet offentligt tilgængeligt..

    Du kan udgive denne side og dens undersider ved at klikke Udgiv alle undersider forneden]]>     + + ok for at udgive %0% og derved gøre indholdet offentligt tilgængeligt..

    Du kan udgive denne side og dens undersider ved at klikke Udgiv alle undersider forneden]]>     Du har ikke konfigureret nogen godkendte farver @@ -1073,8 +1202,11 @@ Mange hilsner fra Umbraco robotten Skift medie Rediger %0% på %1% Annuller indsættelse? - - Du har foretaget ændringer til bruge af dette media. Er du sikker på at du vil annullere? + + + Du har foretaget ændringer til bruge af dette media. Er du sikker på + at du vil annullere? + Fjern brugen af alle medier? Udklipsholder Ikke tilladt @@ -1099,9 +1231,12 @@ Mange hilsner fra Umbraco robotten Oprettet Vælg en version at sammenligne med den nuværende version Nuværende version - Rød tekst vil ikke blive vist i den valgte version. Grøn betyder tilføjet]]> + + Rød tekst vil ikke blive vist i den valgte version. Grøn betyder tilføjet]]> Dokument tilbagerullet - Her vises den valgte version som html. Hvis du ønsker at se forskellen mellem de 2 versioner på samme tid, brug 'diff'-oversigten + Her vises den valgte version som html. Hvis du ønsker at se forskellen mellem de 2 versioner + på samme tid, brug 'diff'-oversigten + Tilbagerulning til Vælg version Vis @@ -1134,7 +1269,9 @@ Mange hilsner fra Umbraco robotten Standardskabelon - For at importere en dokumenttype, find ".udt"-filen på din computer ved at klikke på "Gennemse"-knappen og klik "Import" (Du vil blive bedt om bekræftelse på næste skærmbillede) + For at importere en dokumenttype, find ".udt"-filen på din computer ved at + klikke på "Gennemse"-knappen og klik "Import" (Du vil blive bedt om bekræftelse på næste skærmbillede) + Ny titel på faneblad Nodetype Type @@ -1150,7 +1287,9 @@ Mange hilsner fra Umbraco robotten Sorteringsrækkefølge Oprettelsesdato Sortering udført - Træk de forskellige sider op eller ned for at indstille hvordan de skal arrangeres, eller klik på kolonnehovederne for at sortere hele rækken af sider + Træk de forskellige sider op eller ned for at indstille hvordan de skal arrangeres, eller klik + på kolonnehovederne for at sortere hele rækken af sider + Denne node har ingen under noder at sortere @@ -1216,7 +1355,9 @@ Mange hilsner fra Umbraco robotten Skabelon gemt uden fejl! Indhold fjernet fra udgivelse Indhold variation %0% afpubliceret - Det krævet sprog '%0%' var afpubliceret. Alle sprog for dette indholds element er nu afpubliceret. + Det krævet sprog '%0%' var afpubliceret. Alle sprog for dette + indholds element er nu afpubliceret. + Partial view gemt Partial view gemt uden fejl! Partial view ikke gemt @@ -1241,18 +1382,26 @@ Mange hilsner fra Umbraco robotten Dokumenttypen blev eksporteret til en fil Der skete en fejl under eksport af en dokumenttype Udgivelses datoen kan ikke ligge i fortiden - Kan ikke planlægge dokumentes udgivelse da det krævet '%0%' ikke er udgivet - Kan ikke planlægge dokumentes udgivelse da det krævet '%0%' har en senere udgivelses dato end et ikke krævet sprog + Kan ikke planlægge dokumentes udgivelse da det krævet '%0%' ikke er udgivet + + Kan ikke planlægge dokumentes udgivelse da det krævet '%0%' har en senere + udgivelses dato end et ikke krævet sprog + Afpubliceringsdatoen kan ikke ligge i fortiden Afpubliceringsdatoen kan ikke være før udgivelsesdatoen - Domæner er ikke konfigureret for en flersproget side, kontakt vensligst en administrator, se loggen for mere information - Der er ikke noget domæne konfigureret for %0%, kontakt vensligst en administrator, se loggen for mere information + Domæner er ikke konfigureret for en flersproget side, kontakt vensligst en + administrator, se loggen for mere information + + Der er ikke noget domæne konfigureret for %0%, kontakt vensligst en + administrator, se loggen for mere information + Tilføj style Redigér style Teksteditor-styles - Definér de styles, der skal være tilgængelige i teksteditoren for dette stylesheet + Definér de styles, der skal være tilgængelige i teksteditoren for dette stylesheet + Selector Bruger CSS-syntaks, f.eks. "h1" eller ".redheader" Rediger stylesheet @@ -1274,7 +1423,9 @@ Mange hilsner fra Umbraco robotten Indsæt Hvad vil du indsætte? Oversættelse - Indsætter en oversætbar tekst, som skifter efter det sprog, som websitet vises i. + Indsætter en oversætbar tekst, som skifter efter det sprog, som websitet vises + i. + Makro En makro er et element, som kan have forskellige indstillinger, når det indsættes. @@ -1362,15 +1513,19 @@ Mange hilsner fra Umbraco robotten Klik for at indsætte et billede Skriv her... Grid layout - Et layout er det overordnede arbejdsområde til dit grid - du vil typisk kun behøve ét eller to + Et layout er det overordnede arbejdsområde til dit grid - du vil typisk kun behøve ét + eller to + Tilføj grid layout Rediger grid layout - Juster dit layout ved at justere kolonnebredder og tilføj yderligere sektioner + Juster dit layout ved at justere kolonnebredder og tilføj yderligere sektioner + Rækkekonfigurationer Rækker er foruddefinerede celler, der arrangeres vandret Tilføj rækkekonfiguration Rediger rækkekonfiguration - Juster rækken ved at indstille cellebredder og tilføje yderligere celler + Juster rækken ved at indstille cellebredder og tilføje yderligere celler + Ingen yderligere konfiguration tilgængelig Kolonner Det totale antal kolonner i dit grid @@ -1385,7 +1540,13 @@ Mange hilsner fra Umbraco robotten Vælg standard er tilføjet Du sletter en rækkekonfiguration - Sletning af et rækkekonfigurations navn vil resultere i et tab af data for alle eksiterende indhold som bruger dens konfiguration. + Sletning af et rækkekonfigurations navn vil resultere i et tab af data for alle + eksiterende indhold som bruger dens konfiguration. + + Du sletter et layoutet + Når du redigerer et layout vil data gå tabt de steder, hvor denne konfiguration + bruges. + Maksimalt emner Efterlad blank eller sæt til 0 for ubegrænset @@ -1398,18 +1559,28 @@ Mange hilsner fra Umbraco robotten Tilføj egenskab Påkrævet label Aktivér listevisning - Konfigurér indholdet til at blive vist i en sortérbar og søgbar liste; undersider vil ikke blive vist i træet + Konfigurér indholdet til at blive vist i en sortérbar og søgbar liste; + undersider vil ikke blive vist i træet + Tilladte skabeloner Vælg hvilke skabeloner, der er tilladt at bruge på dette indhold. Tillad på rodniveau - Kun dokumenttyper med denne indstilling aktiveret kan oprettes i rodniveau under indhold og mediearkiv. + Kun dokumenttyper med denne indstilling aktiveret kan oprettes i rodniveau under + indhold og mediearkiv. + Tilladte typer Tillad at oprette indhold af en specifik type under denne. Vælg child node - Nedarv faner og egenskaber fra en anden dokumenttype. Nye faner vil blive tilføjet den nuværende dokumenttype eller sammenflettet hvis fanenavnene er ens. - Indholdstypen bliver brugt i en komposition og kan derfor ikke blive anvendt som komposition + Nedarv faner og egenskaber fra en anden dokumenttype. Nye faner vil blive + tilføjet den nuværende dokumenttype eller sammenflettet hvis fanenavnene er ens. + + Indholdstypen bliver brugt i en komposition og kan derfor ikke blive anvendt som + komposition + Der er ingen indholdstyper tilgængelige at bruge som komposition - Når du fjerner en komposition vil alle associerede indholdsdata blive slettet. Når først dokumenttypen er gemt, er der ingen vej tilbage. + Når du fjerner en komposition vil alle associerede indholdsdata blive slettet. + Når først dokumenttypen er gemt, er der ingen vej tilbage. + Opret ny indstilling Genbrug Input indstillinger @@ -1425,21 +1596,30 @@ Mange hilsner fra Umbraco robotten Alle dokumenttyper Alle dokumenter Alle medier - som benytter denne dokumenttype vil blive slettet permanent. Bekræft at du også vil slette dem. - som benytter denne medietype vil blive slettet permanent. Bekræft at du også vil slette dem. - som benytter denne medlemstype vil blive slettet permanent. Bekræft at du også vil slette dem. + som benytter denne dokumenttype vil blive slettet permanent. Bekræft at du også vil + slette dem. + + som benytter denne medietype vil blive slettet permanent. Bekræft at du også vil slette + dem. + + som benytter denne medlemstype vil blive slettet permanent. Bekræft at du også vil + slette dem. + og alle dokumenter, som benytter denne type og alle medier, som benytter denne type og alle medlemmer, som benytter denne type Medlem kan redigere Tillad at denne egenskab kan redigeres af medlemmet på dets profil. Er følsom data - Skjul værdien af denne egenskab for indholdsredaktører der ikke har adgang til at se følsomme data + Skjul værdien af denne egenskab for indholdsredaktører der ikke har adgang + til at se følsomme data + Vis på medlemsprofil Tillad at denne egenskab kan vises på medlemmets profil. fane har ingen sorteringsrækkefølge Hvor er denne komposition brugt? - Denne komposition brugt i kompositionen af de følgende indholdstyper: + Denne komposition brugt i kompositionen af de følgende indholdstyper: + Tillad variationer Tillad sprogvariation Tillad segmentering @@ -1452,12 +1632,20 @@ Mange hilsner fra Umbraco robotten Tillad segmentering Element-type Er en Element-type - En Element-type er tiltænkt brug i f.eks. Nested Content, ikke i indholdstræet. - En Dokumenttype kan ikke ændres til en Element-type efter den er blevet brugt til at oprette en eller flere indholds elementer. + En Element-type er tiltænkt brug i f.eks. Nested Content, ikke i indholdstræet. + + En Dokumenttype kan ikke ændres til en Element-type efter den er blevet brugt til + at oprette en eller flere indholds elementer. + Dette benyttes ikke for en Element-type - Du har lavet ændringer til denne egenskab. Er du sikker på at du vil kassere dem? + Du har lavet ændringer til denne egenskab. Er du sikker på at du vil kassere dem? + Visning Label hen over (fuld bredde) + Du fjerner noden + Fjernelse af noden, begrænser redaktørens muligheder for at oprette forskellige + typer af underindhold. + Tilføj sprog @@ -1465,10 +1653,13 @@ Mange hilsner fra Umbraco robotten Egenskaber på dette sprog skal være udfyldt før noden kan blive udgivet. Standardsprog Et Umbraco-site kan kun have ét standardsprog. - At skifte standardsprog kan resultere i at standardindhold mangler. + At skifte standardsprog kan resultere i at standardindhold mangler. + Fallback til Intet fallback-sprog - For at tillade flersproget indhold, som ikke er tilgængeligt i det anmodede sprog, skal du her vælge et sprog at falde tilbage på. + For at tillade flersproget indhold, som ikke er tilgængeligt i det anmodede + sprog, skal du her vælge et sprog at falde tilbage på. + Fallback-sprog ingen @@ -1516,24 +1707,34 @@ Mange hilsner fra Umbraco robotten Standard felter Store bogstaver URL encode - Hvis indholdet af felterne skal sendes til en URL, skal denne slåes til så specialtegn formateres + Hvis indholdet af felterne skal sendes til en URL, skal denne slåes til så specialtegn + formateres + Denne tekst bruges hvis ovenstående felter er tomme Dette felt vil blive brugt hvis ovenstående felt er tomt - Ja, med klokkeslæt. Dato/tid separator: + Ja, med klokkeslæt. Dato/tid separator: Oversættelsesdetaljer Download XML DTD Felter Inkluder undersider - Hej %0%. Dette er en automatisk mail sendt for at informere dig om at dokumentet '%1' har en forespørgsel omkring oversættelse til '%5%' af %2%. Gå til http://%3%/translation/details.aspx?id=%4% for at redigere. Eller log ind i Umbraco for at få en oversigt over dine oversættelsesopgaver: http://%3%/Umbraco Hav en god dag! Mange hilsner Umbraco-robotten - Ingen oversættelsesbrugere er fundet. Opret venligst en oversættelsesbruger før du begynder at sende indhold til oversættelse + Hej %0%. Dette er en automatisk mail sendt for at informere dig om at dokumentet '%1' har en + forespørgsel omkring oversættelse til '%5%' af %2%. Gå til http://%3%/translation/details.aspx?id=%4% for at + redigere. Eller log ind i Umbraco for at få en oversigt over dine oversættelsesopgaver: http://%3%/Umbraco Hav en + god dag! Mange hilsner Umbraco-robotten + + Ingen oversættelsesbrugere er fundet. Opret venligst en oversættelsesbruger før du + begynder at sende indhold til oversættelse + Siden '%0%' er blevet sent til oversættelse Send siden '%0%' til oversættelse Totalt antal ord Oversæt til Oversættelse gennemført. - Du kan gennemse de sider, som du lige har oversat, ved at klikke nedenfor. Hvis den originale side bliver fundet, vil du blive præsenteret for en sammenligning af de to sider. + Du kan gennemse de sider, som du lige har oversat, ved at klikke nedenfor. Hvis den + originale side bliver fundet, vil du blive præsenteret for en sammenligning af de to sider. + Oversættelse fejlede, XML-filen kan være korrupt (indeholde fejl) Oversættelsesmuligheder Oversætter @@ -1601,10 +1802,14 @@ Mange hilsner fra Umbraco robotten er ikke blevet låst ude Kodeordet er ikke blevet ændret Gentag dit nye kodeord - Du kan ændre dit kodeord, som giver dig adgang til Umbraco backoffice ved at udfylde formularen og klikke på knappen 'Skift dit kodeord' + Du kan ændre dit kodeord, som giver dig adgang til Umbraco backoffice ved at + udfylde formularen og klikke på knappen 'Skift dit kodeord' + Indholdskanal Opret endnu en bruger - Opret nye brugere for at give dem adgang til Umbraco. Når en ny bruger oprettes, genereres der en adgangskode, som du kan dele med brugeren. + Opret nye brugere for at give dem adgang til Umbraco. Når en ny bruger oprettes, + genereres der en adgangskode, som du kan dele med brugeren. + Beskrivelsesfelt Deaktivér bruger Dokumenttype @@ -1614,7 +1819,9 @@ Mange hilsner fra Umbraco robotten Gå til brugerprofil Tilføj grupper for at tildele adgang og tilladelser Invitér anden bruger - Invitér nye brugere til at give dem adgang til Umbraco. En invitation vil blive sendt via e-mail til brugeren med oplysninger om, hvordan man logger ind i Umbraco. + Invitér nye brugere til at give dem adgang til Umbraco. En invitation vil blive sendt + via e-mail til brugeren med oplysninger om, hvordan man logger ind i Umbraco. + Sprog Indstil det sprog, du vil se i menuer og dialoger Senest låst ude @@ -1659,16 +1866,26 @@ Mange hilsner fra Umbraco robotten Begræns indholdstræet til bestemte startnoder Bruger sidst opdateret er blevet oprettet - Den nye bruger er blevet oprettet. For at logge ind i Umbraco skal du bruge adgangskoden nedenfor. + Den nye bruger er blevet oprettet. For at logge ind i Umbraco skal du bruge + adgangskoden nedenfor. + Brugeradministration Navn Brugertilladelser Brugergruppe er blevet inviteret - En invitation er blevet sendt til den nye bruger med oplysninger om, hvordan man logger ind i Umbraco. - Hej og velkommen til Umbraco! På bare 1 minut vil du være klar til at komme i gang, vi skal bare have dig til at oprette en adgangskode og tilføje et billede til din avatar. - Velkommen til Umbraco! Desværre er din invitation udløbet. Kontakt din administrator og bed om at gensende invitationen. - Hvis du uploader et billede af dig selv, gør du det nemt for andre brugere at genkende dig. Klik på cirklen ovenfor for at uploade et billede. + En invitation er blevet sendt til den nye bruger med oplysninger om, hvordan man + logger ind i Umbraco. + + Hej og velkommen til Umbraco! På bare 1 minut vil du være klar til at komme i + gang, vi skal bare have dig til at oprette en adgangskode og tilføje et billede til din avatar. + + Velkommen til Umbraco! Desværre er din invitation udløbet. Kontakt din + administrator og bed om at gensende invitationen. + + Hvis du uploader et billede af dig selv, gør du det nemt for andre brugere at + genkende dig. Klik på cirklen ovenfor for at uploade et billede. + Forfatter Skift Din profil @@ -1679,7 +1896,8 @@ Mange hilsner fra Umbraco robotten Send invitation Tilbage til brugere Umbraco: Invitation -

    Hej %0%, du er blevet inviteret af %1% til Umbraco backoffice.

    Besked fra %1%: %2%

    Klik på dette link for acceptere invitationen

    Hvis du ikke kan klikke på linket, så kopier og indsæt denne URL i dit browservindue

    %3%

    ]]>     + +

    Hej %0%, du er blevet inviteret af %1% til Umbraco backoffice.

    Besked fra %1%: %2%

    Klik på dette link for acceptere invitationen

    Hvis du ikke kan klikke på linket, så kopier og indsæt denne URL i dit browservindue

    %3%

    ]]>     Gensender invitation... Slet bruger Er du sikker på du ønsker at slette denne brugers konto? @@ -1708,7 +1926,7 @@ Mange hilsner fra Umbraco robotten Indtast en selvvalgt validerings fejlbesked (valgfrit) Du skal tilføje mindst Du kan kun have - Tilføj op til + Tilføj op til elementer URL(er) URL(er) valgt @@ -1733,15 +1951,21 @@ Mange hilsner fra Umbraco robotten Viderestil URL håndtering De følgende URLs viderestiller til dette indholds element Der er ikke lavet nogen viderestillinger - Når en udgivet side bliver omdøbt eller flyttet, vil en viderestilling automatisk blive lavet til den nye side. + Når en udgivet side bliver omdøbt eller flyttet, vil en viderestilling + automatisk blive lavet til den nye side. + Viderestillings URL fjernet. Fejl under fjernelse af viderestillings URL. Dette vil fjerne viderestillingen Er du sikker på at du vil slå URL trackeren fra? URL tracker er nu slået fra. - Der opstod en fejl under forsøget på at slå URL trackeren fra, der findes mere information i logfilen. + Der opstod en fejl under forsøget på at slå URL trackeren fra, der findes mere information + i logfilen. + URL tracker er nu slået fra. - Der opstod en fejl under forsøget på at slå URL trackeren til, der findes mere information i logfilen. + Der opstod en fejl under forsøget på at slå URL trackeren til, der findes mere information + i logfilen. + Ingen ordbog elementer at vælge imellem @@ -1754,7 +1978,9 @@ Mange hilsner fra Umbraco robotten Slettet indhold med Id: {0} Relateret til original "parent" med id: {1} Slettet medie med Id: {0} relateret til original "parent" / mappe med id: {1} Kan ikke automatisk genoprette dette element - Der er ikke nogen placering hvor dette element automatisk kan genoprettes. Du kan flytte elementet manuelt i træet nedenfor. + Der er ikke nogen placering hvor dette element automatisk kan genoprettes. + Du kan flytte elementet manuelt i træet nedenfor. + blev genoprettet under @@ -1824,7 +2050,9 @@ Mange hilsner fra Umbraco robotten Vis flere muligheder Søg i Umbraco backoffice Søg efter indholdsnoder, medienoder osv. i backoffice - Når autoudfyldnings resultaterne er klar, tryk op og ned pilene, eller benyt tab knappen og brug enter knappen til at vælge. + Når autoudfyldnings resultaterne er klar, tryk op og ned pilene, eller benyt tab + knappen og brug enter knappen til at vælge. + Vej Fundet i Har oversættelse @@ -1866,7 +2094,9 @@ Mange hilsner fra Umbraco robotten Søg med Bing Søg efter denne besked på Bing Søg på Our Umbraco - Søg efter denne besked på Our Umbraco forum og dokumentation + Søg efter denne besked på Our Umbraco forum og + dokumentation + Søg på Our Umbraco med Google Søg på Our Umbraco forum med Google Søg i Umbraco kildekoden @@ -1919,14 +2149,20 @@ Mange hilsner fra Umbraco robotten Label Speciel visning Vis speciel visning beskrivelsen - Overskrift hvordan denne block præsenteres i backoffice interfacet. Vælg en .html fil der indeholder din præsensation. + Overskrift hvordan denne block præsenteres i backoffice interfacet. Vælg en + .html fil der indeholder din præsensation. + Indstillings model Rederings lagets størrelse Tilføj speciel visning Tilføj instillinger - %0%?]]> - %0%?]]> - Indholdet vil stadigt eksistere, men redigering af dette indhold vil ikke være muligt. Indholdet vil blive vist som ikke understøttet indhold. + + %0%?]]> + + %0%?]]> + Indholdet vil stadigt eksistere, men redigering af dette indhold vil ikke + være muligt. Indholdet vil blive vist som ikke understøttet indhold. + Billede Tilføj billede @@ -1946,10 +2182,12 @@ Mange hilsner fra Umbraco robotten Hvad er Indholdsskabeloner? - Indholdsskabeloner er foruddefineret indhold der kan vælges når der oprettes nye indholdselementer. + Indholdsskabeloner er foruddefineret indhold der kan vælges når der oprettes nye + indholdselementer. + Hvordan opretter jeg en Indholdsskabelon? - Der er to måder at oprette Indholdsskabeloner på:

    • Højreklik på en indholdsnode og vælg "Opret indholdsskabelon" for at oprette en ny Indholdsskabelon.
      • @@ -1957,9 +2195,12 @@ Mange hilsner fra Umbraco robotten

    Når indholdsskabelonen har fået et navn, kan redaktører begynde at bruge indholdsskabelonen som udgangspunkt for deres nye side.

    ]]> -     +     Hvordan vedligeholder jeg Indholdsskabeloner? - Du kan redigere og slette Indholdsskabeloner fra "Indholdsskabeloner" i sektionen Indstillinger. Fold dokumenttypen som Indholdsskabelonen er baseret på ud og klik på den for at redigere eller slette den. + Du kan redigere og slette Indholdsskabeloner fra "Indholdsskabeloner" i sektionen + Indstillinger. Fold dokumenttypen som Indholdsskabelonen er baseret på ud og klik på den for at redigere eller + slette den. + Afslut @@ -1967,10 +2208,14 @@ Mange hilsner fra Umbraco robotten Vis i nyt vindue Åben forhåndsvisning i nyt vindue Forhåndsvisning af indholdet? - Du har afslutet forhåndsvisning, vil du starte forhåndsvisning igen for at se seneste gemte version af indholdet? + Du har afslutet forhåndsvisning, vil du starte forhåndsvisning igen for at + se seneste gemte version af indholdet? + Se udgivet indhold Se udgivet indhold? - Du er i forhåndsvisning, vil du afslutte for at se den udgivet version? + Du er i forhåndsvisning, vil du afslutte for at se den udgivet + version? + Se udgivet version Forbliv i forhåndsvisning diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 0273439667..748220f671 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -101,7 +101,7 @@ Domain '%0%' has been updated Edit Current Domains - Inherit Culture @@ -160,7 +160,7 @@ Content deleted Content unpublished Content saved and Published - Content saved and published for languages: %0% + Content saved and published for languages: %0% Content saved Content saved for languages: %0% Content moved @@ -221,8 +221,12 @@ Page title This media item has no link Properties - This document is published but is not visible because the parent '%0%' is unpublished - This culture is published but is not visible because it is unpublished on parent '%0%' + This document is published but is not visible because the parent '%0%' is + unpublished + + This culture is published but is not visible because it is unpublished on + parent '%0%' + This document is published but is not in the cache Could not get the URL This document is published but its URL would collide with content %0% @@ -231,14 +235,18 @@ Published Published (pending changes) Publication Status - %0% and all content items underneath and thereby making their content publicly available.]]> - + + %0% and all content items underneath and thereby making their content publicly available.]]> + + Publish at Unpublish at Clear Date Set date Sortorder is updated - To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting + To sort the nodes, simply drag the nodes or click one of the column headers. You can select + multiple nodes by holding the "shift" or "control" key while selecting + Statistics Title (optional) Alternative text (optional) @@ -257,26 +265,37 @@ Child items Target This translates to the following time on the server: - What does this mean?]]> + + What does this mean?]]> Are you sure you want to delete this item? - Property %0% uses editor %1% which is not supported by Nested Content. + Property %0% uses editor %1% which is not supported by Nested + Content. + Are you sure you want to delete all items? No Content Types are configured for this property. Add Element Type Select Element Type - Select the group whose properties should be displayed. If left blank, the first group on the Element Type will be used. - Enter an angular expression to evaluate against each item for its name. Use + Select the group whose properties should be displayed. If left blank, the + first group on the Element Type will be used. + + Enter an angular expression to evaluate against each item for its + name. Use + to display the item index Add another text box Remove this text box Content root Include unpublished content items. - This value is hidden. If you need access to view this value please contact your website administrator. + This value is hidden. If you need access to view this value please contact your + website administrator. + This value is hidden. What languages would you like to publish? What languages would you like to send for approval? What languages would you like to schedule? - Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages. + Select the languages to unpublish. Unpublishing a mandatory language will + unpublish all languages. + All new variants will be saved. Which variants would you like to publish? Choose which variants to be saved. @@ -298,7 +317,9 @@ Content Template created A Content Template was created from '%0%' Another Content Template with the same name already exists - A Content Template is predefined content that an editor can select to use as the basis for creating new content + A Content Template is predefined content that an editor can select to use as the + basis for creating new content + Click to upload @@ -333,26 +354,44 @@ Select the Document Type you want to make a content template for Enter a folder name Choose a type and a title - Document Types within the Settings section, by editing the Allowed child node types under Permissions.]]> - Document Types within the Settings section.]]> - The selected page in the content tree doesn't allow for any pages to be created below it. + + Document Types within the Settings section, by editing the Allowed child node types under Permissions.]]> + + Document Types within the Settings section.]]> + The selected page in the content tree doesn't allow for any pages + to be created below it. + Edit permissions for this Document Type Create a new Document Type - Document Types within the Settings section, by changing the Allow as root option under Permissions.]]> - Media Types within the Settings section, by editing the Allowed child node types under Permissions.]]> - The selected media in the tree doesn't allow for any other media to be created below it. + + Document Types within the Settings section, by changing the Allow as root option under Permissions.]]> + + Media Types within the Settings section, by editing the Allowed child node types under Permissions.]]> + The selected media in the tree doesn't allow for any other media to be + created below it. + Edit permissions for this Media Types Document Type without a template Document Type with Template - The data definition for a content page that can be created by editors in the content tree and is directly accessible via a URL. + The data definition for a content page that can be created by + editors in the content tree and is directly accessible via a URL. + Document Type - The data definition for a content component that can be created by editors in the content tree and be picked on other pages but has no direct URL. + The data definition for a content component that can be created by editors in + the content tree and be picked on other pages but has no direct URL. + Element Type - Defines the schema for a repeating set of properties, for example, in a 'Block List' or 'Nested Content' property editor. + Defines the schema for a repeating set of properties, for example, in a 'Block + List' or 'Nested Content' property editor. + Composition - Defines a re-usable set of properties that can be included in the definition of multiple other Document Types. For example, a set of 'Common Page Settings'. + Defines a re-usable set of properties that can be included in the definition of + multiple other Document Types. For example, a set of 'Common Page Settings'. + Folder - Used to organise the Document Types, Compositions and Element Types created in this Document Type tree. + Used to organise the Document Types, Compositions and Element Types created in this + Document Type tree. + New folder New Data Type New JavaScript file @@ -377,11 +416,17 @@ Stay Discard changes You have unsaved changes - Are you sure you want to navigate away from this page? - you have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved + changes + Publishing will make the selected items visible on the site. - Unpublishing will remove the selected items and all their descendants from the site. + Unpublishing will remove the selected items and all their descendants from the + site. + Unpublishing will remove this page and all its descendants from the site. - You have unsaved changes. Making changes to the Document Type will discard the changes. + You have unsaved changes. Making changes to the Document Type will discard the + changes. + Done @@ -431,7 +476,9 @@ Click to add a Macro Insert table This will delete the language - Changing the culture for a language may be an expensive operation and will result in the content cache and indexes being rebuilt + Changing the culture for a language may be an expensive operation and will result + in the content cache and indexes being rebuilt + Last Edited Link Internal link: @@ -443,16 +490,25 @@ Set permissions for Set permissions for %0% for user group %1% Select the users groups you want to set permissions for - The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place + The items in the recycle bin are now being deleted. Please do not close this window + while this operation takes place + The recycle bin is now empty When items are deleted from the recycle bin, they will be gone forever - regexlib.com's webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]> - Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code', 'URL'. + + regexlib.com's webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]> + Search for a regular expression to add validation to a form field. Example: 'email, + 'zip-code', 'URL'. + Remove Macro Required Field Site is reindexed - The website cache has been refreshed. All publish content is now up to date. While all unpublished content is still unpublished - The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished. + The website cache has been refreshed. All publish content is now up to date. While all + unpublished content is still unpublished + + The website cache will be refreshed. All published content will be updated, while + unpublished content will stay unpublished. + Number of columns Number of rows Click on the image to see full size @@ -493,7 +549,9 @@ account Select editor Select snippet - This will delete the node and all its languages. If you only want to delete one language, you should unpublish the node in that language instead. + This will delete the node and all its languages. If you only want to delete one + language, you should unpublish the node in that language instead. + %0%.]]> %0% from the %1% group]]> Yes, remove @@ -513,7 +571,9 @@ Configured Searchers - Shows properties and tools for any configured Searcher (i.e. such as a multi-index searcher) + Shows properties and tools for any configured Searcher (i.e. such as a + multi-index searcher) + Field values Health status The health status of the index and if it can be read @@ -521,7 +581,9 @@ Index info Lists the properties of the index Manage Examine's indexes - Allows you to view the details of each index and provides some tools for managing the indexes + Allows you to view the details of each index and provides some tools for + managing the indexes + Rebuild index @@ -535,7 +597,9 @@ Tools to manage the index fields The index cannot be read and will need to be rebuilt - The process is taking longer than expected, check the Umbraco log to see if there have been any errors during this operation + The process is taking longer than expected, check the Umbraco log to see if there + have been any errors during this operation + This index cannot be rebuilt because it has no assigned IIndexPopulator @@ -589,12 +653,18 @@ was moved underneath - Your data has been saved, but before you can publish this page there are some errors you need to fix first: - The current membership provider does not support changing password (EnablePasswordRetrieval need to be true) + Your data has been saved, but before you can publish this page there are some + errors you need to fix first: + + The current membership provider does not support changing password + (EnablePasswordRetrieval need to be true) + %0% already exists There were errors: There were errors: - The password should be a minimum of %0% characters long and contain at least %1% non-alpha numeric character(s) + The password should be a minimum of %0% characters long and contain at least %1% + non-alpha numeric character(s) + %0% must be an integer The %0% field in the %1% tab is mandatory %0% is a mandatory field @@ -604,13 +674,17 @@ Received an error from the server The specified file type has been disallowed by the administrator - NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough. + NOTE! Even though CodeMirror is enabled by configuration, it is disabled in + Internet Explorer because it's not stable enough. + Please fill both alias and name on the new property type! There is a problem with read/write access to a specific file or folder Error loading Partial View script (file: %0%) Please enter a title Please choose a type - You're about to make the picture larger than the original size. Are you sure that you want to proceed? + You're about to make the picture larger than the original size. Are you sure + that you want to proceed? + Startnode deleted, please contact your administrator Please mark content before changing style No active styles available @@ -772,6 +846,8 @@ Articles Videos Avatar for + Header + system field Blue @@ -811,15 +887,18 @@ The installer cannot connect to the database. - Could not save the web.config file. Please modify the connection string manually. + Could not save the web.config file. Please modify the connection string + manually. + Your database has been found and is identified as Database configuration - - + install button to install the Umbraco %0% database ]]> - - Next to proceed.]]> + + + Next to proceed.]]> Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.

    To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

    @@ -838,22 +917,33 @@ ]]> Press Next to proceed. ]]> - next to continue the configuration wizard]]> - The Default users' password needs to be changed!]]> - The Default user has been disabled or has no access to Umbraco!

    No further actions needs to be taken. Click Next to proceed.]]> - The Default user's password has been successfully changed since the installation!

    No further actions needs to be taken. Click Next to proceed.]]> + + next to continue the configuration wizard]]> + + The Default users' password needs to be changed!]]> + + The Default user has been disabled or has no access to Umbraco!

    No further actions needs to be taken. Click Next to proceed.]]> + + The Default user's password has been successfully changed since the installation!

    No further actions needs to be taken. Click Next to proceed.]]> The password is changed! Get a great start, watch our introduction videos - By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI. + By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), + you accept the license for this software as specified in the box below. Notice that this Umbraco distribution + consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license + that covers the UI. + Not installed yet. Affected files and folders More information on setting up permissions for Umbraco here - You need to grant ASP.NET modify permissions to the following files/folders + You need to grant ASP.NET modify permissions to the following + files/folders + Your permission settings are almost perfect!

    You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]>     How to Resolve Click here to read the text version - video tutorial on setting up folder permissions for Umbraco or read the text version.]]> + + video tutorial on setting up folder permissions for Umbraco or read the text version.]]> Your permission settings might be an issue!

    You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]>     @@ -863,7 +953,9 @@ Your permission settings are perfect!

    You are ready to run Umbraco and install packages!]]>     Resolving folder issue - Follow this link for more information on problems with ASP.NET and creating folders + Follow this link for more information on problems with ASP.NET and + creating folders + Setting up folder permissions Happy super Sunday - Happy manic Monday + Happy manic Monday Happy tubular Tuesday Happy wonderful Wednesday Happy thunderous Thursday @@ -940,10 +1032,15 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Log in below Sign in with Session timed out - © 2001 - %0%
    Umbraco.com

    ]]>     + + © 2001 - %0%
    Umbraco.com

    ]]>     Forgotten password? - An email will be sent to the address specified with a link to reset your password - An email with password reset instructions will be sent to the specified address if it matched our records + An email will be sent to the address specified with a link to reset your + password + + An email with password reset instructions will be sent to the + specified address if it matched our records + Show password Hide password Return to login form @@ -1051,7 +1148,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont The current node is not allowed under the chosen node because of its type The current node cannot be moved to one of its subpages The current node cannot exist at the root - The action isn't allowed since you have insufficient permissions on 1 or more child documents. + The action isn't allowed since you have insufficient permissions on 1 or more child + documents. + Relate copied items to original @@ -1171,13 +1270,15 @@ To manage your website, simply open the Umbraco backoffice and start adding cont This package has no configuration view No packages have been created yet You don’t have any packages installed - 'Packages' icon in the top right of your screen]]> + + 'Packages' icon in the top right of your screen]]> Package Content License Search for packages Results for We couldn’t find anything for - Please try searching for another package or browse through the categories + Please try searching for another package or browse through the categories + Popular New releases has @@ -1191,7 +1292,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Downloads Likes Compatibility - This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be guaranteed for versions reported below 100% + This package is compatible with the following versions of Umbraco, as + reported by community members. Full compatability cannot be guaranteed for versions reported below 100% + External sources Author Documentation @@ -1216,7 +1319,10 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Paste with full formatting (Not recommended) - The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web. + The text you're trying to paste contains special characters or formatting. This could be + caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so + the pasted content will be more suitable for the web. + Paste as raw text without any formatting at all Paste, but remove formatting (Recommended) @@ -1232,7 +1338,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Login Page Choose the page that contains the login form Remove protection... - %0%?]]> + + %0%?]]> Select the pages that contain login form and error messages %0%]]> %0%]]> @@ -1255,7 +1362,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont - + + Include unpublished subpages Publishing in progress - please wait... %0% out of %1% pages have been published... @@ -1284,7 +1392,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Edit %0% on %1% Discard creation? - You have made changes to this content. Are you sure you want to discard them? + You have made changes to this content. Are you sure you want to + discard them? + Remove all medias? Clipboard Not allowed @@ -1308,10 +1418,13 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Changes Created Current version - Red text will not be shown in the selected version. , green means added]]> + + Red text will not be shown in the selected version. , green means added]]> Document has been rolled back Select a version to compare with the current version - This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view + This displays the selected version as HTML, if you wish to see the difference between 2 + versions at the same time, use the diff view + Rollback to Select version View @@ -1344,7 +1457,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Default template - To import a Document Type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen) + To import a Document Type, find the ".udt" file on your computer by clicking the + "Browse" button and click "Import" (you'll be asked for confirmation on the next screen) + New Tab Title Node type Type @@ -1355,7 +1470,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Tabs Master Content Type enabled This Content Type uses - No properties defined on this tab. Click on the "add a new property" link at the top to create a new property. + No properties defined on this tab. Click on the "add a new property" link at + the top to create a new property. + Create matching template Add icon @@ -1363,7 +1480,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Sort order Creation date Sorting complete. - Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items + Drag the different items up or down below to set how they should be arranged. Or click the + column headers to sort the entire collection of items + @@ -1442,14 +1561,20 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Invitation has been re-sent to %0% Document Type was exported to file An error occurred while exporting the Document Type - Domains are not configured for multilingual site, please contact an administrator, see log for more information - There is no domain configured for %0%, please contact an administrator, see log for more information + Domains are not configured for multilingual site, please contact an administrator, + see log for more information + + There is no domain configured for %0%, please contact an administrator, see + log for more information + Add style Edit style Rich text editor styles - Define the styles that should be available in the rich text editor for this stylesheet + Define the styles that should be available in the rich text editor for this + stylesheet + Edit stylesheet Edit stylesheet property The name displayed in the editor style selector @@ -1471,20 +1596,24 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Insert Choose what to insert into your template Dictionary item - A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites. + A dictionary item is a placeholder for a translatable piece of text, which + makes it easy to create designs for multilingual websites. + Macro - A Macro is a configurable component which is great for - reusable parts of your design, where you need the option to provide parameters, - such as galleries, forms and lists. - + A Macro is a configurable component which is great for + reusable parts of your design, where you need the option to provide parameters, + such as galleries, forms and lists. +     Value - Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values. + Displays the value of a named field from the current page, with options to modify + the value or fallback to alternative values. + Partial view - A partial view is a separate template file which can be rendered inside another - template, it's great for reusing markup or for separating complex templates into separate files. - + A partial view is a separate template file which can be rendered inside another + template, it's great for reusing markup or for separating complex templates into separate files. + Master template No master Render child template @@ -1556,7 +1685,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Click to insert macro Write here... Grid Layouts - Layouts are the overall work area for the grid editor, usually you only need one or two different layouts + Layouts are the overall work area for the grid editor, usually you only need one or + two different layouts + Add Grid Layout Edit Grid Layout Adjust the layout by setting column widths and adding additional sections @@ -1582,8 +1713,13 @@ To manage your website, simply open the Umbraco backoffice and start adding cont are added You are deleting the row configuration - Deleting a row configuration name will result in loss of data for any existing content that is based on this configuration. - + Deleting a row configuration name will result in loss of data for any existing content that is based on this + configuration. + + You are deleting the layout + Modifying a layout will result in loss of data for any existing content that is based + on this configuration. + Compositions @@ -1594,18 +1730,29 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Add property Required label Enable list view - Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree + Configures the content item to show a sortable and searchable list of its + children, the children will not be shown in the tree + Allowed Templates - Choose which templates editors are allowed to use on content of this type + Choose which templates editors are allowed to use on content of this type + Allow as root - Allow editors to create content of this type in the root of the content tree. + Allow editors to create content of this type in the root of the content tree. + Allowed child node types - Allow content of the specified types to be created underneath content of this type. + Allow content of the specified types to be created underneath content of this + type. + Choose child node - Inherit tabs and properties from an existing Document Type. New tabs will be added to the current Document Type or merged if a tab with an identical name exists. - This Content Type is used in a composition, and therefore cannot be composed itself. + Inherit tabs and properties from an existing Document Type. New tabs will be + added to the current Document Type or merged if a tab with an identical name exists. + + This Content Type is used in a composition, and therefore cannot be composed itself. + There are no Content Types available to use as a composition. - Removing a composition will delete all the associated property data. Once you save the Document Type there's no way back. + Removing a composition will delete all the associated property data. Once you + save the Document Type there's no way back. + Create new Use existing Editor settings @@ -1619,21 +1766,33 @@ To manage your website, simply open the Umbraco backoffice and start adding cont All Document Types All Documents All media items - using this Document Type will be deleted permanently, please confirm you want to delete these as well. - using this Media Type will be deleted permanently, please confirm you want to delete these as well. - using this Member Type will be deleted permanently, please confirm you want to delete these as well + using this Document Type will be deleted permanently, please confirm you want to + delete these as well. + + using this Media Type will be deleted permanently, please confirm you want to delete + these as well. + + using this Member Type will be deleted permanently, please confirm you want to delete + these as well + and all documents using this type and all media items using this type and all members using this type Member can edit - Allow this property value to be edited by the member on their profile page + Allow this property value to be edited by the member on their profile page + Is sensitive data - Hide this property value from content editors that don't have access to view sensitive information + Hide this property value from content editors that don't have access to view + sensitive information + Show on member profile - Allow this property value to be displayed on the member profile page + Allow this property value to be displayed on the member profile page + tab has no sort order Where is this composition used? - This composition is currently used in the composition of the following content types: + This composition is currently used in the composition of the following + content types: + Allow variations Allow vary by culture Allow segmentation @@ -1646,23 +1805,35 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Allow segmentation Element Type Is an Element Type - An Element Type is meant to be used for instance in Nested Content, and not in the tree. - A document Type cannot be changed to an Element Type once it has been used to create one or more content items. + An Element Type is meant to be used for instance in Nested Content, and not in the + tree. + + A document Type cannot be changed to an Element Type once it has been used to + create one or more content items. + This is not applicable for an Element Type You have made changes to this property. Are you sure you want to discard them? Appearance Label above (full-width) + You are removing the child node + Removing a child node will limit the editors options to create different content + types beneath a node. + Add language Mandatory language - Properties on this language have to be filled out before the node can be published. + Properties on this language have to be filled out before the node can be + published. + Default language An Umbraco site can only have one default language set. Switching default language may result in default content missing. Falls back to No fall back language - To allow multi-lingual content to fall back to another language if not present in the requested language, select it here. + To allow multi-lingual content to fall back to another language if not + present in the requested language, select it here. + Fall back language none @@ -1733,13 +1904,17 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Cheers from the Umbraco robot ]]> - No translator users found. Please create a translator user before you start sending content to translation + No translator users found. Please create a translator user before you start sending + content to translation + The page '%0%' has been send to translation Send the page '%0%' to translation Total words Translate to Translation completed. - You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages. + You can preview the pages, you've just translated, by clicking below. If the + original page is found, you will get a comparison of the 2 pages. + Translation failed, the XML file might be corrupt Translation options Translator @@ -1792,7 +1967,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Access - Based on the assigned groups and start nodes, the user has access to the following nodes + Based on the assigned groups and start nodes, the user has access to the following nodes + Assign access Administrator Category field @@ -1805,10 +1981,14 @@ To manage your website, simply open the Umbraco backoffice and start adding cont hasn't been locked out The password hasn't been changed Confirm new password - You can change your password for accessing the Umbraco backoffice by filling out the form below and click the 'Change Password' button + You can change your password for accessing the Umbraco backoffice by filling + out the form below and click the 'Change Password' button + Content Channel Create another user - Create new users to give them access to Umbraco. When a new user is created a password will be generated that you can share with the user. + Create new users to give them access to Umbraco. When a new user is created a password + will be generated that you can share with the user. + Description field Disable User Document Type @@ -1818,7 +1998,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Go to user profile Add groups to assign access and permissions Invite another user - Invite new users to give them access to Umbraco. An invite email will be sent to the user with information on how to log in to Umbraco. Invites last for 72 hours. + Invite new users to give them access to Umbraco. An invite email will be sent to the + user with information on how to log in to Umbraco. Invites last for 72 hours. + Language Set the language you will see in menus and dialogs Last lockout date @@ -1842,7 +2024,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Your new password cannot be blank! Current password Invalid current password - There was a difference between the new password and the confirmed password. Please try again! + There was a difference between the new password and the confirmed password. Please + try again! + The confirmed password doesn't match the new password! Replace child node permissions You are currently modifying permissions for the pages: @@ -1863,16 +2047,26 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Limit the content tree to specific start nodes User last updated has been created - The new user has successfully been created. To log in to Umbraco use the password below. + The new user has successfully been created. To log in to Umbraco use the + password below. + User management Name User permissions User group has been invited - An invitation has been sent to the new user with details about how to log in to Umbraco. - Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar. - Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it. - Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo. + An invitation has been sent to the new user with details about how to log in to + Umbraco. + + Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we + just need you to setup a password and add a picture for your avatar. + + Welcome to Umbraco! Unfortunately your invite has expired. Please contact your + administrator and ask them to resend it. + + Uploading a photo of yourself will make it easy for other users to recognize + you. Click the circle above to upload your photo. + Writer Change Your profile @@ -2027,14 +2221,19 @@ To manage your website, simply open the Umbraco backoffice and start adding cont 3: Configuration file path --> Value is set to the recommended value: '%0%'. - Expected value '%1%' for '%2%' in configuration file '%3%', but found '%0%'. - Found unexpected value '%0%' for '%2%' in configuration file '%3%'. + Expected value '%1%' for '%2%' in configuration file '%3%', but + found '%0%'. + + Found unexpected value '%0%' for '%2%' in configuration file '%3%'. + MacroErrors are set to '%0%'. - MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'. + MacroErrors are set to '%0%' which will prevent some or all pages in + your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'. + Debug compilation mode is disabled. - Debug compilation mode is currently enabled. It is recommended to disable this setting before go live. + Debug compilation mode is currently enabled. It is recommended to + disable this setting before go live. + @@ -2061,30 +2266,48 @@ To manage your website, simply open the Umbraco backoffice and start adding cont - X-Frame-Options used to control whether a site can be IFRAMEd by another was found.]]> - X-Frame-Options used to control whether a site can be IFRAMEd by another was not found.]]> - X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was found.]]> - X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was not found.]]> - Strict-Transport-Security, also known as the HSTS-header, was found.]]> - Strict-Transport-Security was not found.]]> + + X-Frame-Options used to control whether a site can be IFRAMEd by another was found.]]> + + X-Frame-Options used to control whether a site can be IFRAMEd by another was not found.]]> + + X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was found.]]> + + X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was not found.]]> + + Strict-Transport-Security, also known as the HSTS-header, was found.]]> + + Strict-Transport-Security was not found.]]> X-XSS-Protection was found.]]> - X-XSS-Protection was not found.]]> + + X-XSS-Protection was not found.]]> - %0%.]]> - No headers revealing information about the website technology were found. + + %0%.]]> + No headers revealing information about the website technology were found. + In the Web.config file, system.net/mailsettings could not be found. - In the Web.config file system.net/mailsettings section, the host is not configured. - SMTP settings are configured correctly and the service is operating as expected. - The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the Web.config file system.net/mailsettings are correct. - %0%.]]> - %0%.]]> -

    Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:

    %2%]]>     + In the Web.config file system.net/mailsettings section, the host is + not configured. + + SMTP settings are configured correctly and the service is operating + as expected. + + The SMTP server configured with host '%0%' and port '%1%' could not be + reached. Please check to ensure the SMTP settings in the Web.config file system.net/mailsettings are correct. + + + %0%.]]> + + %0%.]]> + +

    Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:

    %2%]]>     Umbraco Health Check Status: %0% Check group - The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button. You can add your own health checks, have a look at the documentation for more information about custom health checks.

    ]]> @@ -2098,7 +2321,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Redirect URL Management The following URLs redirect to this content item: No redirects have been made - When a published page gets renamed or moved a redirect will automatically be made to the new page. + When a published page gets renamed or moved a redirect will automatically be + made to the new page. + Redirect URL removed. Error removing redirect URL. This will remove the redirect @@ -2119,7 +2344,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Trashed content with Id: {0} related to original parent content with Id: {1} Trashed media with Id: {0} related to original parent media item with Id: {1} Cannot automatically restore this item - There is no location where this item can be automatically restored. You can move the item manually using the tree below. + There is no location where this item can be automatically restored. You + can move the item manually using the tree below. + was restored under @@ -2189,8 +2416,10 @@ To manage your website, simply open the Umbraco backoffice and start adding cont View more options Search the Umbraco backoffice Search for content nodes, media nodes etc. across the backoffice. - When autocomplete results are available, press up and down arrows, or use the tab key and use the enter key to select. - Path: + When autocomplete results are available, press up and down arrows, or use the + tab key and use the enter key to select. + + Path: Found in Has translation Missing translation @@ -2215,8 +2444,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Delete Saved Search Log Levels - Select all - Deselect all + Select all + Deselect all Saved Searches Save Search Enter a friendly name for your search query @@ -2272,7 +2501,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Refresh status Memory Cache - Reload Database Cache - Rebuilding can be expensive. Use it when reloading is not enough, and you think that the database cache has not been @@ -2293,7 +2522,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Rebuild Internals - not need to use it. ]]> @@ -2305,7 +2534,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Performance profiling - Umbraco currently runs in debug mode. This means you can use the built-in performance profiler to assess the performance when rendering pages.

    @@ -2322,14 +2551,14 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Activate the profiler by default Friendly reminder - You should never let a production site run in debug mode. Debug mode is turned off by setting Umbraco:CMS:Hosting:Debug to false in appsettings.json, appsettings.{Environment}.json or via an environment variable.

    ]]>     - Umbraco currently does not run in debug mode, so you can't use the built-in profiler. This is how it should be for a production site.

    @@ -2342,7 +2571,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Hours of Umbraco training videos are only a click away - Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

    ]]>     @@ -2350,41 +2579,48 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Start here - This section contains the building blocks for your Umbraco site. Follow the below links to find out more about working with the items in the Settings section + This section contains the building blocks for your Umbraco site. Follow the below + links to find out more about working with the items in the Settings section + Find out more - in the Documentation section of Our Umbraco ]]> - Community Forum ]]> - tutorial videos (some are free, some require a subscription) ]]> - productivity boosting tools and commercial support ]]> - training and certification opportunities ]]> Welcome to The Friendly CMS - Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible. + Thank you for choosing Umbraco - we think this could be the beginning of something + beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast + as possible. + Umbraco Forms - Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it! + Create forms using an intuitive drag and drop interface. From simple contact forms + that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it! + Pick Element Type @@ -2404,14 +2640,20 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Label Custom view Show custom view description - Overwrite how this block appears in the backoffice UI. Pick a .html file containing your presentation. + Overwrite how this block appears in the backoffice UI. Pick a .html file + containing your presentation. + Settings model Overlay editor size Add custom view Add settings - %0%?]]> - %0%?]]> - The content of this block will still be present, editing of this content will no longer be available and will be shown as unsupported content. + + %0%?]]> + + %0%?]]> + The content of this block will still be present, editing of this content + will no longer be available and will be shown as unsupported content. + Thumbnail Add thumbnail @@ -2431,10 +2673,12 @@ To manage your website, simply open the Umbraco backoffice and start adding cont What are Content Templates? - Content Templates are pre-defined content that can be selected when creating a new content node. + Content Templates are pre-defined content that can be selected when creating a new + content node. + How do I create a Content Template? - There are two ways to create a Content Template:

    • Right-click a content node and select "Create Content Template" to create a new Content Template.
      • @@ -2444,7 +2688,10 @@ To manage your website, simply open the Umbraco backoffice and start adding cont ]]> How do I manage Content Templates? - You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Expand the Document Type which the Content Template is based on and click it to edit or delete it. + You can edit and delete Content Templates from the "Content Templates" tree in the + Settings section. Expand the Document Type which the Content Template is based on and click it to edit or delete + it. + End @@ -2452,11 +2699,15 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Preview website Open website in preview mode Preview website? - You have ended preview mode, do you want to enable it again to view the latest saved version of your website? + You have ended preview mode, do you want to enable it again to view the + latest saved version of your website? + Preview latest version View published version View published version? - You are in Preview Mode, do you want exit in order to view the published version of your website? + You are in Preview Mode, do you want exit in order to view the + published version of your website? + View published version Stay in preview mode 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 7b8053603e..7f139b2da8 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -102,7 +102,7 @@ Domain '%0%' has been updated Edit Current Domains - Inherit Culture @@ -159,9 +159,9 @@ Viewing for Content deleted Content unpublished - Content unpublished for languages: %0% + Content unpublished for languages: %0% Content published - Content published for languages: %0% + Content published for languages: %0% Content saved Content saved for languages: %0% Content moved @@ -224,8 +224,12 @@ This media item has no link No content can be added for this item Properties - This document is published but is not visible because the parent '%0%' is unpublished - This culture is published but is not visible because it is unpublished on parent '%0%' + This document is published but is not visible because the parent '%0%' is + unpublished + + This culture is published but is not visible because it is unpublished on + parent '%0%' + This document is published but is not in the cache Could not get the URL This document is published but its URL would collide with content %0% @@ -234,14 +238,18 @@ Published Published (pending changes) Publication Status - %0% and all content items underneath and thereby making their content publicly available.]]> - + + %0% and all content items underneath and thereby making their content publicly available.]]> + + Publish at Unpublish at Clear Date Set date Sortorder is updated - To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting + To sort the nodes, simply drag the nodes or click one of the column headers. You can select + multiple nodes by holding the "shift" or "control" key while selecting + Statistics Title (optional) Alternative text (optional) @@ -261,26 +269,37 @@ Child items Target This translates to the following time on the server: - What does this mean?]]> + + What does this mean?]]> Are you sure you want to delete this item? Are you sure you want to delete all items? - Property %0% uses editor %1% which is not supported by Nested Content. + Property %0% uses editor %1% which is not supported by Nested + Content. + No Content Types are configured for this property. Add Element Type Select Element Type - Select the group whose properties should be displayed. If left blank, the first group on the Element Type will be used. - Enter an angular expression to evaluate against each item for its name. Use + Select the group whose properties should be displayed. If left blank, the + first group on the Element Type will be used. + + Enter an angular expression to evaluate against each item for its + name. Use + to display the item index Add another text box Remove this text box Content root Include unpublished content items. - This value is hidden. If you need access to view this value please contact your website administrator. + This value is hidden. If you need access to view this value please contact your + website administrator. + This value is hidden. What languages would you like to publish? What languages would you like to send for approval? What languages would you like to schedule? - Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages. + Select the languages to unpublish. Unpublishing a mandatory language will + unpublish all languages. + All new variants will be saved. Which variants would you like to publish? Choose which variants to be saved. @@ -302,7 +321,9 @@ Content Template created A Content Template was created from '%0%' Another Content Template with the same name already exists - A Content Template is predefined content that an editor can select to use as the basis for creating new content + A Content Template is predefined content that an editor can select to use as the + basis for creating new content + Click to upload @@ -344,26 +365,44 @@ Select the Document Type you want to make a content template for Enter a folder name Choose a type and a title - Document Types within the Settings section, by editing the Allowed child node types under Permissions.]]> - Document Types within the Settings section.]]> - The selected page in the content tree doesn't allow for any pages to be created below it. + + Document Types within the Settings section, by editing the Allowed child node types under Permissions.]]> + + Document Types within the Settings section.]]> + The selected page in the content tree doesn't allow for any pages + to be created below it. + Edit permissions for this Document Type Create a new Document Type - Document Types within the Settings section, by changing the Allow as root option under Permissions.]]> - Media Types Types within the Settings section, by editing the Allowed child node types under Permissions.]]> - The selected media in the tree doesn't allow for any other media to be created below it. + + Document Types within the Settings section, by changing the Allow as root option under Permissions.]]> + + Media Types Types within the Settings section, by editing the Allowed child node types under Permissions.]]> + The selected media in the tree doesn't allow for any other media to be + created below it. + Edit permissions for this Media Type Document Type without a template Document Type with Template - The data definition for a content page that can be created by editors in the content tree and is directly accessible via a URL. + The data definition for a content page that can be created by + editors in the content tree and is directly accessible via a URL. + Document Type - The data definition for a content component that can be created by editors in the content tree and be picked on other pages but has no direct URL. + The data definition for a content component that can be created by editors in + the content tree and be picked on other pages but has no direct URL. + Element Type - Defines the schema for a repeating set of properties, for example, in a 'Block List' or 'Nested Content' property editor. + Defines the schema for a repeating set of properties, for example, in a 'Block + List' or 'Nested Content' property editor. + Composition - Defines a re-usable set of properties that can be included in the definition of multiple other Document Types. For example, a set of 'Common Page Settings'. + Defines a re-usable set of properties that can be included in the definition of + multiple other Document Types. For example, a set of 'Common Page Settings'. + Folder - Used to organise the Document Types, Compositions and Element Types created in this Document Type tree. + Used to organise the Document Types, Compositions and Element Types created in this + Document Type tree. + New folder New Data Type New JavaScript file @@ -388,11 +427,17 @@ Stay Discard changes You have unsaved changes - Are you sure you want to navigate away from this page? - you have unsaved changes + Are you sure you want to navigate away from this page? - you have unsaved + changes + Publishing will make the selected items visible on the site. - Unpublishing will remove the selected items and all their descendants from the site. + Unpublishing will remove the selected items and all their descendants from the + site. + Unpublishing will remove this page and all its descendants from the site. - You have unsaved changes. Making changes to the Document Type will discard the changes. + You have unsaved changes. Making changes to the Document Type will discard the + changes. + Done @@ -441,7 +486,9 @@ Click to add a Macro Insert table This will delete the language - Changing the culture for a language may be an expensive operation and will result in the content cache and indexes being rebuilt + Changing the culture for a language may be an expensive operation and will result + in the content cache and indexes being rebuilt + Last Edited Link Internal link: @@ -453,16 +500,25 @@ Set permissions for Set permissions for %0% for user group %1% Select the users groups you want to set permissions for - The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place + The items in the recycle bin are now being deleted. Please do not close this window + while this operation takes place + The recycle bin is now empty When items are deleted from the recycle bin, they will be gone forever - regexlib.com's webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]> - Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code', 'URL'. + + regexlib.com's webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]> + Search for a regular expression to add validation to a form field. Example: 'email, + 'zip-code', 'URL'. + Remove Macro Required Field Site is reindexed - The website cache has been refreshed. All publish content is now up to date. While all unpublished content is still unpublished - The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished. + The website cache has been refreshed. All publish content is now up to date. While all + unpublished content is still unpublished + + The website cache will be refreshed. All published content will be updated, while + unpublished content will stay unpublished. + Number of columns Number of rows Click on the image to see full size @@ -504,7 +560,9 @@ Select editor Select configuration Select snippet - This will delete the node and all its languages. If you only want to delete one language, you should unpublish the node in that language instead. + This will delete the node and all its languages. If you only want to delete one + language, you should unpublish the node in that language instead. + %0%.]]> %0% from the %1% group]]> Yes, remove @@ -524,7 +582,9 @@ Configured Searchers - Shows properties and tools for any configured Searcher (i.e. such as a multi-index searcher) + Shows properties and tools for any configured Searcher (i.e. such as a + multi-index searcher) + Field values Health status The health status of the index and if it can be read @@ -532,7 +592,9 @@ Index info Lists the properties of the index Manage Examine's indexes - Allows you to view the details of each index and provides some tools for managing the indexes + Allows you to view the details of each index and provides some tools for + managing the indexes + Rebuild index @@ -546,7 +608,9 @@ Tools to manage the index fields The index cannot be read and will need to be rebuilt - The process is taking longer than expected, check the Umbraco log to see if there have been any errors during this operation + The process is taking longer than expected, check the Umbraco log to see if there + have been any errors during this operation + This index cannot be rebuilt because it has no assigned IIndexPopulator @@ -598,16 +662,25 @@ Select the folder to move to in the tree structure below was moved underneath - %0% will delete the properties and their data from the following items]]> - I understand this action will delete the properties and data based on this Data Type + + %0% will delete the properties and their data from the following items]]> + I understand this action will delete the properties and data based on this Data + Type + - Your data has been saved, but before you can publish this page there are some errors you need to fix first: - The current membership provider does not support changing password (EnablePasswordRetrieval need to be true) + Your data has been saved, but before you can publish this page there are some + errors you need to fix first: + + The current membership provider does not support changing password + (EnablePasswordRetrieval need to be true) + %0% already exists There were errors: There were errors: - The password should be a minimum of %0% characters long and contain at least %1% non-alpha numeric character(s) + The password should be a minimum of %0% characters long and contain at least %1% + non-alpha numeric character(s) + %0% must be an integer The %0% field in the %1% tab is mandatory %0% is a mandatory field @@ -619,13 +692,17 @@ Optimistic concurrency failure, object has been modified Received an error from the server The specified file type has been disallowed by the administrator - NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough. + NOTE! Even though CodeMirror is enabled by configuration, it is disabled in + Internet Explorer because it's not stable enough. + Please fill both alias and name on the new property type! There is a problem with read/write access to a specific file or folder Error loading Partial View script (file: %0%) Please enter a title Please choose a type - You're about to make the picture larger than the original size. Are you sure that you want to proceed? + You're about to make the picture larger than the original size. Are you sure + that you want to proceed? + Startnode deleted, please contact your administrator Please mark content before changing style No active styles available @@ -790,6 +867,8 @@ Articles Videos Avatar for + Header + system field Blue @@ -830,13 +909,16 @@ The installer cannot connect to the database. - Could not save the web.config file. Please modify the connection string manually. + Could not save the web.config file. Please modify the connection string + manually. + Your database has been found and is identified as Database configuration install button to install the Umbraco %0% database ]]> - Next to proceed.]]> + + Next to proceed.]]> Database not found! Please check that the information in the "connection string" of the "web.config" file is correct.

      To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

      @@ -855,22 +937,33 @@ ]]> Press Next to proceed. ]]> - next to continue the configuration wizard]]> - The Default users' password needs to be changed!]]> - The Default user has been disabled or has no access to Umbraco!

      No further actions needs to be taken. Click Next to proceed.]]> - The Default user's password has been successfully changed since the installation!

      No further actions needs to be taken. Click Next to proceed.]]> + + next to continue the configuration wizard]]> + + The Default users' password needs to be changed!]]> + + The Default user has been disabled or has no access to Umbraco!

      No further actions needs to be taken. Click Next to proceed.]]> + + The Default user's password has been successfully changed since the installation!

      No further actions needs to be taken. Click Next to proceed.]]> The password is changed! Get a great start, watch our introduction videos - By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this Umbraco distribution consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license that covers the UI. + By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), + you accept the license for this software as specified in the box below. Notice that this Umbraco distribution + consists of two different licenses, the open source MIT license for the framework and the Umbraco freeware license + that covers the UI. + Not installed yet. Affected files and folders More information on setting up permissions for Umbraco here - You need to grant ASP.NET modify permissions to the following files/folders + You need to grant ASP.NET modify permissions to the following + files/folders + Your permission settings are almost perfect!

      You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.]]>       How to Resolve Click here to read the text version - video tutorial on setting up folder permissions for Umbraco or read the text version.]]> + + video tutorial on setting up folder permissions for Umbraco or read the text version.]]> Your permission settings might be an issue!

      You can run Umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of Umbraco.]]>       @@ -880,7 +973,9 @@ Your permission settings are perfect!

      You are ready to run Umbraco and install packages!]]>       Resolving folder issue - Follow this link for more information on problems with ASP.NET and creating folders + Follow this link for more information on problems with ASP.NET and + creating folders + Setting up folder permissions Happy super Sunday - Happy manic Monday + Happy manic Monday Happy tubular Tuesday Happy wonderful Wednesday Happy thunderous Thursday @@ -957,10 +1052,15 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Log in below Sign in with Session timed out - © 2001 - %0%
      Umbraco.com

      ]]>       + + © 2001 - %0%
      Umbraco.com

      ]]>       Forgotten password? - An email will be sent to the address specified with a link to reset your password - An email with password reset instructions will be sent to the specified address if it matched our records + An email will be sent to the address specified with a link to reset your + password + + An email with password reset instructions will be sent to the + specified address if it matched our records + Show password Hide password Return to login form @@ -1066,7 +1166,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont The current node is not allowed under the chosen node because of its type The current node cannot be moved to one of its subpages The current node cannot exist at the root - The action isn't allowed since you have insufficient permissions on 1 or more child documents. + The action isn't allowed since you have insufficient permissions on 1 or more child + documents. + Relate copied items to original @@ -1186,13 +1288,15 @@ To manage your website, simply open the Umbraco backoffice and start adding cont This package has no configuration view No packages have been created yet You don’t have any packages installed - 'Packages' icon in the top right of your screen]]> + + 'Packages' icon in the top right of your screen]]> Package Content License Search for packages Results for We couldn’t find anything for - Please try searching for another package or browse through the categories + Please try searching for another package or browse through the categories + Popular New releases has @@ -1206,7 +1310,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Downloads Likes Compatibility - This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be guaranteed for versions reported below 100% + This package is compatible with the following versions of Umbraco, as + reported by community members. Full compatability cannot be guaranteed for versions reported below 100% + External sources Author Documentation @@ -1233,7 +1339,10 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Paste with full formatting (Not recommended) - The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web. + The text you're trying to paste contains special characters or formatting. This could be + caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so + the pasted content will be more suitable for the web. + Paste as raw text without any formatting at all Paste, but remove formatting (Recommended) @@ -1249,7 +1358,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Login Page Choose the page that contains the login form Remove protection... - %0%?]]> + + %0%?]]> Select the pages that contain login form and error messages %0%]]> %0%]]> @@ -1276,8 +1386,11 @@ To manage your website, simply open the Umbraco backoffice and start adding cont - - Validation failed for required language '%0%'. This language was saved but not published. + + + Validation failed for required language '%0%'. This + language was saved but not published. + Publishing in progress - please wait... %0% out of %1% pages have been published... %0% has been published @@ -1305,7 +1418,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Edit %0% on %1% Discard creation? - You have made changes to this content. Are you sure you want to discard them? + You have made changes to this content. Are you sure you want to + discard them? + Remove all medias? Clipboard Not allowed @@ -1330,9 +1445,12 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Created Select a version to compare with the current version Current version - Red text will not be shown in the selected version. , green means added]]> + + Red text will not be shown in the selected version. , green means added]]> Document has been rolled back - This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view + This displays the selected version as HTML, if you wish to see the difference between 2 + versions at the same time, use the diff view + Rollback to Select version View @@ -1358,7 +1476,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Default template - To import a Document Type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen) + To import a Document Type, find the ".udt" file on your computer by clicking the + "Browse" button and click "Import" (you'll be asked for confirmation on the next screen) + New Tab Title Node type Type @@ -1369,7 +1489,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Tabs Master Content Type enabled This Content Type uses - No properties defined on this tab. Click on the "add a new property" link at the top to create a new property. + No properties defined on this tab. Click on the "add a new property" link at + the top to create a new property. + Create matching template Add icon @@ -1377,7 +1499,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Sort order Creation date Sorting complete. - Drag the different items up or down below to set how they should be arranged. Or click the column headers to sort the entire collection of items + Drag the different items up or down below to set how they should be arranged. Or click the + column headers to sort the entire collection of items + This node has no child nodes to sort @@ -1407,7 +1531,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont and is visible on the website %0% documents published and visible on the website %0% published and visible on the website - %0% documents published for languages %1% and visible on the website + %0% documents published for languages %1% and visible on the website + Content saved Remember to publish to make changes visible A schedule for publishing has been updated @@ -1442,7 +1567,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Template saved without any errors! Content unpublished Content variation %0% unpublished - The mandatory language '%0%' was unpublished. All languages for this content item are now unpublished. + The mandatory language '%0%' was unpublished. All languages for this + content item are now unpublished. + Partial view saved Partial view saved without any errors! Partial view not saved @@ -1462,23 +1589,34 @@ To manage your website, simply open the Umbraco backoffice and start adding cont User %0% was deleted Invite user Invitation has been re-sent to %0% - Cannot publish the document since the required '%0%' is not published + Cannot publish the document since the required '%0%' is not published + Validation failed for language '%0%' Document Type was exported to file An error occurred while exporting the Document Type The release date cannot be in the past - Cannot schedule the document for publishing since the required '%0%' is not published - Cannot schedule the document for publishing since the required '%0%' has a publish date later than a non mandatory language + Cannot schedule the document for publishing since the required '%0%' is not + published + + Cannot schedule the document for publishing since the required '%0%' has a + publish date later than a non mandatory language + The expire date cannot be in the past The expire date cannot be before the release date - Domains are not configured for multilingual site, please contact an administrator, see log for more information - There is no domain configured for %0%, please contact an administrator, see log for more information + Domains are not configured for multilingual site, please contact an administrator, + see log for more information + + There is no domain configured for %0%, please contact an administrator, see + log for more information + Add style Edit style Rich text editor styles - Define the styles that should be available in the rich text editor for this stylesheet + Define the styles that should be available in the rich text editor for this + stylesheet + Edit stylesheet Edit stylesheet property The name displayed in the editor style selector @@ -1500,20 +1638,24 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Insert Choose what to insert into your template Dictionary item - A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites. + A dictionary item is a placeholder for a translatable piece of text, which + makes it easy to create designs for multilingual websites. + Macro - A Macro is a configurable component which is great for - reusable parts of your design, where you need the option to provide parameters, - such as galleries, forms and lists. - + A Macro is a configurable component which is great for + reusable parts of your design, where you need the option to provide parameters, + such as galleries, forms and lists. +       Value - Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values. + Displays the value of a named field from the current page, with options to modify + the value or fallback to alternative values. + Partial view - A partial view is a separate template file which can be rendered inside another - template, it's great for reusing markup or for separating complex templates into separate files. - + A partial view is a separate template file which can be rendered inside another + template, it's great for reusing markup or for separating complex templates into separate files. + Master template No master Render child template @@ -1585,7 +1727,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Click to insert macro Write here... Grid Layouts - Layouts are the overall work area for the grid editor, usually you only need one or two different layouts + Layouts are the overall work area for the grid editor, usually you only need one or + two different layouts + Add Grid Layout Edit Grid Layout Adjust the layout by setting column widths and adding additional sections @@ -1611,31 +1755,49 @@ To manage your website, simply open the Umbraco backoffice and start adding cont are added You are deleting the row configuration - Deleting a row configuration name will result in loss of data for any existing content that is based on this configuration. - + Deleting a row configuration name will result in loss of data for any existing content that is based on this + configuration. + + You are deleting the layout + Modifying a layout will result in loss of data for any existing content that is based + on this configuration. + Compositions Group - You can't move the group %0% to this tab because the group will get the same alias as a tab: "%1%". Rename the group to continue. + You can't move the group %0% to this tab because the group will get the same + alias as a tab: "%1%". Rename the group to continue. + You have not added any groups Add group Inherited from Add property Required label Enable list view - Configures the content item to show a sortable and searchable list of its children, the children will not be shown in the tree + Configures the content item to show a sortable and searchable list of its + children, the children will not be shown in the tree + Allowed Templates - Choose which templates editors are allowed to use on content of this type + Choose which templates editors are allowed to use on content of this type + Allow as root - Allow editors to create content of this type in the root of the content tree. + Allow editors to create content of this type in the root of the content tree. + Allowed child node types - Allow content of the specified types to be created underneath content of this type. + Allow content of the specified types to be created underneath content of this + type. + Choose child node - Inherit tabs and properties from an existing Document Type. New tabs will be added to the current Document Type or merged if a tab with an identical name exists. - This Content Type is used in a composition, and therefore cannot be composed itself. + Inherit tabs and properties from an existing Document Type. New tabs will be + added to the current Document Type or merged if a tab with an identical name exists. + + This Content Type is used in a composition, and therefore cannot be composed itself. + There are no Content Types available to use as a composition. - Removing a composition will delete all the associated property data. Once you save the Document Type there's no way back. + Removing a composition will delete all the associated property data. Once you + save the Document Type there's no way back. + Create new Use existing Editor settings @@ -1651,21 +1813,33 @@ To manage your website, simply open the Umbraco backoffice and start adding cont All Document Types All Documents All media items - using this Document Type will be deleted permanently, please confirm you want to delete these as well. - using this Media Type will be deleted permanently, please confirm you want to delete these as well. - using this Member Type will be deleted permanently, please confirm you want to delete these as well + using this Document Type will be deleted permanently, please confirm you want to + delete these as well. + + using this Media Type will be deleted permanently, please confirm you want to delete + these as well. + + using this Member Type will be deleted permanently, please confirm you want to delete + these as well + and all documents using this type and all media items using this type and all members using this type Member can edit - Allow this property value to be edited by the member on their profile page + Allow this property value to be edited by the member on their profile page + Is sensitive data - Hide this property value from content editors that don't have access to view sensitive information + Hide this property value from content editors that don't have access to view + sensitive information + Show on member profile - Allow this property value to be displayed on the member profile page + Allow this property value to be displayed on the member profile page + tab has no sort order Where is this composition used? - This composition is currently used in the composition of the following Content Types: + This composition is currently used in the composition of the following + Content Types: + Allow variations Allow vary by culture Allow segmentation @@ -1678,31 +1852,45 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Allow segmentation Element Type Is an Element Type - An Element Type is meant to be used for instance in Nested Content, and not in the tree. - A Document Type cannot be changed to an Element Type once it has been used to create one or more content items. + An Element Type is meant to be used for instance in Nested Content, and not in the + tree. + + A Document Type cannot be changed to an Element Type once it has been used to + create one or more content items. + This is not applicable for an Element Type You have made changes to this property. Are you sure you want to discard them? Appearance Label above (full-width) %0%?]]> - %0%?]]> - %0%?]]> + + %0%?]]> + + %0%?]]> This will also delete all items below this tab. This will also delete all items below this group. Add tab Convert to tab Drag properties here to place directly on the tab + You are removing the child node + Removing a child node will limit the editors options to create different content + types beneath a node. + Add language Mandatory language - Properties on this language have to be filled out before the node can be published. + Properties on this language have to be filled out before the node can be + published. + Default language An Umbraco site can only have one default language set. Switching default language may result in default content missing. Falls back to No fall back language - To allow multi-lingual content to fall back to another language if not present in the requested language, select it here. + To allow multi-lingual content to fall back to another language if not + present in the requested language, select it here. + Fall back language none @@ -1773,13 +1961,17 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Cheers from the Umbraco robot ]]> - No translator users found. Please create a translator user before you start sending content to translation + No translator users found. Please create a translator user before you start sending + content to translation + The page '%0%' has been send to translation Send the page '%0%' to translation Total words Translate to Translation completed. - You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages. + You can preview the pages, you've just translated, by clicking below. If the + original page is found, you will get a comparison of the 2 pages. + Translation failed, the XML file might be corrupt Translation options Translator @@ -1832,7 +2024,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Access - Based on the assigned groups and start nodes, the user has access to the following nodes + Based on the assigned groups and start nodes, the user has access to the following nodes + Assign access Administrator Category field @@ -1845,10 +2038,14 @@ To manage your website, simply open the Umbraco backoffice and start adding cont hasn't been locked out The password hasn't been changed Confirm new password - You can change your password for accessing the Umbraco backoffice by filling out the form below and click the 'Change Password' button + You can change your password for accessing the Umbraco backoffice by filling + out the form below and click the 'Change Password' button + Content Channel Create another user - Create new users to give them access to Umbraco. When a new user is created a password will be generated that you can share with the user. + Create new users to give them access to Umbraco. When a new user is created a password + will be generated that you can share with the user. + Description field Disable User Document Type @@ -1859,7 +2056,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Go to user profile Add groups to assign access and permissions Invite another user - Invite new users to give them access to Umbraco. An invite email will be sent to the user with information on how to log in to Umbraco. Invites last for 72 hours. + Invite new users to give them access to Umbraco. An invite email will be sent to the + user with information on how to log in to Umbraco. Invites last for 72 hours. + Language Set the language you will see in menus and dialogs Last lockout date @@ -1883,7 +2082,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Your new password cannot be blank! Current password Invalid current password - There was a difference between the new password and the confirmed password. Please try again! + There was a difference between the new password and the confirmed password. Please + try again! + The confirmed password doesn't match the new password! The password must have at least one digit ('0'-'9') The password must have at least one lowercase ('a'-'z') @@ -1910,7 +2111,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Limit the content tree to specific start nodes User last updated has been created - The new user has successfully been created. To log in to Umbraco use the password below. + The new user has successfully been created. To log in to Umbraco use the + password below. + The user already has a password set The user is already in group '%0%' Lockout is not enabled for this user @@ -1920,10 +2123,18 @@ To manage your website, simply open the Umbraco backoffice and start adding cont User permissions User group has been invited - An invitation has been sent to the new user with details about how to log in to Umbraco. - Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar. - Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it. - Uploading a photo of yourself will make it easy for other users to recognize you. Click the circle above to upload your photo. + An invitation has been sent to the new user with details about how to log in to + Umbraco. + + Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we + just need you to setup a password and add a picture for your avatar. + + Welcome to Umbraco! Unfortunately your invite has expired. Please contact your + administrator and ask them to resend it. + + Uploading a photo of yourself will make it easy for other users to recognize + you. Click the circle above to upload your photo. + Writer Change Your profile @@ -2085,14 +2296,19 @@ To manage your website, simply open the Umbraco backoffice and start adding cont 3: Configuration file path --> Value is set to the recommended value: '%0%'. - Expected value '%1%' for '%2%' in configuration file '%3%', but found '%0%'. - Found unexpected value '%0%' for '%2%' in configuration file '%3%'. + Expected value '%1%' for '%2%' in configuration file '%3%', but + found '%0%'. + + Found unexpected value '%0%' for '%2%' in configuration file '%3%'. + MacroErrors are set to '%0%'. - MacroErrors are set to '%0%' which will prevent some or all pages in your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'. + MacroErrors are set to '%0%' which will prevent some or all pages in + your site from loading completely if there are any errors in macros. Rectifying this will set the value to '%1%'. + Debug compilation mode is disabled. - Debug compilation mode is currently enabled. It is recommended to disable this setting before go live. + Debug compilation mode is currently enabled. It is recommended to + disable this setting before go live. + @@ -2119,30 +2342,48 @@ To manage your website, simply open the Umbraco backoffice and start adding cont - X-Frame-Options used to control whether a site can be IFRAMEd by another was found.]]> - X-Frame-Options used to control whether a site can be IFRAMEd by another was not found.]]> - X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was found.]]> - X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was not found.]]> - Strict-Transport-Security, also known as the HSTS-header, was found.]]> - Strict-Transport-Security was not found.]]> + + X-Frame-Options used to control whether a site can be IFRAMEd by another was found.]]> + + X-Frame-Options used to control whether a site can be IFRAMEd by another was not found.]]> + + X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was found.]]> + + X-Content-Type-Options used to protect against MIME sniffing vulnerabilities was not found.]]> + + Strict-Transport-Security, also known as the HSTS-header, was found.]]> + + Strict-Transport-Security was not found.]]> X-XSS-Protection was found.]]> - X-XSS-Protection was not found.]]> + + X-XSS-Protection was not found.]]> - %0%.]]> - No headers revealing information about the website technology were found. + + %0%.]]> + No headers revealing information about the website technology were found. + The 'Umbraco:CMS:Global:Smtp' configuration could not be found. - The 'Umbraco:CMS:Global:Smtp:Host' configuration could not be found. - SMTP settings are configured correctly and the service is operating as expected. - The SMTP server configured with host '%0%' and port '%1%' could not be reached. Please check to ensure the SMTP settings in the configuration 'Umbraco:CMS:Global:Smtp' are correct. - %0%.]]> - %0%.]]> -

      Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:

      %2%]]>       + The 'Umbraco:CMS:Global:Smtp:Host' configuration could not be + found. + + SMTP settings are configured correctly and the service is operating + as expected. + + The SMTP server configured with host '%0%' and port '%1%' could not be + reached. Please check to ensure the SMTP settings in the configuration 'Umbraco:CMS:Global:Smtp' are correct. + + + %0%.]]> + + %0%.]]> + +

      Results of the scheduled Umbraco Health Checks run on %0% at %1% are as follows:

      %2%]]>       Umbraco Health Check Status: %0% Check group - The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button. You can add your own health checks, have a look at the documentation for more information about custom health checks.

      ]]> @@ -2157,7 +2398,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Redirect URL Management The following URLs redirect to this content item: No redirects have been made - When a published page gets renamed or moved a redirect will automatically be made to the new page. + When a published page gets renamed or moved a redirect will automatically be + made to the new page. + Redirect URL removed. Error removing redirect URL. This will remove the redirect @@ -2178,7 +2421,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Trashed content with Id: {0} related to original parent content with Id: {1} Trashed media with Id: {0} related to original parent media item with Id: {1} Cannot automatically restore this item - There is no location where this item can be automatically restored. You can move the item manually using the tree below. + There is no location where this item can be automatically restored. You + can move the item manually using the tree below. + was restored under @@ -2248,8 +2493,10 @@ To manage your website, simply open the Umbraco backoffice and start adding cont View more options Search the Umbraco backoffice Search for content nodes, media nodes etc. across the backoffice. - When autocomplete results are available, press up and down arrows, or use the tab key and use the enter key to select. - Path: + When autocomplete results are available, press up and down arrows, or use the + tab key and use the enter key to select. + + Path: Found in Has translation Missing translation @@ -2265,7 +2512,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont This Data Type has no references. Used in Document Types Used in Media Types - Used in Member Types + Used in Member Types Used by Used in Documents Used in Members @@ -2274,8 +2521,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Delete Saved Search Log Levels - Select all - Deselect all + Select all + Deselect all Saved Searches Save Search Enter a friendly name for your search query @@ -2331,7 +2578,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Refresh status Memory Cache - Reload Database Cache - Rebuilding can be expensive. Use it when reloading is not enough, and you think that the database cache has not been @@ -2352,7 +2599,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Rebuild Internals - not need to use it. ]]> @@ -2364,7 +2611,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Performance profiling - Umbraco currently runs in debug mode. This means you can use the built-in performance profiler to assess the performance when rendering pages.

      @@ -2381,14 +2628,14 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Activate the profiler by default Friendly reminder - You should never let a production site run in debug mode. Debug mode is turned off by setting Umbraco:CMS:Hosting:Debug to false in appsettings.json, appsettings.{Environment}.json or via an environment variable.

      ]]>       - Umbraco currently does not run in debug mode, so you can't use the built-in profiler. This is how it should be for a production site.

      @@ -2401,7 +2648,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Hours of Umbraco training videos are only a click away - Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit umbraco.tv for even more Umbraco videos

      ]]>       @@ -2409,41 +2656,48 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Start here - This section contains the building blocks for your Umbraco site. Follow the below links to find out more about working with the items in the Settings section + This section contains the building blocks for your Umbraco site. Follow the below + links to find out more about working with the items in the Settings section + Find out more - in the Documentation section of Our Umbraco ]]> - Community Forum ]]> - tutorial videos (some are free, some require a subscription) ]]> - productivity boosting tools and commercial support ]]> - training and certification opportunities ]]> Welcome to The Friendly CMS - Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible. + Thank you for choosing Umbraco - we think this could be the beginning of something + beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast + as possible. + Umbraco Forms - Create forms using an intuitive drag and drop interface. From simple contact forms that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it! + Create forms using an intuitive drag and drop interface. From simple contact forms + that sends e-mails to advanced questionaires that integrate with CRM systems. Your clients will love it! + Pick Element Type @@ -2463,14 +2717,20 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Label Custom view Show custom view description - Overwrite how this block appears in the backoffice UI. Pick a .html file containing your presentation. + Overwrite how this block appears in the backoffice UI. Pick a .html file + containing your presentation. + Settings model Overlay editor size Add custom view Add settings - %0%?]]> - %0%?]]> - The content of this block will still be present, editing of this content will no longer be available and will be shown as unsupported content. + + %0%?]]> + + %0%?]]> + The content of this block will still be present, editing of this content + will no longer be available and will be shown as unsupported content. + Thumbnail Add thumbnail @@ -2490,10 +2750,12 @@ To manage your website, simply open the Umbraco backoffice and start adding cont What are Content Templates? - Content Templates are pre-defined content that can be selected when creating a new content node. + Content Templates are pre-defined content that can be selected when creating a new + content node. + How do I create a Content Template? - There are two ways to create a Content Template:

      • Right-click a content node and select "Create Content Template" to create a new Content Template.
        • @@ -2503,7 +2765,10 @@ To manage your website, simply open the Umbraco backoffice and start adding cont ]]> How do I manage Content Templates? - You can edit and delete Content Templates from the "Content Templates" tree in the Settings section. Expand the Document Type which the Content Template is based on and click it to edit or delete it. + You can edit and delete Content Templates from the "Content Templates" tree in the + Settings section. Expand the Document Type which the Content Template is based on and click it to edit or delete + it. + End @@ -2511,11 +2776,15 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Preview website Open website in preview mode Preview website? - You have ended preview mode, do you want to enable it again to view the latest saved version of your website? + You have ended preview mode, do you want to enable it again to view the + latest saved version of your website? + Preview latest version View published version View published version? - You are in Preview Mode, do you want exit in order to view the published version of your website? + You are in Preview Mode, do you want exit in order to view the + published version of your website? + View published version Stay in preview mode diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml index 39caddbd29..ffc1e8272b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml @@ -167,9 +167,9 @@ Visualizzazione per Contenuto eliminato Contenuto non pubblicato - Contenuto non pubblicato per le lingue: %0% + Contenuto non pubblicato per le lingue: %0% Contenuto pubblicato - Contenuto pubblicato per le lingue: %0% + Contenuto pubblicato per le lingue: %0% Contenuto salvato Contenuto salvato per le lingue: %0% Contenuto spostato @@ -198,7 +198,8 @@ Impossibile creare una cartella sotto genitore con ID %0% Impossibile creare una cartella sotto genitore con nome %0% - + + Impossibile eliminare l'elemento: %0% @@ -234,24 +235,31 @@ Questo media non ha link - - + + + + Impossibile ottenere l'URL - - + + + + Pubblica Pubblicato Pubblicato (modifiche in sospeso) Stato della pubblicazione - %0% e tutti gli elementi sottostanti, rendendo così il loro contenuto pubblicamente disponibile.]]> - + + %0% e tutti gli elementi sottostanti, rendendo così il loro contenuto pubblicamente disponibile.]]> + + Pubblicato il Non pubblicato il Rimuovi data Imposta data Ordinamento dei nodi aggiornato - + + Statistiche Titolo (opzionale) Testo alternativo (opzionale) @@ -271,29 +279,40 @@ Elementi figli Target Questo si traduce nella seguente ora sul server: - Cosa significa questo?]]> + + Cosa significa questo?]]> Sei sicuro di voler eliminare questo oggetto? Sei sicuro di voler eliminare tutti gli oggetti? - - + + + + Aggiungi Element Type Seleziona Element Type - - Immettere un'espressione di angular da valutare rispetto a ciascun elemento per il relativo nome. Utilizza + + + Immettere un'espressione di angular da valutare rispetto a ciascun + elemento per il relativo nome. Utilizza + per visualizzare l'index dell'oggetto Aggiungi un altro box di testo Rimuovi questa text box Root del contenuto Includi elementi di contenuto non pubblicati. - + + - Quali lingue vorresti pubblicare? Tutte le lingue con contenuto vengono salvate! + Quali lingue vorresti pubblicare? Tutte le lingue con contenuto vengono + salvate! + Quali lingue vorresti pubblicare? Quali lingue vorresti salvare? Tutte le lingue con contenuto vengono salvate alla creazione! Quali lingue vorresti inviare per l'approvazione? Quali lingue vorresti pianificare? - Seleziona le lingue da non pubblicare. Non pubblicando una lingua obbligatoria annullerai la pubblicazione di tutte le lingue. + Seleziona le lingue da non pubblicare. Non pubblicando una lingua obbligatoria + annullerai la pubblicazione di tutte le lingue. + Lingue pubblicate Lingue non pubblicate Lingue non modificate @@ -304,7 +323,9 @@ Scegli quali varianti verranno salvate. Scegli le varianti da inviare per l'approvazione. Imposta pubblicazione pianificata... - Seleziona le varianti da non pubblicare. Non pubblicando una lingua obbligatoria annullerai la pubblicazione di tutte le varianti. + Seleziona le varianti da non pubblicare. Non pubblicando una lingua obbligatoria + annullerai la pubblicazione di tutte le varianti. + Per la pubblicazione sono necessarie le seguenti varianti: Non siamo pronti per la pubblicazione @@ -323,7 +344,8 @@ Modello di contenuto creato - + + Clicca per caricare @@ -343,7 +365,8 @@ Crea un nuovo membro Tutti i membri - + + Impossibile copiare il content type @@ -363,26 +386,40 @@ Seleziona il Document Type per cui vuoi creare un modello di contenuto Inserisci il nome della cartella Scegli il tipo ed il titolo - Tipi di documento dentro la sezione Impostazioni, modificando Tipi di nodi figlio consentiti sotto Permessi.]]> - Tipi di documento dentro la sezione Impostazioni.]]> - La pagina selezionata nel content tree non permette a nessuna pagina di essere creata sotto di essa. + + Tipi di documento dentro la sezione Impostazioni, modificando Tipi di nodi figlio consentiti sotto Permessi.]]> + + Tipi di documento dentro la sezione Impostazioni.]]> + La pagina selezionata nel content tree non permette a nessuna + pagina di essere creata sotto di essa. + Modifica permessi per questo tipo di documento Crea un nuovo tipo di documento - Tipi di documento dentro la sezione Impostazioni, cambiando l'opzione Consenti come root sotto Permessi.]]> - Tipi di documento dentro la sezione Impostazioni, modificando Tipi di nodi figlio consentiti sotto Permessi.]]> - Il media selezionato non consente la creazione di altri media al di sotto di esso. + + Tipi di documento dentro la sezione Impostazioni, cambiando l'opzione Consenti come root sotto Permessi.]]> + + Tipi di documento dentro la sezione Impostazioni, modificando Tipi di nodi figlio consentiti sotto Permessi.]]> + Il media selezionato non consente la creazione di altri media al di + sotto di esso. + Modifica permessi per questo tipo di media Tipo di documento senza template Tipo di documento con template - + + Tipo di documento - + + Tipo di elemento - + + Composizione - + + Cartella - Utilizzato per organizzare i tipi di documento, le composizioni e i tipi di elementi creati in questo albero dei tipi di documento. + Utilizzato per organizzare i tipi di documento, le composizioni e i tipi di elementi + creati in questo albero dei tipi di documento. + Nuova cartella Nuovo tipo di dato Nuovo file JavaScript @@ -397,7 +434,8 @@ - + + hai aperto una nuova finestra Riavvia Visita @@ -407,11 +445,15 @@ Rimani Scarta le modifiche Hai delle modifiche non salvate - Sei sicuro di voler lasciare questa pagina? Hai delle modifiche non salvate! + Sei sicuro di voler lasciare questa pagina? Hai delle modifiche non salvate! + Pubblicando renderai visibli gli oggetti selezionati sul sito. - Non pubblicando rimuoverai gli oggetti selezionati e i loro discendenti dal sito. + Non pubblicando rimuoverai gli oggetti selezionati e i loro discendenti dal + sito. + Non pubblicando rimuoverai questa pagina e tutti i suoi discendenti dal sito. - + + Fatto @@ -461,7 +503,8 @@ Inserisci macro Inserisci tabella - + + Ultima modifica Link @@ -474,16 +517,20 @@ Imposta i permessi per Imposta i permessi per %0% per il gruppo di utenti %1% Seleziona i gruppi di utenti per il quale vuoi impostare i permessi - + + - regexlib.com ha attualmente qualche problema, di cui non abbiamo il controllo. Siamo spiacevoli dell'inconveniente.]]> - + + regexlib.com ha attualmente qualche problema, di cui non abbiamo il controllo. Siamo spiacevoli dell'inconveniente.]]> + + Elimina Macro Campo obbligatorio - + + Numero di colonne Numero di righe @@ -525,7 +572,8 @@ Seleziona editor Seleziona configurazione Seleziona snippet - + + %0%.]]> %0% dal gruppo %1%]]> Si, rimuovi @@ -541,7 +589,8 @@ Searchers configurati - + + Valori del campo Stato di salute @@ -549,7 +598,9 @@ Index info Gestisci gli indexes di Examine - Permette di visualizzare i dettagli di ogni index e fornisce alcuni strumenti per gestire gli index + Permette di visualizzare i dettagli di ogni index e fornisce alcuni strumenti + per gestire gli index + Ricostruisci index Strumenti per gestire l'index Campi - + + IIndexPopulator @@ -594,7 +646,8 @@ Crea una list view custom Rimuovi la list view custom - + + Rinominato @@ -614,22 +667,29 @@ Visualizza etichetta Larghezza e altezza - + + Si, elimina - + + Seleziona la cartella da spostare nella struttura sottostante - %0% eliminerà le proprietà e i dati dagli oggetti seguenti]]> - + + %0% eliminerà le proprietà e i dati dagli oggetti seguenti]]> + + - - + + + + - + + @@ -638,18 +698,26 @@ - - - - + + + + + + + + Errore durante il caricamento di una Partial View script (file: %0%) - - - + + + + + + - + + @@ -849,7 +917,8 @@ - + + @@ -857,7 +926,8 @@ Premi il tasto installa per installare il database Umbraco %0% ]]> - Avanti per proseguire.]]> + + Avanti per proseguire.]]> Database non trovato! Perfavore, controlla che le informazioni della stringa di connessione nel file "web.config" siano corrette.

        Per procedere, modifica il file "web.config" (utilizzando Visual Studio o l'editor di testo che preferisci), scorri in basso, aggiungi la stringa di connessione per il database nel parametro chiamato "umbracoDbDSN" e salva il file.

        @@ -884,24 +954,32 @@ Premi il tasto Avanti per continuare. ]]>         - Avanti per continuare la configurazione.]]> - La password predefinita per l'utente di default deve essere cambiata!]]> - L'utente di default è stato disabilitato o non ha accesso ad Umbraco!

        Non è necessario eseguire altre operazioni. Clicca il tasto Avanti per continuare.]]> - La password dell'utente di default è stata modificata con successo

        Non è necessario eseguire altre operazioni. Clicca il tasto Avanti per continuare.]]> + + Avanti per continuare la configurazione.]]> + + La password predefinita per l'utente di default deve essere cambiata!]]> + + L'utente di default è stato disabilitato o non ha accesso ad Umbraco!

        Non è necessario eseguire altre operazioni. Clicca il tasto Avanti per continuare.]]> + + La password dell'utente di default è stata modificata con successo

        Non è necessario eseguire altre operazioni. Clicca il tasto Avanti per continuare.]]> - + + - - + + + + La configurazione dei permessi è quasi perfetta!

        Puoi eseguire Umbraco senza problemi, ma non sarai in grado di installare i pacchetti che sono consigliati per sfruttare a pieno le potenzialità di Umbraco.]]>         - video tutorial su come impostare i permessi delle cartelle per Umbraco o leggi la versione testuale.]]> + + video tutorial su come impostare i permessi delle cartelle per Umbraco o leggi la versione testuale.]]> Le impostazioni dei permessi potrebbero avere dei problemi!

        @@ -917,7 +995,8 @@ Sei pronto per avviare Umbraco e installare i pacchetti!]]>         - + + - + + Fai il login qui sotto Fai il login con Sessione scaduta - © 2001 - %0%
        umbraco.com

        ]]>         + + © 2001 - %0%
        umbraco.com

        ]]>         Password dimenticata? - - + + + + Mostra password Nascondi password Ritorna alla finestra di login @@ -1120,12 +1203,16 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Seleziona dove il documento %0% deve essere copiato Seleziona dove il documento %0% deve essere spostato - - - + + + + + + - + + @@ -1249,7 +1336,9 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Includi tutti i figli o clicca qui per scegliere il file del pacchetto Carica pacchetto - Installa un pacchetto locale dalla tua macchina. Installa solamente pacchetti di cui ti fidi e ne conosci la provenienza + Installa un pacchetto locale dalla tua macchina. Installa solamente pacchetti + di cui ti fidi e ne conosci la provenienza + Carica un altro pacchetto Cancella e carica un altro pacchetto Accetto @@ -1263,7 +1352,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Questo pacchetto non ha una vista di configurazione Non sono ancora stati creati pacchetti Non hai installato nessun pacchetto - 'Pacchetti' in alto a destra del tuo schermo]]> + + 'Pacchetti' in alto a destra del tuo schermo]]> Azioni del pacchetto Contenuto del pacchetto @@ -1276,7 +1366,9 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Cerca un pacchetto... Risultati per Non abbiamo trovato niente per - Per favore prova a cercare un altro pacchetto oppure cerca tra le categorie + Per favore prova a cercare un altro pacchetto oppure cerca tra le + categorie + Popolari Nuove uscite ha @@ -1290,7 +1382,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Downloads Likes - + + Sorgenti esterne Autore Documentazione @@ -1316,27 +1409,33 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Versione del pacchetto Aggiornamento dalla versione - + + Sto disinstallando... Sto scaricando... Sto importando... Sto installando... Sto riavviando, per favore aspetta... - Per favore clicca 'Completa' per completare l'installazione e ricaricare la pagina. + Per favore clicca 'Completa' per completare l'installazione e ricaricare la + pagina. + Sto effettuando l'upload del pacchetto... Verificato il funzionamento su Umbraco Cloud - + + - Devi creare un gruppo di membri prima di utilizzare l'autenticazione basata sui gruppi + Devi creare un gruppo di membri prima di utilizzare l'autenticazione basata sui + gruppi + %0%]]> @@ -1345,8 +1444,10 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in - %0%?]]> - + + %0%?]]> + + %0%]]> %0%]]> Protezione specifica per membri @@ -1384,8 +1485,10 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in %0% non può essere pubblicato perché la pagina padre non è pubblicata. ]]> - - + + + + Pubblicazione in corso, aspetta... %0% di %1% pagine sono state pubblicate... @@ -1416,7 +1519,9 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Modifica %0% su %1% Scartare la creazione? - Hai fatto delle modifiche a questo contenuto. Sei sicuro di volerle scartare? + Hai fatto delle modifiche a questo contenuto. Sei sicuro di volerle + scartare? + Rimuovere? Rimuovere tutti i media? Appunti @@ -1444,9 +1549,11 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Creato Seleziona una versione da confrontare con la versione corrente - Il testo in rosso non verrà mostrato nella versione selezionata, quello in verde verrà aggiunto]]> + + Il testo in rosso non verrà mostrato nella versione selezionata, quello in verde verrà aggiunto]]> - + + @@ -1472,7 +1579,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in - + + Tipo @@ -1483,7 +1591,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Tabs Tipo di contenuto Master abilitato Questo tipo di contenuto usa - + + Crea un template corrispondente Aggiungi icona @@ -1491,17 +1600,22 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Ordinamento Data creazione - - + + + + Questo elemento non ha elementi figlio da ordinare Validazione - Gli errori di validazione devono essere sistemati prima che l'elemento possa essere salvato + Gli errori di validazione devono essere sistemati prima che l'elemento possa + essere salvato + Fallita Salvato Salvato. Per vedere le modifiche appena salvate ricarica la pagina - + + Cancellato @@ -1524,7 +1638,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in %0% documenti pubblicati per le lingue %1% e visibili sul sito web Contenuto salvato - + + %0% salvata Le modifiche sono state inviate per l'approvazione @@ -1543,7 +1658,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Hostnames salvati Errore durante il salvataggio degli hostnames - + + @@ -1556,7 +1672,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Template salvato con successo! Contenuto non pubblicato Variazione di contenuto %0% non pubblicata - + + Partial view salvata Partial view salvata senza errori! Partial view non salvata @@ -1576,21 +1693,28 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Invita utenti - + + Validazione fallita per la lingua '%0%' - + + - - + + + + - + + Aggiungi stile Modifica stile Stili del Rich text editor - Definisci gli stili che dovranno essere disponibili nel Rich text editor per questo foglio di stile + Definisci gli stili che dovranno essere disponibili nel Rich text editor per questo + foglio di stile + @@ -1612,7 +1736,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Inserisci Scegli cosa inserire nel tuo template Elementi del dizionario - + + Macro Valore - Visualizza il valore di un campo nominato dalla pagina corrente, con delle opzioni per modificare il valore o impostare il valore di fallback. + Visualizza il valore di un campo nominato dalla pagina corrente, con delle opzioni + per modificare il valore o impostare il valore di fallback. + Partial view Didascalia dell'immagine... Scrivi qui... I Grid Layout - I layout sono l'area globale di lavoro per il grid editor, di solito ti servono solamente uno o due layout differenti + I layout sono l'area globale di lavoro per il grid editor, di solito ti servono + solamente uno o due layout differenti + Aggiungi un Grid Layout Modifica il Grid Layout - Sistema il layout impostando la larghezza della colonna ed aggiungendo ulteriori sezioni + Sistema il layout impostando la larghezza della colonna ed aggiungendo ulteriori + sezioni + Configurazioni della riga Le righe sono le colonne predefinite disposte orizzontalmente Aggiungi configurazione della riga Modifica configurazione della riga - Sistema la riga impostando la larghezza della colonna ed aggiungendo ulteriori colonne + Sistema la riga impostando la larghezza della colonna ed aggiungendo + ulteriori colonne + Nessuna ulteriore configurazione disponibile Colonne Totale combinazioni delle colonne nel grid layout @@ -1734,7 +1867,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Attenzione Stai eliminando le configurazioni della riga - Eliminando un nome della configurazione della riga perderai i dati associati a qualsiasi contenuto basato su questa configurazione. + Eliminando un nome della configurazione della riga perderai i dati associati a qualsiasi contenuto basato su + questa configurazione. @@ -1746,18 +1880,28 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Etichetta richiesta Abilita la vista lista - Configura l'oggetto per visualizzare una lista dei suoi figli, ordinabili e ricercabili. I figli non saranno visualizzati nell'albero dei contenuti + Configura l'oggetto per visualizzare una lista dei suoi figli, ordinabili e + ricercabili. I figli non saranno visualizzati nell'albero dei contenuti + Templates abilitati - Scegli che templates sono abilitati all'utilizzo per i contenuti di questo tipo. + Scegli che templates sono abilitati all'utilizzo per i contenuti di questo + tipo. + Consenti come nodo root - Consenti agli editori la creazione di questo tipo di contenuto a livello root. + Consenti agli editori la creazione di questo tipo di contenuto a livello root. + Tipi di nodi figlio consentiti - Consenti la creazione di contenuti con i tipi specificati sotto il contenuto di questo tipo. + Consenti la creazione di contenuti con i tipi specificati sotto il contenuto di + questo tipo. + Scegli nodo figlio - - + + + + Non ci sono tipi di contenuto utilizzabili come composizione. - + + Crea nuovo Usa esistente Impostazioni dell'editor @@ -1773,50 +1917,71 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Tutti i tipo di documento Tutti i documenti Tutti i media - che usano questo tipo di documento verranno eliminati permanentemente, sei sicuro di voler eliminare anche questi? - che usano questo tipo di media verranno eliminati permanentemente, sei sicuro di voler eliminare anche questi? - che usano questo tipo di membro verranno eliminati permanentemente, sei sicuro di voler eliminare anche questi? + che usano questo tipo di documento verranno eliminati permanentemente, sei sicuro di + voler eliminare anche questi? + + che usano questo tipo di media verranno eliminati permanentemente, sei sicuro di voler + eliminare anche questi? + + che usano questo tipo di membro verranno eliminati permanentemente, sei sicuro di voler + eliminare anche questi? + e tutti i documenti che usano questo tipo e tutti i media che usano questo tipo e tutti i membri che usano questo tipo - Abilita il membro alla modifica di questo valore dalla pagina del suo profilo. + Abilita il membro alla modifica di questo valore dalla pagina del suo + profilo. + Dati sensibili - + + Visualizza sul profilo del membro - Permette a questo valore di essere visualizzato sulla pagina del profilo del membro + Permette a questo valore di essere visualizzato sulla pagina del profilo + del membro + la scheda non ha un ordine - + + Consenti variazioni Consenti variazioni in base alla lingua Consenti segmentazione Varia in base alla cultura Varia per segmenti - Consenti agli editors la creazione di contenuto di questo tipo in lingue differenti. + Consenti agli editors la creazione di contenuto di questo tipo in lingue + differenti. + Consenti agli editors la creazione di contenuto in diverse lingue. Consenti agli editors la creazione di segmenti per questo contenuto. Consenti variazioni in base alla lingua Consenti segmentazione Tipo di elemento - - + + + + - + + Aspetto Etichetta sopra (larghezza intera) Aggiungi lingua Lingua obbligatoria - + + Lingua di default - Il cambio della lingua predefinita potrebbe comportare la mancanza di contenuti predefiniti. + Il cambio della lingua predefinita potrebbe comportare la mancanza di + contenuti predefiniti. + Ripiega a Nessuna lingua alternativa - + + Lingua alternativa nessuna @@ -1825,7 +1990,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Modifica parametro Inserisci il nome della macro Parametri - Definisci i parametri che dovranno essere disponibili utilizzando questa macro. + Definisci i parametri che dovranno essere disponibili utilizzando questa macro. + Seleziona il file partial view per la macro @@ -1833,7 +1999,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Modelli generati Impossibile generare i modelli - La generazione dei modelli non è andata a buon fine, consulta i log di Umbraco + La generazione dei modelli non è andata a buon fine, consulta i log di Umbraco + Aggiungi campo alternativo @@ -1869,7 +2036,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Campi Standard Maiuscolo - + + Data e ora @@ -1896,13 +2064,15 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Saluti dal robot di Umbraco ]]> - + + - + + Traduttore @@ -1951,11 +2121,14 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in - + + Accesso - Basandosi sui gruppi assegnati e sui nodi di partenza, l'utente ha accesso ai seguenti nodi + Basandosi sui gruppi assegnati e sui nodi di partenza, l'utente ha accesso ai seguenti + nodi + Assegna accessi Amministratore Campo Categoria @@ -1968,10 +2141,13 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Conferma la nuova password - + + Contenuto del canale Crea un altro utente - Crea nuovi utenti per dar loro accesso a Umbraco. Quando un nuovo utente viene creato, una nuova password da condividere con l'utente viene generata. + Crea nuovi utenti per dar loro accesso a Umbraco. Quando un nuovo utente viene creato, + una nuova password da condividere con l'utente viene generata. + Campo Descrizione Disabilita l'utente Tipo di Documento @@ -1981,7 +2157,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Vai al profilo dell'utente Crea gruppi per assegnare gli accessi e i permessi Invita un altro utente - + + Lingua Imposta la lingua che vedrai nei menu e nei dialoghi Data dell'ultimo blocco @@ -1991,7 +2168,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Nodo di inizio nella sezione Media Limita la libreria multimediale a un nodo iniziale specifico Nodi di inizio nella sezione Media - + + Sezioni non ha ancora effettuato l'accesso @@ -2005,7 +2183,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Password attuale - + + @@ -2026,16 +2205,23 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Ultimo aggiornamento utente - + + Gestione utenti Username Gruppo di utenti - - Ciao e benvenuto su Umbraco! In solo 1 minuto sarai pronto a partire, dovrai solamente impostare una password e aggiungere una foto profilo. - - Caricando una tua foto, gli altri utenti potranno riconoscerti facilmente. Fai clic sul cerchio sopra per caricare la tua foto. + + + Ciao e benvenuto su Umbraco! In solo 1 minuto sarai pronto a partire, dovrai + solamente impostare una password e aggiungere una foto profilo. + + + + Caricando una tua foto, gli altri utenti potranno riconoscerti facilmente. Fai + clic sul cerchio sopra per caricare la tua foto. + Autore Modifica Il tuo profilo @@ -2192,99 +2378,166 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in 3: Configuration file path --> - - - + + + + + + Gli errori personalizzati sono impostati a '%0%'. - + + Errori personalizzati impostati correttamente a '%0%'. I MacroErrors sono impostati a '%0%'. - + + I MacroErrors sono ora impostati a '%0%'. - - - + + + + + + Il file seguente non esiste: '%0%'. - '%0%' nel file di configurazione '%1%'.]]> - - - Sono stati trovati %0% problemi con lo schema del database (Controlla i log per dettagli aggiuntivi) - Sono stati trovati alcuni errori durante la validazione dello schema del database per la versione corrente di Umbraco. + + '%0%' nel file di configurazione '%1%'.]]> + + + + + Sono stati trovati %0% problemi con lo schema del database + (Controlla i log per dettagli aggiuntivi) + + Sono stati trovati alcuni errori durante la validazione + dello schema del database per la versione corrente di Umbraco. + Errore di validazione del certificato SSL: '%0%' - + + Errore durante il ping dell'URL %0% - '%1%' - Attualmente %0% stai visualizzando il sito web utilizzando lo schema HTTPS. - - - Non posso aggiornare l'impostazione 'Umbraco.Core.UseHttps' nel file web.config. Errore: %0% + Attualmente %0% stai visualizzando il sito web utilizzando lo schema + HTTPS. + + + + + + Non posso aggiornare l'impostazione 'Umbraco.Core.UseHttps' nel file + web.config. Errore: %0% + Abilita HTTPS - Imposta il valore di umbracoSSL a true nelle appSetting del file web.config. - + Imposta il valore di umbracoSSL a true nelle appSetting del file + web.config. + + + Correggi - Non posso correggere un controllo con un valore di confronto pari a 'ShouldNotEqual'. - Non posso correggere un controllo con un valore di confronto pari a 'ShouldEqual' con un valore fornito. + Non posso correggere un controllo con un valore di confronto pari a + 'ShouldNotEqual'. + + Non posso correggere un controllo con un valore di confronto pari a + 'ShouldEqual' con un valore fornito. + - - + + + + - - + + + + Tutte le cartelle hanno i permessi corretti impostati. - %0%.]]> - %0%. Se non vengono scritte non è necessario intraprendere alcuna azione.]]> + + %0%.]]> + + %0%. Se non vengono scritte non è necessario intraprendere alcuna azione.]]> Tutti i file hanno i permessi corretti impostati. - %0%.]]> - %0%. Se non vengono scritti non è necessario intraprendere alcuna azione.]]> - X-Frame-Options usato per controllare se un sito può essere inserito in un IFRAME da un altro è stato trovato.]]> - X-Frame-Options usato per controllare se un sito può essere inserito in un IFRAME da un altro non è stato trovato.]]> + + %0%.]]> + + %0%. Se non vengono scritti non è necessario intraprendere alcuna azione.]]> + + X-Frame-Options usato per controllare se un sito può essere inserito in un IFRAME da un altro è stato trovato.]]> + + X-Frame-Options usato per controllare se un sito può essere inserito in un IFRAME da un altro non è stato trovato.]]> Imposta l'header nella configurazione - Aggiunge un valore alla sezione httpProtocol/customHeaders del file web.config per prevenire che un sito possa essere inserito in un IFRAME da altri siti web. - + Aggiunge un valore alla sezione httpProtocol/customHeaders del + file web.config per prevenire che un sito possa essere inserito in un IFRAME da altri siti web. + + + Non posso aggiornare il file web.config. Errore: %0% - X-Content-Type-Options usato per proteggere dalle vulnerabilità per MIME sniffing è stato trovato.]]> - X-Content-Type-Options usato per proteggere dalle vulnerabilità per MIME sniffing è stato trovato.]]> - - - Strict-Transport-Security, conosciuto anche come l'header HSTS, è stato trovato.]]> - Strict-Transport-Security non è stato trovato.]]> - Aggiunge l'header 'Strict-Transport-Security' con il valore 'max-age=10886400' alla sezione httpProtocol/customHeaders del file web.config. Usa questa correzione solo se avrai i tuoi domini in esecuzione con https per le prossime 18 settimane (minimo). + + X-Content-Type-Options usato per proteggere dalle vulnerabilità per MIME sniffing è stato trovato.]]> + + X-Content-Type-Options usato per proteggere dalle vulnerabilità per MIME sniffing è stato trovato.]]> + + + + + + Strict-Transport-Security, conosciuto anche come l'header HSTS, è stato trovato.]]> + + Strict-Transport-Security non è stato trovato.]]> + Aggiunge l'header 'Strict-Transport-Security' con il valore + 'max-age=10886400' alla sezione httpProtocol/customHeaders del file web.config. Usa questa correzione solo se + avrai i tuoi domini in esecuzione con https per le prossime 18 settimane (minimo). + - X-XSS-Protection è stato trovato.]]> - X-XSS-Protection non è stato trovato.]]> - Aggiunge l'header 'X-XSS-Protection' con il valore '1; mode=block' alla sezione httpProtocol/customHeaders del file web.config. - + + X-XSS-Protection è stato trovato.]]> + + X-XSS-Protection non è stato trovato.]]> + Aggiunge l'header 'X-XSS-Protection' con il valore '1; + mode=block' alla sezione httpProtocol/customHeaders del file web.config. + + + - %0%.]]> - Non sono stati trovati header che rivelano informazioni riguardo alla tecnologia utilizzata per il sito. - - - Le impostazioni SMTP sono state inserite correttamente e il servizio funziona come previsto. - - %0%.]]> - %0%.]]> -

        I risultati dell'Health Check programmato di Umbraco del %0% alle %1% è il seguente:

        %2%]]>         + + %0%.]]> + Non sono stati trovati header che rivelano informazioni riguardo alla + tecnologia utilizzata per il sito. + + + + + + Le impostazioni SMTP sono state inserite correttamente e il servizio + funziona come previsto. + + + + + %0%.]]> + + %0%.]]> + +

        I risultati dell'Health Check programmato di Umbraco del %0% alle %1% è il seguente:

        %2%]]>         Stato dell'Health Check di Umbraco: %0% Controlla tutti i gruppi Controlla gruppo @@ -2304,16 +2557,19 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Gestione Redirect URL I seguenti URL reindirizzano a questo contenuto: - + + Sei sicuro di voler eliminare il reindirizzamento da '%0%' a '%1%'? Reindirizzamento URL rimosso. Errore durante la rimozione del reindirizzamento URL. Sei sicuro di voler disabilitare il tracciamento degli URL? - + + - + + Nessun elemento del dizionario tra cui scegliere @@ -2323,10 +2579,13 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in %1% di troppo.]]> - Contenuto cestinato con Id: {0} relativo al contenuto principale originale con Id: {1} + Contenuto cestinato con Id: {0} relativo al contenuto principale originale con Id: {1} + Media cestinato con Id: {0} relativo al media principale originale con Id: {1} Impossibile ripristinare automaticamente questo elemento - Non esiste una posizione in cui questo elemento possa essere ripristinato automaticamente. Puoi spostare l'elemento manualmente utilizzando l'albero sottostante. + Non esiste una posizione in cui questo elemento possa essere ripristinato + automaticamente. Puoi spostare l'elemento manualmente utilizzando l'albero sottostante. + @@ -2396,8 +2655,9 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Cerca nel backoffice di Umbraco Cerca contenuti, media, ecc. nel backoffice. - - Percorso: + + + Percorso: Trovato in Ha una traduzione Traduzione mancante @@ -2443,7 +2703,9 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Ricerca con Bing Ricerca questo messaggio con Bing Ricerca su Our Umbraco - Ricerca questo messaggio sui forum e le documentazioni di Our Umbraco + Ricerca questo messaggio sui forum e le documentazioni di + Our Umbraco + Ricerca su Our Umbraco con Google Ricerca sui forum di Our Umbraco con Google Ricerca nel codice sorgente di Umbraco @@ -2561,7 +2823,8 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Inizia da qui! - + + Benvenuto nell'amichevole CMS - + + Umbraco Forms - Crea moduli utilizzando un'interfaccia drag and drop intuitiva. Da semplici moduli di contatto che inviano e-mail a questionari avanzati che si integrano con i sistemi CRM. I tuoi clienti lo adoreranno! + Crea moduli utilizzando un'interfaccia drag and drop intuitiva. Da semplici moduli di + contatto che inviano e-mail a questionari avanzati che si integrano con i sistemi CRM. I tuoi clienti lo + adoreranno! + Scegli tipo di elemento @@ -2615,15 +2882,19 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Etichetta Vista personalizzata Mostra la descrizione della vista personalizzata - + + Modello di impostazioni Dimensione dell'editor di sovrapposizione Aggiungi vista personalizzata Aggiungi impostazioni Sovrascrivi modello di etichetta - %0%?]]> - %0%?]]> - + + %0%?]]> + + %0%?]]> + + Miniatura Aggiungi miniatura @@ -2636,14 +2907,18 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Scartare la creazione? Errore! - + + Aggiungi contenuto Aggiungi %0% - + + Cosa sono i modelli di contenuto? - I modelli di contenuto sono contenuti predefiniti che possono essere selezionati durante la creazione di un nuovo nodo di contenuto. + I modelli di contenuto sono contenuti predefiniti che possono essere selezionati + durante la creazione di un nuovo nodo di contenuto. + Come creo un modello di contenuto? Come gestisco i modelli di contenuto? - Puoi modificare ed eliminare i modelli di contenuto dall'albero "Modelli di contenuto" nella sezione Impostazioni. Espandere il tipo di documento su cui si basa il modello di contenuto e fare clic su di esso per modificarlo o eliminarlo. + Puoi modificare ed eliminare i modelli di contenuto dall'albero "Modelli di + contenuto" nella sezione Impostazioni. Espandere il tipo di documento su cui si basa il modello di contenuto e + fare clic su di esso per modificarlo o eliminarlo. + Chiudi @@ -2664,11 +2942,13 @@ Per gestire il tuo sito web, è sufficiente aprire il backoffice di Umbraco e in Anteprima sito web Aprire l'anteprima del sito web? - + + Anteprima dell'ultima versione Visualizza versione pubblicata Vuoi vedere la versione pubblicata? - + + Visualizza versione pubblicata diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index 1975cb6a1e..bedf544ea0 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -103,7 +103,7 @@ Bewerk huidige domeinen Overerven - Cultuur @@ -115,9 +115,9 @@ Tonen voor Inhoud verwijderd Inhoud gedepubliceerd - Inhoud gedepubliceerd voor talen: %0% + Inhoud gedepubliceerd voor talen: %0% Inhoud gepubliceerd - Inhoud gepubliceerd voor talen: %0% + Inhoud gepubliceerd voor talen: %0% Inhoud bewaard Inhoud bewaard voor talen: %0% Inhoud verplaatst @@ -225,9 +225,15 @@ Dit media item heeft geen link Inhoud kan niet worden toegevoegd aan dit item Eigenschappen - Dit document is gepubliceerd maar niet zichtbaar omdat de bovenliggende pagina '%0%' niet gepubliceerd is - Deze cultuur is gepubliceerd maar is niet zichtbaar omdat het niet gepubliceerd is op de bovenliggende pagina '%0%' - Dit document is gepubliceerd, maar het staat niet in de cache (interne serverfout) + Dit document is gepubliceerd maar niet zichtbaar omdat de bovenliggende pagina '%0%' + niet gepubliceerd is + + Deze cultuur is gepubliceerd maar is niet zichtbaar omdat het niet + gepubliceerd is op de bovenliggende pagina '%0%' + + Dit document is gepubliceerd, maar het staat niet in de cache (interne + serverfout) + Kan de URL niet ophalen Dit document is gepubliceerd maar de URL conflicteert met %0% Dit document is gepubliceerd maar de URL kan niet worden gerouteerd @@ -235,14 +241,18 @@ Gepubliceerd Gepubliceerd (hangende wijzigingen) Publicatiestatus - %0% en alle onderliggende content items en maak daarmee de inhoud openbaar.]]> - + + %0% en alle onderliggende content items en maak daarmee de inhoud openbaar.]]> + + Publiceren op Depubliceren op Verwijderdatum Datum instellen De sorteervolgorde is gewijzigd - Om nodes te sorteren, sleep de nodes of klik op één van de kolomtitels. Je kan meerdere nodes tegelijk selecteren door de "shift"- of "control"knop in te drukken tijdens het selecteren. + Om nodes te sorteren, sleep de nodes of klik op één van de kolomtitels. Je kan meerdere nodes + tegelijk selecteren door de "shift"- of "control"knop in te drukken tijdens het selecteren. + Statistieken Titel (optioneel) Alternatieve tekst (optioneel) @@ -261,26 +271,37 @@ Subitems Doel Dit betekend de volgende tijd op de server: - Wat houd dit in?]]> + + Wat houd dit in?]]> Ben je er zeker van dat je dit item wilt verwijderen? Ben je zeker dat je alle items wilt verwijderen? - Eigenschap %0% gebruikt editor %1% welke niet wordt ondersteund door Nested Content. + Eigenschap %0% gebruikt editor %1% welke niet wordt ondersteund door + Nested Content. + Er zijn geen content types geconfigureerd voor deze eigenschap. Element type toevoegen Selecteer een element type - Selecteer de groep waarvan je de eigenschappen wil tonen. Indien je niets selecteert, wordt de eerste groep van het elementtype gebruikt. - Voer een angular expressie in om te evalueren tegen de naam van elk item. Gebruik + Selecteer de groep waarvan je de eigenschappen wil tonen. Indien je niets + selecteert, wordt de eerste groep van het elementtype gebruikt. + + Voer een angular expressie in om te evalueren tegen de naam van elk + item. Gebruik + om de itemindex weer te geven Voeg nog een tekstvak toe Verwijder dit tekstvak Content root Inclusief niet-gepubliceerde inhoudsitems. - Deze waarde is verborgen. Indien u toegang nodig heeft om deze waarde te bekijken, neem dan contact op met uw websitebeheerder. + Deze waarde is verborgen. Indien u toegang nodig heeft om deze waarde te bekijken, + neem dan contact op met uw websitebeheerder. + Deze waarde is verborgen Welke talen wil je publiceren? Welke talen wil je ter goedkeuring verzenden? Welke talen wil je plannen? - Selecteer de talen om te depubliceren. Een verplichte taal depubliceren zal alle talen depubliceren. + Selecteer de talen om te depubliceren. Een verplichte taal depubliceren zal alle + talen depubliceren. + Alle nieuwe varianten worden opgeslagen. Welke varianten wil je publiceren? Kies welke varianten u wilt opslaan. @@ -289,7 +310,8 @@ Klaar om te publiceren? Klaar om op te slaan? Ter goedkeuring verzenden - Selecteer de datum en tijd om het content item te publiceren en/of depubliceren. + Selecteer de datum en tijd om het content item te publiceren en/of depubliceren. + Maak nieuw Plakken vanaf het klembord Dit item is in de prullenbak @@ -301,7 +323,9 @@ Inhoudssjabloon aangemaakt Inhoudssjabloon is aangemaakt voor '%0%' Er bestaat al een Inhoudssjabloon met dezelfde naam - Een inhoudssjabloon is voorgedefinieerde inhoud die een editor kan selecteren om te gebruiken als basis voor het maken van nieuwe inhoud + Een inhoudssjabloon is voorgedefinieerde inhoud die een editor kan selecteren om + te gebruiken als basis voor het maken van nieuwe inhoud + Klik om te uploaden @@ -326,14 +350,22 @@ Selecteer een documenttype waarvoor je een Inhoudssjabloon wil maken Voer een mapnaam in Kies een type en een titel - "Documenttypes".]]> - Documenttypes in de sectie Instellingen.]]> - De geselecteerde pagina in de boomstructuur laat geen nieuwe onderliggende paginas toe. + + "Documenttypes".]]> + + Documenttypes in de sectie Instellingen.]]> + De geselecteerde pagina in de boomstructuur laat geen nieuwe + onderliggende paginas toe. + Rechten aanpassen voor dit documenttype Nieuw documenttype aanmaken - Documenttypes in de sectie Instellingen, de optie Toestaan op root-niveau onder Rechten.]]> - "Mediatypes".]]> - De geselecteerde media in de boomstructuur laat niet toe dat er onderliggende media aangemaakt wordt. + + Documenttypes in de sectie Instellingen, de optie Toestaan op root-niveau onder Rechten.]]> + + "Mediatypes".]]> + De geselecteerde media in de boomstructuur laat niet toe dat er + onderliggende media aangemaakt wordt. + Rechten aanpassen voor dit mediatype Documenttype zonder sjabloon Nieuwe map @@ -350,7 +382,8 @@ Open je website - Verbergen - Als Umbraco niet geopend wordt dan moet je mogelijk popups toestaan voor deze site. + Als Umbraco niet geopend wordt dan moet je mogelijk popups toestaan voor deze site. + is geopend in een nieuw venster Herstarten Bezoek @@ -360,11 +393,17 @@ Blijf op deze pagina Negeer wijzigingen Wijzigingen niet opgeslagen - Weet je zeker dat deze pagina wilt verlaten? Er zijn onopgeslagen wijzigingen + Weet je zeker dat deze pagina wilt verlaten? Er zijn onopgeslagen wijzigingen + Publiceren maakt de geselecteerde items zichtbaar op de site. - Depubliceren zal de geselecteerde items en alle onderliggende items verwijderen van de site. - Depubliceren zal deze pagina en alle onderliggende pagina's verwijderen van de site. - Wijzigingen niet opgeslagen. Aanpassingen aan het Documenttype zullen de wijzigingen ongedaan maken. + Depubliceren zal de geselecteerde items en alle onderliggende items + verwijderen van de site. + + Depubliceren zal deze pagina en alle onderliggende pagina's verwijderen van de site. + + Wijzigingen niet opgeslagen. Aanpassingen aan het Documenttype zullen de + wijzigingen ongedaan maken. + Done @@ -413,7 +452,9 @@ Klik om een Macro toe te voegen Tabel invoegen Dit zal de taal verwijderen - De cultuur veranderen voor een taal kan een langdurige operatie zijn en zal ertoe leiden dat de inhoudscache en indexen opnieuw worden opgebouwd + De cultuur veranderen voor een taal kan een langdurige operatie zijn en zal ertoe + leiden dat de inhoudscache en indexen opnieuw worden opgebouwd + Laatst aangepast op Link Interne link: @@ -425,16 +466,23 @@ Rechten instellen voor Rechten instellen voor %0% voor gebruikersgroepf %1% Selecteer de gebruikersgroepen waarvoor u de rechten wilt instellen - De items worden nu uit de prullenbak verwijderd. Sluit dit venster niet terwijl de actie nog niet voltooid is. + De items worden nu uit de prullenbak verwijderd. Sluit dit venster niet terwijl de + actie nog niet voltooid is. + De prullenbak is nu leeg. Als items worden verwijderd uit de prullenbak, zijn ze voorgoed verwijderd. - regexlib.com ondervindt momenteel problemen waarover we geen controle hebben. Onze excuses voor het ongemak.]]> - Zoek naar een reguliere expressie om validatie aan een formulierveld toe te voegen. Voorbeeld: 'email', 'postcode', 'URL'. + + regexlib.com ondervindt momenteel problemen waarover we geen controle hebben. Onze excuses voor het ongemak.]]> + Zoek naar een reguliere expressie om validatie aan een formulierveld toe te voegen. + Voorbeeld: 'email', 'postcode', 'URL'. + Verwijder Macro Verplicht veld Site is opnieuw geïndexeerd De site is opnieuw gepubliceerd - De cache zal worden vernieuwd. Alle gepubliceerde inhoud zal worden bijgewerkt, terwijl ongepubliceerde inhoud ongepubliceerd zal blijven. + De cache zal worden vernieuwd. Alle gepubliceerde inhoud zal worden bijgewerkt, + terwijl ongepubliceerde inhoud ongepubliceerd zal blijven. + Aantal kolommen Aantal regels Klik op de afbeelding voor volledige grootte @@ -476,7 +524,9 @@ Selecteer editor Selecteer configuratie Selecteer fragment - Dit zal de node en al zijn talen verwijderen. Als je slechts één taal wil verwijderen, moet je de node in die taal depubliceren. + Dit zal de node en al zijn talen verwijderen. Als je slechts één taal wil + verwijderen, moet je de node in die taal depubliceren. + %0% verwijderen.]]> %0% verwijderen van de %1% groep]]> Ja, verwijderen @@ -496,7 +546,9 @@ Ingestelde Zoekers - Toont eigenschappen en hulpmiddelen voor elke geconfigureerde Zoeker (bijv. zoals een multi-indexzoeker) + Toont eigenschappen en hulpmiddelen voor elke geconfigureerde Zoeker + (bijv. zoals een multi-indexzoeker) + Veldwaarden Gezondheidsstatus De gezondheidsstatus van de index en of het kan gelezen worden @@ -504,7 +556,9 @@ Index info De eigenschappen oplijsten van de index Beheer de indexen van Examine - Bekijk de details van elke index en gebruik hulpmiddelen voor het beheer er van + Bekijk de details van elke index en gebruik hulpmiddelen voor het beheer er + van + Index opnieuw bouwen @@ -518,7 +572,9 @@ Hulpmiddelen om de index te beheren velden De index kan niet gelezen worden en moet opnieuw worden gebouwd - Het proces duurt langer dan verwacht, controleer het Umbraco logboek om te kijken of er geen fouten waren tijdens deze operatie + Het proces duurt langer dan verwacht, controleer het Umbraco logboek om te kijken + of er geen fouten waren tijdens deze operatie + Deze index kan niet opnieuw worden opgebouwd want het heeft geen toegewezen IIndexPopulator @@ -570,16 +626,25 @@ Selecteer een map om te verplaatsen naar in de boomstructuur hieronder werd eronder verplaatst - %0% te verwijderen zullen alle eigenschappen en de data verwijderd worden van de volgende items:]]> - Ik begrijp dat deze actie alle eigenschappen en data zal verwijderen die gebaseerd is op dit datatype. + + %0% te verwijderen zullen alle eigenschappen en de data verwijderd worden van de volgende items:]]> + Ik begrijp dat deze actie alle eigenschappen en data zal verwijderen die + gebaseerd is op dit datatype. + - Je data is opgeslagen, maar voordat je deze pagina kunt publiceren moet je eerst aan paar problemen oplossen: - Veranderen van het wachtwoord wordt door de huidige Membership Provider niet ondersteund (EnablePasswordRetrieval moet op true staan) + Je data is opgeslagen, maar voordat je deze pagina kunt publiceren moet je eerst + aan paar problemen oplossen: + + Veranderen van het wachtwoord wordt door de huidige Membership Provider + niet ondersteund (EnablePasswordRetrieval moet op true staan) + %0% bestaat al Er zijn fouten geconstateerd: Er zijn fouten geconstateerd: - Het wachtwoord moet minstens %0% tekens lang zijn en moet minstens %1% cijfers bevatten + Het wachtwoord moet minstens %0% tekens lang zijn en moet minstens %1% cijfers + bevatten + %0% moet een geheel getal zijn %0% op tab %1% is een verplicht veld %0% is een verplicht veld @@ -589,13 +654,19 @@ Een error ontvangen van de server Het opgegeven bestandstype is niet toegestaan ​​door de beheerder - OPMERKING! Ondanks dat CodeMiror is ingeschakeld, is het uitgeschakeld in Internet Explorer omdat het niet stabiel genoeg is. - Zowel de alias als de naam van het nieuwe eigenschappentype moeten worden ingevuld! + OPMERKING! Ondanks dat CodeMiror is ingeschakeld, is het uitgeschakeld in Internet + Explorer omdat het niet stabiel genoeg is. + + Zowel de alias als de naam van het nieuwe eigenschappentype moeten + worden ingevuld! + Er is een probleem met de lees/schrijfrechten op een bestand of map Error bij het laden van Partial View script (file: %0%) Vul een titel in Selecteer een type - U wilt een afbeelding groter maken dan de originele afmetingen. Weet je zeker dat je wilt doorgaan? + U wilt een afbeelding groter maken dan de originele afmetingen. Weet je + zeker dat je wilt doorgaan? + Start node is verwijderd, neem contact op met uw systeembeheerder Markeer de inhoud voordat u de stijl aanpast Geen actieve stijlen beschikbaar @@ -795,19 +866,31 @@ De installer kan geen connectie met de database maken. - De web.config kon niet worden opgeslagen. Gelieve de connectiestring handmatig aan te passen. + De web.config kon niet worden opgeslagen. Gelieve de connectiestring handmatig + aan te passen. + Je database is gevonden en is geïdentificeerd als - Database configuratie - installeren om de Umbraco %0% database te installeren]]> - Volgende om door te gaan.]]> - De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is.

        Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.

        Klik op de knop opnieuw proberen als je hiermee klaar bent.
        Meer informatie over het aanpassen van de web.config vind je hier.

        ]]>         - Gelieve contact op te nemen met je ISP indien nodig. Wanneer je installeert op een lokale computer of server, dan heb je waarschijnlijk informatie nodig van je systeembeheerder.]]> - Klik de upgrade knop om je database te upgraden naar Umbraco %0%

        Maak je geen zorgen - er zal geen inhoud worden gewist en alles blijft gewoon werken!

        ]]>         - Klik Volgende om verder te gaan.]]> - volgende om door te gaan]]> - Het wachtwoord van de default gebruiker dient veranderd te worden!]]> - De default gebruiker is geblokkeerd of heeft geen toegang tot Umbraco!

        Geen verdere actie noodzakelijk. Klik Volgende om verder te gaan.]]> - Het wachtwoord van de default gebruiker is sinds installatie met succes veranderd.

        Geen verdere actie noodzakelijk. Klik Volgende om verder te gaan.]]> + Database configuratie + + installeren om de Umbraco %0% database te installeren]]> + + Volgende om door te gaan.]]> + + De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is.

        Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.

        Klik op de knop opnieuw proberen als je hiermee klaar bent.
        Meer informatie over het aanpassen van de web.config vind je hier.

        ]]>         + + Gelieve contact op te nemen met je ISP indien nodig. Wanneer je installeert op een lokale computer of server, dan heb je waarschijnlijk informatie nodig van je systeembeheerder.]]> + + Klik de upgrade knop om je database te upgraden naar Umbraco %0%

        Maak je geen zorgen - er zal geen inhoud worden gewist en alles blijft gewoon werken!

        ]]>         + + Klik Volgende om verder te gaan.]]> + + volgende om door te gaan]]> + + Het wachtwoord van de default gebruiker dient veranderd te worden!]]> + + De default gebruiker is geblokkeerd of heeft geen toegang tot Umbraco!

        Geen verdere actie noodzakelijk. Klik Volgende om verder te gaan.]]> + + Het wachtwoord van de default gebruiker is sinds installatie met succes veranderd.

        Geen verdere actie noodzakelijk. Klik Volgende om verder te gaan.]]> Het wachtwoord is veranderd! Neem een jumpstart en bekijk onze introductie videos Nog niet geïnstalleerd. Betreffende bestanden en mappen - Meer informatie over het instellen van machtigingen voor Umbraco vind je hier - Je dient ASP.NET 'modify' machtiging te geven voor de volgende bestanden/mappen - Je machtigingen zijn bijna perfect!

        Je kunt Umbraco zonder problemen starten, maar je kunt nog geen packages installeren om volledig van Umbraco te profiteren.]]>         + Meer informatie over het instellen van machtigingen voor Umbraco + vind je hier + + Je dient ASP.NET 'modify' machtiging te geven voor de volgende + bestanden/mappen + + + Je machtigingen zijn bijna perfect!

        Je kunt Umbraco zonder problemen starten, maar je kunt nog geen packages installeren om volledig van Umbraco te profiteren.]]>         Hoe op te lossen Klik hier om de tekst versie te lezen - video tutorial over het instellen van machtigingen voor Umbraco, of lees de tekst versie.]]> - Je machtigingen zijn misschien incorrect!

        Je kunt Umbraco probleemloos starten, maar je kunt nog geen mappen aanmaken of packages installeren om zo volledig van Umbraco te profiteren.]]>         - Je machtigingen zijn nog niet gereed gemaakt voor Umbraco!

        Om Umbraco te starten zul je je machtigingen moeten aanpassen.]]>         - Je machtigingen zijn perfect!

        Je bent nu klaar om Umbraco te starten en om packages te installeren!]]>         + + video tutorial over het instellen van machtigingen voor Umbraco, of lees de tekst versie.]]> + + Je machtigingen zijn misschien incorrect!

        Je kunt Umbraco probleemloos starten, maar je kunt nog geen mappen aanmaken of packages installeren om zo volledig van Umbraco te profiteren.]]>         + + Je machtigingen zijn nog niet gereed gemaakt voor Umbraco!

        Om Umbraco te starten zul je je machtigingen moeten aanpassen.]]>         + + Je machtigingen zijn perfect!

        Je bent nu klaar om Umbraco te starten en om packages te installeren!]]>         Map probleem wordt opgelost - Volg deze link voor meer informatie over problemen met ASP.NET en het aanmaken van mappen + Volg deze link voor meer informatie over problemen met ASP.NET en + het aanmaken van mappen + Machtigingen worden aangepast - Umbraco heeft write/modify toegang nodig op bepaalde mappen om bestanden zoals plaatjes en PDF's op te slaan. Het slaat ook tijdelijke data (ook bekend als 'de cache') op om de snelheid van je website te verbeteren. + Umbraco heeft write/modify toegang nodig op bepaalde mappen om bestanden zoals plaatjes + en PDF's op te slaan. Het slaat ook tijdelijke data (ook bekend als 'de cache') op om de snelheid van je website + te verbeteren. + Ik wil met een lege website beginnen - leer hoe). Je kunt er later alsnog voor kiezen om Runway te installeren. Ga dan naar de Ontwikkelaar sectie en kies Packages.]]> + + leer hoe). Je kunt er later alsnog voor kiezen om Runway te installeren. Ga dan naar de Ontwikkelaar sectie en kies Packages.]]> Je hebt zojuist een blanco Umbraco platform geinstalleerd. Wat wil je nu doen? Runway is geinstalleerd - Dit is onze lijst van aanbevolen modules. Vink de modules die je wilt installeren, of bekijk de volledige lijst modules]]> + + Dit is onze lijst van aanbevolen modules. Vink de modules die je wilt installeren, of bekijk de volledige lijst modules]]> Alleen aanbevolen voor gevorderde gebruikers Ik wil met een eenvoudige website beginnen "Runway" is een eenvoudige website die je van enkele elementaire documenttypes en templates voorziet. De installer kan Runway automatisch voor je opzetten, maar je kunt het gemakkelijk aanpassen, uitbreiden of verwijderen. Het is niet vereist en je kunt Umbraco prima zonder Runway gebruiken. @@ -846,17 +945,23 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Stap 4/5: Umbraco beveiliging controleren Stap 5/5: Umbraco is klaar Bedankt dat je voor Umbraco hebt gekozen - Browse je nieuwe site Je hebt Runway geinstalleerd, dus kijk eens hoe je nieuwe site eruit ziet.]]> - Meer hulp en informatie Vind hulp in onze bekroonde community, blader door de documentatie of bekijk enkele gratis videos over het bouwen van een eenvoudige site, het gebruiken van packages en een overzicht van Umbraco terminologie]]> + + Browse je nieuwe site Je hebt Runway geinstalleerd, dus kijk eens hoe je nieuwe site eruit ziet.]]> + + Meer hulp en informatie Vind hulp in onze bekroonde community, blader door de documentatie of bekijk enkele gratis videos over het bouwen van een eenvoudige site, het gebruiken van packages en een overzicht van Umbraco terminologie]]> Umbraco %0% is geïnstalleerd en klaar voor gebruik. - /web.config bestand aanpassen, en de Appsetting key UmbracoConfigurationStatus onder in het bestand veranderen naar '%0%'.]]> - meteen beginnen door de "Launch Umbraco" knop hieronder te klikken.
        Als je een beginnende Umbraco gebruiker bent, dan kun je you can find veel informatie op onze "getting started" pagina's vinden.]]>         - Launch Umbraco Om je website te beheren open je simpelweg de Umbraco backoffice en begin je inhoud toe te voegen, templates en stylesheets aan te passen of nieuwe functionaliteit toe te voegen]]> + + /web.config bestand aanpassen, en de Appsetting key UmbracoConfigurationStatus onder in het bestand veranderen naar '%0%'.]]> + + meteen beginnen door de "Launch Umbraco" knop hieronder te klikken.
        Als je een beginnende Umbraco gebruiker bent, dan kun je you can find veel informatie op onze "getting started" pagina's vinden.]]>         + + Launch Umbraco Om je website te beheren open je simpelweg de Umbraco backoffice en begin je inhoud toe te voegen, templates en stylesheets aan te passen of nieuwe functionaliteit toe te voegen]]> Verbinding met de database mislukt. Umbraco versie 3 Umbraco versie 4 Bekijken - Umbraco %0% voor een nieuwe installatie of een upgrade van versie 3.0.

        Druk op "volgende" om de wizard te starten.]]>         + + Umbraco %0% voor een nieuwe installatie of een upgrade van versie 3.0.

        Druk op "volgende" om de wizard te starten.]]>         Cultuurcode @@ -877,10 +982,15 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je log hieronder in Inloggen met Sessie is verlopen - © 2001 - %0%
        umbraco.com

        ]]>         + + © 2001 - %0%
        umbraco.com

        ]]>         Wachtwoord vergeten? - Er zal een e-mail worden gestuurd naar het e-mailadres van jouw account. Hierin staat een link om je wachtwoord te resetten - Een e-mail met daarin de wachtwoord reset uitleg zal worden gestuurd als het e-mailadres in onze database voorkomt. + Er zal een e-mail worden gestuurd naar het e-mailadres van jouw account. + Hierin staat een link om je wachtwoord te resetten + + Een e-mail met daarin de wachtwoord reset uitleg zal worden gestuurd + als het e-mailadres in onze database voorkomt. + Wachtwoord tonen Wacthwoord verbergen Terug naar loginformulier @@ -888,7 +998,8 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Je wachtwoord is aangepast De link die je hebt aangeklikt is niet (meer) geldig. Umbraco: Wachtwoord Reset - De gebruikersnaam om in te loggen bij jouw Umbraco omgeving is: %0%

        Klik hier om je wachtwoord te resetten of knip/plak deze URL in je browser:

        %1%

        ]]>         + + De gebruikersnaam om in te loggen bij jouw Umbraco omgeving is: %0%

        Klik hier om je wachtwoord te resetten of knip/plak deze URL in je browser:

        %1%

        ]]>         Dashboard @@ -902,8 +1013,12 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je %0% is verplaatst naar %1% Verplaats naar is geselecteerd als root van je nieuwe pagina, klik hieronder op 'ok'. - Nog geen node geselecteerd, selecteer eerst een node in bovenstaade lijst voordat je op 'volgende' klikt - De huidige node is niet toegestaan onder de geselecteerde node vanwege het node type + Nog geen node geselecteerd, selecteer eerst een node in bovenstaade lijst voordat je op + 'volgende' klikt + + De huidige node is niet toegestaan onder de geselecteerde node vanwege het node + type + De huidige node kan niet naar een van zijn subpagina’s worden verplaatst. De huidige node kan niet worden gebruikt op root-niveau Deze actie is niet toegestaan omdat je onvoldoende rechten hebt op één of meer subitems. @@ -927,7 +1042,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je ]]>         De volgende talen zijn gewijzigd %0% - Hi %0%

        + Hi %0%

        Dit is een geautomatiseerde mail om u op de hoogte te brengen dat de taak '%1%' is uitgevoerd op pagina '%2%' @@ -965,7 +1080,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Acties Aangemaakt Package aanmaken - Kies een package op je computer door op "Bladeren" te klikken en de package te selecteren. Umbraco packages hebben meestal ".umb" of ".zip" als extensie. + Kies een package op je computer door op "Bladeren" te klikken en de package te + selecteren. Umbraco packages hebben meestal ".umb" of ".zip" als extensie. + Dit zal de package verwijderen Inclusief alle onderliggende nodes Geïnstalleerd @@ -973,7 +1090,8 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Deze package heeft geen instellingen Er zijn nog geen packages aangemaakt Er zijn geen packages geïnstalleerd - 'Packages' rechtsboven in je scherm.]]> + + 'Packages' rechtsboven in je scherm.]]> Package Inhoud Licentie Zoeken naar packages @@ -993,7 +1111,10 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Downloads Likes Compatibiliteit - Deze package is compatibel met de volgende versies van Umbraco, zoals gerapporteerd door de communityleden. Volledige compatibiliteit kan niet worden gegarandeerd voor versies die voor minder dan 100% worden gerapporteerd + Deze package is compatibel met de volgende versies van Umbraco, zoals + gerapporteerd door de communityleden. Volledige compatibiliteit kan niet worden gegarandeerd voor versies die voor + minder dan 100% worden gerapporteerd + Externe bronnen Auteur Documentatie @@ -1018,31 +1139,43 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Plakken met alle opmaak (Niet aanbevolen) - De tekst die je probeert te plakken bevat speciale tekens en/of opmaak. Dit kan veroorzaakt worden doordat de tekst vanuit Microsoft Word is gekopieerd. Umbraco kan deze speciale tekens en formattering automatisch verwijderen zodat de geplakte tekst geschikt is voor het web. + De tekst die je probeert te plakken bevat speciale tekens en/of opmaak. Dit kan + veroorzaakt worden doordat de tekst vanuit Microsoft Word is gekopieerd. Umbraco kan deze speciale tekens en + formattering automatisch verwijderen zodat de geplakte tekst geschikt is voor het web. + Plakken als ruwe tekst en alle opmaak verwijderen Plakken, en verwijder de opmaak (aanbevolen) Groepsgebaseerde beveiliging Als je toegang wilt verlenen aan alle leden van specifieke ledengroepen - Je moet een ledengroep maken voordat je op groep gebaseerde authenticatie kunt gebruiken + Je moet een ledengroep maken voordat je op groep gebaseerde authenticatie kunt + gebruiken + Foutpagina - Gebruikt om te tonen als een gebruiker is ingelogd, maar geen rechten heeft om de pagina te bekijken + Gebruikt om te tonen als een gebruiker is ingelogd, maar geen rechten heeft om de + pagina te bekijken + %0% beveiligen?]]> %0% is nu beveiligd]]> %0%]]> Login Pagina Kies de pagina met het login-formulier Beveiliging verwijderen - %0% wilt verwijderen?]]> + + %0% wilt verwijderen?]]> Kies de pagina's die het login-formulier en de error-berichten bevatten - %0%]]> - %0%]]> + + %0%]]> + + %0%]]> Specifieke bescherming voor leden Als je toegang wilt verlenen aan bepaalde leden - Onvoldoende gebruikersmachtigingen om alle onderliggende documenten te publiceren + Onvoldoende gebruikersmachtigingen om alle onderliggende documenten te + publiceren + @@ -1062,8 +1195,11 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je - - Validatie mislukt voor de vereiste taal '%0%'. Deze taal werd opgeslagen maar is niet gepubliceerd. + + + Validatie mislukt voor de vereiste taal '%0%'. Deze + taal werd opgeslagen maar is niet gepubliceerd. + Publicatie in uitvoering - even geduld... %0% van %1% pagina’s zijn gepubliceerd... %0% is gepubliceerd @@ -1078,13 +1214,21 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Je kan alleen items van de volgende type(s) selecteren: %0% - Je hebt een content-item geselecteerd dat op dit ogenblik verwijderd of in the prullenbak is - Je hebt content-items geselecteerd die op dit ogenblik verwijderd of in the prullenbak zijn + Je hebt een content-item geselecteerd dat op dit ogenblik verwijderd of in the + prullenbak is + + Je hebt content-items geselecteerd die op dit ogenblik verwijderd of in the + prullenbak zijn + Verwijderd item - Je hebt een media-item geselecteerd dat op dit ogenblik verwijderd of in the prullenbak is - Je hebt media-items geselecteerd die op dit ogenblik verwijderd of in the prullenbak zijn + Je hebt een media-item geselecteerd dat op dit ogenblik verwijderd of in the + prullenbak is + + Je hebt media-items geselecteerd die op dit ogenblik verwijderd of in the prullenbak + zijn + Weggegooid @@ -1107,9 +1251,12 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Aangemaakt Selecteer een versie om te vergelijken met de huidige versie Huidige versie - Rode tekst wordt niet getoond in de geselecteerde versie, groen betekent toegevoegd]]> + + Rode tekst wordt niet getoond in de geselecteerde versie, groen betekent toegevoegd]]> Document is teruggezet - Hiermee wordt de geselecteerde versie als html getoond, als u de verschillen tussen de twee versies tegelijk wilt zien, gebruik dan de diff view + Hiermee wordt de geselecteerde versie als html getoond, als u de verschillen tussen de twee + versies tegelijk wilt zien, gebruik dan de diff view + Terugzetten naar Selecteer versie Bekijk @@ -1135,7 +1282,10 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Standaard template - Om een bestaand documenttype te importeren, zoek het betreffende “.udt” bestand door op browse en import te klikken. (Je ziet een bevestigingspagina voordat de import start. Als het documenttype al bestaat dan wordt het bijgewerkt.) + Om een bestaand documenttype te importeren, zoek het betreffende “.udt” bestand + door op browse en import te klikken. (Je ziet een bevestigingspagina voordat de import start. Als het documenttype + al bestaat dan wordt het bijgewerkt.) + Nieuwe tabtitel Node type Type @@ -1146,7 +1296,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Tabs Basis inhoudstype ingeschakeld Dit inhoudstype gebruikt - Geen eigenschappen gedefinieerd op dit tabblad. Klik op de link "voeg een nieuwe eigenschap" aan de bovenkant om een ​​nieuwe eigenschap te creëren. + Geen eigenschappen gedefinieerd op dit tabblad. Klik op de link "voeg een + nieuwe eigenschap" aan de bovenkant om een ​​nieuwe eigenschap te creëren. + Maak een bijpassende sjabloon Icoon toevoegen @@ -1154,17 +1306,22 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Sorteer volgorde Aanmaakdatum Sorteren gereed. - Sleep de pagina's omhoog of omlaag om de volgorde te veranderen. Of klik op de kolomkop om alle pagina's daarop te sorteren. + Sleep de pagina's omhoog of omlaag om de volgorde te veranderen. Of klik op de kolomkop om + alle pagina's daarop te sorteren. + Dit item heeft geen subitems om te sorteren Validatie - Validatiefouten moeten worden opgelost voor dit item kan worden opgeslagen + Validatiefouten moeten worden opgelost voor dit item kan worden opgeslagen + Mislukt Opgeslagen - Opgeslagen. Gelieve uw browser te herladen om de aanpassingen te zien - Wegens onvoldoende rechten kon deze handeling kon niet worden uitgevoerd + Opgeslagen. Gelieve uw browser te herladen om de aanpassingen te zien + + Wegens onvoldoende rechten kon deze handeling kon niet worden uitgevoerd + Geannuleerd Uitvoering is geannuleerd door de plugin van een 3e partij Eigenschappentype bestaat al @@ -1184,7 +1341,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je en zichtbaar op de website %0% documenten gepubliceerd en zichtbaar op de website %0% gepubliceerd en zichtbaar op de website - %0% documenten gepubliceerd voor de talen languages %1% en zichtbaar op de website + %0% documenten gepubliceerd voor de talen languages %1% en zichtbaar op + de website + Inhoud opgeslagen Vergeet niet te publiceren om de wijzigingen zichtbaar te maken Een planning voor publicatie is bijgewerkt @@ -1219,7 +1378,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Sjabloon opgeslagen zonder fouten! Inhoud gedepubliceerd Inhoud variatie %0% gedepubliceerd - De verplichte taal '%0%' is gedepubliceerd. Alle talen voor deze inhoud zijn nu gedepubliceerd. + De verplichte taal '%0%' is gedepubliceerd. Alle talen voor deze + inhoud zijn nu gedepubliceerd. + Partial view opgeslagen Partial view opgeslagen zonder fouten! Partial view niet opgeslagen @@ -1239,13 +1400,19 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Gebruiker %0% is verwijderd Gebruiker uitnodigen Uitnodiging is opnieuw gestuurd naar gebruiker %0% - Kan het document niet publiceren omdat de vereiste '%0%' niet is gepubliceerd + Kan het document niet publiceren omdat de vereiste '%0%' niet is + gepubliceerd + Validatie is mislukt voor de taal '%0%' Documenttype is geëxporteerd naar een bestand Er is een fout gebeurd tijdens het exporteren van het documenttype De publicatiedatum kan niet in het verleden liggen - Kan het document niet plannen voor publicatie omdat de vereiste '%0%' niet is gepubliceerd - Kan het document niet plannen voor publicatie omdat de vereiste '%0%' een publicatiedatum heeft die later is dan een niet-verplichte taal + Kan het document niet plannen voor publicatie omdat de vereiste '%0%' niet is + gepubliceerd + + Kan het document niet plannen voor publicatie omdat de vereiste '%0%' een + publicatiedatum heeft die later is dan een niet-verplichte taal + De vervaldatum kan niet in het verleden liggen De vervaldatum kan niet voor de publicatiedatum liggen @@ -1253,7 +1420,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Stijl toevoegen Stijl bewerken Rich text editor stijlen - Definieer de stijlen die beschikbaar moeten zijn in de rich text editor voor deze stylesheet + Definieer de stijlen die beschikbaar moeten zijn in de rich text editor voor deze + stylesheet + Stylesheet bewerken Stylesheet eigenschap bewerken Naam waarmee de stijl in de editor te kiezen is @@ -1275,32 +1444,37 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Invoegen Kies wat je wil invoegen in het sjabloon Woordenboek item invoegen - Een woordenboekitem is een tijdelijke aanduiding voor een vertaalbaar stuk tekst, waardoor het gemakkelijk is om ontwerpen voor meertalige websites te maken. + Een woordenboekitem is een tijdelijke aanduiding voor een vertaalbaar stuk + tekst, waardoor het gemakkelijk is om ontwerpen voor meertalige websites te maken. + Macro invoegen - Een Macro is een configureerbaar component die gebruikt kan worden voor - herbruikbare delen van je ontwerp, waar je de optie nodig hebt om parameters op te geven, - zoals bij gallerijen, formulieren en lijsten. + Een Macro is een configureerbaar component die gebruikt kan worden voor + herbruikbare delen van je ontwerp, waar je de optie nodig hebt om parameters op te geven, + zoals bij gallerijen, formulieren en lijsten. Umbraco pagina veld invoegen - Toont de waarde van een benoemd veld van de huidige pagina, met opties om de waarde te wijzigen of terug te vallen op alternatieve waarden. + Toont de waarde van een benoemd veld van de huidige pagina, met opties om de waarde + te wijzigen of terug te vallen op alternatieve waarden. + Partial view - Een partial view is een apart sjabloon dat kan gerendered worden in een ander sjabloon, - het is geschikt voor het hergebruiken van HTML of voor het scheiden van complexe sjablonen in afzonderlijke bestanden. + Een partial view is een apart sjabloon dat kan gerendered worden in een ander sjabloon, + het is geschikt voor het hergebruiken van HTML of voor het scheiden van complexe sjablonen in afzonderlijke + bestanden. Hoofdsjabloon Geen hoofdsjabloon Render onderliggend sjabloon - @RenderBody() in te voegen. ]]> Definieer een benoemde sectie - @section { ... } te omwikkelen. Dit kan worden weergegeven in een specifiek gebied van de bovenliggende sjabloon door @RenderSection te gebruiken. @@ -1308,7 +1482,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Render een benoemde sectie - @RenderSection(name) in te voegen. This renders an area of a child template which is wrapped in a corresponding @section [name]{ ... } definition. ]]> @@ -1316,7 +1490,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Sectienaam Sectie is verplicht - @section definiëren, anders wordt een fout getoond. ]]> @@ -1367,15 +1541,21 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Klik om een afbeelding in te voegen Typ hier... Grid lay-outs - Lay-outs zijn het globale werkgebied voor de grid editor. Je hebt meestal maar één of twee verschillende lay-outs nodig + Lay-outs zijn het globale werkgebied voor de grid editor. Je hebt meestal maar één of + twee verschillende lay-outs nodig + Een grid lay-out toevoegen Grid lay-out aanpassen - De lay-out aanpassen door de kolombreedte aan te passen en extra kolommen toe te voegen + De lay-out aanpassen door de kolombreedte aan te passen en extra kolommen toe te + voegen + Rijconfiguratie Rijen zijn voorgedefinieerde cellen die horizontaal zijn gerangschikt Een rijconfiguratie toevoegen Rijconfiguratie aanpassen - De rijconfiguratie aanpassen door de breedte van de cel in te stellen en extra cellen toe te voegen + De rijconfiguratie aanpassen door de breedte van de cel in te stellen en + extra cellen toe te voegen + Geen verdere instellingen beschikbaar Kolommen Het totaal aantal gecombineerde kolommen in de grid layout @@ -1393,7 +1573,8 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je zijn toegevoegd Je gaat de rijconfiguratie verwijderen - Een rijconfiguratienaam verwijderen zal er voor zorgen dat bestaande inhoud verloren gaat die gebaseerd is op deze configuratie. + Een rijconfiguratienaam verwijderen zal er voor zorgen dat bestaande inhoud verloren gaat die gebaseerd is op deze + configuratie. @@ -1405,18 +1586,30 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Eigenschap toevoegen Verplicht label Lijstweergave inschakelen - Laat de onderliggende nodes van het content item zien als een sorteer- en doorzoekbare lijstweergave. Deze onderliggende nodes worden dan niet in de boomstructuur getoond. + Laat de onderliggende nodes van het content item zien als een sorteer- en + doorzoekbare lijstweergave. Deze onderliggende nodes worden dan niet in de boomstructuur getoond. + Toegestane Sjablonen - Kies welke sjablonen toegestaan zijn om door de editors op dit contenttype gebruikt te worden + Kies welke sjablonen toegestaan zijn om door de editors op dit contenttype + gebruikt te worden + Sta toe op hoofdniveau Sta editors toe om inhoud van dit type aan te maken op hoofdniveau Toegestane onderliggende node types - Sta inhoud van een bepaald type toe om onder dit type aangemaakt te kunnen worden + Sta inhoud van een bepaald type toe om onder dit type aangemaakt te kunnen + worden + Kies onderliggende node - Overgeërfde tabs en properties van een bestaand documenttype. Nieuwe tabs worden toegevoegd aan het huidige documenttype of samengevoegd als een tab met dezelfde naam al bestaat. - Dit contenttype wordt gebruikt in een compositie en kan daarom niet zelf een compositie worden. + Overgeërfde tabs en properties van een bestaand documenttype. Nieuwe tabs + worden toegevoegd aan het huidige documenttype of samengevoegd als een tab met dezelfde naam al bestaat. + + Dit contenttype wordt gebruikt in een compositie en kan daarom niet zelf een + compositie worden. + Er zijn geen contenttypen beschikbaar om als compositie te gebruiken. - Een compositie verwijderen zal alle bijbehorende eigenschapsdata ook verwijderen. Zodra je het documenttype hebt opgeslagen is er geen weg meer terug. + Een compositie verwijderen zal alle bijbehorende eigenschapsdata ook + verwijderen. Zodra je het documenttype hebt opgeslagen is er geen weg meer terug. + Beschikbare editors Herbruik Editor instellingen @@ -1432,48 +1625,74 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Alle Documenttypes Alle documenten Alle media items - die gebruik maken van dit documenttype zullen permanent verwijderd worden. Bevestig aub dat je deze ook wilt verwijderen. - die gebruik maken van dit mediatype zullen permanent verwijderd worden. Bevestig aub dat je deze ook wilt verwijderen. - die gebruik maken van dit lidtype zullen permanent verwijderd worden. Bevestig aub dat je deze ook wilt verwijderen. + die gebruik maken van dit documenttype zullen permanent verwijderd worden. Bevestig + aub dat je deze ook wilt verwijderen. + + die gebruik maken van dit mediatype zullen permanent verwijderd worden. Bevestig aub dat + je deze ook wilt verwijderen. + + die gebruik maken van dit lidtype zullen permanent verwijderd worden. Bevestig aub dat + je deze ook wilt verwijderen. + en alle documenten van dit type en alle media items van dit type en alle leden van dit type Lid kan bewerken - Toestaan dat deze eigenschap kan worden gewijzigd door het lid op zijn profiel pagina. + Toestaan dat deze eigenschap kan worden gewijzigd door het lid op zijn profiel + pagina. + Omvat gevoelige gegevens - Verberg deze eigenschap voor de content editor die geen toegang heeft tot het bekijken van gevoelige informatie. + Verberg deze eigenschap voor de content editor die geen toegang heeft tot + het bekijken van gevoelige informatie. + Toon in het profiel van leden - Toelaten dat deze eigenschap wordt getoond op de profiel pagina van het lid. + Toelaten dat deze eigenschap wordt getoond op de profiel pagina van het + lid. + tab heeft geen sorteervolgorde Waar wordt deze compositie gebruikt? - Deze samenstelling wordt momenteel gebruikt bij de samenstelling van de volgende inhoudstypen: + Deze samenstelling wordt momenteel gebruikt bij de samenstelling van de + volgende inhoudstypen: + Variaties toestaan Variëren per cultuur toestaan Segmentatie toestaan Varieer per cultuur Varieer per segment - Editors toestaan om nieuwe inhoud aan te maken van dit type in verschillende talen. + Editors toestaan om nieuwe inhoud aan te maken van dit type in verschillende + talen. + Editors toestaan om nieuwe inhoud in verschillende talen te creëren Editors toestaan om nieuwe segmenten van deze inhoud te creëren. Variaties per cultuur toestaan Segmentatie toestaan Elementtype Is een elementtype - Een elementtype is bedoeld om bijvoorbeeld in geneste inhoud gebruikt te worden en niet in de boomstructuur. - Een documenttype kan niet worden gewijzigd in een elementtype nadat het is gebruikt om een of meer contentitems te maken. + Een elementtype is bedoeld om bijvoorbeeld in geneste inhoud gebruikt te worden en + niet in de boomstructuur. + + Een documenttype kan niet worden gewijzigd in een elementtype nadat het is gebruikt + om een of meer contentitems te maken. + Dit is niet van toepassing op een elementtype - Je hebt wijzigingen aangebracht aan deze eigenschap. Ben je zeker dat je ze wil weggooien? + Je hebt wijzigingen aangebracht aan deze eigenschap. Ben je zeker dat je ze wil + weggooien? + Taal toevoegen Verplichte taal - Eigenschappen van deze taal moeten worden ingevuld voordat de node kan worden gepubliceerd. + Eigenschappen van deze taal moeten worden ingevuld voordat de node kan worden + gepubliceerd. + Standaard taal Een Umbraco site kan maar één standaardtaal hebben. Als u de standaardtaal wijzigt, kan er standaardinhoud ontbreken. Valt terug naar Geen terugvaltaal - Om meertalige inhoud terug te laten vallen naar een andere taal als deze niet aanwezig is in de gevraagde taal, selecteert u deze hier. + Om meertalige inhoud terug te laten vallen naar een andere taal als deze + niet aanwezig is in de gevraagde taal, selecteert u deze hier. + Terugvaltaal Geen @@ -1482,7 +1701,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Parameter bewerken Macro naam invoeren Parameters - Definieer de parameters die beschikbaar moeten zijn bij het gebruik van deze macro. + Definieer de parameters die beschikbaar moeten zijn bij het gebruik van deze + macro. + Selecteer een partial view macro bestand @@ -1522,7 +1743,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Speciale karakters in URL's worden geëncodeerd Zal alleen worden gebruikt waneer de bovenstaande veldwaardes leeg zijn Dit veld zal alleen worden gebruikt als het primaire veld leeg is - Ja, met tijd. Scheidingsteken: + Ja, met tijd. Scheidingsteken: Details van vertaling @@ -1544,13 +1765,17 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je De Umbraco Robot ]]> - Geen vertaal-gebruikers gevonden. Maak eerst een vertaal-gebruiker aan voordat je pagina's voor vertaling verstuurt + Geen vertaal-gebruikers gevonden. Maak eerst een vertaal-gebruiker aan voordat je + pagina's voor vertaling verstuurt + De pagina '%0%' is verstuurd voor vertaling Stuur voor vertaling Totaal aantal woorden Vertaal naar Vertaling voltooid. - Je kan een voorbeeld van vertaalde pagina's bekijken door hieronder te klikken. Als de originele pagina gevonden werd, wordt een vergelijking van beide pagina's getoond. + Je kan een voorbeeld van vertaalde pagina's bekijken door hieronder te klikken. Als + de originele pagina gevonden werd, wordt een vergelijking van beide pagina's getoond. + Vertalen niet gelukt, het XML-bestand is mogelijk beschadigd. Vertalingsopties Vertaler @@ -1599,11 +1824,15 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Nieuwe update beschikbaar %0% is gereed, klik hier om te downloaden Er is geen verbinding met de server - Er is een fout opgetreden bij het zoeken naar een update. Bekijk de trace-stack voor verdere informatie. + Er is een fout opgetreden bij het zoeken naar een update. Bekijk de trace-stack + voor verdere informatie. + Toegang - Gebaseerd op de gebruikersgroepen en startpagina's heeft de gebruiker toegang tot de volgende pagina's + Gebaseerd op de gebruikersgroepen en startpagina's heeft de gebruiker toegang tot de + volgende pagina's + Toegang geven Beheerders Categorieveld @@ -1614,10 +1843,14 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je is niet gedeblokkeerd Het wachtwoord is niet gewijzigd Bevestig nieuw password - Je kunt je wachtwoord veranderen door onderstaand formulier in te vullen en op de knop 'Verander wachtwoord' te klikken + Je kunt je wachtwoord veranderen door onderstaand formulier in te vullen en + op de knop 'Verander wachtwoord' te klikken + Inhoudskanaal Nog een gebruiker aanmaken - Maak nieuwe gebruikers aan om hun toegang te geven tot Umbraco. Wanneer een nieuwe gebruiker wordt aangemaakt wordt er een wachtwoord gegenereerd dat je met hun kan delen. + Maak nieuwe gebruikers aan om hun toegang te geven tot Umbraco. Wanneer een nieuwe + gebruiker wordt aangemaakt wordt er een wachtwoord gegenereerd dat je met hun kan delen. + Omschrijving Geblokkeerde gebruiker Documenttype @@ -1627,7 +1860,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Ga naar gebruikersprofiel Voeg gebruikersgroepen toe om rechten in te stellen Nog een gebruiker uitnodigen - Nodig gebruikers uit om hen toegang te geven to Umbraco. Een uitnodiging wordt via e-mail verstuurd met instructies hoe de gebruiker kan inloggen. + Nodig gebruikers uit om hen toegang te geven to Umbraco. Een uitnodiging wordt via + e-mail verstuurd met instructies hoe de gebruiker kan inloggen. + Taal Stel de taal in die gebruiker zal zien in menu's en dialoogvensters Laatst geblokkeerd datum @@ -1672,15 +1907,23 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Beperk de Inhoud tot specifieke startnodes Laatste keer bijgewerkt is aangemaakt - De gebruiker is aangemaakt. Om in te loggen in Umbraco gebruik je onderstaand wachtwoord. + De gebruiker is aangemaakt. Om in te loggen in Umbraco gebruik je onderstaand + wachtwoord. + Gebruikers beheren Gebruikersnaam Gebruikersrechten Gebruikersgroep is uitgenodigd - Een uitnodiging is gestuurd naar de nieuwe gebruiker met informatie over hoe in te loggen in Umbraco - Hallo en welkom in Umbraco! Binnen ongeveer één minuut kan je aan de slag. Je moet enkel je wachtwoord instellen en een foto toevoegen. - Welkom bij Umbraco! Helaas is je uitnodiging vervallen. Vraag aan je administrator om de uitnodiging opnieuw te versturen. + Een uitnodiging is gestuurd naar de nieuwe gebruiker met informatie over hoe in + te loggen in Umbraco + + Hallo en welkom in Umbraco! Binnen ongeveer één minuut kan je aan de slag. Je + moet enkel je wachtwoord instellen en een foto toevoegen. + + Welkom bij Umbraco! Helaas is je uitnodiging vervallen. Vraag aan je + administrator om de uitnodiging opnieuw te versturen. + Wijzig je foto zodat andere gebruikers je makkelijk kunnen herkennen. Auteur Wijzig @@ -1834,14 +2077,21 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je 3: Configuration file path --> Waarde is insteld naar the aanbevolen waarde: '%0%'. - De verwachte waarde voor '%2%' is '%1%' in configuratiebestand '%3%', maar is '%0%'. - Onverwachte waarde '%0%' gevonden voor '%2%' in configuratiebestand '%3%'. + De verwachte waarde voor '%2%' is '%1%' in configuratiebestand + '%3%', maar is '%0%'. + + Onverwachte waarde '%0%' gevonden voor '%2%' in configuratiebestand + '%3%'. + Macro foutmeldingen zijn ingesteld op'%0%'. - Macro foutmeldingen zijn ingesteld op '%0%'. Dit zal er voor zorgen dat bepaalde, of alle, pagina's van de website niet geladen kunnen worden als er errors in een Macro zitten. Corrigeren zal deze waarde aanpassen naar '%1%'. + Macro foutmeldingen zijn ingesteld op '%0%'. Dit zal er voor zorgen dat + bepaalde, of alle, pagina's van de website niet geladen kunnen worden als er errors in een Macro zitten. + Corrigeren zal deze waarde aanpassen naar '%1%'. + Debug compilatie mode staat uit. - Debug compilatie mode staat momenteel aan. Wij raden aan deze instelling uit te zetten voor livegang. + Debug compilatie mode staat momenteel aan. Wij raden aan deze + instelling uit te zetten voor livegang. + @@ -1868,30 +2124,49 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je - X-Frame-Options header of meta-tag om IFRAMEing door andere websites te voorkomen is aanwezig!]]> - X-Frame-Options header of meta-tag om IFRAMEing door andere websites te voorkomen is NIET aanwezig.]]> - X-Content-Type-Options die beveiligt tegen MIME sniffing kwetsbaarheden is gevonden.]]> - X-Content-Type-Options die beveiligt tegen MIME sniffing kwetsbaarheden is niet gevonden.]]> - Strict-Transport-Security header, ook bekend als de HSTS-header, is gevonden.]]> - Strict-Transport-Securityheader is niet gevonden.]]> - X-XSS-Protection is gevonden.]]> - X-XSS-Protection is niet gevonden.]]> + + X-Frame-Options header of meta-tag om IFRAMEing door andere websites te voorkomen is aanwezig!]]> + + X-Frame-Options header of meta-tag om IFRAMEing door andere websites te voorkomen is NIET aanwezig.]]> + + X-Content-Type-Options die beveiligt tegen MIME sniffing kwetsbaarheden is gevonden.]]> + + X-Content-Type-Options die beveiligt tegen MIME sniffing kwetsbaarheden is niet gevonden.]]> + + Strict-Transport-Security header, ook bekend als de HSTS-header, is gevonden.]]> + + Strict-Transport-Securityheader is niet gevonden.]]> + + X-XSS-Protection is gevonden.]]> + + X-XSS-Protection is niet gevonden.]]> - %0%.]]> - Er zijn geen headers gevonden die informatie vrijgeven over de gebruikte website technologie! + + %0%.]]> + Er zijn geen headers gevonden die informatie vrijgeven over de gebruikte + website technologie! + In de Web.config werd system.net/mailsettings niet gevonden - In de Web.config sectie system.net/mailsettings is de host niet geconfigureerd. - SMTP instellingen zijn correct ingesteld en werken zoals verwacht. - De SMTP server geconfigureerd met host '%0%' en poort '%1%' kon niet gevonden worden. Controleer of de SMTP instellingen in Web.config file system.net/mailsettings correct zijn. - %0%.]]> - %0%.]]> -

        Resultaten van de geplande Umbraco Health Checks uitgevoerd op %0% op %1%:

        %2%]]>         + In de Web.config sectie system.net/mailsettings is de host niet + geconfigureerd. + + SMTP instellingen zijn correct ingesteld en werken zoals verwacht. + + De SMTP server geconfigureerd met host '%0%' en poort '%1%' kon niet + gevonden worden. Controleer of de SMTP instellingen in Web.config file system.net/mailsettings correct zijn. + + + %0%.]]> + + %0%.]]> + +

        Resultaten van de geplande Umbraco Health Checks uitgevoerd op %0% op %1%:

        %2%]]>         Umbraco Health Check Status: %0% Groep controleren - De health checker evalueert verschillende delen van de website voor best practice instellingen, configuratie, mogelijke problemen, enzovoort. U kunt problemen eenvoudig oplossen met een druk op de knop. U kunt uw eigen health checks toevoegen, kijk even naar de documentatie voor meer informatie over aangepaste health checks.

        ]]> @@ -1906,15 +2181,21 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Redirect Url Beheer De volgende URLs verwijzen naar dit content item: Er zijn geen redirects - Er wordt automatisch een redirect aangemaakt als een gepubliceerde pagina hernoemd of verplaatst wordt. + Er wordt automatisch een redirect aangemaakt als een gepubliceerde pagina + hernoemd of verplaatst wordt. + Redirect URL verwijderd. Fout bij verwijderen redirect URL. Dit zal de redirect verwijderen Weet je zeker dat je de URL tracker wilt uitzetten? URL tracker staat nu uit. - Fout bij het uitzetten van de URL Tracker. Meer informatie kan gevonden worden in de log file. + Fout bij het uitzetten van de URL Tracker. Meer informatie kan gevonden worden in de log + file. + URL tracker staat nu aan. - Fout bij het aanzetten van de URL tracker. Meer informatie kan gevonden worden in de log file. + Fout bij het aanzetten van de URL tracker. Meer informatie kan gevonden worden in de log + file. + Geen woordenboekitems om uit te kiezen @@ -1927,7 +2208,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Content verwijderd met id : {0} gerelateerd aan aan bovenliggend item met Id: {1} Media verwijderd met id: {0} gerelateerd aan aan bovenliggend item met Id: {1} Kan dit item niet automatisch herstellen - Er is geen locatie waar dit item automatisch kan worden hersteld. U kunt het item handmatig verplaatsen met behulp van de onderstaande boomstructuur. + Er is geen locatie waar dit item automatisch kan worden hersteld. U kunt + het item handmatig verplaatsen met behulp van de onderstaande boomstructuur. + was hersteld onder @@ -2122,7 +2405,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Je bent slechts een klik verwijderd van uren aan Umbraco trainingvideo's. - Wil je Umbraco onder de knie krijgen? Besteed een paar minuten aan het leren van enkele best practices door een van deze video's over het gebruik van Umbraco te bekijken. Bezoek umbraco.tv voor meer Umbraco videos

        ]]>         @@ -2130,41 +2413,49 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Start hier - Deze sectie bevat de bouwstenen voor jouw Umbraco-site. Volg de onderstaande links voor meer informatie over het werken met de items in de sectie Instellingen + Deze sectie bevat de bouwstenen voor jouw Umbraco-site. Volg de onderstaande links + voor meer informatie over het werken met de items in de sectie Instellingen + Meer te weten komen - in het Documentatiegedeelte van Our Umbraco ]]> - Community Forum ]]> - instructievideo's (sommige zijn gratis, andere vereisen een abonnement) ]]> - productiviteitsverhogende programma's en commerciële ondersteuning ]]> - training en certificering opportuniteiten ]]> Welkom bij Het Vriendelijke CMS - Bedankt om voor Umbraco te kiezen - We denken dat dit het begin van iets moois is. Hoewel het in het begin misschien overweldigend aanvoelt, hebben we er veel aan gedaan om de leercurve zo soepel en snel mogelijk te laten verlopen. + Bedankt om voor Umbraco te kiezen - We denken dat dit het begin van iets moois is. + Hoewel het in het begin misschien overweldigend aanvoelt, hebben we er veel aan gedaan om de leercurve zo soepel + en snel mogelijk te laten verlopen. + Umbraco Forms - Maak formulieren met behulp van een intuïtieve interface. Van eenvoudige contactformulieren die e-mails versturen tot geavanceerde vragenlijsten die integreren met CRM-systemen. Je klanten zullen er dol op zijn! + Maak formulieren met behulp van een intuïtieve interface. Van eenvoudige + contactformulieren die e-mails versturen tot geavanceerde vragenlijsten die integreren met CRM-systemen. Je + klanten zullen er dol op zijn! + Nieuwe blok aanmaken @@ -2184,14 +2475,20 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Label Aangepaste weergave Aangepaste weergave-omschrijving tonen - Overschrijf hoe dit blok wordt weergegeven in de BackOffice-gebruikersinterface. Kies een .html-bestand met je presentatie. + Overschrijf hoe dit blok wordt weergegeven in de + BackOffice-gebruikersinterface. Kies een .html-bestand met je presentatie. + Instellingen model Grootte van overlay-editor Aangepaste weergave toevoegen Instellingen toevoegen - %0% wil verwijderen?]]> - %0% wil verwijderen?]]> - De inhoud van dit blok is nog steeds aanwezig, bewerken van deze inhoud is niet langer mogelijk en wordt weergegeven als niet-ondersteunde inhoud. + + %0% wil verwijderen?]]> + + %0% wil verwijderen?]]> + De inhoud van dit blok is nog steeds aanwezig, bewerken van deze inhoud is + niet langer mogelijk en wordt weergegeven als niet-ondersteunde inhoud. + Miniatuur Miniatuur toevoegen @@ -2206,14 +2503,18 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Fout! Het Elementtype van dit blok bestaat niet meer Inhoud toevoegen - Eigenschap '%0%' gebruikt editor '%1%' die niet ondersteund wordt in blokken. + Eigenschap '%0%' gebruikt editor '%1%' die niet ondersteund wordt in + blokken. + Wat zijn Inhoudssjablonen? - Inhoudssjablonen is vooraf gedefinieerde inhoud die kan worden geselecteerd bij het maken van een nieuwe node. + Inhoudssjablonen is vooraf gedefinieerde inhoud die kan worden geselecteerd bij het + maken van een nieuwe node. + Hoe maak ik een Inhoudssjabloon? - Er zijn 2 manieren om Inhoudssjablonen te maken:

        • Klik met de rechtermuisknop op een inhoudsnode en selecteer "Inhoudssjabloon aanmaken" om een nieuwe Inhoudssjabloon te maken.
          • @@ -2223,6 +2524,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je ]]> Hoe beheer ik Inhoudssjablonen? - U kunt Inhoudssjablonen bewerken en verwijderen vanuit de boomstructuur "inhoudssjablonen" in de sectie Instellingen. Vouw het documenttype uit waarop de Inhoudssjabloon is gebaseerd en klik erop om het te bewerken of te verwijderen. + U kunt Inhoudssjablonen bewerken en verwijderen vanuit de boomstructuur + "inhoudssjablonen" in de sectie Instellingen. Vouw het documenttype uit waarop de Inhoudssjabloon is gebaseerd en + klik erop om het te bewerken of te verwijderen. + diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs index ad189cc02a..5b033fcd42 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs +++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs @@ -32,9 +32,8 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { - /// - /// Tests covering all methods in the ContentService class. + /// Tests covering all methods in the ContentService class. /// [TestFixture] [UmbracoTest( @@ -43,6 +42,11 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services WithApplication = true)] public class ContentServiceTests : UmbracoIntegrationTestWithContent { + [SetUp] + public void Setup() => ContentRepositoryBase.ThrowOnWarning = true; + + [TearDown] + public void Teardown() => ContentRepositoryBase.ThrowOnWarning = false; // TODO: Add test to verify there is only ONE newest document/content in {Constants.DatabaseSchema.Tables.Document} table after updating. // TODO: Add test to delete specific version (with and without deleting prior versions) and versions by date. @@ -75,17 +79,11 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services private IValueEditorCache ValueEditorCache => GetRequiredService(); - [SetUp] - public void Setup() => ContentRepositoryBase.ThrowOnWarning = true; - protected override void CustomTestSetup(IUmbracoBuilder builder) => builder .AddNotificationHandler() .AddNotificationHandler() .AddNotificationHandler(); - [TearDown] - public void Teardown() => ContentRepositoryBase.ThrowOnWarning = false; - [Test] public void Create_Blueprint() { @@ -177,9 +175,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services FileService.SaveTemplate(ct2.DefaultTemplate); ContentTypeService.Save(ct2); - for (int i = 0; i < 10; i++) + for (var i = 0; i < 10; i++) { - Content blueprint = ContentBuilder.CreateTextpageContent(i % 2 == 0 ? ct1 : ct2, "hello" + i, Constants.System.Root); + Content blueprint = + ContentBuilder.CreateTextpageContent(i % 2 == 0 ? ct1 : ct2, "hello" + i, Constants.System.Root); ContentService.SaveBlueprint(blueprint); } @@ -218,7 +217,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // 10x invariant content, half is scheduled to be published in 5 seconds, the other half is scheduled to be unpublished in 5 seconds var invariant = new List(); - for (int i = 0; i < 10; i++) + for (var i = 0; i < 10; i++) { Content c = ContentBuilder.CreateBasicContent(ctInvariant); c.Name = "name" + i; @@ -240,8 +239,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // 10x variant content, half is scheduled to be published in 5 seconds, the other half is scheduled to be unpublished in 5 seconds var variant = new List(); - string alternatingCulture = langFr.IsoCode; - for (int i = 0; i < 10; i++) + var alternatingCulture = langFr.IsoCode; + for (var i = 0; i < 10; i++) { Content c = ContentBuilder.CreateBasicContent(ctVariant); c.SetCultureName("name-uk" + i, langUk.IsoCode); @@ -294,7 +293,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // re-run the scheduled publishing, there should be no results runSched = ContentService.PerformScheduledPublish( - now.AddMinutes(1)).ToList(); + now.AddMinutes(1)).ToList(); Assert.AreEqual(0, runSched.Count); } @@ -305,10 +304,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // Arrange // Act - IContent content = ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId); + IContent content = ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage"); content.ContentSchedule.Add(null, DateTime.Now.AddHours(2)); - ContentService.Save(content, Constants.Security.SuperUserId); + ContentService.Save(content); Assert.AreEqual(1, content.ContentSchedule.FullSchedule.Count); content = ContentService.GetById(content.Id); @@ -316,7 +315,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual(1, sched.Count); Assert.AreEqual(1, sched.Count(x => x.Culture == string.Empty)); content.ContentSchedule.Clear(ContentScheduleAction.Expire); - ContentService.Save(content, Constants.Security.SuperUserId); + ContentService.Save(content); // Assert content = ContentService.GetById(content.Id); @@ -330,8 +329,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { // Arrange // Act - IContent content = ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId); - for (int i = 0; i < 20; i++) + IContent content = ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage"); + for (var i = 0; i < 20; i++) { content.SetValue("bodyText", "hello world " + Guid.NewGuid()); ContentService.SaveAndPublish(content); @@ -351,12 +350,13 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // Arrange // Act var results = new List(); - for (int i = 0; i < 20; i++) + for (var i = 0; i < 20; i++) { results.Add(ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", 0)); } - IContent[] sortedGet = ContentService.GetByIds(new[] { results[10].Id, results[5].Id, results[12].Id }).ToArray(); + IContent[] sortedGet = ContentService.GetByIds(new[] { results[10].Id, results[5].Id, results[12].Id }) + .ToArray(); // Assert Assert.AreEqual(sortedGet[0].Id, results[10].Id); @@ -369,9 +369,9 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { // Arrange // Act - for (int i = 0; i < 20; i++) + for (var i = 0; i < 20; i++) { - ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId); + ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage"); } // Assert @@ -385,17 +385,18 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Template template = TemplateBuilder.CreateTextPageTemplate(); FileService.SaveTemplate(template); - ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbBlah", "test Doc Type", defaultTemplateId: template.Id); + ContentType contentType = + ContentTypeBuilder.CreateSimpleContentType("umbBlah", "test Doc Type", defaultTemplateId: template.Id); ContentTypeService.Save(contentType); // Act - for (int i = 0; i < 20; i++) + for (var i = 0; i < 20; i++) { - ContentService.CreateAndSave("Test", Constants.System.Root, "umbBlah", Constants.Security.SuperUserId); + ContentService.CreateAndSave("Test", Constants.System.Root, "umbBlah"); } // Assert - Assert.AreEqual(20, ContentService.Count(contentTypeAlias: "umbBlah")); + Assert.AreEqual(20, ContentService.Count("umbBlah")); } [Test] @@ -405,12 +406,13 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Template template = TemplateBuilder.CreateTextPageTemplate(); FileService.SaveTemplate(template); - ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbBlah", "test Doc Type", defaultTemplateId: template.Id); + ContentType contentType = + ContentTypeBuilder.CreateSimpleContentType("umbBlah", "test Doc Type", defaultTemplateId: template.Id); ContentTypeService.Save(contentType); - IContent parent = ContentService.CreateAndSave("Test", Constants.System.Root, "umbBlah", Constants.Security.SuperUserId); + IContent parent = ContentService.CreateAndSave("Test", Constants.System.Root, "umbBlah"); // Act - for (int i = 0; i < 20; i++) + for (var i = 0; i < 20; i++) { ContentService.CreateAndSave("Test", parent, "umbBlah"); } @@ -426,13 +428,14 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Template template = TemplateBuilder.CreateTextPageTemplate(); FileService.SaveTemplate(template); - ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbBlah", "test Doc Type", defaultTemplateId: template.Id); + ContentType contentType = + ContentTypeBuilder.CreateSimpleContentType("umbBlah", "test Doc Type", defaultTemplateId: template.Id); ContentTypeService.Save(contentType); - IContent parent = ContentService.CreateAndSave("Test", Constants.System.Root, "umbBlah", Constants.Security.SuperUserId); + IContent parent = ContentService.CreateAndSave("Test", Constants.System.Root, "umbBlah"); // Act IContent current = parent; - for (int i = 0; i < 20; i++) + for (var i = 0; i < 20; i++) { current = ContentService.CreateAndSave("Test", current, "umbBlah"); } @@ -458,7 +461,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { // Arrange // Act - IContent content = ContentService.Create("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId); + IContent content = ContentService.Create("Test", Constants.System.Root, "umbTextpage"); // Assert Assert.That(content, Is.Not.Null); @@ -470,7 +473,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { // Arrange // Act - IContent content = ContentService.Create("Test", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId); + IContent content = ContentService.Create("Test", Constants.System.Root, "umbTextpage"); // Assert Assert.That(content, Is.Not.Null); @@ -486,7 +489,9 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // Assert Assert.That(content, Is.Not.Null); Assert.That(content.HasIdentity, Is.False); - Assert.That(content.CreatorId, Is.EqualTo(Constants.Security.SuperUserId)); // Default to -1 aka SuperUser (unknown) since we didn't explicitly set this in the Create call + Assert.That(content.CreatorId, + Is.EqualTo(Constants.Security + .SuperUserId)); // Default to -1 aka SuperUser (unknown) since we didn't explicitly set this in the Create call } [Test] @@ -567,21 +572,21 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services var versions = ContentService.GetVersions(Subpage.Id).ToList(); Assert.AreEqual(1, versions.Count); - int version1 = content.VersionId; + var version1 = content.VersionId; Console.WriteLine($"1 e={content.VersionId} p={content.PublishedVersionId}"); content.Name = "Text Page 2 Updated"; content.SetValue("author", "Jane Doe"); ContentService.SaveAndPublish(content); // publishes the current version, creates a version - int version2 = content.VersionId; + var version2 = content.VersionId; Console.WriteLine($"2 e={content.VersionId} p={content.PublishedVersionId}"); content.Name = "Text Page 2 ReUpdated"; content.SetValue("author", "Bob Hope"); ContentService.SaveAndPublish(content); // publishes again, creates a version - int version3 = content.VersionId; + var version3 = content.VersionId; Console.WriteLine($"3 e={content.VersionId} p={content.PublishedVersionId}"); IContent content1 = ContentService.GetById(content.Id); @@ -615,7 +620,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // and proper values // first, the current (edited) version, with edited and published versions Assert.AreEqual("John Farr", versions[0].GetValue("author")); // current version has the edited value - Assert.AreEqual("Bob Hope", versions[0].GetValue("author", published: true)); // and the published published value + Assert.AreEqual("Bob Hope", + versions[0].GetValue("author", published: true)); // and the published published value // then, the current (published) version, with edited == published Assert.AreEqual("Bob Hope", versions[1].GetValue("author")); // own edited version @@ -678,7 +684,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { // Arrange // Act - var contents = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out long _).ToList(); + var contents = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out var _).ToList(); // Assert Assert.That(contents, Is.Not.Null); @@ -706,7 +712,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services [Test] public void Can_Unpublish_Content_Variation() { - IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr, out ContentType contentType); + IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr, + out ContentType contentType); content.PublishCulture(CultureImpact.Explicit(langFr.IsoCode, langFr.IsDefault)); content.PublishCulture(CultureImpact.Explicit(langUk.IsoCode, langUk.IsDefault)); @@ -738,7 +745,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services [Test] public void Can_Publish_Culture_After_Last_Culture_Unpublished() { - IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr, out ContentType contentType); + IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr, + out ContentType contentType); PublishResult published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode }); Assert.AreEqual(PublishedState.Published, content.PublishedState); @@ -776,7 +784,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services [Test] public void Unpublish_All_Cultures_Has_Unpublished_State() { - IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr, out ContentType contentType); + IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr, + out ContentType contentType); PublishResult published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode }); Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode)); @@ -807,7 +816,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual(PublishResultType.SuccessUnpublishLastCulture, unpublished.Result); Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode)); Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode)); - Assert.AreEqual(PublishedState.Unpublished, content.PublishedState); // the last culture was unpublished so the document should also reflect this + Assert.AreEqual(PublishedState.Unpublished, + content.PublishedState); // the last culture was unpublished so the document should also reflect this // re-get content = ContentService.GetById(content.Id); @@ -859,7 +869,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services [Test] public void Unpublishing_Already_Unpublished_Culture() { - IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr, out ContentType contentType); + IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr, + out ContentType contentType); PublishResult published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode }); Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode)); @@ -894,7 +905,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services [Test] public void Publishing_No_Cultures_Still_Saves() { - IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr, out ContentType contentType); + IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr, + out ContentType contentType); PublishResult published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode }); Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode)); @@ -983,7 +995,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // audit log will only show that french was published IAuditItem lastLog = AuditService.GetLogs(content.Id).Last(); - Assert.AreEqual($"Published languages: French (France)", lastLog.Comment); + Assert.AreEqual("Published languages: French (France)", lastLog.Comment); // re-get content = ContentService.GetById(content.Id); @@ -992,7 +1004,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // audit log will only show that english was published lastLog = AuditService.GetLogs(content.Id).Last(); - Assert.AreEqual($"Published languages: English (United Kingdom)", lastLog.Comment); + Assert.AreEqual("Published languages: English (United Kingdom)", lastLog.Comment); } [Test] @@ -1027,7 +1039,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // audit log will only show that french was unpublished IAuditItem lastLog = AuditService.GetLogs(content.Id).Last(); - Assert.AreEqual($"Unpublished languages: French (France)", lastLog.Comment); + Assert.AreEqual("Unpublished languages: French (France)", lastLog.Comment); // re-get content = ContentService.GetById(content.Id); @@ -1036,8 +1048,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // audit log will only show that english was published var logs = AuditService.GetLogs(content.Id).ToList(); - Assert.AreEqual($"Unpublished languages: English (United Kingdom)", logs[^2].Comment); - Assert.AreEqual($"Unpublished (mandatory language unpublished)", logs[^1].Comment); + Assert.AreEqual("Unpublished languages: English (United Kingdom)", logs[^2].Comment); + Assert.AreEqual("Unpublished (mandatory language unpublished)", logs[^1].Comment); } [Test] @@ -1086,7 +1098,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services [Test] public void Can_Publish_Content_WithEvents() { - bool publishingWasCalled = false; + var publishingWasCalled = false; ContentNotificationHandler.PublishingContent = notification => { @@ -1109,7 +1121,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual("Home", content.Name); content.Name = "foo"; - PublishResult published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId); + PublishResult published = + ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId); Assert.That(published.Success, Is.True); Assert.That(content.Published, Is.True); @@ -1130,14 +1143,16 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { Content content = new ContentBuilder() .AddContentType() - .WithContentVariation(ContentVariation.Culture) - .Done() + .WithContentVariation(ContentVariation.Culture) + .Done() .Build(); Assert.Throws(() => ContentService.SaveAndPublish(content, new[] { "*" })); - Assert.Throws(() => ContentService.SaveAndPublish(content, new string[] { null })); + Assert.Throws( + () => ContentService.SaveAndPublish(content, new string[] { null })); Assert.Throws(() => ContentService.SaveAndPublish(content, new[] { "*", null })); - Assert.Throws(() => ContentService.SaveAndPublish(content, new[] { "en-US", "*", "es-ES" })); + Assert.Throws(() => + ContentService.SaveAndPublish(content, new[] { "en-US", "*", "es-ES" })); } [Test] @@ -1146,10 +1161,11 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Template template = TemplateBuilder.CreateTextPageTemplate(); FileService.SaveTemplate(template); - ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id); + ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", + mandatoryProperties: true, defaultTemplateId: template.Id); ContentTypeService.Save(contentType); - int parentId = Textpage.Id; + var parentId = Textpage.Id; IContent parent = ContentService.GetById(parentId); @@ -1165,8 +1181,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.IsFalse(content.HasIdentity); // content cannot publish values because they are invalid - var propertyValidationService = new PropertyValidationService(PropertyEditorCollection, DataTypeService, TextService, ValueEditorCache); - bool isValid = propertyValidationService.IsPropertyDataValid(content, out IProperty[] invalidProperties, CultureImpact.Invariant); + var propertyValidationService = new PropertyValidationService(PropertyEditorCollection, DataTypeService, + TextService, ValueEditorCache); + var isValid = propertyValidationService.IsPropertyDataValid(content, out IProperty[] invalidProperties, + CultureImpact.Invariant); Assert.IsFalse(isValid); Assert.IsNotEmpty(invalidProperties); @@ -1204,7 +1222,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services content.SetCultureName("name-da", langDa.IsoCode); content.PublishCulture(CultureImpact.Explicit(langFr.IsoCode, langFr.IsDefault)); - PublishResult result = ((ContentService)ContentService).CommitDocumentChanges(content); + PublishResult result = ContentService.CommitDocumentChanges(content); Assert.IsTrue(result.Success); content = ContentService.GetById(content.Id); Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode)); @@ -1213,7 +1231,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services content.UnpublishCulture(langFr.IsoCode); content.PublishCulture(CultureImpact.Explicit(langDa.IsoCode, langDa.IsDefault)); - result = ((ContentService)ContentService).CommitDocumentChanges(content); + result = ContentService.CommitDocumentChanges(content); Assert.IsTrue(result.Success); Assert.AreEqual(PublishResultType.SuccessMixedCulture, result.Result); @@ -1248,17 +1266,18 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services [Test] public void Can_Publish_Content_Children() { - int parentId = Textpage.Id; + var parentId = Textpage.Id; IContent parent = ContentService.GetById(parentId); Console.WriteLine(" " + parent.Id); const int pageSize = 500; - int page = 0; - long total = long.MaxValue; + var page = 0; + var total = long.MaxValue; while (page * pageSize < total) { - IEnumerable descendants = ContentService.GetPagedDescendants(parent.Id, page++, pageSize, out total); + IEnumerable descendants = + ContentService.GetPagedDescendants(parent.Id, page++, pageSize, out total); foreach (IContent x in descendants) { Console.WriteLine(" ".Substring(0, x.Level) + x.Id); @@ -1274,14 +1293,17 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services foreach (PublishResult result in parentPublished) { - Console.WriteLine(" ".Substring(0, result.Content.Level) + $"{result.Content.Id}: {result.Result}"); + Console.WriteLine(" ".Substring(0, result.Content.Level) + + $"{result.Content.Id}: {result.Result}"); } // everything should be successful Assert.IsTrue(parentPublished.All(x => x.Success)); Assert.IsTrue(parent.Published); - IEnumerable children = ContentService.GetPagedChildren(parentId, 0, 500, out long totalChildren); // we only want the first so page size, etc.. is abitrary + IEnumerable + children = ContentService.GetPagedChildren(parentId, 0, 500, + out var totalChildren); // we only want the first so page size, etc.. is abitrary // children are published including ... that was released 5 mins ago Assert.IsTrue(children.First(x => x.Id == Subpage.Id).Published); @@ -1296,7 +1318,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services ContentService.Save(content); IContent parent = ContentService.GetById(Textpage.Id); - PublishResult parentPublished = ContentService.SaveAndPublish(parent, userId: Constants.Security.SuperUserId); // Publish root Home node to enable publishing of 'Subpage.Id' + PublishResult parentPublished = + ContentService.SaveAndPublish(parent, + userId: Constants.Security + .SuperUserId); // Publish root Home node to enable publishing of 'Subpage.Id' // Act PublishResult published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId); @@ -1320,7 +1345,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services content.ContentSchedule.Add("en-US", null, DateTime.Now.AddMinutes(-5)); ContentService.Save(content); - PublishResult published = ContentService.SaveAndPublish(content, "en-US", Constants.Security.SuperUserId); + PublishResult published = ContentService.SaveAndPublish(content, "en-US"); Assert.IsFalse(published.Success); Assert.AreEqual(PublishResultType.FailedPublishCultureHasExpired, published.Result); @@ -1333,10 +1358,13 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // Arrange IContent content = ContentService.GetById(Subpage.Id); content.ContentSchedule.Add(DateTime.Now.AddHours(2), null); - ContentService.Save(content, Constants.Security.SuperUserId); + ContentService.Save(content); IContent parent = ContentService.GetById(Textpage.Id); - PublishResult parentPublished = ContentService.SaveAndPublish(parent, userId: Constants.Security.SuperUserId); // Publish root Home node to enable publishing of 'Subpage.Id' + PublishResult parentPublished = + ContentService.SaveAndPublish(parent, + userId: Constants.Security + .SuperUserId); // Publish root Home node to enable publishing of 'Subpage.Id' // Act PublishResult published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId); @@ -1379,12 +1407,12 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services contentService.SaveAndPublish(content); - content.Properties[0].SetValue("Foo", culture: string.Empty); + content.Properties[0].SetValue("Foo", string.Empty); content.ContentSchedule.Add(DateTime.Now.AddHours(2), null); contentService.Save(content); // Act - var result = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId); + PublishResult result = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId); // Assert Assert.Multiple(() => @@ -1409,10 +1437,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services IContentType contentType = new ContentTypeBuilder() .WithId(0) .AddPropertyType() - .WithAlias("header") - .WithValueStorageType(ValueStorageType.Integer) - .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox) - .WithName("header") + .WithAlias("header") + .WithValueStorageType(ValueStorageType.Integer) + .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox) + .WithName("header") .Done() .WithContentVariation(ContentVariation.Nothing) .Build(); @@ -1434,7 +1462,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services contentService.Save(content); // Act - var result = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId); + PublishResult result = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId); // Assert Assert.Multiple(() => @@ -1461,7 +1489,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services content.ContentSchedule.Add("en-US", DateTime.Now.AddHours(2), null); ContentService.Save(content); - PublishResult published = ContentService.SaveAndPublish(content, "en-US", Constants.Security.SuperUserId); + PublishResult published = ContentService.SaveAndPublish(content, "en-US"); Assert.IsFalse(published.Success); Assert.AreEqual(PublishResultType.FailedPublishCultureAwaitingRelease, published.Result); @@ -1472,8 +1500,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services public void Cannot_Publish_Content_Where_Parent_Is_Unpublished() { // Arrange - IContent content = ContentService.Create("Subpage with Unpublished Parent", Textpage.Id, "umbTextpage", Constants.Security.SuperUserId); - ContentService.Save(content, Constants.Security.SuperUserId); + IContent content = ContentService.Create("Subpage with Unpublished Parent", Textpage.Id, "umbTextpage"); + ContentService.Save(content); // Act IEnumerable published = ContentService.SaveAndPublishBranch(content, true); @@ -1502,7 +1530,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services public void Can_Save_And_Publish_Content() { // Arrange - IContent content = ContentService.Create("Home US", -1, "umbTextpage", Constants.Security.SuperUserId); + IContent content = ContentService.Create("Home US", -1, "umbTextpage"); content.SetValue("author", "Barack Obama"); // Act @@ -1515,28 +1543,29 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services } /// - /// Try to immitate a new child content item being created through the UI. - /// This content item will have no Id, Path or Identity. - /// It seems like this is wiped somewhere in the process when creating an item through the UI - /// and we need to make sure we handle nullchecks for these properties when creating content. - /// This is unfortunately not caught by the normal ContentService tests. + /// Try to immitate a new child content item being created through the UI. + /// This content item will have no Id, Path or Identity. + /// It seems like this is wiped somewhere in the process when creating an item through the UI + /// and we need to make sure we handle nullchecks for these properties when creating content. + /// This is unfortunately not caught by the normal ContentService tests. /// [Test] public void Can_Save_And_Publish_Content_And_Child_Without_Identity() { // Arrange - IContent content = ContentService.Create("Home US", Constants.System.Root, "umbTextpage", Constants.Security.SuperUserId); + IContent content = ContentService.Create("Home US", Constants.System.Root, "umbTextpage"); content.SetValue("author", "Barack Obama"); // Act PublishResult published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId); - IContent childContent = ContentService.Create("Child", content.Id, "umbTextpage", Constants.Security.SuperUserId); + IContent childContent = ContentService.Create("Child", content.Id, "umbTextpage"); // Reset all identity properties childContent.Id = 0; childContent.Path = null; ((Content)childContent).ResetIdentity(); - PublishResult childPublished = ContentService.SaveAndPublish(childContent, userId: Constants.Security.SuperUserId); + PublishResult childPublished = + ContentService.SaveAndPublish(childContent, userId: Constants.Security.SuperUserId); // Assert Assert.That(content.HasIdentity, Is.True); @@ -1557,7 +1586,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services IContent content = ContentService.GetById(Subpage.Id); content.Properties["title"].SetValue(content.Properties["title"].GetValue() + " Published"); PublishResult contentPublished = ContentService.SaveAndPublish(content); - int publishedVersion = content.VersionId; + var publishedVersion = content.VersionId; content.Properties["title"].SetValue(content.Properties["title"].GetValue() + " Saved"); ContentService.Save(content); @@ -1578,7 +1607,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // Ensure that the published content version has the correct property value and is marked as published IContent publishedContentVersion = publishedDescendants.First(x => x.VersionId == publishedVersion); Assert.That(publishedContentVersion.Published, Is.True); - Assert.That(publishedContentVersion.Properties["title"].GetValue(published: true), Contains.Substring("Published")); + Assert.That(publishedContentVersion.Properties["title"].GetValue(published: true), + Contains.Substring("Published")); // and has the correct draft properties Assert.That(publishedContentVersion.Properties["title"].GetValue(), Contains.Substring("Saved")); @@ -1595,11 +1625,11 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services public void Can_Save_Content() { // Arrange - IContent content = ContentService.Create("Home US", -1, "umbTextpage", Constants.Security.SuperUserId); + IContent content = ContentService.Create("Home US", -1, "umbTextpage"); content.SetValue("author", "Barack Obama"); // Act - ContentService.Save(content, Constants.Security.SuperUserId); + ContentService.Save(content); // Assert Assert.That(content.HasIdentity, Is.True); @@ -1620,9 +1650,9 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // re-get content = ContentService.GetById(content.Id); - content.SetValue("title", "another title of mine"); // Change a value - content.SetValue("bodyText", null); // Clear a value - content.SetValue("author", "new author"); // Add a value + content.SetValue("title", "another title of mine"); // Change a value + content.SetValue("bodyText", null); // Clear a value + content.SetValue("author", "new author"); // Add a value ContentService.SaveAndPublish(content); // re-get @@ -1634,17 +1664,17 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services content.SetValue("title", "new title"); content.SetValue("bodyText", "new body text"); content.SetValue("author", "new author text"); - ContentService.Save(content); // new non-published version + ContentService.Save(content); // new non-published version // re-get content = ContentService.GetById(content.Id); - content.SetValue("title", null); // Clear a value - content.SetValue("bodyText", null); // Clear a value - ContentService.Save(content); // saving non-published version + content.SetValue("title", null); // Clear a value + content.SetValue("bodyText", null); // Clear a value + ContentService.Save(content); // saving non-published version // re-get content = ContentService.GetById(content.Id); - Assert.IsNull(content.GetValue("title")); // Test clearing the value worked with the non-published version + Assert.IsNull(content.GetValue("title")); // Test clearing the value worked with the non-published version Assert.IsNull(content.GetValue("bodyText")); Assert.AreEqual("new author text", content.GetValue("author")); @@ -1665,7 +1695,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services var list = new List { subpage, subpage2 }; // Act - ContentService.Save(list, Constants.Security.SuperUserId); + ContentService.Save(list); // Assert Assert.That(list.Any(x => !x.HasIdentity), Is.False); @@ -1678,7 +1708,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services var hierarchy = CreateContentHierarchy().ToList(); // Act - ContentService.Save(hierarchy, Constants.Security.SuperUserId); + ContentService.Save(hierarchy); Assert.That(hierarchy.Any(), Is.True); Assert.That(hierarchy.Any(x => x.HasIdentity == false), Is.False); @@ -1696,7 +1726,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // Act ContentService.DeleteOfType(contentType.Id); IEnumerable rootContent = ContentService.GetRootContent(); - IEnumerable contents = ContentService.GetPagedOfType(contentType.Id, 0, int.MaxValue, out long _, null); + IEnumerable contents = ContentService.GetPagedOfType(contentType.Id, 0, int.MaxValue, out var _); // Assert Assert.That(rootContent.Any(), Is.False); @@ -1710,7 +1740,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services IContent content = ContentService.GetById(Textpage.Id); // Act - ContentService.Delete(content, Constants.Security.SuperUserId); + ContentService.Delete(content); IContent deleted = ContentService.GetById(Textpage.Id); // Assert @@ -1724,7 +1754,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services IContent content = ContentService.GetById(Textpage.Id); // Act - ContentService.MoveToRecycleBin(content, Constants.Security.SuperUserId); + ContentService.MoveToRecycleBin(content); // Assert Assert.That(content.ParentId, Is.EqualTo(-20)); @@ -1737,12 +1767,12 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services IContentType contentType = ContentTypeService.Get("umbTextpage"); Content subsubpage = ContentBuilder.CreateSimpleContent(contentType, "Text Page 3", Subpage.Id); - ContentService.Save(subsubpage, Constants.Security.SuperUserId); + ContentService.Save(subsubpage); IContent content = ContentService.GetById(Textpage.Id); const int pageSize = 500; - int page = 0; - long total = long.MaxValue; + var page = 0; + var total = long.MaxValue; var descendants = new List(); while (page * pageSize < total) { @@ -1755,7 +1785,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.IsFalse(descendants.Any(x => x.Path.StartsWith("-1,-20,"))); Assert.IsFalse(descendants.Any(x => x.Trashed)); - ContentService.MoveToRecycleBin(content, Constants.Security.SuperUserId); + ContentService.MoveToRecycleBin(content); descendants.Clear(); page = 0; @@ -1770,8 +1800,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.IsTrue(descendants.All(x => x.Path.StartsWith("-1,-20,"))); Assert.True(descendants.All(x => x.Trashed)); - ContentService.EmptyRecycleBin(Constants.Security.SuperUserId); - var trashed = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out long _).ToList(); + ContentService.EmptyRecycleBin(); + var trashed = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out var _).ToList(); Assert.IsEmpty(trashed); } @@ -1780,8 +1810,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { // Arrange // Act - ContentService.EmptyRecycleBin(Constants.Security.SuperUserId); - var contents = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out long _).ToList(); + ContentService.EmptyRecycleBin(); + var contents = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out var _).ToList(); // Assert Assert.That(contents.Any(), Is.False); @@ -1797,10 +1827,11 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Template template = TemplateBuilder.CreateTextPageTemplate(); FileService.SaveTemplate(template); - ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id); + ContentType contentType = + ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id); contentType.AllowedContentTypes = new List { - new ContentTypeSort(new Lazy(() => contentType.Id), 0, contentType.Alias) + new(new Lazy(() => contentType.Id), 0, contentType.Alias) }; ContentTypeService.Save(contentType); @@ -1820,8 +1851,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services IContent copy = ContentService.Copy(childPage, parentPage2.Id, false, true); // get the permissions and verify - EntityPermissionSet permissions = UserService.GetPermissionsForPath(userGroup, copy.Path, fallbackToDefaultPermissions: true); - string[] allPermissions = permissions.GetAllPermissions().ToArray(); + EntityPermissionSet permissions = UserService.GetPermissionsForPath(userGroup, copy.Path, true); + var allPermissions = permissions.GetAllPermissions().ToArray(); Assert.AreEqual(1, allPermissions.Length); Assert.AreEqual("A", allPermissions[0]); } @@ -1836,10 +1867,11 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Template template = TemplateBuilder.CreateTextPageTemplate(); FileService.SaveTemplate(template); - ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id); + ContentType contentType = + ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id); contentType.AllowedContentTypes = new List { - new ContentTypeSort(new Lazy(() => contentType.Id), 0, contentType.Alias) + new(new Lazy(() => contentType.Id), 0, contentType.Alias) }; ContentTypeService.Save(contentType); @@ -1857,8 +1889,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // Verify that the children have the inherited permissions var descendants = new List(); const int pageSize = 500; - int page = 0; - long total = long.MaxValue; + var page = 0; + var total = long.MaxValue; while (page * pageSize < total) { descendants.AddRange(ContentService.GetPagedDescendants(parentPage.Id, page++, pageSize, out total)); @@ -1868,8 +1900,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services foreach (IContent descendant in descendants) { - EntityPermissionSet permissions = UserService.GetPermissionsForPath(userGroup, descendant.Path, fallbackToDefaultPermissions: true); - string[] allPermissions = permissions.GetAllPermissions().ToArray(); + EntityPermissionSet permissions = UserService.GetPermissionsForPath(userGroup, descendant.Path, true); + var allPermissions = permissions.GetAllPermissions().ToArray(); Assert.AreEqual(1, allPermissions.Length); Assert.AreEqual("A", allPermissions[0]); } @@ -1893,8 +1925,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services foreach (IContent descendant in descendants) { - EntityPermissionSet permissions = UserService.GetPermissionsForPath(userGroup, descendant.Path, fallbackToDefaultPermissions: true); - string[] allPermissions = permissions.GetAllPermissions().ToArray(); + EntityPermissionSet permissions = UserService.GetPermissionsForPath(userGroup, descendant.Path, true); + var allPermissions = permissions.GetAllPermissions().ToArray(); Assert.AreEqual(1, allPermissions.Length); Assert.AreEqual("B", allPermissions[0]); } @@ -1914,22 +1946,19 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // * published & preview data // * multiple versions ContentType contentType = ContentTypeBuilder.CreateAllTypesContentType("test", "test"); - ContentTypeService.Save(contentType, Constants.Security.SuperUserId); + ContentTypeService.Save(contentType); object obj = - new - { - tags = "[\"Hello\",\"World\"]" - }; + new { tags = "[\"Hello\",\"World\"]" }; Content content1 = ContentBuilder.CreateBasicContent(contentType); content1.PropertyValues(obj); content1.ResetDirtyProperties(false); - ContentService.Save(content1, Constants.Security.SuperUserId); + ContentService.Save(content1); Assert.IsTrue(ContentService.SaveAndPublish(content1, userId: 0).Success); Content content2 = ContentBuilder.CreateBasicContent(contentType); content2.PropertyValues(obj); content2.ResetDirtyProperties(false); - ContentService.Save(content2, Constants.Security.SuperUserId); + ContentService.Save(content2); Assert.IsTrue(ContentService.SaveAndPublish(content2, userId: 0).Success); IUserGroup editorGroup = UserService.GetUserGroupByAlias(Constants.Security.EditorGroupAlias); @@ -1940,17 +1969,12 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services admin.StartContentIds = new[] { content1.Id }; UserService.Save(admin); - RelationService.Save(new RelationType("test", "test", false, Constants.ObjectTypes.Document, Constants.ObjectTypes.Document)); + RelationService.Save(new RelationType("test", "test", false, Constants.ObjectTypes.Document, + Constants.ObjectTypes.Document)); Assert.IsNotNull(RelationService.Relate(content1, content2, "test")); - PublicAccessService.Save(new PublicAccessEntry(content1, content2, content2, new List - { - new PublicAccessRule - { - RuleType = "test", - RuleValue = "test" - } - })); + PublicAccessService.Save(new PublicAccessEntry(content1, content2, content2, + new List { new() { RuleType = "test", RuleValue = "test" } })); Assert.IsTrue(PublicAccessService.AddRule(content1, "test2", "test2").Success); IUser user = UserService.GetUserById(Constants.Security.SuperUserId); @@ -1959,15 +1983,13 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services ContentService.SetPermission(content1, 'A', new[] { userGroup.Id }); - Assert.IsTrue(DomainService.Save(new UmbracoDomain("www.test.com", "en-AU") - { - RootContentId = content1.Id - }).Success); + Assert.IsTrue(DomainService.Save(new UmbracoDomain("www.test.com", "en-AU") { RootContentId = content1.Id }) + .Success); // Act - ContentService.MoveToRecycleBin(content1, Constants.Security.SuperUserId); - ContentService.EmptyRecycleBin(Constants.Security.SuperUserId); - var contents = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out long _).ToList(); + ContentService.MoveToRecycleBin(content1); + ContentService.EmptyRecycleBin(); + var contents = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out var _).ToList(); // Assert Assert.That(contents.Any(), Is.False); @@ -1995,7 +2017,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services IContent temp = ContentService.GetById(Subpage.Id); // Act - IContent copy = ContentService.Copy(temp, temp.ParentId, false, Constants.Security.SuperUserId); + IContent copy = ContentService.Copy(temp, temp.ParentId, false); IContent content = ContentService.GetById(Subpage.Id); // Assert @@ -2015,8 +2037,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { // see https://github.com/umbraco/Umbraco-CMS/issues/5513 - bool copyingWasCalled = false; - bool copiedWasCalled = false; + var copyingWasCalled = false; + var copiedWasCalled = false; ContentNotificationHandler.CopyingContent = notification => { @@ -2028,8 +2050,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services ContentNotificationHandler.CopiedContent = notification => { - string copyVal = notification.Copy.GetValue("title"); - string origVal = notification.Original.GetValue("title"); + var copyVal = notification.Copy.GetValue("title"); + var origVal = notification.Original.GetValue("title"); Assert.AreEqual("1", copyVal); Assert.AreEqual("2", origVal); @@ -2048,7 +2070,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services content.SetValue("title", "New Value"); ContentService.Save(content); - IContent copy = ContentService.Copy(content, content.ParentId, false, Constants.Security.SuperUserId); + IContent copy = ContentService.Copy(content, content.ParentId, false); Assert.AreEqual("1", copy.GetValue("title")); Assert.IsTrue(copyingWasCalled); @@ -2070,7 +2092,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual(3, ContentService.CountChildren(temp.Id)); // Act - IContent copy = ContentService.Copy(temp, temp.ParentId, false, true, Constants.Security.SuperUserId); + IContent copy = ContentService.Copy(temp, temp.ParentId, false, true); IContent content = ContentService.GetById(Textpage.Id); // Assert @@ -2080,7 +2102,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual(3, ContentService.CountChildren(copy.Id)); IContent child = ContentService.GetById(Subpage.Id); - IContent childCopy = ContentService.GetPagedChildren(copy.Id, 0, 500, out long total).First(); + IContent childCopy = ContentService.GetPagedChildren(copy.Id, 0, 500, out var total).First(); Assert.AreEqual(childCopy.Name, child.Name); Assert.AreNotEqual(childCopy.Id, child.Id); Assert.AreNotEqual(childCopy.Key, child.Key); @@ -2095,7 +2117,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual(3, ContentService.CountChildren(temp.Id)); // Act - IContent copy = ContentService.Copy(temp, temp.ParentId, false, false, Constants.Security.SuperUserId); + IContent copy = ContentService.Copy(temp, temp.ParentId, false, false); IContent content = ContentService.GetById(Textpage.Id); // Assert @@ -2114,12 +2136,15 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // the property needs to support tags, else nothing works of course! Template template = TemplateBuilder.CreateTextPageTemplate(); FileService.SaveTemplate(template); - ContentType contentType = ContentTypeBuilder.CreateSimpleTagsContentType("umbTagsPage", "TagsPage", defaultTemplateId: template.Id); + ContentType contentType = + ContentTypeBuilder.CreateSimpleTagsContentType("umbTagsPage", "TagsPage", + defaultTemplateId: template.Id); contentType.Key = new Guid("78D96D30-1354-4A1E-8450-377764200C58"); ContentTypeService.Save(contentType); - Content content = ContentBuilder.CreateSimpleContent(contentType, "Simple Tags Page", Constants.System.Root); - content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, propAlias, new[] { "hello", "world" }); + Content content = ContentBuilder.CreateSimpleContent(contentType, "Simple Tags Page"); + content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, propAlias, + new[] { "hello", "world" }); ContentService.Save(content); // value has been set but no tags have been created (not published) @@ -2174,7 +2199,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services var versions = ContentService.GetVersions(Subpage.Id).ToList(); Assert.AreEqual(1, versions.Count); - int version1 = content.VersionId; + var version1 = content.VersionId; content.Name = "Text Page 2 Updated"; content.SetValue("author", "Francis Doe"); @@ -2183,12 +2208,13 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.IsTrue(content.Edited); ContentService.SaveAndPublish(content); // new version - int version2 = content.VersionId; + var version2 = content.VersionId; Assert.AreNotEqual(version1, version2); Assert.IsTrue(content.Published); Assert.IsFalse(content.Edited); - Assert.AreEqual("Francis Doe", ContentService.GetById(content.Id).GetValue("author")); // version2 author is Francis + Assert.AreEqual("Francis Doe", + ContentService.GetById(content.Id).GetValue("author")); // version2 author is Francis Assert.AreEqual("Text Page 2 Updated", content.Name); Assert.AreEqual("Text Page 2 Updated", content.PublishName); @@ -2207,12 +2233,13 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services content.Name = "Text Page 2 ReReUpdated"; ContentService.SaveAndPublish(content); // new version - int version3 = content.VersionId; + var version3 = content.VersionId; Assert.AreNotEqual(version2, version3); Assert.IsTrue(content.Published); Assert.IsFalse(content.Edited); - Assert.AreEqual("Jane Doe", ContentService.GetById(content.Id).GetValue("author")); // version3 author is Jane + Assert.AreEqual("Jane Doe", + ContentService.GetById(content.Id).GetValue("author")); // version3 author is Jane Assert.AreEqual("Text Page 2 ReReUpdated", content.Name); Assert.AreEqual("Text Page 2 ReReUpdated", content.PublishName); @@ -2232,7 +2259,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.IsNotNull(rollback); Assert.IsTrue(rollback.Published); Assert.IsTrue(rollback.Edited); - Assert.AreEqual("Francis Doe", ContentService.GetById(content.Id).GetValue("author")); // author is now Francis again + Assert.AreEqual("Francis Doe", + ContentService.GetById(content.Id).GetValue("author")); // author is now Francis again Assert.AreEqual(version3, rollback.VersionId); // same version but with edits // props and name have rolled back @@ -2291,7 +2319,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Template template = TemplateBuilder.CreateTextPageTemplate(); FileService.SaveTemplate(template); - ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("multi", "Multi", defaultTemplateId: template.Id); + ContentType contentType = + ContentTypeBuilder.CreateSimpleContentType("multi", "Multi", defaultTemplateId: template.Id); contentType.Key = new Guid("45FF9A70-9C5F-448D-A476-DCD23566BBF8"); contentType.Variations = ContentVariation.Culture; IPropertyType p1 = contentType.PropertyTypes.First(); @@ -2311,13 +2340,13 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services page.SetCultureName("da1", langDa.IsoCode); Thread.Sleep(1); ContentService.Save(page); - int versionId0 = page.VersionId; + var versionId0 = page.VersionId; page.SetValue(p1.Alias, "v1fr", langFr.IsoCode); page.SetValue(p1.Alias, "v1da", langDa.IsoCode); Thread.Sleep(1); ContentService.SaveAndPublish(page); - int versionId1 = page.VersionId; + var versionId1 = page.VersionId; Thread.Sleep(10); @@ -2325,7 +2354,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services page.SetValue(p1.Alias, "v2fr", langFr.IsoCode); Thread.Sleep(1); ContentService.SaveAndPublish(page, langFr.IsoCode); - int versionId2 = page.VersionId; + var versionId2 = page.VersionId; Thread.Sleep(10); @@ -2333,7 +2362,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services page.SetValue(p1.Alias, "v2da", langDa.IsoCode); Thread.Sleep(1); ContentService.SaveAndPublish(page, langDa.IsoCode); - int versionId3 = page.VersionId; + var versionId3 = page.VersionId; Thread.Sleep(10); @@ -2343,7 +2372,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services page.SetValue(p1.Alias, "v3da", langDa.IsoCode); Thread.Sleep(1); ContentService.SaveAndPublish(page); - int versionId4 = page.VersionId; + var versionId4 = page.VersionId; // now get all versions IContent[] versions = ContentService.GetVersions(page.Id).ToArray(); @@ -2395,14 +2424,14 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual("da3", versions[0].GetCultureName(langDa.IsoCode)); // all versions have the same publish infos - for (int i = 0; i < 5; i++) + for (var i = 0; i < 5; i++) { Assert.AreEqual(versions[0].PublishDate, versions[i].PublishDate); Assert.AreEqual(versions[0].GetPublishDate(langFr.IsoCode), versions[i].GetPublishDate(langFr.IsoCode)); Assert.AreEqual(versions[0].GetPublishDate(langDa.IsoCode), versions[i].GetPublishDate(langDa.IsoCode)); } - for (int i = 0; i < 5; i++) + for (var i = 0; i < 5; i++) { Console.Write("[{0}] ", i); Console.WriteLine(versions[i].UpdateDate.ToString("O")[11..]); @@ -2444,7 +2473,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // helps showcase the functionality is actually working Thread.Sleep(5); ContentService.Save(page); - int versionId5 = page.VersionId; + var versionId5 = page.VersionId; versions = ContentService.GetVersions(page.Id).ToArray(); @@ -2452,7 +2481,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual(5, versions.Length); Assert.AreEqual(versionId4, versionId5); - for (int i = 0; i < 5; i++) + for (var i = 0; i < 5; i++) { Console.Write("[{0}] ", i); Console.WriteLine(versions[i].UpdateDate.ToString("O")[11..]); @@ -2465,7 +2494,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services IContent[] versionsSlim = ContentService.GetVersionsSlim(page.Id, 0, 50).ToArray(); Assert.AreEqual(5, versionsSlim.Length); - for (int i = 0; i < 5; i++) + for (var i = 0; i < 5; i++) { Console.Write("[{0}] ", i); Console.WriteLine(versionsSlim[i].UpdateDate.Ticks); @@ -2476,7 +2505,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Console.WriteLine("-"); // what we do in the controller to get rollback versions - IContent[] versionsSlimFr = versionsSlim.Where(x => x.UpdateDate == x.GetUpdateDate(langFr.IsoCode)).ToArray(); + IContent[] versionsSlimFr = + versionsSlim.Where(x => x.UpdateDate == x.GetUpdateDate(langFr.IsoCode)).ToArray(); Assert.AreEqual(4, versionsSlimFr.Length); @@ -2506,8 +2536,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services IContentType contentType = ContentTypeService.Get("umbTextpage"); IContent root = ContentService.GetById(Textpage.Id); - var c = new Lazy(() => ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Page", root.Id)); - var c2 = new Lazy(() => ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Subpage", c.Value.Id)); + var c = new Lazy(() => + ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Page", root.Id)); + var c2 = new Lazy(() => + ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Subpage", c.Value.Id)); var list = new List> { c, c2 }; using (IScope scope = ScopeProvider.CreateScope()) @@ -2537,9 +2569,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services IContentTypeService contentTypeService = ContentTypeService; ContentType contentType = ContentTypeBuilder.CreateAllTypesContentType("allDataTypes", "All DataTypes"); ContentTypeService.Save(contentType); - Content content = ContentBuilder.CreateAllTypesContent(contentType, "Random Content", Constants.System.Root); + Content content = + ContentBuilder.CreateAllTypesContent(contentType, "Random Content", Constants.System.Root); ContentService.Save(content); - int id = content.Id; + var id = content.Id; // Act IContent sut = ContentService.GetById(id); @@ -2555,17 +2588,26 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services // SD: This is failing because the 'content' call to GetValue always has empty milliseconds // MCH: I'm guessing this is an issue because of the format the date is actually stored as, right? Cause we don't do any formatting when saving or loading - Assert.That(sut.GetValue("dateTime").ToString("G"), Is.EqualTo(content.GetValue("dateTime").ToString("G"))); + Assert.That(sut.GetValue("dateTime").ToString("G"), + Is.EqualTo(content.GetValue("dateTime").ToString("G"))); Assert.That(sut.GetValue("colorPicker"), Is.EqualTo("black")); Assert.That(sut.GetValue("ddlMultiple"), Is.EqualTo("1234,1235")); Assert.That(sut.GetValue("rbList"), Is.EqualTo("random")); - Assert.That(sut.GetValue("date").ToString("G"), Is.EqualTo(content.GetValue("date").ToString("G"))); + Assert.That(sut.GetValue("date").ToString("G"), + Is.EqualTo(content.GetValue("date").ToString("G"))); Assert.That(sut.GetValue("ddl"), Is.EqualTo("1234")); Assert.That(sut.GetValue("chklist"), Is.EqualTo("randomc")); - Assert.That(sut.GetValue("contentPicker"), Is.EqualTo(Udi.Create(Constants.UdiEntityType.Document, new Guid("74ECA1D4-934E-436A-A7C7-36CC16D4095C")))); - Assert.That(sut.GetValue("mediaPicker"), Is.EqualTo(Udi.Create(Constants.UdiEntityType.Media, new Guid("44CB39C8-01E5-45EB-9CF8-E70AAF2D1691")))); - Assert.That(sut.GetValue("memberPicker"), Is.EqualTo(Udi.Create(Constants.UdiEntityType.Member, new Guid("9A50A448-59C0-4D42-8F93-4F1D55B0F47D")))); - Assert.That(sut.GetValue("multiUrlPicker"), Is.EqualTo("[{\"name\":\"https://test.com\",\"url\":\"https://test.com\"}]")); + Assert.That(sut.GetValue("contentPicker"), + Is.EqualTo(Udi.Create(Constants.UdiEntityType.Document, + new Guid("74ECA1D4-934E-436A-A7C7-36CC16D4095C")))); + Assert.That(sut.GetValue("mediaPicker"), + Is.EqualTo(Udi.Create(Constants.UdiEntityType.Media, + new Guid("44CB39C8-01E5-45EB-9CF8-E70AAF2D1691")))); + Assert.That(sut.GetValue("memberPicker"), + Is.EqualTo(Udi.Create(Constants.UdiEntityType.Member, + new Guid("9A50A448-59C0-4D42-8F93-4F1D55B0F47D")))); + Assert.That(sut.GetValue("multiUrlPicker"), + Is.EqualTo("[{\"name\":\"https://test.com\",\"url\":\"https://test.com\"}]")); Assert.That(sut.GetValue("tags"), Is.EqualTo("this,is,tags")); } @@ -2574,10 +2616,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { // Arrange IContent content = ContentService.GetById(Trashed.Id); - int version = content.VersionId; + var version = content.VersionId; // Act - ContentService.DeleteVersion(Trashed.Id, version, true, Constants.Security.SuperUserId); + ContentService.DeleteVersion(Trashed.Id, version, true); IContent sut = ContentService.GetById(Trashed.Id); // Assert @@ -2589,20 +2631,20 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { // Start by cleaning the "db" IContent umbTextPage = ContentService.GetById(new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0")); - ContentService.Delete(umbTextPage, Constants.Security.SuperUserId); + ContentService.Delete(umbTextPage); Template template = TemplateBuilder.CreateTextPageTemplate(); FileService.SaveTemplate(template); ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id); ContentTypeService.Save(contentType); - for (int i = 0; i < 10; i++) + for (var i = 0; i < 10; i++) { Content c1 = ContentBuilder.CreateSimpleContent(contentType); ContentService.Save(c1); } - IContent[] entities = ContentService.GetPagedChildren(Constants.System.Root, 0, 6, out long total).ToArray(); + IContent[] entities = ContentService.GetPagedChildren(Constants.System.Root, 0, 6, out var total).ToArray(); Assert.That(entities.Length, Is.EqualTo(6)); Assert.That(total, Is.EqualTo(10)); entities = ContentService.GetPagedChildren(Constants.System.Root, 1, 6, out total).ToArray(); @@ -2615,7 +2657,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { // Start by cleaning the "db" IContent umbTextPage = ContentService.GetById(new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0")); - ContentService.Delete(umbTextPage, Constants.Security.SuperUserId); + ContentService.Delete(umbTextPage); Template template = TemplateBuilder.CreateTextPageTemplate(); FileService.SaveTemplate(template); @@ -2624,7 +2666,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services ContentTypeService.Save(contentType); // Only add 9 as we also add a content with children - for (int i = 0; i < 9; i++) + for (var i = 0; i < 9; i++) { Content c1 = ContentBuilder.CreateSimpleContent(contentType); ContentService.Save(c1); @@ -2632,14 +2674,14 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Content willHaveChildren = ContentBuilder.CreateSimpleContent(contentType); ContentService.Save(willHaveChildren); - for (int i = 0; i < 10; i++) + for (var i = 0; i < 10; i++) { Content c1 = ContentBuilder.CreateSimpleContent(contentType, "Content" + i, willHaveChildren.Id); ContentService.Save(c1); } // children in root including the folder - not the descendants in the folder - IContent[] entities = ContentService.GetPagedChildren(Constants.System.Root, 0, 6, out long total).ToArray(); + IContent[] entities = ContentService.GetPagedChildren(Constants.System.Root, 0, 6, out var total).ToArray(); Assert.That(entities.Length, Is.EqualTo(6)); Assert.That(total, Is.EqualTo(10)); entities = ContentService.GetPagedChildren(Constants.System.Root, 1, 6, out total).ToArray(); @@ -2658,22 +2700,17 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services [Test] public void PublishingTest() { - var contentType = new ContentType(ShortStringHelper, Constants.System.Root) - { - Alias = "foo", - Name = "Foo" - }; + var contentType = new ContentType(ShortStringHelper, Constants.System.Root) { Alias = "foo", Name = "Foo" }; var properties = new PropertyTypeCollection(true) { - new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext) { Alias = "title", Name = "Title", Mandatory = false, DataTypeId = -88 }, + new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext) + { + Alias = "title", Name = "Title", Mandatory = false, DataTypeId = -88 + } }; - contentType.PropertyGroups.Add(new PropertyGroup(properties) - { - Alias = "content", - Name = "content" - }); + contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "content" }); contentType.SetDefaultTemplate(new Template(ShortStringHelper, "Textpage", "textpage")); FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType! @@ -2733,8 +2770,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual("foo", content.GetValue("title", published: true)); Assert.AreEqual("foo", content.GetValue("title")); - int vpk = ((Content)content).VersionId; - int ppk = ((Content)content).PublishedVersionId; + var vpk = ((Content)content).VersionId; + var ppk = ((Content)content).PublishedVersionId; content = ContentService.GetById(content.Id); Assert.IsFalse(content.Published); @@ -2808,7 +2845,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services IContentType contentType = ContentTypeService.Get("umbTextpage"); contentType.Variations = ContentVariation.Culture; - contentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Nvarchar, "prop") { Variations = ContentVariation.Culture }); + contentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, + ValueStorageType.Nvarchar, "prop") { Variations = ContentVariation.Culture }); ContentTypeService.Save(contentType); var content = new Content(null, Constants.System.Root, contentType); @@ -2853,17 +2891,19 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services content.SetCultureName("root", langUk.IsoCode); ContentService.Save(content); - for (int i = 0; i < 5; i++) + for (var i = 0; i < 5; i++) { var child = new Content(null, content, contentType); child.SetCultureName("child", langUk.IsoCode); ContentService.Save(child); - Assert.AreEqual("child" + (i == 0 ? string.Empty : " (" + i + ")"), child.GetCultureName(langUk.IsoCode)); + Assert.AreEqual("child" + (i == 0 ? string.Empty : " (" + i + ")"), + child.GetCultureName(langUk.IsoCode)); // Save it again to ensure that the unique check is not performed again against it's own name ContentService.Save(child); - Assert.AreEqual("child" + (i == 0 ? string.Empty : " (" + i + ")"), child.GetCultureName(langUk.IsoCode)); + Assert.AreEqual("child" + (i == 0 ? string.Empty : " (" + i + ")"), + child.GetCultureName(langUk.IsoCode)); } } @@ -2894,8 +2934,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services contentType.Variations = ContentVariation.Culture; ContentTypeService.Save(contentType); - int[] o = new[] { 2, 1, 3, 0, 4 }; // randomly different - for (int i = 0; i < 5; i++) + int[] o = { 2, 1, 3, 0, 4 }; // randomly different + for (var i = 0; i < 5; i++) { var contentA = new Content(null, Constants.System.Root, contentType); contentA.SetCultureName("contentA" + i + "uk", langUk.IsoCode); @@ -2911,7 +2951,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services } // get all - var list = ContentService.GetPagedChildren(Constants.System.Root, 0, 100, out long total).ToList(); + var list = ContentService.GetPagedChildren(Constants.System.Root, 0, 100, out var total).ToList(); Console.WriteLine("ALL"); WriteList(list); @@ -2964,7 +3004,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual(5, total); Assert.AreEqual(5, list.Count); - for (int i = 0; i < 5; i++) + for (var i = 0; i < 5; i++) { Assert.AreEqual("contentA" + i + "fr", list[i].GetCultureName(langFr.IsoCode)); } @@ -2975,7 +3015,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services 100, out total, sqlContext.Query().Where(x => x.Name.Contains("contentA")), - Ordering.By("name", direction: Direction.Descending, culture: langFr.IsoCode)).ToList(); + Ordering.By("name", Direction.Descending, langFr.IsoCode)).ToList(); Console.WriteLine("FILTER BY NAME fr:'contentA', ORDER DESC"); WriteList(list); @@ -2983,7 +3023,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual(5, total); Assert.AreEqual(5, list.Count); - for (int i = 0; i < 5; i++) + for (var i = 0; i < 5; i++) { Assert.AreEqual("contentA" + (4 - i) + "fr", list[i].GetCultureName(langFr.IsoCode)); } @@ -2993,7 +3033,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services { foreach (IContent content in list) { - Console.WriteLine("[{0}] {1} {2} {3} {4}", content.Id, content.Name, content.GetCultureName("en-GB"), content.GetCultureName("fr-FR"), content.GetCultureName("da-DK")); + Console.WriteLine("[{0}] {1} {2} {3} {4}", content.Id, content.Name, content.GetCultureName("en-GB"), + content.GetCultureName("fr-FR"), content.GetCultureName("da-DK")); } Console.WriteLine("-"); @@ -3008,14 +3049,14 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services .WithIsDefault(true) .Build(); ILanguage langFr = new LanguageBuilder() - .WithCultureInfo("fr-FR") - .Build(); + .WithCultureInfo("fr-FR") + .Build(); ILanguage langUk = new LanguageBuilder() - .WithCultureInfo("en-GB") - .Build(); + .WithCultureInfo("en-GB") + .Build(); ILanguage langDe = new LanguageBuilder() - .WithCultureInfo("de-DE") - .Build(); + .WithCultureInfo("de-DE") + .Build(); languageService.Save(langFr); languageService.Save(langUk); @@ -3025,7 +3066,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services IContentType contentType = ContentTypeService.Get("umbTextpage"); contentType.Variations = ContentVariation.Culture; - contentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Nvarchar, "prop") { Variations = ContentVariation.Culture }); + contentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, + ValueStorageType.Nvarchar, "prop") { Variations = ContentVariation.Culture }); // FIXME: add test w/ an invariant prop ContentTypeService.Save(contentType); @@ -3065,12 +3107,16 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.IsNull(content2.GetPublishName(langUk.IsoCode)); // only fr and uk have a name, and are available - AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); // nothing has been published yet - AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, false), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, false), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, false), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, false), + (langDe, false)); // not published => must be edited, if available AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false)); @@ -3102,19 +3148,27 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode, published: true)); // no change - AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); // fr and uk have been published now - AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true), + (langDe, false)); // fr and uk, published without changes, not edited - AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, false), (langUk, false), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, false), (langUk, false), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, false), (langUk, false), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, false), (langUk, false), + (langDe, false)); - AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false), (langUk, false)); // DE would throw - AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false), (langUk, false)); // DE would throw + AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false), + (langUk, false)); // DE would throw + AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false), + (langUk, false)); // DE would throw // note that content and content2 culture published dates might be slightly different due to roundtrip to database @@ -3155,19 +3209,25 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode, published: true)); // no change - AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); // no change - AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true), + (langDe, false)); // we have changed values so now fr and uk are edited AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false)); AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false)); - AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false), (langUk, false)); // DE would throw - AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false), (langUk, false)); // DE would throw + AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false), + (langUk, false)); // DE would throw + AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false), + (langUk, false)); // DE would throw // Act // cannot just 'save' since we are changing what's published! @@ -3195,19 +3255,25 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode)); // no change - AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); // fr is not published anymore - AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), + (langDe, false)); // and so, fr has to be edited AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false)); AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false)); - AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langUk, false)); // FR, DE would throw - AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langUk, false)); // FR, DE would throw + AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, + (langUk, false)); // FR, DE would throw + AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, + (langUk, false)); // FR, DE would throw // Act ContentService.Unpublish(content); @@ -3236,22 +3302,29 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual("value-fr2", content2.GetValue("prop", langFr.IsoCode)); Assert.AreEqual("value-uk2", content2.GetValue("prop", langUk.IsoCode)); Assert.IsNull(content2.GetValue("prop", langFr.IsoCode, published: true)); - Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode, published: true)); // has value, see note above + Assert.AreEqual("value-uk1", + content2.GetValue("prop", langUk.IsoCode, published: true)); // has value, see note above // no change - AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); // fr is not published anymore - uk still is, see note above - AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), + (langDe, false)); // and so, fr has to be edited - uk still is AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false)); AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false)); - AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langUk, false)); // FR, DE would throw - AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langUk, false)); // FR, DE would throw + AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, + (langUk, false)); // FR, DE would throw + AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, + (langUk, false)); // FR, DE would throw // Act @@ -3281,19 +3354,25 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode, published: true)); // no change - AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); // no change, back to published - AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), + (langDe, false)); // no change, back to published AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false)); AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false)); - AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langUk, false)); // FR, DE would throw - AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langUk, false)); // FR, DE would throw + AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, + (langUk, false)); // FR, DE would throw + AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, + (langUk, false)); // FR, DE would throw // Act ContentService.SaveAndPublish(content, langUk.IsoCode); @@ -3301,19 +3380,26 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services content2 = ContentService.GetById(content.Id); // no change - AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true), + (langDe, false)); // no change - AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), (langDe, false)); + AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), + (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true), + (langDe, false)); // now, uk is no more edited AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, false), (langDe, false)); - AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, false), (langDe, false)); + AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, false), + (langDe, false)); - AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langUk, false)); // FR, DE would throw - AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langUk, false)); // FR, DE would throw + AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, + (langUk, false)); // FR, DE would throw + AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, + (langUk, false)); // FR, DE would throw // Act content.SetCultureName("name-uk3", langUk.IsoCode); @@ -3329,12 +3415,14 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services Assert.IsTrue(content2.IsCultureEdited(langUk.IsoCode)); } - private void AssertPerCulture(IContent item, Func getter, params (ILanguage Language, bool Result)[] testCases) + private void AssertPerCulture(IContent item, Func getter, + params (ILanguage Language, bool Result)[] testCases) { foreach ((ILanguage Language, bool Result) testCase in testCases) { T value = getter(item, testCase.Language.IsoCode); - Assert.AreEqual(testCase.Result, value, $"Expected {testCase.Result} and got {value} for culture {testCase.Language.IsoCode}."); + Assert.AreEqual(testCase.Result, value, + $"Expected {testCase.Result} and got {value} for culture {testCase.Language.IsoCode}."); } } @@ -3345,9 +3433,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services var list = new List(); - for (int i = 0; i < 10; i++) + for (var i = 0; i < 10; i++) { - Content content = ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Page " + i, root); + Content content = + ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Page " + i, root); list.Add(content); list.AddRange(CreateChildrenOf(contentType, content, 4)); @@ -3361,9 +3450,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services private IEnumerable CreateChildrenOf(IContentType contentType, IContent content, int depth) { var list = new List(); - for (int i = 0; i < depth; i++) + for (var i = 0; i < depth; i++) { - Content c = ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Subpage " + i, content); + Content c = ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Subpage " + i, + content); list.Add(c); Debug.Print("Created: 'Hierarchy Simple Text Subpage {0}' - Depth: {1}", i, depth); @@ -3372,7 +3462,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services return list; } - private void CreateEnglishAndFrenchDocumentType(out Language langUk, out Language langFr, out ContentType contentType) + private void CreateEnglishAndFrenchDocumentType(out Language langUk, out Language langFr, + out ContentType contentType) { langUk = (Language)new LanguageBuilder() .WithCultureInfo("en-GB") @@ -3389,7 +3480,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services ContentTypeService.Save(contentType); } - private IContent CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr, out ContentType contentType) + private IContent CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr, + out ContentType contentType) { CreateEnglishAndFrenchDocumentType(out langUk, out langFr, out contentType); @@ -3405,17 +3497,16 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services INotificationHandler, INotificationHandler { - public void Handle(ContentPublishingNotification notification) => PublishingContent?.Invoke(notification); - - public void Handle(ContentCopyingNotification notification) => CopyingContent?.Invoke(notification); - - public void Handle(ContentCopiedNotification notification) => CopiedContent?.Invoke(notification); - public static Action PublishingContent { get; set; } public static Action CopyingContent { get; set; } public static Action CopiedContent { get; set; } + + public void Handle(ContentCopiedNotification notification) => CopiedContent?.Invoke(notification); + + public void Handle(ContentCopyingNotification notification) => CopyingContent?.Invoke(notification); + public void Handle(ContentPublishingNotification notification) => PublishingContent?.Invoke(notification); } } }