Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.2.0

nul800sebastiaan · nul800sebastiaan · commit 4366500fada2 · 2014-06-10T17:15:07.000+02:00
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
@@ -264,10 +264,11 @@ function ContentEditController($scope, $routeParams, $q, $timeout, $window, appS
     $scope.preview = function (content) {
         // Chromes popup blocker will kick in if a window is opened 
         // outwith the initial scoped request. This trick will fix that.
-        var previewWindow = $window.open('preview/?id=' + data.id, 'umbpreview');
+        //  
+        var previewWindow = $window.open('preview/?id=' + content.id, 'umbpreview');
         $scope.save().then(function (data) {
             // Build the correct path so both /#/ and #/ work.
-            var redirect = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + 'preview/?id=' + data.id;
+            var redirect = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + '/preview/?id=' + data.id;
             previewWindow.location.href = redirect;
         });
     };
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
@@ -1,6 +1,6 @@
 <div ng-controller="Umbraco.PropertyEditors.Grid.EmbedController">
 
-	<div class="usky-editor-placeholder" ng-click="setEmbed())" ng-if="control.value === null">
+	<div class="usky-editor-placeholder" ng-click="setEmbed()" ng-if="control.value === null">
 		<i class="icon icon-movie-alt"></i>
 		<div class="help-text">Click to embed</div>
 	</div>
diff --git a/src/Umbraco.Web.UI/Umbraco/preview/index.html b/src/Umbraco.Web.UI/Umbraco/preview/index.html
@@ -7,7 +7,7 @@
     <link href="/Umbraco/lib/jquery/jquery-ui-1.10.4.custom.min.css" type="text/css" rel="stylesheet" />
 </head>
 
-<body id="tuningPanel" ng-controller="Umbraco.tuningController">
+<body id="tuningPanel" ng-class="{open:isOpen}" ng-controller="Umbraco.tuningController">
 
     <div class="wait" ng-show="!frameLoaded">Loading ...</div>
 
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
@@ -36,17 +36,19 @@
                                                             </text>
                                                             break;
                                                         case "macro":
+                                                            if (control.value != null)
+                                                                {
+                                                                string macroAlias = control.value.macroAlias.ToString();
+                                                                ViewDataDictionary parameters = new ViewDataDictionary();
+                                                                foreach (dynamic mpd in control.value.marcoParamsDictionary)
+                                                                {
+                                                                    parameters.Add(mpd.Name, mpd.Value);
+                                                                }
 
-                                                            string macroAlias = control.value.macroAlias.ToString();
-                                                            ViewDataDictionary parameters = new ViewDataDictionary();
-                                                            foreach (dynamic mpd in control.value.marcoParamsDictionary)
-                                                            {
-                                                                parameters.Add(mpd.Name, mpd.Value);
+                                                                <text>
+                                                                    @Umbraco.RenderMacro(macroAlias, parameters)
+                                                                </text>
                                                             }
-
-                                                            <text>
-                                                                @Umbraco.RenderMacro(macroAlias, parameters)
-                                                            </text>
                                                             break;
                                                         case "textstring":
 
@@ -71,12 +73,15 @@
                                                             break;
                                                         case "media":
                                                         <text>
-                                                            <div class="thumbnail">
-                                                                <img src="@control.value.image">
-                                                            </div>
-                                                            @if (control.value.caption != null)
-                                                            {
-                                                                <p class="caption">@control.value.caption</p>
+                                                            @if (control.value != null)
+                                                            { 
+                                                                <div class="thumbnail">
+                                                                    <img src="@control.value.image">
+                                                                </div>
+                                                                if (control.value.caption != null)
+                                                                {
+                                                                    <p class="caption">@control.value.caption</p>
+                                                                }
                                                             }
                                                         </text>
                                                             break;
