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/ diff --git a/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs b/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs index f7b7bb7..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.3")] -[assembly: AssemblyFileVersion("1.12.3")] +[assembly: AssemblyVersion("1.13.0")] +[assembly: AssemblyFileVersion("1.13.0")] diff --git a/app/controllers/config.controller.js b/app/controllers/config.controller.js index 47c54b9..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; @@ -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/less/archetype.less b/app/less/archetype.less index e7f7932..3aa95ae 100644 --- a/app/less/archetype.less +++ b/app/less/archetype.less @@ -33,30 +33,6 @@ margin-left: 0; } - .icon { - color: #ddd; - padding: 2px; - font-size: 16px; - &:hover { - color: #333; - } - &.icon-delete:hover { - color: #b94a48; - } - &.icon-disabled { - cursor: default; - &:hover { - color: #ddd; - } - } - &.icon-active { - color: #333; - &:hover { - color: #333; - } - } - } - .fieldsetIcon { float: left; padding: 0 4px 0 0; @@ -190,6 +166,30 @@ position: absolute; right: 15px; top: 0; + + .icon { + color: #ddd; + padding: 2px; + font-size: 16px; + &:hover { + color: #333; + } + &.icon-delete:hover { + color: #b94a48; + } + &.icon-disabled { + cursor: default; + &:hover { + color: #ddd; + } + } + &.icon-active { + color: #333; + &:hover { + color: #333; + } + } + } } &:hover { @@ -333,6 +333,7 @@ .settings { padding: 14px; background-color: #f8f8f8; + overflow: hidden; .allowedGroups { .umb-membergrouppicker a { 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 a0e567f..8daca19 100644 --- a/app/views/archetype.config.fieldset.dialog.html +++ b/app/views/archetype.config.fieldset.dialog.html @@ -3,49 +3,49 @@

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

    - +
    - +
    - +
    - +
diff --git a/config/meta.json b/config/meta.json index ea78cd6..f276b58 100644 --- a/config/meta.json +++ b/config/meta.json @@ -1,6 +1,6 @@ { "name": "Archetype", - "version": "1.12.3", + "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/",