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

Merge

Browse Source
This commit is contained in:
Matt@MBP-PC.Home
2012-07-09 11:11:47 -01:00
parent 76fbcffea0 a519903516
commit 2a0448cf4c
2 changed files with 118 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/umbraco.presentation/umbraco/config/create/UI.Release.xml
View File

@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<createUI>
<nodeType alias="nodeTypes">
<header>Nodetype</header>
<usercontrol>/create/nodeType.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="nodetypeTasks" />
<delete assembly="umbraco" type="nodetypeTasks" />
</tasks>
</nodeType>
<nodeType alias="initnodeTypes">
<header>Nodetype</header>
<usercontrol>/create/nodeType.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="nodetypeTasks" />
</tasks>
</nodeType>
<nodeType alias="nodeType">
<header>Nodetype</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="nodetypeTasks" />
</tasks>
</nodeType>
@@ -19,6 +21,7 @@
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="templateTasks" />
<create assembly="umbraco" type="templateTasks" />
</tasks>
</nodeType>
<nodeType alias="inittemplates">
@@ -35,7 +38,7 @@
<create assembly="umbraco" type="macroTasks" />
</tasks>
</nodeType>
<nodeType alias="macro">
<nodeType alias="macros">
<header>Macro</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
@@ -49,6 +52,13 @@
<delete assembly="umbraco" type="XsltTasks" />
</tasks>
</nodeType>
<nodeType alias="xsltFolder">
<header>Xslt</header>
<usercontrol>/create/xslt.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="XsltTasks" />
</tasks>
</nodeType>
<nodeType alias="content">
<header>Page</header>
<usercontrol>/create/content.ascx</usercontrol>
@@ -122,7 +132,7 @@
<create assembly="umbraco" type="MediaTypeTasks" />
</tasks>
</nodeType>
<nodeType alias="mediaType">
<nodeType alias="mediaTypes">
<header>Medie type</header>
<tasks>
<delete assembly="umbraco" type="MediaTypeTasks" />
@@ -229,7 +239,7 @@
<create assembly="umbraco" type="languageTasks" />
</tasks>
</nodeType>
<nodeType alias="language">
<nodeType alias="languages">
<header>Language</header>
<usercontrol>/create/language.ascx</usercontrol>
<tasks>
@@ -241,7 +251,6 @@
<delete assembly="umbraco" type="cacheTasks" />
</tasks>
</nodeType>
<nodeType alias="initpython">
<header>Scripting file</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
@@ -256,6 +265,7 @@
<delete assembly="umbraco" type="PythonTasks" />
</tasks>
</nodeType>
<nodeType alias="initdlrscripting">
<header>Scripting file</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
@@ -263,6 +273,7 @@
<create assembly="umbraco" type="DLRScriptingTasks" />
</tasks>
</nodeType>
<nodeType alias="dlrscripting">
<header>Macro</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
@@ -270,14 +281,6 @@
<delete assembly="umbraco" type="DLRScriptingTasks" />
</tasks>
</nodeType>
<nodeType alias="python">
<header>Macro</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="PythonTasks" />
</tasks>
</nodeType>
<nodeType alias="initscripts">
<header>Script file</header>
<usercontrol>/create/script.ascx</usercontrol>
@@ -300,7 +303,20 @@
<delete assembly="umbraco" type="ScriptTasks" />
</tasks>
</nodeType>
<nodeType alias="initpackager">
<header>Package</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="CreatedPackageTasks" />
</tasks>
</nodeType>
<nodeType alias="packager">
<header>Package</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="CreatedPackageTasks" />
</tasks>
</nodeType>
<nodeType alias="createdPackages">
<header>Package</header>
<usercontrol>/create/simple.ascx</usercontrol>
@@ -308,7 +324,6 @@
<create assembly="umbraco" type="CreatedPackageTasks" />
</tasks>
</nodeType>
<nodeType alias="createdPackageInstance">
<header>Package</header>
<usercontrol>/create/simple.ascx</usercontrol>
@@ -316,5 +331,12 @@
<delete assembly="umbraco" type="CreatedPackageTasks" />
</tasks>
</nodeType>
</createUI>
<nodeType alias="userTypes">
<header>User Types</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="cms.presentation.user.UserTypeTasks" />
<delete assembly="umbraco" type="cms.presentation.user.UserTypeTasks" />
</tasks>
</nodeType>
</createUI>

