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

Merge branch 'temp8-tree-sections-no-more-xml' into temp8

Browse Source
This commit is contained in:
Stephan
2019-01-18 10:59:04 +01:00
parent cee1171d39 437385fd61
commit 07238b54e1
96 changed files with 927 additions and 3058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -241,9 +241,6 @@
<DependentUpon>umbracoSettings.config</DependentUpon>
<SubType>Designer</SubType>
</None>
<None Include="Config\trees.Release.config">
<DependentUpon>trees.config</DependentUpon>
</None>
<None Include="Config\tinyMceConfig.Release.config">
<DependentUpon>tinyMceConfig.config</DependentUpon>
<SubType>Designer</SubType>
@@ -301,14 +298,6 @@
</Content>
<Content Include="Config\scripting.config" />
<Content Include="Config\feedProxy.config" />
<Content Include="Config\applications.config" />
<Content Include="Config\trees.config">
<SubType>Designer</SubType>
</Content>
<None Include="Config\applications.Release.config">
<DependentUpon>applications.config</DependentUpon>
<SubType>Designer</SubType>
</None>
<Content Include="Umbraco\Views\Default.cshtml" />
<Content Include="Umbraco\PartialViewMacros\Templates\EditProfile.cshtml" />
<Content Include="Umbraco\PartialViewMacros\Templates\Empty.cshtml" />

11
src/Umbraco.Web.UI/config/applications.Release.config
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<applications>
<add alias="content" name="Content" sortOrder="0" />
<add alias="media" name="Media" sortOrder="1" />
<add alias="settings" name="Settings" sortOrder="2" />
<add alias="packages" name="Packages" sortOrder="3" />
<add alias="users" name="Users" sortOrder="4" />
<add alias="member" name="Members" sortOrder="5" />
<add alias="forms" name="Forms" sortOrder="6" />
<add alias="translation" name="Translation" sortOrder="7" />
</applications>

11
src/Umbraco.Web.UI/config/applications.config
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<applications>
<add alias="content" name="Content" sortOrder="0" />
<add alias="media" name="Media" sortOrder="1" />
<add alias="settings" name="Settings" sortOrder="2" />
<add alias="packages" name="Packages" sortOrder="3" />
<add alias="users" name="Users" sortOrder="4" />
<add alias="member" name="Members" sortOrder="5" />
<add alias="forms" name="Forms" sortOrder="6" />
<add alias="translation" name="Translation" sortOrder="7" />
</applications>

34
src/Umbraco.Web.UI/config/trees.Release.config
View File

@@ -1,34 +0,0 @@
<?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" type="Umbraco.Web.Trees.ContentTreeController, Umbraco.Web" />
<add initialize="false" sortOrder="0" alias="contentRecycleBin" application="content" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.ContentRecycleBin, Umbraco.Web" />
<!--Media-->
<add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.MediaTreeController, Umbraco.Web" />
<add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, Umbraco.Web" />
<!--Settings-->
<add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="1" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="2" alias="memberTypes" application="settings" title="Member Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTypeTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="3" alias="dataTypes" application="settings" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, Umbraco.Web" />
<add application="settings" sortOrder="4" alias="macros" title="Macros" type="Umbraco.Web.Trees.MacrosTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="5" alias="relationTypes" title="Relation Types" type="Umbraco.Web.Trees.RelationTypeTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="6" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, Umbraco.Web" initialize="true" />
<add application="settings" sortOrder="7" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTreeController, Umbraco.Web" />
<add application="settings" sortOrder="8" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTreeController, Umbraco.Web" silent="false" initialize="true" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="9" alias="stylesheets" title="Stylesheets" type="Umbraco.Web.Trees.StylesheetsTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="10" alias="scripts" title="Scripts" type="Umbraco.Web.Trees.ScriptsTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="11" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="12" alias="contentBlueprints" application="settings" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentBlueprintTreeController, Umbraco.Web" />
<!--Developer-->
<add initialize="true" sortOrder="0" alias="packages" application="packages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.PackagesTreeController, Umbraco.Web" />
<!--Users-->
<add initialize="true" sortOrder="0" alias="users" application="users" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.UserTreeController, Umbraco.Web" />
<!--Members-->
<add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="1" alias="memberGroups" application="member" title="Member Groups" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberGroupTreeController, Umbraco.Web" />
<!--Translation-->
<add initialize="true" application="translation" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
</trees>

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

@@ -1,36 +0,0 @@
<?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" type="Umbraco.Web.Trees.ContentTreeController, Umbraco.Web" />
<add initialize="false" sortOrder="0" alias="contentRecycleBin" application="content" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.ContentRecycleBin, Umbraco.Web" />
<!--Media-->
<add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.MediaTreeController, Umbraco.Web" />
<add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, Umbraco.Web" />
<!--Settings-->
<add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="1" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="2" alias="memberTypes" application="settings" title="Member Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTypeTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="3" alias="dataTypes" application="settings" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, Umbraco.Web" />
<add application="settings" sortOrder="4" alias="macros" title="Macros" type="Umbraco.Web.Trees.MacrosTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="5" alias="relationTypes" title="Relation Types" type="Umbraco.Web.Trees.RelationTypeTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="6" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, Umbraco.Web" initialize="true" />
<add application="settings" sortOrder="7" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTreeController, Umbraco.Web" />
<add application="settings" sortOrder="8" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTreeController, Umbraco.Web" silent="false" initialize="true" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="9" alias="stylesheets" title="Stylesheets" type="Umbraco.Web.Trees.StylesheetsTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="10" alias="scripts" title="Scripts" type="Umbraco.Web.Trees.ScriptsTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" />
<add application="settings" sortOrder="11" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="12" alias="contentBlueprints" application="settings" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentBlueprintTreeController, Umbraco.Web" />
<add initialize="false" application="settings" sortOrder="13" alias="files" title="Files" type="Umbraco.Web.Trees.FilesTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" />
<!--Developer/Packages-->
<add initialize="true" sortOrder="0" alias="packages" application="packages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.PackagesTreeController, Umbraco.Web" />
<!--Users-->
<add initialize="true" sortOrder="0" alias="users" application="users" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.UserTreeController, Umbraco.Web" />
<!--Members-->
<add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, Umbraco.Web" />
<add initialize="true" sortOrder="1" alias="memberGroups" application="member" title="Member Groups" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberGroupTreeController, Umbraco.Web" />
<!--Translation-->
<add initialize="true" application="translation" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, Umbraco.Web" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
</trees>