Merge pull request #171 from skttl/develop

Preparing 1.1 release

Author: skttl

appveyor.yml

@@ -1,7 +1,7 @@
 image: Visual Studio 2017
 
 # version format
-version: 1.0.0.{build}
+version: 1.1.0.{build}
 
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta

docs/developers-guide.md

@@ -57,7 +57,7 @@ You can also add your editors using a package.manifest file in a folder in the `
             "allowedDocTypes": [...],
             "nameTemplate": "",
             "enablePreview": true,
-			"largeDialog": true,
+            "overlaySize": "medium",
             "viewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/",
             "previewViewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/Previews/",
             "previewCssFilePath": "",
@@ -86,13 +86,17 @@ The **Doc Type Grid Editor** supports 3 config options, all of which are optiona
 | AllowedDocTypes | String[] | An array of doc type aliases of which should be allowed to be selected in the grid editor. Strings can be REGEX patterns to allow matching groups of doc types in a single entry. e.g. "Widget$" will match all doc types with an alias ending in "Widget". However if a single doc type is matched, (aka **Single Doc Type Mode**), then doc type selection stage (in the DTGE panel) will be skipped. Note, your document type must be an Element type, in order to be usable in DTGE. |
 | NameTemplate    | String   | Allows using any of the doctype's property values in the name/label: {{propertyAlias}} |
 | EnablePreview   | Boolean  | Enables rendering a preview of the grid cell in the grid editor. |
-| LargeDialog     | Boolean  | Makes the editing dialog larger. Especially useful for grid editors with complex property editors. |
+| overlaySize     | String   | Define the size of the grid editor dialog. You can write `large`, `medium` or `small`. If no size is set, the grid editor dialog will be small. Note, the medium size requires a minimum Umbraco version of 8.3 |
+| LargeDialog     | Boolean  | (obsolete, use overlaySize instead) Makes the editing dialog larger. Especially useful for grid editors with complex property editors. |
+| size            | string   | (obsolete, use overlaySize instead) 
 | ViewPath        | String   | Sets an alternative view path for where the **Doc Type Grid Editor** should look for views when rendering. Defaults to `~/Views/Partials/` |
 | PreviewViewPath | String   | Sets an alternative view path for where the **Doc Type Grid Editor** should look for views when rendering previews in the backoffice |
 | ShowDocTypeSelectAsGrid | Boolean | Makes the content type selection dialog render a grid, in stead of the default list with descriptions |
 
 By default, a universal grid editor allowing all available element document types is added upon installation.
 
+Since Doc Type Grid Editor does not support culture variation, element document types allowing culture variations is not available for use in Doc Type Grid Editor.
+
 ---
 
 ### Hooking Up The Doc Type Grid Editor

src/Our.Umbraco.DocTypeGridEditor/Models/DetachedPublishedProperty.cs

@@ -85,6 +85,12 @@ public IPublishedPropertyType PropertyType
                 return _propertyType;
             }
         }
-        public string Alias { get; }
+        public string Alias 
+        { 
+            get
+            {
+                return _propertyType.Alias;
+            }
+        }
     }
-}
+}

src/Our.Umbraco.DocTypeGridEditor/Web/Controllers/DocTypeGridEditorApiController.cs

@@ -11,6 +11,7 @@
 using Our.Umbraco.DocTypeGridEditor.Extensions;
 using Our.Umbraco.DocTypeGridEditor.Helpers;
 using Our.Umbraco.DocTypeGridEditor.Models;
+using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Services;
@@ -60,7 +61,7 @@ public IEnumerable<object> GetContentTypes([ModelBinder] string[] allowedContent
         {
             var allContentTypes = Current.Services.ContentTypeService.GetAll().ToList();
             var contentTypes = allContentTypes
-                .Where(x => x.IsElement)
+                .Where(x => x.IsElement && x.VariesByCulture() == false)
                 .Where(x => allowedContentTypes == null || allowedContentTypes.Length == 0 || allowedContentTypes.Any(y => Regex.IsMatch(x.Alias, y)))
                 .OrderBy(x => x.Name)
                 .ToList();

src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.controllers.js

@@ -85,7 +85,7 @@
             overlayOptions.allowedDocTypes = $scope.control.editor.config.allowedDocTypes || [];
             overlayOptions.showDocTypeSelectAsGrid = $scope.control.editor.config.showDocTypeSelectAsGrid === true;
             overlayOptions.nameTemplate = $scope.control.editor.config.nameTemplate;
-            overlayOptions.size = $scope.control.editor.config.largeDialog ? null : "small";
+            overlayOptions.size = $scope.control.editor.config.largeDialog ? null : $scope.control.editor.config.overlaySize || "small";
 
             overlayOptions.dialogData = {
                 docTypeAlias: $scope.control.value.dtgeContentTypeAlias,

src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Views/doctypegrideditor.html

@@ -11,6 +11,7 @@
             </div>
         </div>
         <div ng-if="preview"
+             class="dtge-editor-preview-container"
              style="text-align: left;"
              dtge-bind-html-compile="preview"
              prevent-default>