Skip to content
This repository was archived by the owner on Feb 10, 2024. It is now read-only.

Commit 77cf778

Browse files
tompipetompipe
authored
Merge pull request #1 from skttl/develop
Sync upstream
2 parents 60bc7b8 + 47c8f5d commit 77cf778

File tree

65 files changed

+1853
-1152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1853
-1152
lines changed

‎LICENSE.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
Copyright © 2014 Umbrella Inc, Our Umbraco and other contributors
1+
Copyright © 2019 Søren Kottal, Our Umbraco and other contributors
2+
Copyright © 2017 UMCO, Our Umbraco and other contributors
3+
Copyright © 2014 Umbrella Inc
24

35
Permission is hereby granted, free of charge, to any person obtaining a copy of
46
this software and associated documentation files (the "Software"), to deal in

‎README.md

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
# Doc Type Grid Editor
22

3-
[![Build status](https://img.shields.io/appveyor/ci/leekelleher/umbraco-doc-type-grid-editor.svg)](https://ci.appveyor.com/project/leekelleher/umbraco-doc-type-grid-editor)
3+
[![Build status](https://img.shields.io/appveyor/ci/skttl/umbraco-doc-type-grid-editor.svg)](https://ci.appveyor.com/project/skttl/umbraco-doc-type-grid-editor)
44
[![NuGet release](https://img.shields.io/nuget/v/Our.Umbraco.DocTypeGridEditor.svg)](https://www.nuget.org/packages/Our.Umbraco.DocTypeGridEditor)
55
[![Our Umbraco project page](https://img.shields.io/badge/our-umbraco-orange.svg)](https://our.umbraco.org/projects/backoffice-extensions/doc-type-grid-editor)
6-
[![Chat on Gitter](https://img.shields.io/badge/gitter-join_chat-green.svg)](https://gitter.im/leekelleher/umbraco-doc-type-grid-editor)
76

87

9-
A grid editor for Umbraco 7 that allows you to use Doc Types as a blue print for cell data.
8+
A grid editor for Umbraco 8 that allows you to use Doc Types as a blue print for grid-cell data.
109

1110

1211
## Getting Started
1312

1413
### Installation
1514

16-
> *Note:* Doc Type Grid Editor has been developed against **Umbraco v7.2.0** and will support that version and above.
15+
> *Note:* Doc Type Grid Editor has been developed against **Umbraco v8.1.0** and will support that version and above.
1716
1817
Doc Type Grid Editor can be installed from either Our Umbraco package repository, or build manually from the source-code.
1918

@@ -35,11 +34,12 @@ We also have a [MyGet package repository](https://www.myget.org/gallery/umbraco-
3534

3635
If you prefer, you can compile Doc Type Grid Editor yourself, you'll need:
3736

38-
* Visual Studio 2012 (or above)
37+
* [Visual Studio 2017 (or above, including Community Editions)](https://www.visualstudio.com/downloads/)
38+
* Microsoft Build Tools 2015 (aka [MSBuild 15](https://www.microsoft.com/en-us/download/details.aspx?id=48159))
3939

4040
To clone it locally click the "Clone in Windows" button above or run the following git commands.
4141

42-
git clone https://github.com/umco/umbraco-doc-type-grid-editor.git umbraco-doc-type-grid-editor
42+
git clone https://github.com/skttl/umbraco-doc-type-grid-editor.git umbraco-doc-type-grid-editor
4343
cd umbraco-doc-type-grid-editor
4444
.\build.cmd
4545

@@ -49,18 +49,18 @@ To clone it locally click the "Clone in Windows" button above or run the followi
4949

5050
For details on how to use the Doc Type Grid Editor package, please refer to our [Developers Guide](docs/developers-guide.md) documentation.
5151

52-
A PDF download is also available: [Doc Type Grid Editor - Developers Guide v1.0.pdf](docs/Doc-Type-Grid-Editor--Developers-Guide-v1.0.pdf)
53-
5452
---
5553

5654
## Known Issues
5755

58-
Please be aware that not all property-editors will work within Doc Type Grid Editor. The following property-editors are known to have compatibility issues:
56+
Please be aware that not all property-editors will work within Doc Type Grid Editor. The following Umbraco core property-editors are known to have compatibility issues:
57+
58+
* Image Cropper
59+
* Macro Container
60+
* Tags
61+
* Upload
5962

60-
* Upload (default Umbraco core)
61-
* Image Cropper (default Umbraco core)
62-
* Macro Container (default Umbraco core)
63-
* Tags (default Umbraco core)
63+
Another known issue is that validation of property-editors within the overlay do not always work. For editors that use client-side (HTML5) validation, this may appear to work, (e.g. text input require attribute is added), but server-side validation does not work.
6464

6565
---
6666

@@ -78,21 +78,27 @@ Anyone and everyone is welcome to contribute. Please take a moment to review the
7878
Have a question?
7979

8080
* [Doc Type Grid Editor Forum](https://our.umbraco.org/projects/backoffice-extensions/doc-type-grid-editor/doc-type-grid-editor-feedback/) on Our Umbraco
81-
* [Raise an issue](https://github.com/umco/umbraco-doc-type-grid-editor/issues) on GitHub
81+
* [Raise an issue](https://github.com/skttl/umbraco-doc-type-grid-editor/issues) on GitHub
8282

8383

8484
## Dev Team
8585

86-
* [Matt Brailsford](https://github.com/mattbrailsford)
87-
* [Lee Kelleher](https://github.com/leekelleher)
86+
* [Søren Kottal](https://github.com/skttl)
8887

8988
### Special thanks
9089

90+
* Thanks to [Matt Brailsford](https://github.com/mattbrailsford) and [Lee Kelleher](https://github.com/leekelleher) for building this great package.
9191
* Thanks to [Jeavon Leopold](https://github.com/Jeavon) for being a rockstar and adding AppVeyor & NuGet support.
92+
* Thanks to [Dave Woestenborghs](https://github.com/dawoe) for helping solve showstopper issues.
93+
* Thanks to [Arnold Visser](https://github.com/ArnoldV) and [Bjarne Fyrstenborg](https://github.com/bjarnef) for help with porting the package to Umbraco 8.
9294

9395

9496
## License
9597

96-
Copyright © 2014 Umbrella Inc, Our Umbraco and [other contributors](https://github.com/umco/umbraco-doc-type-grid-editor/graphs/contributors)
98+
Copyright © 2019 Søren Kottal, Our Umbraco and [other contributors](https://github.com/skttl/umbraco-doc-type-grid-editor/graphs/contributors)
99+
100+
Copyright © 2017 UMCO, Our Umbraco and [other contributors](https://github.com/skttl/umbraco-doc-type-grid-editor/graphs/contributors)
101+
102+
Copyright © 2014 Umbrella Inc
97103

98104
Licensed under the [MIT License](LICENSE.md)

‎appveyor.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
image: Visual Studio 2017
2+
13
# version format
2-
version: 0.3.0.{build}
4+
version: 1.1.0.{build}
35

46
# UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
57
# example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta
@@ -9,8 +11,11 @@ init:
911
cache:
1012
- src\packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
1113

14+
before_build:
15+
- nuget restore src
16+
1217
build_script:
13-
- build-appveyor.cmd
18+
- build-appveyor.cmd
1419

1520
artifacts:
1621
- path: artifacts\*.nupkg
@@ -19,18 +24,18 @@ artifacts:
1924
deploy:
2025
# MyGet Deployment for builds & releases
2126
- provider: NuGet
22-
server: https://www.myget.org/F/umbraco-packages/
23-
symbol_server: https://nuget.symbolsource.org/MyGet/umbraco-packages
27+
server: https://www.myget.org/F/umbraco-packages/api/v2/package
28+
symbol_server: https://www.myget.org/F/umbraco-packages/symbols/api/v2/package
2429
api_key:
25-
secure: Q1/4K8VSwr7BjwmKDTef8y5lOc7S+jK9ELuWy67y6OVRpjxmnF9M3Gfs1kT+ir8x
30+
secure: MopTO3Wq0dA16UdDqhP2GIzXLzZqS4SxGPCGiwN1i1hEL0AYLscuJVq6Ot7XYD2m
2631
artifact: /.*\.nupkg/
2732
on:
2833
branch: develop
2934

3035
# GitHub Deployment for releases
3136
- provider: GitHub
3237
auth_token:
33-
secure: pEozEGTqJutQwOidJU6BTB+Ix0NV4vrUnomhfeqheVz4RNwfxjEYLoqR4XabhlPz
38+
secure: Z9C0Mgv2YVEeAilwYB/x9jhPMyg73MSzKVviFSsHBYqjmV56ayWp/FMoEdspu3tE
3439
artifact: /.*\.zip/ # upload all Zip packages to release assets
3540
draft: false
3641
prerelease: false
@@ -41,8 +46,9 @@ deploy:
4146
# NuGet Deployment for releases
4247
- provider: NuGet
4348
server:
49+
skip_symbols: true
4450
api_key:
45-
secure: CGzDKxw4QI/z2VSe9ceiYlIabqGXHolgBgVNWWZjVAJ2V5WLF11IFdlp9r5Qp+Sw
51+
secure: RYtJVVEuX1s2cy3Wo1Xly0yvp1n40wDdndhNsXQGgrAUmZDnlwujEycsLxUL8NsN
4652
artifact: /.*\.nupkg/
4753
on:
4854
branch: master

‎build-appveyor.cmd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ ECHO APPVEYOR_REPO_TAG: %APPVEYOR_REPO_TAG%
33
ECHO APPVEYOR_BUILD_NUMBER : %APPVEYOR_BUILD_NUMBER%
44
ECHO APPVEYOR_BUILD_VERSION : %APPVEYOR_BUILD_VERSION%
55

6-
CALL src\.nuget\NuGet.exe restore src\Our.Umbraco.DocTypeGridEditor.sln
7-
CALL "%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe" build\package.proj
6+
CALL build\tools\NuGet.exe restore src\Our.Umbraco.DocTypeGridEditor.sln
7+
CALL "%programfiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\amd64\MsBuild.exe" build\package.proj
8+
REM CALL "%programfiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\amd64\MsBuild.exe" build\package.proj

‎build/install.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if (!$docTypeGridEditorFolder)
1313
$projectPathExists = Test-Path $projectPath
1414

1515
if ($projectPathExists) {
16-
Write-Host "Updating Nested Content App_Plugin files using PS as they have been excluded from the project"
16+
Write-Host "Updating Doc Type Grid Editor App_Plugin files using PS as they have been excluded from the project"
1717
Copy-Item $newPackageFiles $projectPath -Recurse -Force
1818
}
1919
}

‎build/package.proj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
<PropertyGroup>
1919
<ProjectName>Our.Umbraco.DocTypeGridEditor</ProjectName>
2020
<PackageName>Doc Type Grid Editor</PackageName>
21-
<MinUmbracoVersion>7.2.0</MinUmbracoVersion>
22-
<Readme>Doc Type Grid Editor is an advanced grid editor for the new Umbraco v7.2 Grid</Readme>
23-
<AuthorName>Matt Brailsford, Lee Kelleher</AuthorName>
24-
<AuthorUrl>https://github.com/leekelleher/umbraco-doc-type-grid-editor/graphs/contributors</AuthorUrl>
21+
<MinUmbracoVersion>8.1.0</MinUmbracoVersion>
22+
<Readme>Doc Type Grid Editor is an advanced grid editor for Umbraco 8</Readme>
23+
<AuthorName>Matt Brailsford, Lee Kelleher, Søren Kottal</AuthorName>
24+
<AuthorUrl>https://github.com/umco/umbraco-doc-type-grid-editor/graphs/contributors</AuthorUrl>
2525
<PackageLicenseName>MIT license</PackageLicenseName>
2626
<PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
27-
<ProjectUrl>https://github.com/leekelleher/umbraco-doc-type-grid-editor</ProjectUrl>
27+
<ProjectUrl>https://github.com/umco/umbraco-doc-type-grid-editor</ProjectUrl>
2828
</PropertyGroup>
2929

3030
<!-- NUGET ONLY PROPERTIES -->
3131
<PropertyGroup>
3232
<PackageId>Our.Umbraco.DocTypeGridEditor</PackageId>
3333
<NuGetPackageName>Doc Type Grid Editor for Umbraco</NuGetPackageName>
34-
<Copyright>Copyright &#169; 2015 Matt Brailsford, Lee Kelleher</Copyright>
35-
<Owners>Matt Brailsford, Lee Kelleher</Owners>
34+
<Copyright>Copyright &#169; 2019 UMCO</Copyright>
35+
<Owners>Matt Brailsford, Lee Kelleher, Søren Kottal</Owners>
3636
<IconUrl>https://our.umbraco.org/media/wiki/145708/635623742802070736_dtgepng.png</IconUrl>
3737
<Tags>umbraco grid document type editor</Tags>
3838
<Language>en-GB</Language>
@@ -195,7 +195,7 @@
195195
OutputDirectory="$(ArtifactsDir)"
196196
Files="@(PackageFiles)" />
197197

198-
<MSBuild.NuGet.Tasks.Pack NuGetExePath="$(RootDir)\src\.nuget\NuGet.exe"
198+
<MSBuild.NuGet.Tasks.Pack NuGetExePath="$(RootDir)\build\tools\NuGet.exe"
199199
ManifestFile="$(BuildNuGetDir)\package.nuspec"
200200
BasePath="$(BuildNuGetDir)"
201201
Version="$(ProductVersion)"
@@ -207,4 +207,4 @@
207207

208208
</Target>
209209

210-
</Project>
210+
</Project>

‎build/package.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@
2727
<Languages />
2828
<DataTypes />
2929

30-
<Actions>
31-
<Action runat="install" undo="true" alias="AddObjectToJsonArray"
32-
keyProperty="alias"
33-
sourceFile="~/App_Plugins/DocTypeGridEditor/Config/grid.editors.config.js"
34-
targetFile="~/Config/grid.editors.config.js" />
35-
</Actions>
36-
3730
<control />
3831

3932
<files />

‎build/readme.txt

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,34 @@
1-
____ _____ ____ _ _ _____ _ _ _
2-
| _ \ ___ __|_ _| _ _ __ ___ / ___|_ __(_) __| | ____|__| (_) |_ ___ _ __
3-
| | | |/ _ \ / __|| || | | | '_ \ / _ \ | _| '__| |/ _` | _| / _` | | __/ _ \| '__|
4-
| |_| | (_) | (__ | || |_| | |_) | __/ |_| | | | | (_| | |__| (_| | | || (_) | |
5-
|____/ \___/ \___||_| \__, | .__/ \___|\____|_| |_|\__,_|_____\__,_|_|\__\___/|_|
6-
|___/|_|
1+
 ██████████████
2+
████████████████████████
3+
██████████████████████████████
4+
████████████████████████████████████
5+
██████████████████████████████████████
6+
███████ ███████ _
7+
████████ ████████ _ _ _ __ ___ | |__ _ __ __ _ ___ ___
8+
██████████████████████████████████████████████ | | | | '_ ` _ \| '_ \| '__/ _` |/ __/ _ \
9+
██████████ ████ ████ ██████████ | |_| | | | | | | |_) | | | (_| | (_| (_) |
10+
██████████ ████ ████ ██████████ \__,_|_| |_| |_|_.__/|_| \__,_|\___\___/
11+
███████████ ████ ████ █ ██████ ____ _____
12+
███████████████████████████████████████ █████ | _ \ ___ ___ |_ _| _ _ __ ___
13+
███████████ ████ ███████ | | | |/ _ \ / __| | || | | | '_ \ / _ \
14+
███████████ █ ██████████ | |_| | (_) | (__ | || |_| | |_) | __/
15+
█████████████████████████████████ ████████████ |____/ \___/ \___| |_| \__, | .__/ \___|
16+
██████████ ████ ████ ██ ██████████ ____ _ _ ___|___/|_|_ _
17+
█████████ ████ ███ ██ █████████ / ___|_ __(_) __| | | ____|__| (_) |_ ___ _ __
18+
█████████ ████ ██ █ █████████ | | _| '__| |/ _` | | _| / _` | | __/ _ \| '__|
19+
████████ ████ ██ ███ ████████ | |_| | | | | (_| | | |__| (_| | | || (_) | |
20+
████████████████████ ████████████████ \____|_| |_|\__,_| |_____\__,_|_|\__\___/|_|
21+
██████████████████████████████████████
22+
████████████████████████████████
23+
████████████████████████████
24+
████████████████████
25+
████████████
26+
727

828
--------------------------------------------------------------------------------------
929

10-
To enable DocTypeGridEditor you must add the following JSON snippet to "grid.editors.config.js" found in the Config folder.
30+
Thanks for installing Doc Type Grid Editor.
1131

12-
{
13-
"name": "Doc Type",
14-
"alias": "docType",
15-
"view": "/App_Plugins/DocTypeGridEditor/Views/doctypegrideditor.html",
16-
"render": "/App_Plugins/DocTypeGridEditor/Render/DocTypeGridEditor.cshtml",
17-
"icon": "icon-item-arrangement",
18-
"config": {
19-
"allowedDocTypes": [],
20-
"nameTemplate": "",
21-
"enablePreview": true,
22-
"viewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/",
23-
"previewViewPath": "/Views/Partials/Grid/Editors/DocTypeGridEditor/Previews/",
24-
"previewCssFilePath": "",
25-
"previewJsFilePath": ""
26-
}
27-
}
32+
We have added an universal grid editor allowing all your element types, in a package.manifest file in /App_Plugins/DocTypeGridEditor/package.manifest.
33+
You can add your own and target specific doctypes, for single purpose grid editors if you'd like. Checkout the Developers Guide for more info at:
34+
https://github.com/skttl/umbraco-doc-type-grid-editor/blob/master/docs/developers-guide.md

‎build/tools/NuGet.exe

4.82 MB
Binary file not shown.

‎docs/Doc-Type-Grid-Editor--Developers-Guide-v1.0.pdf

-566 KB
Binary file not shown.

0 commit comments

Comments
 (0)