Merge branch 'dev/v2.x' into dev/v3.0

# Conflicts: # VERSION # src/Umbraco.Community.Contentment/Umbraco.Community.Contentment.csproj
leekelleher · Oct 5, 2021 · 11276a0 · 11276a0
2 parents 2218f95 + f62d093
commit 11276a0
Show file tree

Hide file tree

Showing 44 changed files with 1,107 additions and 8 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -37,6 +37,7 @@ Let's take a look inside...
 - [Notes](../docs/editors/notes.md) - a read-only label to display rich-text instructional messages for content editors.
 - [Number Input](../docs/editors/number-input.md) - a numeric editor, with sizing configurations.
 - [Render Macro](../docs/editors/render-macro.md) - a read-only label dynamically generated from an Umbraco Macro.
+- [Templated Label](../docs/editors/templated-label.md) - a display label, ideal for showing data from 3rd-party systems.
 - [Text Input](../docs/editors/text-input.md) - a textstring editor, configurable with HTML5 options.
 
 #### Telemetry

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.0-alpha005
+3.0.0-alpha006
diff --git a/docs/README.md b/docs/README.md
@@ -20,6 +20,7 @@ Here is the documentation for the Contentment property-editors...
 - [Notes](../docs/editors/notes.md) - a read-only label to display rich-text instructional messages for content editors.
 - [Number Input](../docs/editors/number-input.md) - a numeric editor, with sizing configurations.
 - [Render Macro](../docs/editors/render-macro.md) - a read-only label dynamically generated from an Umbraco Macro.
+- [Templated Label](../docs/editors/templated-label.md) - a display label, ideal for showing data from 3rd-party systems.
 - [Text Input](../docs/editors/text-input.md) - a textstring editor, configurable with HTML5 options.
 
 

