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

Ensures internal generic properties are all wired up in c# and fixes up the boolean editor, adds templatepicker html file so that something is rendered and there are no js errors.

Browse Source
This commit is contained in:
Shannon
2013-08-12 14:16:45 +10:00
parent afe1023e19
commit 1e2af42ce6
14 changed files with 161 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
View File

@@ -53,7 +53,7 @@
label: "Grid",
id: 4,
properties: [
{ alias: "grid", label: "Grid", view: "grid", controller: "umbraco.grid", value: "test", hideLabel: true }
{ alias: "grid", label: "Grid", view: "grid", value: "test", hideLabel: true }
]
}, {
label: "Generic Properties",
@@ -62,7 +62,7 @@
{
label: 'Created by',
description: 'Original author',
value: 1,
value: "Administrator",
view: "readonlyvalue",
alias: "_umb_createdby"
},
@@ -71,9 +71,6 @@
description: 'Time this document was created',
value: new Date().toIsoDateTimeString(),
view: "readonlyvalue",
//NOTE: No need for filters because the date is a formatted string already because
// that is how it comes from the server as a pre-formatted json string
//config: {filter: 'date', format: 'medium'},
alias: "_umb_createdate"
},
{
@@ -99,10 +96,10 @@
label: 'Template',
value: "1234",
view: "templatepicker",
alias: "_umb_template"
alias: "_umb_template"
},
{
alias: "test", label: "Stuff", view: "test", controller: "umbraco.embeddedcontent", value: "",
alias: "test", label: "Stuff", view: "test", value: "",
config: {
fields: [
{ alias: "embedded", label: "Embbeded", view: "textstring", value: "" },

4
src/Umbraco.Web.UI.Client/src/common/mocks/resources/media.mocks.js
View File

@@ -56,14 +56,14 @@ angular.module('umbraco.mocks').
alias: "tab03",
id: 3,
properties: [
{ alias: "grid", label: "Grid", view: "grid", controller: "umbraco.grid", value: "test", hideLabel: true }
{ alias: "grid", label: "Grid", view: "grid", value: "test", hideLabel: true }
]
},{
label: "WIP",
alias: "tab04",
id: 4,
properties: [
{ alias: "tes", label: "Stuff", view: "test", controller: "umbraco.embeddedcontent", value: "",
{ alias: "tes", label: "Stuff", view: "test", value: "",
config: {
fields: [

15
src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js Normal file
View File

@@ -0,0 +1,15 @@
function booleanEditorController($scope, $rootScope, assetsService) {
$scope.renderModel = {
value: false
};
if ($scope.model && $scope.model.value && ($scope.model.value.toString() === "1" || angular.lowercase($scope.model.value) === "true")) {
$scope.renderModel.value = true;
}
$scope.$watch("renderModel.value", function (newVal) {
$scope.model.value = newVal === true ? "1" : "0";
});
}
angular.module("umbraco").controller("Umbraco.Editors.BooleanController", booleanEditorController);

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

@@ -1 +1,3 @@
<input type="checkbox" ng-model="model.value" ng-checked="{model.value == 1}" id="{{model.alias}} />
<div ng-controller="Umbraco.Editors.BooleanController">
<input type="checkbox" ng-model="renderModel.value" id="{{model.alias}" />
</div>

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/templatepicker/templatepicker.html Normal file
View File

@@ -0,0 +1,4 @@
<div class="span7">
<h5>TODO: Implement this picker</h5>
<div ng-model="model.value"></div>
</div>