diff --git a/README.md b/README.md index 957efe0..07ab183 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ Install the selected rele ## Official Docs ## https://github.com/kgiszewski/ArchetypeManual - ## News and Updates ## Follow us on Twitter https://twitter.com/ArchetypeKit @@ -21,6 +20,11 @@ Follow us on Twitter https://twitter.com/ArchetypeKit * Matt Brailsford - The Outfield - http://www.theoutfield.co.uk/ * Kenn Jacobsen - Vertica - http://kennjacobsen.dk/ +## Donate! +[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KBKWLURGLGU6L) + +This project is funded by the core team members' time only. We don't charge for Archetype but it does take quite a bit of effort to keep it up-to-date with Umbraco core changes. If you're making a few bucks off of Archetype, we wouldn't refuse a donation :) + ## Contribute ## Want to contribute to Archetype? You'll want to use Grunt (our task runner) to help you integrate with a local copy of Umbraco. diff --git a/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueFieldset.cs b/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueFieldset.cs index e97206b..84fa1d0 100644 --- a/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueFieldset.cs +++ b/app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueFieldset.cs @@ -26,6 +26,9 @@ namespace Archetype.Models [JsonProperty("label")] public string Label { get; set; } + [JsonProperty("previewImage")] + public string PreviewImage { get; set; } + [JsonProperty("properties")] public IEnumerable Properties { get; set; } diff --git a/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs b/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs index bef7141..320be57 100644 --- a/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs +++ b/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("1.13.1")] -[assembly: AssemblyFileVersion("1.13.1")] +[assembly: AssemblyVersion("1.14.1")] +[assembly: AssemblyFileVersion("1.14.1")] diff --git a/app/controllers/controller.js b/app/controllers/controller.js index aa8b1df..2f538f7 100644 --- a/app/controllers/controller.js +++ b/app/controllers/controller.js @@ -264,7 +264,8 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc alias: fieldset.alias, label: fieldset.label, icon: (fieldset.icon || "icon-document-dashed-line"), // default icon if none is chosen - group: fieldset.group ? fieldset.group.name : null + group: fieldset.group ? fieldset.group.name : null, + previewImage: fieldset.previewImage }); }); // sanity check @@ -304,13 +305,22 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc $scope.closeFieldsetPicker = function () { $scope.overlayMenu.show = false; + $scope.overlayMenu.fieldsetPreview = null; }; $scope.pickFieldset = function (fieldsetAlias, $index) { $scope.closeFieldsetPicker(); $scope.addRow(fieldsetAlias, $index); }; - + + $scope.openFieldsetPreview = function (fieldset) { + $scope.overlayMenu.fieldsetPreview = fieldset; + } + + $scope.closeFieldsetPreview = function () { + $scope.overlayMenu.fieldsetPreview = null; + } + $scope.addRow = function (fieldsetAlias, $index) { if ($scope.canAdd()) { if ($scope.model.config.fieldsets) { diff --git a/app/langs/da-dk.js b/app/langs/da-dk.js index 7f147e9..0c5a649 100644 --- a/app/langs/da-dk.js +++ b/app/langs/da-dk.js @@ -55,5 +55,8 @@ "enableMemberGroups": "Aktivér medlems-grupper", "enableMemerGroupsDescription": "Tillad at fieldsets kun vises for specifikke medlems-grupper", "allowedMemberGroups": "Tilladte medlems-grupper", - "allowedMemberGroupsHelpText": "Vælg de medlems-grupper, der skal kunne se dette element. Hvis der ikke er valgt nogen, kan alle se elementet." + "allowedMemberGroupsHelpText": "Vælg de medlems-grupper, der skal kunne se dette element. Hvis der ikke er valgt nogen, kan alle se elementet.", + "previewFieldsetOpen": "(se eksempel)", + "previewFieldsetHeader": "Eksempel: ", + "previewFieldsetClose": "(luk eksempel)" } diff --git a/app/langs/da.js b/app/langs/da.js index 7f147e9..0c5a649 100644 --- a/app/langs/da.js +++ b/app/langs/da.js @@ -55,5 +55,8 @@ "enableMemberGroups": "Aktivér medlems-grupper", "enableMemerGroupsDescription": "Tillad at fieldsets kun vises for specifikke medlems-grupper", "allowedMemberGroups": "Tilladte medlems-grupper", - "allowedMemberGroupsHelpText": "Vælg de medlems-grupper, der skal kunne se dette element. Hvis der ikke er valgt nogen, kan alle se elementet." + "allowedMemberGroupsHelpText": "Vælg de medlems-grupper, der skal kunne se dette element. Hvis der ikke er valgt nogen, kan alle se elementet.", + "previewFieldsetOpen": "(se eksempel)", + "previewFieldsetHeader": "Eksempel: ", + "previewFieldsetClose": "(luk eksempel)" } diff --git a/app/less/archetype.less b/app/less/archetype.less index 3a24018..0c87813 100644 --- a/app/less/archetype.less +++ b/app/less/archetype.less @@ -290,6 +290,12 @@ overflow: visible; vertical-align: top; height: 90px; + .fieldsetPreviewOpen { + font-style: italic; + a:hover { + text-decoration: underline; + } + } } ul.groups { display: block; @@ -310,6 +316,24 @@ } } } + + .fieldsetPreview { + .fieldsetPreviewClose { + font-style: italic; + font-size: 12px; + text-align: center; + } + .fieldsetPreviewImage { + padding: 6px 0px; + img { + height: auto; + max-width: 100%; + vertical-align: middle; + border: 0; + cursor: zoom-in; + } + } + } } .settingsWrapper { @@ -392,10 +416,10 @@ small { margin-left: 5px; } - + a { float: right; - + img { width: 35px; } @@ -441,7 +465,8 @@ .archetypeFieldsetOption { margin-bottom: 15px; margin-right: 15px; - input[type=text]{ + + input[type=text] { max-width: 100%; width: 100%; } @@ -459,7 +484,7 @@ margin-bottom: 5px; } - label{ + label { width: 400px; } } @@ -499,7 +524,7 @@ label { width: 100%; } - + input[type=text] { width: 100%; } @@ -534,10 +559,10 @@ } } } - } + } } - .archetypeMaxFieldsets{ + .archetypeMaxFieldsets { border: 1px solid #ddd; width: 40px; text-align: right; @@ -550,7 +575,7 @@ .archetypePropertyCollapser { margin-top: 10px; - + div { margin-bottom: 10px; margin-right: 15px; @@ -564,6 +589,10 @@ .fieldsetIcon { margin-right: 10px; } + + small { + color: #817f85; + } } .ui-sortable-placeholder { diff --git a/app/views/archetype.config.html b/app/views/archetype.config.html index bc5755e..e44f1c7 100644 --- a/app/views/archetype.config.html +++ b/app/views/archetype.config.html @@ -16,10 +16,12 @@
+ The label shown to the editors when adding a new fieldset.
+ The alias used to identify the fieldset when rendering.
@@ -28,6 +30,12 @@
+ Generates labels per fieldset. Can contain property aliases, e.g. "Article: {{title}}". +
+
+ + + A relative path to a preview image, e.g. "/assets/fieldset.png".
diff --git a/app/views/archetype.default.html b/app/views/archetype.default.html index 8d0f650..9fc9bd5 100644 --- a/app/views/archetype.default.html +++ b/app/views/archetype.default.html @@ -112,24 +112,45 @@
-
- Add an item -
- - +
+
+ (close preview) +
+
diff --git a/config/meta.json b/config/meta.json index 32d38d2..8eb6bc2 100644 --- a/config/meta.json +++ b/config/meta.json @@ -1,6 +1,6 @@ { "name": "Archetype", - "version": "1.13.1", + "version": "1.14.1", "url": "http://github.com/imulus/archetype/", "author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.", "authorUrl": "http://imulus.com/",