yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
This commit is contained in:
Sebastiaan Janssen
2014-06-10 17:15:07 +02:00
parent ee6e1a9d8b 3b95184f04
commit 4366500fad
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
View File

@@ -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;
});
};

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/embed.html
View File

@@ -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>

2
src/Umbraco.Web.UI/Umbraco/preview/index.html
View File

@@ -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>

35
src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
View File

@@ -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;