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

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

Browse Source
This commit is contained in:
perploug
2013-09-10 15:09:36 +02:00
parent 64fc4f617d b097f33bc9
commit f1dda1b86c
28 changed files with 173 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/App_Plugins/MarkdownEditor/package.manifest
View File

@@ -6,7 +6,7 @@
editor: {
view: "~/App_Plugins/MarkDownEditor/markdowneditor.html"
},
preValueEditor: {
prevalues: {
fields: [
{
label: "Preview",

41
src/Umbraco.Web.UI/App_Plugins/MyPackage/Package.manifest
View File

@@ -8,17 +8,12 @@
},
editor: {
view: "~/App_Plugins/MyPackage/PropertyEditors/Views/RegexEditor.html",
validation: [
{
type: "Required"
},
{
type: "Regex",
config: "^\\d*$"
}
]
validation: {
required : true,
regex : "^\\d*$"
}
},
preValueEditor: {
prevalues: {
fields: [
{
label: "Regular expression",
@@ -39,31 +34,19 @@
name: "CSV Editor",
editor: {
view: "~/App_Plugins/MyPackage/PropertyEditors/Views/CsvEditor.html",
validation: [
{
type: "Delimited",
config: {
delimiter: ",",
pattern: "^[a-zA-Z]*$"
}
},
]
validation: {
delimited : {
delimiter: ",",
pattern: "^[a-zA-Z]*$"
}
}
}
},
{
id: "48B0DA8C-3492-4693-96DB-5C5099C680F3",
name: "Custom editor",
editor: {
view: "~/App_Plugins/MyPackage/PropertyEditors/Views/CustomJson.html"
}
}
}
],
javascript: [
'~/App_Plugins/MyPackage/Common/Js/MyPackage.js',
'~/App_Plugins/MyPackage/PropertyEditors/Js/CsvEditor.js',
'~/App_Plugins/MyPackage/PropertyEditors/Js/PostcodeEditor.js',
'~/App_Plugins/MyPackage/PropertyEditors/Js/RegexEditor.js'
/*
'~/App_Plugins/MyPackage/PropertyEditors/Js/CustomJsonEditor.js'*/
]
}

12
src/Umbraco.Web.UI/config/trees.config
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<trees>
<!--Content-->
<add initialize="true" sortOrder="0" alias="content" application="content" title="Content" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTreeController, umbraco" />
<add initialize="false" sortOrder="0" alias="contentRecycleBin" application="content" title="Recycle Bin" iconClosed="folder.gif" iconOpen="folder_o.gif" type="umbraco.cms.presentation.Trees.ContentRecycleBin, umbraco" action="" />
<add initialize="true" sortOrder="0" alias="content" application="content" title="Content" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTreeController,umbraco" />
<add initialize="false" sortOrder="0" alias="contentRecycleBin" application="content" title="Recycle Bin" iconClosed="folder.gif" iconOpen="folder_o.gif" type="umbraco.cms.presentation.Trees.ContentRecycleBin,umbraco" action="" />
<!--Media-->
<add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTreeController, umbraco" />
<add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTreeController,umbraco" />
<add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="folder.gif" iconOpen="folder_o.gif" type="umbraco.cms.presentation.Trees.MediaRecycleBin, umbraco" />
<!--Settings-->
<add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="0" />
<add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets,umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="0" />
<add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" />
<add application="settings" alias="templates" title="Templates" type="umbraco.loadTemplates, umbraco" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="1" />
<add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />
@@ -39,8 +39,4 @@
<!-- Custom -->
<!--<add application="myApplication" alias="myTree" title="Me Tree" type="MyNamespace.myTree, MyAssembly"
iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="10" />-->
<add initialize="true" sortOrder="0" alias="forms" application="contour" title="Forms" iconClosed="legacy" iconOpen="legacy" type="Umbraco.Forms.UI.Trees.LoadForm, Umbraco.Forms.UI" />
<add initialize="true" sortOrder="1" alias="formdatasources" application="contour" title="Data Sources" iconClosed="legacy" iconOpen="legacy" type="Umbraco.Forms.UI.Trees.LoadDataSource, Umbraco.Forms.UI" />
<add initialize="true" sortOrder="2" alias="formprevaluesource" application="contour" title="Prevalue Sources" iconClosed="legacy" iconOpen="legacy" type="Umbraco.Forms.UI.Trees.LoadPreValueSource, Umbraco.Forms.UI" />
<add initialize="true" sortOrder="5" alias="formssecurity" application="users" title="Contour security" iconClosed="legacy" iconOpen="legacy" type="Umbraco.Forms.UI.Trees.LoadFormsSecurity, Umbraco.Forms.UI" />
</trees>