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

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

Browse Source 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
This commit is contained in:
Shannon
2015-03-19 11:36:05 +11:00
parent 6cf25f0043 c0f50a4c1b
commit e004ad31b5
7 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/less/gridview.less
View File

@@ -155,6 +155,8 @@ IFRAME {overflow:hidden;}
opacity: 0.3;
z-index: 50;
}
//special rule to ensure forms doesnt overrride (forms will align in a later release)
.umb-grid .cell-tools{width: 50px !important;}
.usky-grid .cell-tools.with-prompt {
width:200px;

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/error.html Normal file
View File

@@ -0,0 +1,2 @@
<p class="red">Something went wrong with this editor, below is the data stored:</p>
<pre>{{control | json}}</pre>

19
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
View File

@@ -572,19 +572,32 @@ angular.module("umbraco")
control.$index = index;
control.$uniqueId = $scope.setUniqueId();
//error handling in case of missing editor..
//should only happen if stripped earlier
if(!control.editor){
control.$editorPath = "views/propertyeditors/grid/editors/error.html";
}
if(!control.$editorPath){
var editorConfig = $scope.getEditor(control.editor.alias);
control.editor = editorConfig;
if(editorConfig){
control.editor = editorConfig;
//if its an absolute path
if (control.editor.view.startsWith("/") || control.editor.view.startsWith("~/")) {
control.$editorPath = umbRequestHelper.convertVirtualToAbsolutePath(control.editor.view);
}
else {
//use convention
control.$editorPath = "views/propertyeditors/grid/editors/" + control.editor.view + ".html";
//use convention
control.$editorPath = "views/propertyeditors/grid/editors/" + control.editor.view + ".html";
}
}else{
control.$editorPath = "views/propertyeditors/grid/editors/error.html";
}
}
};

5
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.PropertyEditors.GridController" class="usky-grid" id="usky-grid">
<div ng-controller="Umbraco.PropertyEditors.GridController" class="usky-grid umb-editor umb-grid" id="usky-grid">
<div ng-if="contentReady">
@@ -57,7 +57,8 @@
ng-mouseleave="disableCurrentRow()">
<!-- Row tool -->
<div class="row-tools" ng-animate="'fade'" ng-if="currentRow === row && currentControl === null">
<div class="row-tools" ng-animate="'fade'"
ng-if="currentRow === row && currentControl === null">
<!-- delete row -->
<div class="cell-tools-remove">

4
src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml
View File

@@ -65,7 +65,7 @@
if(cfg != null)
foreach (JProperty property in cfg.Properties()) {
attrs.Add(property.Name + "='" + property.Value.ToString() + "'");
attrs.Add(property.Name + "=\"" + property.Value.ToString() + "\"");
}
JObject style = contentItem.styles;
@@ -76,7 +76,7 @@
cssVals.Add(property.Name + ":" + property.Value.ToString() + ";");
if (cssVals.Any())
attrs.Add("style='" + string.Join(" ", cssVals) + "'");
attrs.Add("style=\"" + string.Join(" ", cssVals) + "\"");
}
return new MvcHtmlString(string.Join(" ", attrs));

4
src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml
View File

@@ -65,7 +65,7 @@
if(cfg != null)
foreach (JProperty property in cfg.Properties()) {
attrs.Add(property.Name + "='" + property.Value.ToString() + "'");
attrs.Add(property.Name + "=\"" + property.Value.ToString() + "\"");
}
JObject style = contentItem.styles;
@@ -76,7 +76,7 @@
cssVals.Add(property.Name + ":" + property.Value.ToString() + ";");
if (cssVals.Any())
attrs.Add("style='" + string.Join(" ", cssVals) + "'");
attrs.Add("style=\"" + string.Join(" ", cssVals) + "\"");
}
return new MvcHtmlString(string.Join(" ", attrs));

2
src/Umbraco.Web/Models/TagModel.cs
View File

@@ -19,7 +19,7 @@ namespace Umbraco.Web.Models
[DataMember(Name = "group")]
public string Group { get; set; }
[DataMember(Name = "nodeCount`")]
[DataMember(Name = "nodeCount")]
public int NodeCount { get; set; }
}
}