101
src/umbraco.presentation/umbraco/config/create/UI.xml
View File

@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<createUI>
<nodeType alias="nodeTypes">
<header>Nodetype</header>
<usercontrol>/create/nodeType.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="nodetypeTasks" />
<delete assembly="umbraco" type="nodetypeTasks" />
</tasks>
</nodeType>
<nodeType alias="initnodeTypes">
<header>Nodetype</header>
<usercontrol>/create/nodeType.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="nodetypeTasks" />
</tasks>
</nodeType>
<nodeType alias="nodeType">
<header>Nodetype</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="nodetypeTasks" />
</tasks>
</nodeType>
@@ -19,6 +21,7 @@
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="templateTasks" />
<create assembly="umbraco" type="templateTasks" />
</tasks>
</nodeType>
<nodeType alias="inittemplates">
@@ -35,7 +38,7 @@
<create assembly="umbraco" type="macroTasks" />
</tasks>
</nodeType>
<nodeType alias="macro">
<nodeType alias="macros">
<header>Macro</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
@@ -49,6 +52,13 @@
<delete assembly="umbraco" type="XsltTasks" />
</tasks>
</nodeType>
<nodeType alias="xsltFolder">
<header>Xslt</header>
<usercontrol>/create/xslt.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="XsltTasks" />
</tasks>
</nodeType>
<nodeType alias="content">
<header>Page</header>
<usercontrol>/create/content.ascx</usercontrol>
@@ -122,7 +132,7 @@
<create assembly="umbraco" type="MediaTypeTasks" />
</tasks>
</nodeType>
<nodeType alias="mediaType">
<nodeType alias="mediaTypes">
<header>Medie type</header>
<tasks>
<delete assembly="umbraco" type="MediaTypeTasks" />
@@ -229,7 +239,7 @@
<create assembly="umbraco" type="languageTasks" />
</tasks>
</nodeType>
<nodeType alias="language">
<nodeType alias="languages">
<header>Language</header>
<usercontrol>/create/language.ascx</usercontrol>
<tasks>
@@ -241,20 +251,36 @@
<delete assembly="umbraco" type="cacheTasks" />
</tasks>
</nodeType>
<nodeType alias="initpython">
<header>Python file</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="PythonTasks" />
</tasks>
</nodeType>
<nodeType alias="python">
<header>Macro</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="PythonTasks" />
</tasks>
</nodeType>
<nodeType alias="initpython">
<header>Scripting file</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="PythonTasks" />
</tasks>
</nodeType>
<nodeType alias="python">
<header>Macro</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="PythonTasks" />
</tasks>
</nodeType>
<nodeType alias="initdlrscripting">
<header>Scripting file</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="DLRScriptingTasks" />
</tasks>
</nodeType>
<nodeType alias="dlrscripting">
<header>Macro</header>
<usercontrol>/create/DLRScripting.ascx</usercontrol>
<tasks>
<delete assembly="umbraco" type="DLRScriptingTasks" />
</tasks>
</nodeType>
<nodeType alias="initscripts">
<header>Script file</header>
<usercontrol>/create/script.ascx</usercontrol>
@@ -277,7 +303,20 @@
<delete assembly="umbraco" type="ScriptTasks" />
</tasks>
</nodeType>
<nodeType alias="initpackager">
<header>Package</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="CreatedPackageTasks" />
</tasks>
</nodeType>
<nodeType alias="packager">
<header>Package</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="CreatedPackageTasks" />
</tasks>
</nodeType>
<nodeType alias="createdPackages">
<header>Package</header>
<usercontrol>/create/simple.ascx</usercontrol>
@@ -285,7 +324,6 @@
<create assembly="umbraco" type="CreatedPackageTasks" />
</tasks>
</nodeType>
<nodeType alias="createdPackageInstance">
<header>Package</header>
<usercontrol>/create/simple.ascx</usercontrol>
@@ -293,5 +331,12 @@
<delete assembly="umbraco" type="CreatedPackageTasks" />
</tasks>
</nodeType>
</createUI>
<nodeType alias="userTypes">
<header>User Types</header>
<usercontrol>/create/simple.ascx</usercontrol>
<tasks>
<create assembly="umbraco" type="cms.presentation.user.UserTypeTasks" />
<delete assembly="umbraco" type="cms.presentation.user.UserTypeTasks" />
</tasks>
</nodeType>
</createUI>