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

Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0

Browse Source
This commit is contained in:
Shannon
2014-10-02 12:23:55 +10:00
parent 08ea69caae 2380217c21
commit 0e736a8d32
9 changed files with 76 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/color.html
View File

@@ -1,4 +1,5 @@
<div ng-controller="Umbraco.canvasdesigner.color">
<div class="box-slider">
<spectrum colorselected="item.values.color"></spectrum>

21
src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/googlefontpicker.less
View File

@@ -10,12 +10,25 @@
@fonttype-ALIAS-:'';
/***end-lessParam--ALIAS-***/
/***start-gridStyle--ALIAS-***/
-SCHEMA- {
font-family:@fontfamily-ALIAS-;
/***start-fontfamilystyle--ALIAS-***/
.fontfamily-ALIAS- () when not (@fontfamily-ALIAS- = '') {
font-family:@fontfamily-ALIAS-;
}
.fontweight-ALIAS- () when not (@fontweight-ALIAS- = '') {
font-weight:@fontweight-ALIAS-;
}
.fontstyle-ALIAS- () when not (@fontstyle-ALIAS- = '') {
font-style:@fontstyle-ALIAS-;
}
/***end-gridStyle--ALIAS-***/
-SCHEMA- {
.fontfamily-ALIAS-;
.fontweight-ALIAS-;
.fontstyle-ALIAS-;
}
/***end-fontfamilystyle--ALIAS-***/

2
src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/layout.less
View File

@@ -4,7 +4,7 @@
/************************************************************************/
/***start-lessParam--ALIAS-***/
@layout-ALIAS-:box;
@layout-ALIAS-:'';
/***end-lessParam--ALIAS-***/
/***start-lessStyle--ALIAS-***/

8
src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.html Normal file
View File

@@ -0,0 +1,8 @@
<div ng-controller="Umbraco.canvasdesigner.shadow">
<div class="box-slider">
<div ui-slider min="0" max="100" step="1" ng-model="item.values.shadow"></div>
</div>
</div>

16
src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.js Normal file
View File

@@ -0,0 +1,16 @@
/*********************************************************************************************************/
/* shadow editor */
/*********************************************************************************************************/
angular.module("Umbraco.canvasdesigner")
.controller("Umbraco.canvasdesigner.shadow", function ($scope) {
if (!$scope.item.values) {
$scope.item.values = {
shadow: ''
}
}
})

21
src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.less Normal file
View File

@@ -0,0 +1,21 @@
/************************************************************************/
/* shadow -ALIAS- -CSS- */
/************************************************************************/
/***start-lessParam--ALIAS-***/
@shadow-ALIAS-:'';
/***end-lessParam--ALIAS-***/
/***start-lessStyle--ALIAS-***/
.valueshadow-ALIAS- () when (isnumber(@shadow-ALIAS-)) {
-webkit-box-shadow: 0 0 @shadow-ALIAS- + 0px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 0 0 @shadow-ALIAS- + 0px rgba(0, 0, 0, 0.5);
box-shadow: 0 0 @shadow-ALIAS- + 0px rgba(0, 0, 0, 0.5);
}
-SCHEMA- {
.valueshadow-ALIAS-
}
/***end-lessStyle--ALIAS-***/

9
src/Umbraco.Web.UI.Client/src/views/propertyeditors/canvas/canvas.controller.js
View File

@@ -207,13 +207,18 @@ angular.module("umbraco")
};
$scope.addRow = function (section, layout) {
//copy the selected layout into the rows collection
var row = angular.copy(layout);
// Init row value
row = $scope.initRow(row);
// Push the new row
if(row){
section.rows.push(row);
}
};
$scope.removeRow = function (section, $index) {
@@ -460,6 +465,10 @@ angular.module("umbraco")
//set a disposable unique ID
original.$uniqueId = $scope.setUniqueId();
//set a no disposable unique ID (util for row styling)
original.id = !row.id ? $scope.setUniqueId() : row.id;
return original;
}

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/canvas/canvas.html
View File

@@ -125,7 +125,7 @@
</a>
</div>
<div ng-if="overlayMenu.show && overlayMenu.key == area.$uniqueId" ng-include="'views/propertyeditors/grid/dialogs/additem.html'"></div>
<div ng-if="overlayMenu.show && overlayMenu.key == area.$uniqueId" ng-include="'views/propertyeditors/canvas/dialogs/additem.html'"></div>
</div>
</div>
@@ -193,7 +193,7 @@
</a>
</div>
<div ng-if="overlayMenu.show && overlayMenu.key == control.$uniqueId" ng-include="'views/propertyeditors/grid/dialogs/additem.html'"></div>
<div ng-if="overlayMenu.show && overlayMenu.key == control.$uniqueId" ng-include="'views/propertyeditors/canvas/additem.html'"></div>
</div>
</div>

2
src/Umbraco.Web/UmbracoHelper.cs
View File

@@ -1344,7 +1344,7 @@ namespace Umbraco.Web
if (UmbracoContext.Current.InPreviewMode)
{
canvasdesignerConfigPath = !string.IsNullOrEmpty(canvasdesignerConfigPath) ? canvasdesignerConfigPath : "/umbraco/js/canvasdesigner.config.js";
canvasdesignerPalettesPath = !string.IsNullOrEmpty(canvasdesignerPalettesPath) ? canvasdesignerConfigPath : "/umbraco/js/canvasdesigner.palettes.js";
canvasdesignerPalettesPath = !string.IsNullOrEmpty(canvasdesignerPalettesPath) ? canvasdesignerPalettesPath : "/umbraco/js/canvasdesigner.palettes.js";
if (!string.IsNullOrEmpty(cssPath))
result = string.Format(noPreviewLinks, cssPath) + Environment.NewLine;