Merge remote-tracking branch 'refs/remotes/imulus/master'

Gruntfile.js

@@ -279,7 +279,7 @@ module.exports = function(grunt) {
 
     assemblyinfo: {
       options: {
-        files: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj', 'app/Umbraco/Umbraco.Archetype/Archetype.Courier.csproj'],
+        files: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj', 'app/Umbraco/Archetype.Courier/Archetype.Courier.csproj'],
         filename: 'VersionInfo.cs',
         info: {
           version: '<%= (pkgMeta.version.indexOf("-") > 0 ? pkgMeta.version.substring(0, pkgMeta.version.indexOf("-")) : pkgMeta.version) %>', 

app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.12.2")]
-[assembly: AssemblyFileVersion("1.12.2")]
+[assembly: AssemblyVersion("1.12.3")]
+[assembly: AssemblyFileVersion("1.12.3")]

app/controllers/config.controller.js

@@ -314,7 +314,6 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
             template: template,
             show: true,
             callback: function(data) {
-                $scope.archetypeConfigRenderModel = data;
             },
             dialogData: $scope.archetypeConfigRenderModel
         });

app/controllers/config.dialog.controller.js

@@ -1,5 +1,5 @@
 angular.module('umbraco').controller('ArchetypeConfigOptionsController', function ($scope) {
-	$scope.model = angular.copy($scope.dialogData);
+    $scope.model = $scope.dialogData;
 
     //handles a fieldset group add
     $scope.addFieldsetGroup = function () {

app/views/archetype.config.developer.dialog.html

@@ -20,12 +20,8 @@
     <div class="umb-panel-footer">
         <div class="umb-el-wrap umb-panel-buttons">
             <div class="btn-toolbar umb-btn-toolbar pull-right">
-                <a href="" ng-click="close()" class="btn btn-link">
-                    <localize key="general_cancel" class="ng-isolate-scope ng-scope">Cancel</localize>
-                </a>
-
-                <button class="btn btn-primary" ng-click="apply()">
-                    <archetype-localize key="button_apply">Apply</archetype-localize>
+                <button class="btn" ng-click="apply()">
+                    <archetype-localize key="button_close">Close</archetype-localize>
                 </button>
             </div>
         </div>

app/views/archetype.config.fieldset.dialog.html

@@ -53,12 +53,8 @@
     <div class="umb-panel-footer">
         <div class="umb-el-wrap umb-panel-buttons">
             <div class="btn-toolbar umb-btn-toolbar pull-right">
-                <a href="" ng-click="close()" class="btn btn-link">
-                    <localize key="general_cancel" class="ng-isolate-scope ng-scope">Cancel</localize>
-                </a>
-
-                <button class="btn btn-primary" ng-click="apply()">
-                    <archetype-localize key="button_apply">Apply</archetype-localize>
+                <button class="btn" ng-click="apply()">
+                    <archetype-localize key="button_close">Close</archetype-localize>
                 </button>
             </div>
         </div>

app/views/archetype.config.stylescript.dialog.html

@@ -22,12 +22,8 @@
     <div class="umb-panel-footer">
         <div class="umb-el-wrap umb-panel-buttons">
             <div class="btn-toolbar umb-btn-toolbar pull-right">
-                <a href="" ng-click="close()" class="btn btn-link">
-                    <localize key="general_cancel" class="ng-isolate-scope ng-scope">Cancel</localize>
-                </a>
-
-                <button class="btn btn-primary" ng-click="apply()">
-                    <archetype-localize key="button_apply">Apply</archetype-localize>
+                <button class="btn" ng-click="apply()">
+                    <archetype-localize key="button_close">Close</archetype-localize>
                 </button>
             </div>
         </div>

config/meta.json

@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "1.12.2",
+	"version": "1.12.3",
 	"url": "http://github.com/imulus/archetype/",
 	"author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.",
 	"authorUrl": "http://imulus.com/",