diff --git a/docs/data-sources/README.md b/docs/data-sources/README.md
@@ -0,0 +1,47 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+The following data-sources are available by default with the Contentment package for the [Data List](../editors/data-list.md) and [Text Input](../editors/text-input.md) editors.
+
+#### .NET
+
+- [.NET Countries (ISO 3166)](data-source--countries.md) - All the countries available in the .NET Framework, (as installed on the web server).
+- [.NET Currencies (ISO 4217)](data-source--currencies.md) - All the currencies available in the .NET Framework, (as installed on the web server).
+- [.NET Enumeration](data-source--enum.md) - Select an enumeration from a .NET assembly as the data source.
+- [.NET Languages (ISO 639)](data-source--languages.md) - All the languages available in the .NET Framework, (as installed on the web server).
+- [.NET Time Zones (UTC)](data-source--timezone.md) - All the time zones available in the .NET Framework.
+
+#### Data
+
+- [File System](data-source--file-system.md) - Select paths from the physical file system as the data source.
+- [JSON Data](data-source--json.md) - Configure JSON data to populate the data source.
+- [Number Range](data-source--number-range.md) - Generates a sequence of numbers within a specified range.
+- [SQL Data](data-source--sql.md) - Use a SQL Server database query as the data source.
+- [Text Delimited Data](data-source--text-delimited.md) - Configure text-delimited data to populate the data source.
+- [User-defined List](data-source--user-defined.md) - Manually configure the items for the data source.
+- [XML Data](data-source--xml.md) - Configure XML data to populate the data source.
+
+#### Umbraco
+
+- [Examine Query](data-source--examine.md) - Populate the data source from an Examine query.
+- [Umbraco Content](data-source--umbraco-content.md) - Select a start node to use its children as the data source.
+- [Umbraco Content Properties](data-source--umbraco-content-properties.md) - Populate the data source using a Content Type's properties.
+- [Umbraco Content Types](data-source--umbraco-content-types.md) - Populate the data source using Content Types.
+- [Umbraco Content by XPath](data-source--umbraco-content-xpath.md) - Use an XPath query to select Umbraco content to use as the data source.
+- [Umbraco Dictionary Items](data-source--umbraco-dictionary.md) - Select an Umbraco dictionary item to populate the data source with its child items.
+- [Umbraco Entities](data-source--umbraco-entity.md) - Select an Umbraco entity type to populate the data source.
+- [Umbraco Image Crops](data-source--umbraco-image-crop.md) - Select an Image Cropper data-type to use its defined crops to populate the data source.
+- [Umbraco Languages](data-source--umbraco-languages.md) - Populate the data source with langauges configured in Umbraco.
+- [Umbraco Member Groups](data-source--umbraco-member-group.md) - Populate the data source with Umbraco member groups.
+- [Umbraco Members](data-source--umbraco-members.md) - Use Umbraco members to populate the data source.
+- [Umbraco Tags](data-source--umbraco-tags.md) - Populate the data source using already defined tags.
+
+
+#### Web
+
+- [uCssClassName](data-source--ucssclassname.md) - A homage to @marcemarc's bingo-famous uCssClassNameDropdown package!
+- [XML Sitemap: Change Frequency](data-source--xml-sitemap-change-frequency.md) - Populate the data source using XML Sitemap change frequency values.
+- [XML Sitemap: Priority](data-source--xml-sitemap-priority.md) - Populate the data source using XML Sitemap priority values.
diff --git a/docs/data-sources/data-source--countries.md b/docs/data-sources/data-source--countries.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### .NET Countries (ISO 3166)
+
+All the countries available in the .NET Framework, (as installed on the web server).
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--currencies.md b/docs/data-sources/data-source--currencies.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### .NET Currencies (ISO 4217)
+
+All the currencies available in the .NET Framework, (as installed on the web server).
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--enum.md b/docs/data-sources/data-source--enum.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### .NET Enumeration
+
+Select an enumeration from a .NET assembly as the data source.
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--examine.md b/docs/data-sources/data-source--examine.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### Examine Query
+
+Populate the data source from an Examine query.
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--file-system.md b/docs/data-sources/data-source--file-system.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### File System
+
+Select paths from the physical file system as the data source.
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--json.md b/docs/data-sources/data-source--json.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### JSON Data
+
+Configure JSON data to populate the data source.
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--languages.md b/docs/data-sources/data-source--languages.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### .NET Languages (ISO 639)
+
+All the languages available in the .NET Framework, (as installed on the web server).
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--number-range.md b/docs/data-sources/data-source--number-range.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### Number Range
+
+Generates a sequence of numbers within a specified range.
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--sql.md b/docs/data-sources/data-source--sql.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### SQL Data
+
+Use a SQL Server database query as the data source.
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--text-delimited.md b/docs/data-sources/data-source--text-delimited.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### Text Delimited Data
+
+Configure text-delimited data to populate the data source.
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--timezone.md b/docs/data-sources/data-source--timezone.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### .NET Time Zones (UTC)
+
+All the time zones available in the .NET Framework.
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--ucssclassname.md b/docs/data-sources/data-source--ucssclassname.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### uCssClassName
+
+A homage to @marcemarc's bingo-famous [uCssClassNameDropdown](https://our.umbraco.com/packages/backoffice-extensions/ucssclassnamedropdown/) package!
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--umbraco-content-properties.md b/docs/data-sources/data-source--umbraco-content-properties.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### Umbraco Content Properties
+
+Populate the data source using a Content Type's properties.
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--umbraco-content-types.md b/docs/data-sources/data-source--umbraco-content-types.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### Umbraco Content Types
+
+Populate the data source using Content Types.
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--umbraco-content-xpath.md b/docs/data-sources/data-source--umbraco-content-xpath.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### Umbraco Content by XPath
+
+Use an XPath query to select Umbraco content to use as the data source.
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_
diff --git a/docs/data-sources/data-source--umbraco-content.md b/docs/data-sources/data-source--umbraco-content.md
@@ -0,0 +1,19 @@
+<img src="../assets/img/logo.png" alt="Contentment for Umbraco logo" title="A state of Umbraco happiness." height="130" align="right">
+
+## Contentment for Umbraco
+
+### Data Sources
+
+#### Umbraco Content
+
+Select a start node to use its children as the data source.
+
+
+##### How to configure the editor?
+
+_[TBC]_
+
+
+##### What is the value's object-type?
+
+_[TBC]_