From 6bcf291c99c2da83630ae9ca3208dd14d6c8b4a3 Mon Sep 17 00:00:00 2001 From: Kevin Giszewski Date: Tue, 29 Mar 2016 09:41:05 -0400 Subject: [PATCH 1/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 99ffdd3..e263c35 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ https://github.com/kgiszewski/ArchetypeManual Follow us on Twitter https://twitter.com/ArchetypeKit ##Core Team## -* Kevin Giszewski (founder) - University of Notre Dame - https://kevin.giszewski.com/ +* Kevin Giszewski (founder/project lead) - University of Notre Dame - https://kevin.giszewski.com/ * Tom Fulton (founder) - Tonic - http://hellotonic.com/ * Lee Kelleher - Umbrella - http://www.umbrellainc.co.uk/ * Matt Brailsford - The Outfield - http://www.theoutfield.co.uk/ From 8228b2dae5a15ae73046b1e4d9ddb36d5dcb1304 Mon Sep 17 00:00:00 2001 From: kjac Date: Thu, 31 Mar 2016 08:17:43 +0200 Subject: [PATCH 2/9] Scope icon styles to fieldset controls only --- app/less/archetype.less | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/app/less/archetype.less b/app/less/archetype.less index 76776e6..e0a4f89 100644 --- a/app/less/archetype.less +++ b/app/less/archetype.less @@ -33,18 +33,6 @@ margin-left: 0; } - .icon { - color: #ddd; - padding: 2px; - font-size: 16px; - &:hover { - color: #333; - } - &.icon-delete:hover { - color: #b94a48; - } - } - .fieldsetIcon { float: left; padding: 0 4px 0 0; @@ -163,6 +151,19 @@ position: absolute; right: 15px; top: 0; + + .icon { + color: #ddd; + padding: 2px; + font-size: 16px; + &:hover { + color: #333; + } + &.icon-delete:hover { + color: #b94a48; + } + } + } &:hover { From 1ca113b455caa0f38661bbaeacf1dd57e9f06953 Mon Sep 17 00:00:00 2001 From: kjac Date: Thu, 31 Mar 2016 23:44:52 +0200 Subject: [PATCH 3/9] Fix issue 342 --- app/controllers/config.controller.js | 8 +++++-- app/controllers/config.dialog.controller.js | 8 +++---- .../archetype.config.developer.dialog.html | 8 +++---- .../archetype.config.fieldset.dialog.html | 24 +++++++++---------- .../archetype.config.stylescript.dialog.html | 8 +++---- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/app/controllers/config.controller.js b/app/controllers/config.controller.js index 47c54b9..695acc8 100644 --- a/app/controllers/config.controller.js +++ b/app/controllers/config.controller.js @@ -313,9 +313,13 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio dialogService.open({ template: template, show: true, - callback: function(data) { + callback: function (data) { + // replace the entire render model if it was changed (in developer options) + if (data.model && data.modelChanged) { + $scope.archetypeConfigRenderModel = data.model; + } }, - dialogData: $scope.archetypeConfigRenderModel + dialogData: { model: $scope.archetypeConfigRenderModel } }); } diff --git a/app/controllers/config.dialog.controller.js b/app/controllers/config.dialog.controller.js index 1661ea0..511f37d 100644 --- a/app/controllers/config.dialog.controller.js +++ b/app/controllers/config.dialog.controller.js @@ -1,17 +1,15 @@ angular.module('umbraco').controller('ArchetypeConfigOptionsController', function ($scope) { - $scope.model = $scope.dialogData; - //handles a fieldset group add $scope.addFieldsetGroup = function () { - $scope.model.fieldsetGroups.push({ name: "" }); + $scope.dialogData.model.fieldsetGroups.push({ name: "" }); } //handles a fieldset group removal $scope.removeFieldsetGroup = function ($index) { - $scope.model.fieldsetGroups.splice($index, 1); + $scope.dialogData.model.fieldsetGroups.splice($index, 1); } $scope.apply = function(index) { - $scope.submit($scope.model); + $scope.submit($scope.dialogData); } }); \ No newline at end of file diff --git a/app/views/archetype.config.developer.dialog.html b/app/views/archetype.config.developer.dialog.html index d5dacbb..96e4f44 100644 --- a/app/views/archetype.config.developer.dialog.html +++ b/app/views/archetype.config.developer.dialog.html @@ -3,18 +3,18 @@

Developer Options

- +
- +
- +
- +
diff --git a/app/views/archetype.config.fieldset.dialog.html b/app/views/archetype.config.fieldset.dialog.html index 5c062e5..5d17d9e 100644 --- a/app/views/archetype.config.fieldset.dialog.html +++ b/app/views/archetype.config.fieldset.dialog.html @@ -3,46 +3,46 @@

Global Fieldset Options

- +
- +
- +
- +

Fieldset controls

- +
- +
- +

Multiple fieldsets

- +
-
+
If you have a lot of fieldsets to choose from, you may want to consider grouping them in the fieldset picker. Once you have created your groups here, a group picker will be displayed in the fieldset editor and you can assign your fieldsets to their respective groups.
-
    -
  • +
      +
    • - +
    diff --git a/app/views/archetype.config.stylescript.dialog.html b/app/views/archetype.config.stylescript.dialog.html index 3df7ac9..ef3ad11 100644 --- a/app/views/archetype.config.stylescript.dialog.html +++ b/app/views/archetype.config.stylescript.dialog.html @@ -4,19 +4,19 @@

    Custom Style/Script Options

    - +
    - +
    - +
    - +
From 2b6d87d97c314ffaeebb4c8942c7accd5eb7c50b Mon Sep 17 00:00:00 2001 From: kgiszewski <3flowers> Date: Sat, 2 Apr 2016 19:10:54 -0400 Subject: [PATCH 4/9] Bump version to v1.12.4 --- app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs | 4 ++-- config/meta.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs b/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs index f7b7bb7..590b2b1 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.12.3")] -[assembly: AssemblyFileVersion("1.12.3")] +[assembly: AssemblyVersion("1.12.4")] +[assembly: AssemblyFileVersion("1.12.4")] diff --git a/config/meta.json b/config/meta.json index ea78cd6..7c374b8 100644 --- a/config/meta.json +++ b/config/meta.json @@ -1,6 +1,6 @@ { "name": "Archetype", - "version": "1.12.3", + "version": "1.12.4", "url": "http://github.com/imulus/archetype/", "author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.", "authorUrl": "http://imulus.com/", From 89aeca9bf06785241006b4fef89ab5ccc449aef0 Mon Sep 17 00:00:00 2001 From: kgiszewski <3flowers> Date: Sat, 2 Apr 2016 19:11:39 -0400 Subject: [PATCH 5/9] Add version to json config --- config/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/meta.json b/config/meta.json index 65d5b46..7c374b8 100644 --- a/config/meta.json +++ b/config/meta.json @@ -1,6 +1,6 @@ { "name": "Archetype", - "version": "1.8", + "version": "1.12.4", "url": "http://github.com/imulus/archetype/", "author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.", "authorUrl": "http://imulus.com/", From 3e91b1c2c3752a9767f24e6b04f31ff598992f5c Mon Sep 17 00:00:00 2001 From: kgiszewski <3flowers> Date: Sat, 2 Apr 2016 19:14:30 -0400 Subject: [PATCH 6/9] Why do I have to keep committing this? --- config/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/meta.json b/config/meta.json index ea78cd6..7c374b8 100644 --- a/config/meta.json +++ b/config/meta.json @@ -1,6 +1,6 @@ { "name": "Archetype", - "version": "1.12.3", + "version": "1.12.4", "url": "http://github.com/imulus/archetype/", "author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.", "authorUrl": "http://imulus.com/", From 715a2bf6d5d90b887fcda71f832c699c97c5c2a4 Mon Sep 17 00:00:00 2001 From: kgiszewski Date: Mon, 4 Apr 2016 12:03:52 -0400 Subject: [PATCH 7/9] Fixed missing dialogData from enablePublishing --- app/controllers/config.controller.js | 2 +- app/views/archetype.config.fieldset.dialog.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/config.controller.js b/app/controllers/config.controller.js index 695acc8..6cd13d5 100644 --- a/app/controllers/config.controller.js +++ b/app/controllers/config.controller.js @@ -6,7 +6,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio //define empty items var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeGuid": "0cc0eba1-9960-42c9-bf9b-60e150b429ae", "value": ""}'; var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "icon": "", "label": "", "properties": [' + newPropertyModel + '], "group": null}'; - var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "enableCloning": false, "enableDisabling": true, "enableDeepDatatypeRequests": false, "fieldsets": [' + newFieldsetModel + '], "fieldsetGroups": []}'); + var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "startWithAddButton": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "enableCollapsing": true, "enableCloning": false, "enableDisabling": true, "enableDeepDatatypeRequests": false, "enablePublishing": false, "fieldsets": [' + newFieldsetModel + '], "fieldsetGroups": []}'); //ini the model $scope.model.value = $scope.model.value || defaultFieldsetConfigModel; diff --git a/app/views/archetype.config.fieldset.dialog.html b/app/views/archetype.config.fieldset.dialog.html index 751a2f7..8daca19 100644 --- a/app/views/archetype.config.fieldset.dialog.html +++ b/app/views/archetype.config.fieldset.dialog.html @@ -28,7 +28,7 @@
- +

Multiple fieldsets

From 5c2a99987ab93d9e674d8c60e3954dd85923b714 Mon Sep 17 00:00:00 2001 From: kgiszewski Date: Mon, 4 Apr 2016 12:47:39 -0400 Subject: [PATCH 8/9] Fix style so text won't overflow out. --- app/less/archetype.less | 1 + 1 file changed, 1 insertion(+) diff --git a/app/less/archetype.less b/app/less/archetype.less index 79cc198..7d2e8a0 100644 --- a/app/less/archetype.less +++ b/app/less/archetype.less @@ -333,6 +333,7 @@ .settings { padding: 14px; background-color: #f8f8f8; + overflow: hidden; } } } From 4410f1bb813275947eb3a50f20ec1ffb2c46cbc8 Mon Sep 17 00:00:00 2001 From: kgiszewski Date: Mon, 4 Apr 2016 13:08:58 -0400 Subject: [PATCH 9/9] Bump version to v1.13 --- app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs | 4 ++-- config/meta.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs b/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs index 590b2b1..98e1212 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.12.4")] -[assembly: AssemblyFileVersion("1.12.4")] +[assembly: AssemblyVersion("1.13.0")] +[assembly: AssemblyFileVersion("1.13.0")] diff --git a/config/meta.json b/config/meta.json index 7c374b8..f276b58 100644 --- a/config/meta.json +++ b/config/meta.json @@ -1,6 +1,6 @@ { "name": "Archetype", - "version": "1.12.4", + "version": "1.13.0", "url": "http://github.com/imulus/archetype/", "author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.", "authorUrl": "http://imulus.com/",