From 34f7326c623d9daf67e51bef23a42fea8d81e995 Mon Sep 17 00:00:00 2001 From: Thomas Eldblom Date: Tue, 15 Dec 2015 13:01:23 +1100 Subject: [PATCH 1/9] Added Common and Demo websites --- Habitat.sln | 28 +++ gulpfile.js | 2 +- .../Project.yml | 2 +- .../Foundation/Foundation.Theming.config | 3 + .../Common.Website.Serialization.config | 19 ++ .../Include/Project/Common.Website.config | 38 ++++ .../Common/code/Properties/AssemblyInfo.cs | 35 ++++ .../Properties/PublishProfiles/Habitat.pubxml | 18 ++ .../code/Sitecore.Common.Website.csproj | 191 ++++++++++++++++++ .../Sitecore.Common.Website.csproj.sitecore | 5 + src/Project/Common/code/Views/Web.config | 44 ++++ src/Project/Common/code/packages.config | 15 ++ src/Project/Common/code/web.config.transform | 10 + .../Common.Website.Layouts/Common.yml | 13 ++ .../Common.yml | 13 ++ .../Common.Website.Renderings/Common.yml | 16 ++ .../Common.Website.Templates/Common.yml | 16 ++ .../Common.Website.UserProfiles/Common.yml} | 2 +- .../Common}/UserProfile.yml | 9 +- .../Project/Demo.Website.Serialization.config | 14 ++ .../Include/Project/Demo.Website.config | 35 ++++ .../Demo/code/Properties/AssemblyInfo.cs | 35 ++++ .../Properties/PublishProfiles/Habitat.pubxml | 18 ++ .../Demo/code/Sitecore.Demo.Website.csproj | 158 +++++++++++++++ .../Sitecore.Demo.Website.csproj.sitecore | 5 + src/Project/Demo/code/packages.config | 9 + src/Project/Demo/code/web.config.transform | 5 + .../Demo.Website.Content}/Demo.yml | 0 .../Demo.Website.Content}/Demo/search.yml | 0 .../Demo/search/campaign.yml | 0 .../Demo/search/destination.yml | 0 .../Demo/search/searchterm.yml | 0 .../Habitat.Website.Serialization.config | 29 +-- .../Include/Project/Habitat.Website.config | 26 +-- .../code/Sitecore.Habitat.Website.csproj | 8 +- src/Project/Habitat/code/Views/Web.config | 22 +- src/Project/Habitat/code/web.config.transform | 7 +- 37 files changed, 781 insertions(+), 69 deletions(-) create mode 100644 src/Project/Common/code/App_Config/Include/Project/Common.Website.Serialization.config create mode 100644 src/Project/Common/code/App_Config/Include/Project/Common.Website.config create mode 100644 src/Project/Common/code/Properties/AssemblyInfo.cs create mode 100644 src/Project/Common/code/Properties/PublishProfiles/Habitat.pubxml create mode 100644 src/Project/Common/code/Sitecore.Common.Website.csproj create mode 100644 src/Project/Common/code/Sitecore.Common.Website.csproj.sitecore create mode 100644 src/Project/Common/code/Views/Web.config create mode 100644 src/Project/Common/code/packages.config create mode 100644 src/Project/Common/code/web.config.transform create mode 100644 src/Project/Common/serialization/Common.Website.Layouts/Common.yml create mode 100644 src/Project/Common/serialization/Common.Website.PlaceholderSettings/Common.yml create mode 100644 src/Project/Common/serialization/Common.Website.Renderings/Common.yml create mode 100644 src/Project/Common/serialization/Common.Website.Templates/Common.yml rename src/Project/{Habitat/serialization/Habitat.Website.UserProfiles/Habitat.yml => Common/serialization/Common.Website.UserProfiles/Common.yml} (83%) rename src/Project/{Habitat/serialization/Habitat.Website.UserProfiles/Habitat => Common/serialization/Common.Website.UserProfiles/Common}/UserProfile.yml (61%) create mode 100644 src/Project/Demo/code/App_Config/Include/Project/Demo.Website.Serialization.config create mode 100644 src/Project/Demo/code/App_Config/Include/Project/Demo.Website.config create mode 100644 src/Project/Demo/code/Properties/AssemblyInfo.cs create mode 100644 src/Project/Demo/code/Properties/PublishProfiles/Habitat.pubxml create mode 100644 src/Project/Demo/code/Sitecore.Demo.Website.csproj create mode 100644 src/Project/Demo/code/Sitecore.Demo.Website.csproj.sitecore create mode 100644 src/Project/Demo/code/packages.config create mode 100644 src/Project/Demo/code/web.config.transform rename src/Project/{Habitat/serialization/Habitat.Website.Demo => Demo/serialization/Demo.Website.Content}/Demo.yml (100%) rename src/Project/{Habitat/serialization/Habitat.Website.Demo => Demo/serialization/Demo.Website.Content}/Demo/search.yml (100%) rename src/Project/{Habitat/serialization/Habitat.Website.Demo => Demo/serialization/Demo.Website.Content}/Demo/search/campaign.yml (100%) rename src/Project/{Habitat/serialization/Habitat.Website.Demo => Demo/serialization/Demo.Website.Content}/Demo/search/destination.yml (100%) rename src/Project/{Habitat/serialization/Habitat.Website.Demo => Demo/serialization/Demo.Website.Content}/Demo/search/searchterm.yml (100%) diff --git a/Habitat.sln b/Habitat.sln index d930eee801..27fd2e414d 100644 --- a/Habitat.sln +++ b/Habitat.sln @@ -157,6 +157,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Theming", "Theming", "{F7F6 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Foundation.Theming", "src\Foundation\Theming\code\Sitecore.Foundation.Theming.csproj", "{98DE0D1D-26F1-4CCA-847C-4E0FC2DBA5FC}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{5ABB37C0-E86D-4585-81D2-50A0E41ED859}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Common.Website", "src\Project\Common\code\Sitecore.Common.Website.csproj", "{C98EAD78-4D83-4789-A621-6011C3D7314D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Demo.Website", "src\Project\Demo\code\Sitecore.Demo.Website.csproj", "{D584C2DC-7F5F-447A-831C-8C5A75277FAF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{BC277CB0-BAA3-4C15-973F-3F9C10B77278}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -539,6 +547,22 @@ Global {98DE0D1D-26F1-4CCA-847C-4E0FC2DBA5FC}.Release|Any CPU.Build.0 = Release|Any CPU {98DE0D1D-26F1-4CCA-847C-4E0FC2DBA5FC}.Release|x64.ActiveCfg = Release|Any CPU {98DE0D1D-26F1-4CCA-847C-4E0FC2DBA5FC}.Release|x64.Build.0 = Release|Any CPU + {C98EAD78-4D83-4789-A621-6011C3D7314D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C98EAD78-4D83-4789-A621-6011C3D7314D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C98EAD78-4D83-4789-A621-6011C3D7314D}.Debug|x64.ActiveCfg = Debug|Any CPU + {C98EAD78-4D83-4789-A621-6011C3D7314D}.Debug|x64.Build.0 = Debug|Any CPU + {C98EAD78-4D83-4789-A621-6011C3D7314D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C98EAD78-4D83-4789-A621-6011C3D7314D}.Release|Any CPU.Build.0 = Release|Any CPU + {C98EAD78-4D83-4789-A621-6011C3D7314D}.Release|x64.ActiveCfg = Release|Any CPU + {C98EAD78-4D83-4789-A621-6011C3D7314D}.Release|x64.Build.0 = Release|Any CPU + {D584C2DC-7F5F-447A-831C-8C5A75277FAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D584C2DC-7F5F-447A-831C-8C5A75277FAF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D584C2DC-7F5F-447A-831C-8C5A75277FAF}.Debug|x64.ActiveCfg = Debug|Any CPU + {D584C2DC-7F5F-447A-831C-8C5A75277FAF}.Debug|x64.Build.0 = Debug|Any CPU + {D584C2DC-7F5F-447A-831C-8C5A75277FAF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D584C2DC-7F5F-447A-831C-8C5A75277FAF}.Release|Any CPU.Build.0 = Release|Any CPU + {D584C2DC-7F5F-447A-831C-8C5A75277FAF}.Release|x64.ActiveCfg = Release|Any CPU + {D584C2DC-7F5F-447A-831C-8C5A75277FAF}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -611,5 +635,9 @@ Global {931B6ABB-1791-44F8-9727-4110FB59C961} = {18A4B060-7586-4321-806B-0325FAA01373} {F7F6C8C8-67C9-40D9-946F-62630C39102A} = {D2CBE02E-6AA7-4343-9A01-891F971A17F5} {98DE0D1D-26F1-4CCA-847C-4E0FC2DBA5FC} = {F7F6C8C8-67C9-40D9-946F-62630C39102A} + {5ABB37C0-E86D-4585-81D2-50A0E41ED859} = {9A8FD752-FF60-4789-8251-E1D8FF290F3F} + {C98EAD78-4D83-4789-A621-6011C3D7314D} = {5ABB37C0-E86D-4585-81D2-50A0E41ED859} + {D584C2DC-7F5F-447A-831C-8C5A75277FAF} = {BC277CB0-BAA3-4C15-973F-3F9C10B77278} + {BC277CB0-BAA3-4C15-973F-3F9C10B77278} = {9A8FD752-FF60-4789-8251-E1D8FF290F3F} EndGlobalSection EndGlobal diff --git a/gulpfile.js b/gulpfile.js index 5f04d72db2..6d1a39283c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -43,7 +43,7 @@ gulp.task("02-Publish-All-Projects", function (callback) { }); gulp.task("03-Apply-Xml-Transform", function () { - return gulp.src("./src/Project/**/*Website.csproj") + return gulp.src("./src/Project/**/code/*.csproj") .pipe(foreach(function (stream, file) { return stream .pipe(debug({ title: "Applying transform project:" })) diff --git a/src/Foundation/Serialization/serialization/Foundation.Serialization.Renderings.Project/Project.yml b/src/Foundation/Serialization/serialization/Foundation.Serialization.Renderings.Project/Project.yml index 100f81f7de..037256e6ac 100644 --- a/src/Foundation/Serialization/serialization/Foundation.Serialization.Renderings.Project/Project.yml +++ b/src/Foundation/Serialization/serialization/Foundation.Serialization.Renderings.Project/Project.yml @@ -1,7 +1,7 @@ --- ID: 1995806f-0a84-42b5-93b0-88f0e2ff872c Parent: 32566f0e-7686-45f1-a12f-d7260bd78bc3 -Template: a87a00b1-e6db-45ab-8b54-636fec3b5523 +Template: 7ee0975b-0698-493e-b3a2-0b2ef33d0522 Path: /sitecore/layout/Renderings/Project SharedFields: - ID: 06d5295c-ed2f-4a54-9bf2-26228d113318 diff --git a/src/Foundation/Theming/code/App_Config/Include/Foundation/Foundation.Theming.config b/src/Foundation/Theming/code/App_Config/Include/Foundation/Foundation.Theming.config index 11129b6715..306c6443d1 100644 --- a/src/Foundation/Theming/code/App_Config/Include/Foundation/Foundation.Theming.config +++ b/src/Foundation/Theming/code/App_Config/Include/Foundation/Foundation.Theming.config @@ -18,6 +18,9 @@ + + + \ No newline at end of file diff --git a/src/Project/Common/code/App_Config/Include/Project/Common.Website.Serialization.config b/src/Project/Common/code/App_Config/Include/Project/Common.Website.Serialization.config new file mode 100644 index 0000000000..e28300301f --- /dev/null +++ b/src/Project/Common/code/App_Config/Include/Project/Common.Website.Serialization.config @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Project/Common/code/App_Config/Include/Project/Common.Website.config b/src/Project/Common/code/App_Config/Include/Project/Common.Website.config new file mode 100644 index 0000000000..b9272db432 --- /dev/null +++ b/src/Project/Common/code/App_Config/Include/Project/Common.Website.config @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Project/Common/code/Properties/AssemblyInfo.cs b/src/Project/Common/code/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..a63db967b0 --- /dev/null +++ b/src/Project/Common/code/Properties/AssemblyInfo.cs @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Sitecore.Common.Website")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Habitat")] +[assembly: AssemblyCopyright("Copyright © Sitecore 2015")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("2e86ee8e-0354-4fbf-a1fa-fbb14596c093")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Project/Common/code/Properties/PublishProfiles/Habitat.pubxml b/src/Project/Common/code/Properties/PublishProfiles/Habitat.pubxml new file mode 100644 index 0000000000..2739d016da --- /dev/null +++ b/src/Project/Common/code/Properties/PublishProfiles/Habitat.pubxml @@ -0,0 +1,18 @@ + + + + + + + FileSystem + Debug + Any CPU + + True + False + False + + \ No newline at end of file diff --git a/src/Project/Common/code/Sitecore.Common.Website.csproj b/src/Project/Common/code/Sitecore.Common.Website.csproj new file mode 100644 index 0000000000..678a19188d --- /dev/null +++ b/src/Project/Common/code/Sitecore.Common.Website.csproj @@ -0,0 +1,191 @@ + + + + + + + + Debug + AnyCPU + + + 2.0 + {C98EAD78-4D83-4789-A621-6011C3D7314D} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + Sitecore.Common.Website + Sitecore.Common.Website + v4.5.2 + false + true + + + + + + + + + + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + ..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + True + + + + ..\..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + True + + + ..\..\..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll + True + + + ..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + True + + + + + + ..\..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + True + + + + + + + + + ..\..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + True + + + ..\..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll + True + + + ..\..\..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll + True + + + ..\..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + True + + + ..\..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + True + + + ..\..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + True + + + ..\..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + True + + + ..\..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + True + + + + + + + + + + + + + + + + ..\..\..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll + + + + + + + + + Designer + + + Designer + + + + + + + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + + + + + + + + True + True + 52949 + / + http://localhost:52949/ + False + False + + + False + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Project/Common/code/Sitecore.Common.Website.csproj.sitecore b/src/Project/Common/code/Sitecore.Common.Website.csproj.sitecore new file mode 100644 index 0000000000..1148f57560 --- /dev/null +++ b/src/Project/Common/code/Sitecore.Common.Website.csproj.sitecore @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/Project/Common/code/Views/Web.config b/src/Project/Common/code/Views/Web.config new file mode 100644 index 0000000000..e22c474254 --- /dev/null +++ b/src/Project/Common/code/Views/Web.config @@ -0,0 +1,44 @@ + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Project/Common/code/packages.config b/src/Project/Common/code/packages.config new file mode 100644 index 0000000000..60d3352341 --- /dev/null +++ b/src/Project/Common/code/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Project/Common/code/web.config.transform b/src/Project/Common/code/web.config.transform new file mode 100644 index 0000000000..1ba7cb9e98 --- /dev/null +++ b/src/Project/Common/code/web.config.transform @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/Project/Common/serialization/Common.Website.Layouts/Common.yml b/src/Project/Common/serialization/Common.Website.Layouts/Common.yml new file mode 100644 index 0000000000..b3cf9f9fcc --- /dev/null +++ b/src/Project/Common/serialization/Common.Website.Layouts/Common.yml @@ -0,0 +1,13 @@ +--- +ID: 442946ad-fb32-4434-b4c0-ade42526e7d0 +Parent: da04b275-8838-4a3a-afee-817cf1fdd2eb +Template: 93227c5d-4fef-474d-94c0-f252ec8e8219 +Path: /sitecore/layout/Layouts/Project/Common +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: 25bed78c-4957-4165-998a-ca1b52f67497 + # __Created + Value: 20151215T014837Z diff --git a/src/Project/Common/serialization/Common.Website.PlaceholderSettings/Common.yml b/src/Project/Common/serialization/Common.Website.PlaceholderSettings/Common.yml new file mode 100644 index 0000000000..f80d72d3a4 --- /dev/null +++ b/src/Project/Common/serialization/Common.Website.PlaceholderSettings/Common.yml @@ -0,0 +1,13 @@ +--- +ID: 6ca1a082-5054-4aa0-88da-39489a7d1cce +Parent: f5f0fbe3-61ad-4967-a5d8-8d760331d6a1 +Template: c3b037a0-46e5-4b67-ac7a-a144b962a56f +Path: /sitecore/layout/Placeholder Settings/Project/Common +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: 25bed78c-4957-4165-998a-ca1b52f67497 + # __Created + Value: 20151215T014906Z diff --git a/src/Project/Common/serialization/Common.Website.Renderings/Common.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common.yml new file mode 100644 index 0000000000..0962eb7489 --- /dev/null +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common.yml @@ -0,0 +1,16 @@ +--- +ID: 4935d7de-c715-46e5-862e-44adf1bc61e8 +Parent: 1995806f-0a84-42b5-93b0-88f0e2ff872c +Template: 7ee0975b-0698-493e-b3a2-0b2ef33d0522 +Path: /sitecore/layout/Renderings/Project/Common +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: 25bed78c-4957-4165-998a-ca1b52f67497 + # __Created + Value: 20151215T014521Z + - ID: 5dd74568-4d4b-44c1-b513-0af5f4cda34f + # __Created by + Value: sitecore\admin diff --git a/src/Project/Common/serialization/Common.Website.Templates/Common.yml b/src/Project/Common/serialization/Common.Website.Templates/Common.yml new file mode 100644 index 0000000000..1de2c2d544 --- /dev/null +++ b/src/Project/Common/serialization/Common.Website.Templates/Common.yml @@ -0,0 +1,16 @@ +--- +ID: 104e6124-706d-4620-9db6-f8814be5f471 +Parent: 825b30b4-b40b-422e-9920-23a1b6bda89c +Template: 0437fee2-44c9-46a6-abe9-28858d9fee8c +Path: /sitecore/templates/Project/Common +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: 25bed78c-4957-4165-998a-ca1b52f67497 + # __Created + Value: 20151215T015753Z + - ID: 5dd74568-4d4b-44c1-b513-0af5f4cda34f + # __Created by + Value: sitecore\admin diff --git a/src/Project/Habitat/serialization/Habitat.Website.UserProfiles/Habitat.yml b/src/Project/Common/serialization/Common.Website.UserProfiles/Common.yml similarity index 83% rename from src/Project/Habitat/serialization/Habitat.Website.UserProfiles/Habitat.yml rename to src/Project/Common/serialization/Common.Website.UserProfiles/Common.yml index bddb2b7c05..bab76f8d14 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.UserProfiles/Habitat.yml +++ b/src/Project/Common/serialization/Common.Website.UserProfiles/Common.yml @@ -2,7 +2,7 @@ ID: f2913f12-6c68-49f2-a675-c9bb8892d987 Parent: 65701ce7-6ffc-4a76-88f0-05834afd7e9d Template: a87a00b1-e6db-45ab-8b54-636fec3b5523 -Path: /sitecore/system/Settings/Security/Profiles/Habitat +Path: /sitecore/system/Settings/Security/Profiles/Common Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.UserProfiles/Habitat/UserProfile.yml b/src/Project/Common/serialization/Common.Website.UserProfiles/Common/UserProfile.yml similarity index 61% rename from src/Project/Habitat/serialization/Habitat.Website.UserProfiles/Habitat/UserProfile.yml rename to src/Project/Common/serialization/Common.Website.UserProfiles/Common/UserProfile.yml index 6c47d952e5..a3fac49dc5 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.UserProfiles/Habitat/UserProfile.yml +++ b/src/Project/Common/serialization/Common.Website.UserProfiles/Common/UserProfile.yml @@ -2,7 +2,11 @@ ID: 14523428-879d-491c-9df0-1417e82a4311 Parent: f2913f12-6c68-49f2-a675-c9bb8892d987 Template: 696d276b-786a-4d1e-b8bb-8e139db7be7c -Path: /sitecore/system/Settings/Security/Profiles/Habitat/UserProfile +Path: /sitecore/system/Settings/Security/Profiles/Common/UserProfile +SharedFields: +- ID: 06d5295c-ed2f-4a54-9bf2-26228d113318 + # __Icon + Value: People/32x32/woman2.png Languages: - Language: en Versions: @@ -14,3 +18,6 @@ Languages: - ID: 5dd74568-4d4b-44c1-b513-0af5f4cda34f # __Created by Value: sitecore\admin + - ID: e7bc8a3e-3201-4556-b2ff-ff4db04db081 + # FirstName + Value: s diff --git a/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.Serialization.config b/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.Serialization.config new file mode 100644 index 0000000000..ad53d252fa --- /dev/null +++ b/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.Serialization.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.config b/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.config new file mode 100644 index 0000000000..11090bd8dd --- /dev/null +++ b/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.config @@ -0,0 +1,35 @@ + + + + + + + + + demo + + + + + + + demo + + + + + + + + + + + 50MB + 0 + 0 + 25MB + + + + + \ No newline at end of file diff --git a/src/Project/Demo/code/Properties/AssemblyInfo.cs b/src/Project/Demo/code/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..54cf09bd31 --- /dev/null +++ b/src/Project/Demo/code/Properties/AssemblyInfo.cs @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Sitecore.Demo.Website")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Habitat")] +[assembly: AssemblyCopyright("Copyright © Sitecore 2015")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("d584c2dc-7f5f-447a-831c-8c5a75277faf")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Project/Demo/code/Properties/PublishProfiles/Habitat.pubxml b/src/Project/Demo/code/Properties/PublishProfiles/Habitat.pubxml new file mode 100644 index 0000000000..2739d016da --- /dev/null +++ b/src/Project/Demo/code/Properties/PublishProfiles/Habitat.pubxml @@ -0,0 +1,18 @@ + + + + + + + FileSystem + Debug + Any CPU + + True + False + False + + \ No newline at end of file diff --git a/src/Project/Demo/code/Sitecore.Demo.Website.csproj b/src/Project/Demo/code/Sitecore.Demo.Website.csproj new file mode 100644 index 0000000000..afb0a8ae8b --- /dev/null +++ b/src/Project/Demo/code/Sitecore.Demo.Website.csproj @@ -0,0 +1,158 @@ + + + + + + + Debug + AnyCPU + + + 2.0 + {D584C2DC-7F5F-447A-831C-8C5A75277FAF} + {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + Library + Properties + Sitecore.Demo.Website + Sitecore.Demo.Website + v4.5.2 + true + + + + + + + + + + true + full + false + bin\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\ + TRACE + prompt + 4 + + + + ..\..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + True + + + + + + + + + + + + + + + + + + + + + + ..\..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + + + ..\..\..\..\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Webpages.dll + + + ..\..\..\..\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Webpages.Deployment.dll + + + ..\..\..\..\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Webpages.Razor.dll + + + ..\..\..\..\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Helpers.dll + + + ..\..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + ..\..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + + + + + + + + + + Designer + + + + + + + + Designer + + + + + + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + + + + + True + True + 54622 + / + http://localhost:54622/ + False + False + + + False + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Project/Demo/code/Sitecore.Demo.Website.csproj.sitecore b/src/Project/Demo/code/Sitecore.Demo.Website.csproj.sitecore new file mode 100644 index 0000000000..1148f57560 --- /dev/null +++ b/src/Project/Demo/code/Sitecore.Demo.Website.csproj.sitecore @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/Project/Demo/code/packages.config b/src/Project/Demo/code/packages.config new file mode 100644 index 0000000000..5b4d29cbb4 --- /dev/null +++ b/src/Project/Demo/code/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/Project/Demo/code/web.config.transform b/src/Project/Demo/code/web.config.transform new file mode 100644 index 0000000000..55b8fa6582 --- /dev/null +++ b/src/Project/Demo/code/web.config.transform @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/Project/Habitat/serialization/Habitat.Website.Demo/Demo.yml b/src/Project/Demo/serialization/Demo.Website.Content/Demo.yml similarity index 100% rename from src/Project/Habitat/serialization/Habitat.Website.Demo/Demo.yml rename to src/Project/Demo/serialization/Demo.Website.Content/Demo.yml diff --git a/src/Project/Habitat/serialization/Habitat.Website.Demo/Demo/search.yml b/src/Project/Demo/serialization/Demo.Website.Content/Demo/search.yml similarity index 100% rename from src/Project/Habitat/serialization/Habitat.Website.Demo/Demo/search.yml rename to src/Project/Demo/serialization/Demo.Website.Content/Demo/search.yml diff --git a/src/Project/Habitat/serialization/Habitat.Website.Demo/Demo/search/campaign.yml b/src/Project/Demo/serialization/Demo.Website.Content/Demo/search/campaign.yml similarity index 100% rename from src/Project/Habitat/serialization/Habitat.Website.Demo/Demo/search/campaign.yml rename to src/Project/Demo/serialization/Demo.Website.Content/Demo/search/campaign.yml diff --git a/src/Project/Habitat/serialization/Habitat.Website.Demo/Demo/search/destination.yml b/src/Project/Demo/serialization/Demo.Website.Content/Demo/search/destination.yml similarity index 100% rename from src/Project/Habitat/serialization/Habitat.Website.Demo/Demo/search/destination.yml rename to src/Project/Demo/serialization/Demo.Website.Content/Demo/search/destination.yml diff --git a/src/Project/Habitat/serialization/Habitat.Website.Demo/Demo/search/searchterm.yml b/src/Project/Demo/serialization/Demo.Website.Content/Demo/search/searchterm.yml similarity index 100% rename from src/Project/Habitat/serialization/Habitat.Website.Demo/Demo/search/searchterm.yml rename to src/Project/Demo/serialization/Demo.Website.Content/Demo/search/searchterm.yml diff --git a/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.Serialization.config b/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.Serialization.config index 8feec3badf..bc0dfdc478 100644 --- a/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.Serialization.config +++ b/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.Serialization.config @@ -2,31 +2,20 @@ - - + + - - - - - - - - - + + + + + + + diff --git a/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config b/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config index 1585246150..7dac94b271 100644 --- a/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config +++ b/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config @@ -6,32 +6,20 @@ - - - habitat - demo - - - habitat - demo - - - - - + @@ -41,22 +29,10 @@ 0 25MB - - 50MB - 0 - 0 - 25MB - - - - - - - \ No newline at end of file diff --git a/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj b/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj index f9a34323c5..4556073cbd 100644 --- a/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj +++ b/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj @@ -162,15 +162,14 @@ Designer - - Designer - Designer - + + Designer + @@ -193,6 +192,7 @@ + diff --git a/src/Project/Habitat/code/Views/Web.config b/src/Project/Habitat/code/Views/Web.config index ed125a4ba0..237268f328 100644 --- a/src/Project/Habitat/code/Views/Web.config +++ b/src/Project/Habitat/code/Views/Web.config @@ -2,14 +2,9 @@ - -
-
+ +
+
@@ -35,8 +30,15 @@ - + + + + + + + + + \ No newline at end of file diff --git a/src/Project/Habitat/code/web.config.transform b/src/Project/Habitat/code/web.config.transform index 1ba7cb9e98..55b8fa6582 100644 --- a/src/Project/Habitat/code/web.config.transform +++ b/src/Project/Habitat/code/web.config.transform @@ -1,10 +1,5 @@  - - - - - - + \ No newline at end of file From fa5e33f1ffa018741c2b3d402fe004f7128737b4 Mon Sep 17 00:00:00 2001 From: Thomas Eldblom Date: Tue, 15 Dec 2015 14:39:31 +1100 Subject: [PATCH 2/9] Moved Demo templates to the Demo.Website project --- .../Common.Website.Renderings/Common.yml | 3 --- .../Project/Demo.Website.Serialization.config | 1 + .../Demo.Website.Templates/Demo.yml | 16 ++++++++++++++++ .../Demo/Content Types.yml | 16 ++++++++++++++++ .../Demo}/Content Types/Demo Tokens.yml | 4 ++-- .../Content Types/Demo Tokens/Campaign Token.yml | 2 +- .../Content Types/Demo Tokens/Link Token.yml | 2 +- .../Content Types/Demo Tokens/Text Token.yml | 2 +- .../Demo.Website.Templates/Demo/Page Types.yml | 16 ++++++++++++++++ .../Demo}/Page Types/Demo Page.yml | 6 +++--- .../Page Types/Demo Page/__Standard Values.yml | 2 +- .../Project/Habitat.Website.Serialization.config | 8 ++++---- 12 files changed, 62 insertions(+), 16 deletions(-) create mode 100644 src/Project/Demo/serialization/Demo.Website.Templates/Demo.yml create mode 100644 src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types.yml rename src/Project/{Habitat/serialization/Habitat.Website.Templates/Habitat => Demo/serialization/Demo.Website.Templates/Demo}/Content Types/Demo Tokens.yml (75%) rename src/Project/{Habitat/serialization/Habitat.Website.Templates/Habitat => Demo/serialization/Demo.Website.Templates/Demo}/Content Types/Demo Tokens/Campaign Token.yml (89%) rename src/Project/{Habitat/serialization/Habitat.Website.Templates/Habitat => Demo/serialization/Demo.Website.Templates/Demo}/Content Types/Demo Tokens/Link Token.yml (89%) rename src/Project/{Habitat/serialization/Habitat.Website.Templates/Habitat => Demo/serialization/Demo.Website.Templates/Demo}/Content Types/Demo Tokens/Text Token.yml (89%) create mode 100644 src/Project/Demo/serialization/Demo.Website.Templates/Demo/Page Types.yml rename src/Project/{Habitat/serialization/Habitat.Website.Templates/Habitat => Demo/serialization/Demo.Website.Templates/Demo}/Page Types/Demo Page.yml (83%) rename src/Project/{Habitat/serialization/Habitat.Website.Templates/Habitat => Demo/serialization/Demo.Website.Templates/Demo}/Page Types/Demo Page/__Standard Values.yml (93%) diff --git a/src/Project/Common/serialization/Common.Website.Renderings/Common.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common.yml index 0962eb7489..b77cd95433 100644 --- a/src/Project/Common/serialization/Common.Website.Renderings/Common.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common.yml @@ -11,6 +11,3 @@ Languages: - ID: 25bed78c-4957-4165-998a-ca1b52f67497 # __Created Value: 20151215T014521Z - - ID: 5dd74568-4d4b-44c1-b513-0af5f4cda34f - # __Created by - Value: sitecore\admin diff --git a/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.Serialization.config b/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.Serialization.config index ad53d252fa..0d10a95f73 100644 --- a/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.Serialization.config +++ b/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.Serialization.config @@ -6,6 +6,7 @@ + diff --git a/src/Project/Demo/serialization/Demo.Website.Templates/Demo.yml b/src/Project/Demo/serialization/Demo.Website.Templates/Demo.yml new file mode 100644 index 0000000000..be48eb3507 --- /dev/null +++ b/src/Project/Demo/serialization/Demo.Website.Templates/Demo.yml @@ -0,0 +1,16 @@ +--- +ID: e132e073-74f0-4fa6-82b1-a18581c2cb3d +Parent: 825b30b4-b40b-422e-9920-23a1b6bda89c +Template: 0437fee2-44c9-46a6-abe9-28858d9fee8c +Path: /sitecore/templates/Project/Demo +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: 25bed78c-4957-4165-998a-ca1b52f67497 + # __Created + Value: 20151215T030740Z + - ID: 5dd74568-4d4b-44c1-b513-0af5f4cda34f + # __Created by + Value: sitecore\admin diff --git a/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types.yml b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types.yml new file mode 100644 index 0000000000..3177640da9 --- /dev/null +++ b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types.yml @@ -0,0 +1,16 @@ +--- +ID: dafa16b2-4dc1-474d-b696-88022c19b8a1 +Parent: e132e073-74f0-4fa6-82b1-a18581c2cb3d +Template: 0437fee2-44c9-46a6-abe9-28858d9fee8c +Path: /sitecore/templates/Project/Demo/Content Types +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: 25bed78c-4957-4165-998a-ca1b52f67497 + # __Created + Value: 20151215T030756Z + - ID: 5dd74568-4d4b-44c1-b513-0af5f4cda34f + # __Created by + Value: sitecore\admin diff --git a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Content Types/Demo Tokens.yml b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types/Demo Tokens.yml similarity index 75% rename from src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Content Types/Demo Tokens.yml rename to src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types/Demo Tokens.yml index 85bebe990a..c0972a3a01 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Content Types/Demo Tokens.yml +++ b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types/Demo Tokens.yml @@ -1,8 +1,8 @@ --- ID: 32f4012d-fc30-4efd-af6c-1d3144b257fc -Parent: b4f0acba-3630-4189-ad63-8dc213ef7d8c +Parent: dafa16b2-4dc1-474d-b696-88022c19b8a1 Template: 0437fee2-44c9-46a6-abe9-28858d9fee8c -Path: /sitecore/templates/Project/Habitat/Content Types/Demo Tokens +Path: /sitecore/templates/Project/Demo/Content Types/Demo Tokens Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Content Types/Demo Tokens/Campaign Token.yml b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types/Demo Tokens/Campaign Token.yml similarity index 89% rename from src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Content Types/Demo Tokens/Campaign Token.yml rename to src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types/Demo Tokens/Campaign Token.yml index b73864f990..ad09553f91 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Content Types/Demo Tokens/Campaign Token.yml +++ b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types/Demo Tokens/Campaign Token.yml @@ -2,7 +2,7 @@ ID: 51b1726b-4290-4908-a2da-b169194ae80c Parent: 32f4012d-fc30-4efd-af6c-1d3144b257fc Template: ab86861a-6030-46c5-b394-e8f99e8b87db -Path: /sitecore/templates/Project/Habitat/Content Types/Demo Tokens/Campaign Token +Path: /sitecore/templates/Project/Demo/Content Types/Demo Tokens/Campaign Token SharedFields: - ID: 06d5295c-ed2f-4a54-9bf2-26228d113318 # __Icon diff --git a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Content Types/Demo Tokens/Link Token.yml b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types/Demo Tokens/Link Token.yml similarity index 89% rename from src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Content Types/Demo Tokens/Link Token.yml rename to src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types/Demo Tokens/Link Token.yml index 3c21d23ff8..74a10df7c8 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Content Types/Demo Tokens/Link Token.yml +++ b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types/Demo Tokens/Link Token.yml @@ -2,7 +2,7 @@ ID: 7defaa26-ed9d-4495-b5f0-0a7620403842 Parent: 32f4012d-fc30-4efd-af6c-1d3144b257fc Template: ab86861a-6030-46c5-b394-e8f99e8b87db -Path: /sitecore/templates/Project/Habitat/Content Types/Demo Tokens/Link Token +Path: /sitecore/templates/Project/Demo/Content Types/Demo Tokens/Link Token SharedFields: - ID: 06d5295c-ed2f-4a54-9bf2-26228d113318 # __Icon diff --git a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Content Types/Demo Tokens/Text Token.yml b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types/Demo Tokens/Text Token.yml similarity index 89% rename from src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Content Types/Demo Tokens/Text Token.yml rename to src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types/Demo Tokens/Text Token.yml index e15cd2f06e..d5e5e63ef8 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Content Types/Demo Tokens/Text Token.yml +++ b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Content Types/Demo Tokens/Text Token.yml @@ -2,7 +2,7 @@ ID: 3f3cae5e-63d2-4f75-95d9-23eb01827aa9 Parent: 32f4012d-fc30-4efd-af6c-1d3144b257fc Template: ab86861a-6030-46c5-b394-e8f99e8b87db -Path: /sitecore/templates/Project/Habitat/Content Types/Demo Tokens/Text Token +Path: /sitecore/templates/Project/Demo/Content Types/Demo Tokens/Text Token SharedFields: - ID: 06d5295c-ed2f-4a54-9bf2-26228d113318 # __Icon diff --git a/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Page Types.yml b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Page Types.yml new file mode 100644 index 0000000000..6e5bab13e0 --- /dev/null +++ b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Page Types.yml @@ -0,0 +1,16 @@ +--- +ID: c9635039-d5d7-445e-8a90-09bdd60913a1 +Parent: e132e073-74f0-4fa6-82b1-a18581c2cb3d +Template: 0437fee2-44c9-46a6-abe9-28858d9fee8c +Path: /sitecore/templates/Project/Demo/Page Types +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: 25bed78c-4957-4165-998a-ca1b52f67497 + # __Created + Value: 20151215T030750Z + - ID: 5dd74568-4d4b-44c1-b513-0af5f4cda34f + # __Created by + Value: sitecore\admin diff --git a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Page Types/Demo Page.yml b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Page Types/Demo Page.yml similarity index 83% rename from src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Page Types/Demo Page.yml rename to src/Project/Demo/serialization/Demo.Website.Templates/Demo/Page Types/Demo Page.yml index 86d045d610..174e37adb5 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Page Types/Demo Page.yml +++ b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Page Types/Demo Page.yml @@ -1,12 +1,12 @@ --- ID: 49c651ba-4004-40a9-9b0f-e95d0573f3ae -Parent: 85086bb5-0365-48d7-98b1-cb9b1b6392ca +Parent: c9635039-d5d7-445e-8a90-09bdd60913a1 Template: ab86861a-6030-46c5-b394-e8f99e8b87db -Path: /sitecore/templates/Project/Habitat/Page Types/Demo Page +Path: /sitecore/templates/Project/Demo/Page Types/Demo Page SharedFields: - ID: 06d5295c-ed2f-4a54-9bf2-26228d113318 # __Icon - Value: People/32x32/palm.png + Value: People/32x32/teacher.png - ID: 12c33f3f-86c5-43a5-aeb4-5598cec45116 # __Base template Type: tree list diff --git a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Page Types/Demo Page/__Standard Values.yml b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Page Types/Demo Page/__Standard Values.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Page Types/Demo Page/__Standard Values.yml rename to src/Project/Demo/serialization/Demo.Website.Templates/Demo/Page Types/Demo Page/__Standard Values.yml index 771b80f8aa..2cec348205 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Page Types/Demo Page/__Standard Values.yml +++ b/src/Project/Demo/serialization/Demo.Website.Templates/Demo/Page Types/Demo Page/__Standard Values.yml @@ -2,7 +2,7 @@ ID: cae7dae3-deb2-4415-b118-a2069bdb174a Parent: 49c651ba-4004-40a9-9b0f-e95d0573f3ae Template: 49c651ba-4004-40a9-9b0f-e95d0573f3ae -Path: /sitecore/templates/Project/Habitat/Page Types/Demo Page/__Standard Values +Path: /sitecore/templates/Project/Demo/Page Types/Demo Page/__Standard Values SharedFields: - ID: 1172f251-dad4-4efb-a329-0c63500e4f1e # __Masters diff --git a/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.Serialization.config b/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.Serialization.config index bc0dfdc478..e96c9cdfc6 100644 --- a/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.Serialization.config +++ b/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.Serialization.config @@ -5,16 +5,16 @@ - - - - + + + + From 22e66e61835fb78ce545d9d55e1644011a979bd3 Mon Sep 17 00:00:00 2001 From: Thomas Eldblom Date: Tue, 15 Dec 2015 18:13:30 +1100 Subject: [PATCH 3/9] Removed Shared folder and moved to Site --- .../Feature.Media.Renderings/Media/Carousel.yml | 2 +- .../Media/LightboxGallery.yml | 2 +- .../Media/LightboxImage.yml | 5 +---- .../Media/LightboxVideo.yml | 5 +---- .../_HasMediaSelector/Media/MediaSelector.yml | 2 +- .../Social/TwitterFeed.yml | 2 +- .../Teasers/AccordeonTeaser.yml | 2 +- .../Teasers/Jumbotron.yml | 7 ++----- .../Teasers/TitleImageSummaryTeaser.yml | 5 +---- .../Teasers/TitleImageTeaser.yml | 5 +---- .../Teasers/TitleSummaryTeaser.yml | 5 +---- .../serialization/Demo.Website.Layouts/Demo.yml | 13 +++++++++++++ .../Include/Project/Habitat.Website.config | 2 +- .../Dependencies 1.yml | 2 +- .../Dependencies 2.yml | 2 +- .../Dependencies 3.yml | 2 +- .../Dependencies 4.yml | 2 +- .../Dependencies 5.yml | 2 +- .../Dependencies 6.yml | 2 +- .../Habitat/Global}/Dictionary.yml | 4 ++-- .../Habitat/Global}/Dictionary/R.yml | 2 +- .../Habitat/Global}/Dictionary/R/Read more.yml | 2 +- .../Habitat/Global}/Media.yml | 4 ++-- .../Global}/Media/Architecture Introduction.yml | 2 +- .../Habitat/Global}/Media/Carousel.yml | 2 +- .../Habitat/Global/Media/Dependencies.yml} | 2 +- ...ies_4b86cb93-0ae5-4845-877b-6a045eac5707.yml} | 2 +- .../Habitat/Global}/Media/Experience.yml | 2 +- .../Habitat/Global}/Media/Extensibility.yml | 2 +- .../Habitat/Global}/Media/Flexibility.yml | 2 +- .../Media/Habitat Getting Started Video.yml | 2 +- .../Global}/Media/Habitat Introduction Video.yml | 2 +- .../Global}/Media/Habitat Layers Video.yml | 2 +- .../Global}/Media/Habitat Modules Video.yml | 2 +- .../Media/Lightbox Image Documentation.yml | 2 +- .../Media/Lightbox Video Documentation.yml | 2 +- .../Habitat/Global}/Media/Simplicity.yml | 2 +- .../Habitat/Global}/Social.yml | 4 ++-- .../Habitat/Global}/Social/Twitter feeds.yml | 2 +- .../Social/Twitter feeds/sitecorehabitat.yml | 2 +- .../Habitat/Global}/Teasers.yml | 4 ++-- .../Habitat/Global}/Teasers/About Habitat.yml | 2 +- .../Habitat/Global}/Teasers/Accordeon.yml | 2 +- .../Habitat/Global}/Teasers/Content.yml | 2 +- .../Global}/Teasers/Content/Example Divider.yml | 2 +- .../Teasers/Content/Recommended Reading.yml | 2 +- .../Content/The Common Closure Principle.yml | 2 +- .../Content/The Common Reuse Principle.yml | 2 +- .../The Release Reuse Equivalency Principle.yml | 2 +- .../The Stable Abstractions Principle.yml | 2 +- .../The Stable Dependencies Principle.yml | 2 +- .../Teasers/Content/TitleSummaryTeaser.yml | 2 +- .../Habitat/Global}/Teasers/Extensibility.yml | 2 +- .../Habitat/Global}/Teasers/Flexibility.yml | 2 +- .../Habitat/Global}/Teasers/Lighboxes.yml | 2 +- .../Global}/Teasers/Media Documentation.yml | 2 +- .../Habitat/Global}/Teasers/Simplicity.yml | 2 +- .../Teasers/Sitecore Experience Platform.yml | 2 +- .../Global}/Teasers/Teasers Documentation.yml | 2 +- .../Habitat.Website.SharedContent/Shared.yml | 16 ---------------- 60 files changed, 76 insertions(+), 97 deletions(-) create mode 100644 src/Project/Demo/serialization/Demo.Website.Layouts/Demo.yml rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared/Media/Dependencies => Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707}/Dependencies 1.yml (92%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared/Media/Dependencies => Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707}/Dependencies 2.yml (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared/Media/Dependencies => Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707}/Dependencies 3.yml (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared/Media/Dependencies => Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707}/Dependencies 4.yml (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared/Media/Dependencies => Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707}/Dependencies 5.yml (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared/Media/Dependencies => Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707}/Dependencies 6.yml (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Dictionary.yml (94%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Dictionary/R.yml (88%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Dictionary/R/Read more.yml (88%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Media.yml (73%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Media/Architecture Introduction.yml (91%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Media/Carousel.yml (92%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared/Media/Dependencies_153dd91b-8f8b-4f76-8879-62d30283bc7e.yml => Habitat.Website.Content/Habitat/Global/Media/Dependencies.yml} (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared/Media/Dependencies.yml => Habitat.Website.Content/Habitat/Global/Media/Dependencies_4b86cb93-0ae5-4845-877b-6a045eac5707.yml} (83%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Media/Experience.yml (94%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Media/Extensibility.yml (94%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Media/Flexibility.yml (94%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Media/Habitat Getting Started Video.yml (92%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Media/Habitat Introduction Video.yml (92%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Media/Habitat Layers Video.yml (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Media/Habitat Modules Video.yml (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Media/Lightbox Image Documentation.yml (92%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Media/Lightbox Video Documentation.yml (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Media/Simplicity.yml (95%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Social.yml (79%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Social/Twitter feeds.yml (83%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Social/Twitter feeds/sitecorehabitat.yml (89%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers.yml (73%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/About Habitat.yml (94%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Accordeon.yml (91%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Content.yml (84%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Content/Example Divider.yml (84%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Content/Recommended Reading.yml (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Content/The Common Closure Principle.yml (90%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Content/The Common Reuse Principle.yml (91%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Content/The Release Reuse Equivalency Principle.yml (90%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Content/The Stable Abstractions Principle.yml (91%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Content/The Stable Dependencies Principle.yml (91%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Content/TitleSummaryTeaser.yml (91%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Extensibility.yml (94%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Flexibility.yml (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Lighboxes.yml (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Media Documentation.yml (91%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Simplicity.yml (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Sitecore Experience Platform.yml (93%) rename src/Project/Habitat/serialization/{Habitat.Website.SharedContent/Shared => Habitat.Website.Content/Habitat/Global}/Teasers/Teasers Documentation.yml (93%) delete mode 100644 src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared.yml diff --git a/src/Feature/Media/serialization/Feature.Media.Renderings/Media/Carousel.yml b/src/Feature/Media/serialization/Feature.Media.Renderings/Media/Carousel.yml index a71eca9c26..be63e51dd4 100644 --- a/src/Feature/Media/serialization/Feature.Media.Renderings/Media/Carousel.yml +++ b/src/Feature/Media/serialization/Feature.Media.Renderings/Media/Carousel.yml @@ -12,7 +12,7 @@ SharedFields: Value: /Views/Media/Carousel.cshtml - ID: b5b27af1-25ef-405c-87ce-369b3a004016 # Datasource Location - Value: {EA13174A-B43E-4F68-B474-B41188771A9E} + Value: query:/sitecore/content/*/Global/Media - ID: e514a1eb-ddba-44f7-8528-82ca2280f778 # JavaScript assets Value: /Scripts/Media/carousel.js diff --git a/src/Feature/Media/serialization/Feature.Media.Renderings/Media/LightboxGallery.yml b/src/Feature/Media/serialization/Feature.Media.Renderings/Media/LightboxGallery.yml index 8b18153e25..dfd3e918fc 100644 --- a/src/Feature/Media/serialization/Feature.Media.Renderings/Media/LightboxGallery.yml +++ b/src/Feature/Media/serialization/Feature.Media.Renderings/Media/LightboxGallery.yml @@ -12,7 +12,7 @@ SharedFields: Value: /Views/Media/LightboxGallery.cshtml - ID: b5b27af1-25ef-405c-87ce-369b3a004016 # Datasource Location - Value: {EA13174A-B43E-4F68-B474-B41188771A9E} + Value: query:/sitecore/content/*/Global/Media Languages: - Language: en Versions: diff --git a/src/Feature/Media/serialization/Feature.Media.Renderings/Media/LightboxImage.yml b/src/Feature/Media/serialization/Feature.Media.Renderings/Media/LightboxImage.yml index addc259e4b..26a2036d25 100644 --- a/src/Feature/Media/serialization/Feature.Media.Renderings/Media/LightboxImage.yml +++ b/src/Feature/Media/serialization/Feature.Media.Renderings/Media/LightboxImage.yml @@ -22,13 +22,10 @@ SharedFields: Value: /Views/Media/LightboxImage.cshtml - ID: b5b27af1-25ef-405c-87ce-369b3a004016 # Datasource Location - Value: {EA13174A-B43E-4F68-B474-B41188771A9E} + Value: query:/sitecore/content/*/Global/Media - ID: e514a1eb-ddba-44f7-8528-82ca2280f778 # JavaScript assets Value: /Scripts/Media/ekko-lightbox.min.js -- ID: ef7c5528-7307-4e19-863b-da19eed6a9ed - # Open Properties after Add - Value: - Languages: - Language: en Versions: diff --git a/src/Feature/Media/serialization/Feature.Media.Renderings/Media/LightboxVideo.yml b/src/Feature/Media/serialization/Feature.Media.Renderings/Media/LightboxVideo.yml index 6b837ee9e7..9335c4ee62 100644 --- a/src/Feature/Media/serialization/Feature.Media.Renderings/Media/LightboxVideo.yml +++ b/src/Feature/Media/serialization/Feature.Media.Renderings/Media/LightboxVideo.yml @@ -22,13 +22,10 @@ SharedFields: Value: /Views/Media/LightboxVideo.cshtml - ID: b5b27af1-25ef-405c-87ce-369b3a004016 # Datasource Location - Value: {EA13174A-B43E-4F68-B474-B41188771A9E} + Value: query:/sitecore/content/*/Global/Media - ID: e514a1eb-ddba-44f7-8528-82ca2280f778 # JavaScript assets Value: /Scripts/Media/ekko-lightbox.min.js -- ID: ef7c5528-7307-4e19-863b-da19eed6a9ed - # Open Properties after Add - Value: - Languages: - Language: en Versions: diff --git a/src/Feature/Media/serialization/Feature.Media.Templates/Media/_HasMediaSelector/Media/MediaSelector.yml b/src/Feature/Media/serialization/Feature.Media.Templates/Media/_HasMediaSelector/Media/MediaSelector.yml index 9f00a8246f..36a08dd9d8 100644 --- a/src/Feature/Media/serialization/Feature.Media.Templates/Media/_HasMediaSelector/Media/MediaSelector.yml +++ b/src/Feature/Media/serialization/Feature.Media.Templates/Media/_HasMediaSelector/Media/MediaSelector.yml @@ -6,7 +6,7 @@ Path: /sitecore/templates/Feature/Media/_HasMediaSelector/Media/MediaSelector SharedFields: - ID: 1eb8ae32-e190-44a6-968d-ed904c794ebf # Source - Value: query:/sitecore/content/Shared/Media//*[@@templateid='{F0369E1A-9030-4A05-A09C-EF09B664ED27}' or @@templateid='{F1C095E2-B3E0-46D0-B838-02A9E8B880D9}'] + Value: query:/sitecore/content/*/Global/Media//*[@@templateid='{F0369E1A-9030-4A05-A09C-EF09B664ED27}' or @@templateid='{F1C095E2-B3E0-46D0-B838-02A9E8B880D9}'] - ID: ab162cc0-dc80-4abf-8871-998ee5d7ba32 # Type Value: Multilist diff --git a/src/Feature/Social/serialization/Feature.Social.Renderings/Social/TwitterFeed.yml b/src/Feature/Social/serialization/Feature.Social.Renderings/Social/TwitterFeed.yml index ec31da604a..3dfbc32e4c 100644 --- a/src/Feature/Social/serialization/Feature.Social.Renderings/Social/TwitterFeed.yml +++ b/src/Feature/Social/serialization/Feature.Social.Renderings/Social/TwitterFeed.yml @@ -15,7 +15,7 @@ SharedFields: Value: {9EEE8077-990F-4FDE-95FB-C7B9819DF913} - ID: b5b27af1-25ef-405c-87ce-369b3a004016 # Datasource Location - Value: /sitecore/content/Shared/Social/Twitter feeds + Value: query:/sitecore/content/*/Global/Social - ID: e514a1eb-ddba-44f7-8528-82ca2280f778 # JavaScript assets Value: http://platform.twitter.com/widgets.js diff --git a/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/AccordeonTeaser.yml b/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/AccordeonTeaser.yml index 5214700c55..98410482d2 100644 --- a/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/AccordeonTeaser.yml +++ b/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/AccordeonTeaser.yml @@ -9,7 +9,7 @@ SharedFields: Value: {20A56D46-F5E3-4DB8-8B96-081575363D44} - ID: b5b27af1-25ef-405c-87ce-369b3a004016 # Datasource Location - Value: {6AA25831-0944-4A79-9AFF-7BAC39E03557} + Value: query:/sitecore/content/*/Global/Teasers - ID: ded9e431-3604-4921-a4b3-a6ec7636a5b6 # Controller Action Value: AccordeonTeaser diff --git a/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/Jumbotron.yml b/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/Jumbotron.yml index 4fdb95c45b..44583ca918 100644 --- a/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/Jumbotron.yml +++ b/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/Jumbotron.yml @@ -6,16 +6,13 @@ Path: /sitecore/layout/Renderings/Feature/Teasers/Jumbotron SharedFields: - ID: 1a7c85e5-dc0b-490d-9187-bb1dbcb4c72f # Datasource Template - Value: {C7D9D293-4EF8-4380-8E10-C4632E729F39} + Value: {20A56D46-F5E3-4DB8-8B96-081575363D44} - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path Value: /Views/Teasers/Jumbotron.cshtml - ID: b5b27af1-25ef-405c-87ce-369b3a004016 # Datasource Location - Value: {6AA25831-0944-4A79-9AFF-7BAC39E03557} -- ID: ef7c5528-7307-4e19-863b-da19eed6a9ed - # Open Properties after Add - Value: - + Value: query:/sitecore/content/*/Global/Teasers Languages: - Language: en Versions: diff --git a/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/TitleImageSummaryTeaser.yml b/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/TitleImageSummaryTeaser.yml index 4ce74be9e7..494f6bda34 100644 --- a/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/TitleImageSummaryTeaser.yml +++ b/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/TitleImageSummaryTeaser.yml @@ -12,10 +12,7 @@ SharedFields: Value: /Views/Teasers/TitleImageSummaryTeaser.cshtml - ID: b5b27af1-25ef-405c-87ce-369b3a004016 # Datasource Location - Value: {6AA25831-0944-4A79-9AFF-7BAC39E03557} -- ID: ef7c5528-7307-4e19-863b-da19eed6a9ed - # Open Properties after Add - Value: - + Value: query:/sitecore/content/*/Global/Teasers Languages: - Language: en Versions: diff --git a/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/TitleImageTeaser.yml b/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/TitleImageTeaser.yml index bb404da506..22a17b872c 100644 --- a/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/TitleImageTeaser.yml +++ b/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/TitleImageTeaser.yml @@ -12,10 +12,7 @@ SharedFields: Value: /Views/Teasers/TitleImageTeaser.cshtml - ID: b5b27af1-25ef-405c-87ce-369b3a004016 # Datasource Location - Value: {6AA25831-0944-4A79-9AFF-7BAC39E03557} -- ID: ef7c5528-7307-4e19-863b-da19eed6a9ed - # Open Properties after Add - Value: - + Value: query:/sitecore/content/*/Global/Teasers Languages: - Language: en Versions: diff --git a/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/TitleSummaryTeaser.yml b/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/TitleSummaryTeaser.yml index eaabbf0a30..79000d2c7f 100644 --- a/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/TitleSummaryTeaser.yml +++ b/src/Feature/Teasers/serialization/Feature.Teasers.Renderings/Teasers/TitleSummaryTeaser.yml @@ -12,10 +12,7 @@ SharedFields: Value: /Views/Teasers/TitleSummaryTeaser.cshtml - ID: b5b27af1-25ef-405c-87ce-369b3a004016 # Datasource Location - Value: {6AA25831-0944-4A79-9AFF-7BAC39E03557} -- ID: ef7c5528-7307-4e19-863b-da19eed6a9ed - # Open Properties after Add - Value: - + Value: query:/sitecore/content/*/Global/Teasers Languages: - Language: en Versions: diff --git a/src/Project/Demo/serialization/Demo.Website.Layouts/Demo.yml b/src/Project/Demo/serialization/Demo.Website.Layouts/Demo.yml new file mode 100644 index 0000000000..348a137865 --- /dev/null +++ b/src/Project/Demo/serialization/Demo.Website.Layouts/Demo.yml @@ -0,0 +1,13 @@ +--- +ID: 6a12aeac-46ad-463a-8e28-a00e757ebbdc +Parent: da04b275-8838-4a3a-afee-817cf1fdd2eb +Template: 93227c5d-4fef-474d-94c0-f252ec8e8219 +Path: /sitecore/layout/Layouts/Project/Demo +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: 25bed78c-4957-4165-998a-ca1b52f67497 + # __Created + Value: 20151215T064518Z diff --git a/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config b/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config index 7dac94b271..f5f915f7fe 100644 --- a/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config +++ b/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config @@ -19,7 +19,7 @@ - + diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 1.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 1.yml similarity index 92% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 1.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 1.yml index 01f7b0064a..e959dc9595 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 1.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 1.yml @@ -2,7 +2,7 @@ ID: 38682229-4386-40f3-a1ae-a824f705f5b2 Parent: 4b86cb93-0ae5-4845-877b-6a045eac5707 Template: f0369e1a-9030-4a05-a09c-ef09b664ed27 -Path: /sitecore/content/Shared/Media/Dependencies/Dependencies 1 +Path: /sitecore/content/Habitat/Global/Media/Dependencies/Dependencies 1 Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 2.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 2.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 2.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 2.yml index b73e1ae2a0..150c7b2906 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 2.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 2.yml @@ -2,7 +2,7 @@ ID: 04b0e023-7e12-466d-b7cc-2c4d514d872b Parent: 4b86cb93-0ae5-4845-877b-6a045eac5707 Template: f0369e1a-9030-4a05-a09c-ef09b664ed27 -Path: /sitecore/content/Shared/Media/Dependencies/Dependencies 2 +Path: /sitecore/content/Habitat/Global/Media/Dependencies/Dependencies 2 Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 3.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 3.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 3.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 3.yml index 1ab68d1052..73f7be897e 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 3.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 3.yml @@ -2,7 +2,7 @@ ID: 080ae969-5337-41f4-8cff-ca81f7710fb0 Parent: 4b86cb93-0ae5-4845-877b-6a045eac5707 Template: f0369e1a-9030-4a05-a09c-ef09b664ed27 -Path: /sitecore/content/Shared/Media/Dependencies/Dependencies 3 +Path: /sitecore/content/Habitat/Global/Media/Dependencies/Dependencies 3 Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 4.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 4.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 4.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 4.yml index c7885d1427..b20e1fa744 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 4.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 4.yml @@ -2,7 +2,7 @@ ID: 16241f49-b3ae-4178-9f94-019551a34a5d Parent: 4b86cb93-0ae5-4845-877b-6a045eac5707 Template: f0369e1a-9030-4a05-a09c-ef09b664ed27 -Path: /sitecore/content/Shared/Media/Dependencies/Dependencies 4 +Path: /sitecore/content/Habitat/Global/Media/Dependencies/Dependencies 4 Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 5.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 5.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 5.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 5.yml index f038575291..0e28f2a19c 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 5.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 5.yml @@ -2,7 +2,7 @@ ID: 9be736e5-4a1f-4ef1-8449-a7b62f09c9ee Parent: 4b86cb93-0ae5-4845-877b-6a045eac5707 Template: f0369e1a-9030-4a05-a09c-ef09b664ed27 -Path: /sitecore/content/Shared/Media/Dependencies/Dependencies 5 +Path: /sitecore/content/Habitat/Global/Media/Dependencies/Dependencies 5 Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 6.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 6.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 6.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 6.yml index 912f334530..e68565dbc5 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies/Dependencies 6.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/4b86cb93-0ae5-4845-877b-6a045eac5707/Dependencies 6.yml @@ -2,7 +2,7 @@ ID: 7e5bdd04-6032-42fb-a0b7-b1a3c83eaf70 Parent: 4b86cb93-0ae5-4845-877b-6a045eac5707 Template: f0369e1a-9030-4a05-a09c-ef09b664ed27 -Path: /sitecore/content/Shared/Media/Dependencies/Dependencies 6 +Path: /sitecore/content/Habitat/Global/Media/Dependencies/Dependencies 6 Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Dictionary.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Dictionary.yml similarity index 94% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Dictionary.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Dictionary.yml index 4a8736f163..320321e2f8 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Dictionary.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Dictionary.yml @@ -1,8 +1,8 @@ --- ID: bb4ecaf5-be3b-4be7-b6bc-6bcc0b5bb77f -Parent: 75bc9ee3-894a-4e87-bcde-2a7443807f60 +Parent: 4b67a7f9-7246-4a59-a051-961095c2dc70 Template: 239f9cf4-e5a0-44e0-b342-0f32cd4c6d8b -Path: /sitecore/content/Shared/Dictionary +Path: /sitecore/content/Habitat/Global/Dictionary SharedFields: - ID: 06d5295c-ed2f-4a54-9bf2-26228d113318 # __Icon diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Dictionary/R.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Dictionary/R.yml similarity index 88% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Dictionary/R.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Dictionary/R.yml index 29a7f75d22..3587ade5ac 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Dictionary/R.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Dictionary/R.yml @@ -2,7 +2,7 @@ ID: 0bb1f3d4-0f46-4a82-b4d3-c1f42e067e70 Parent: bb4ecaf5-be3b-4be7-b6bc-6bcc0b5bb77f Template: 267d9ac7-5d85-4e9d-af89-99ab296cc218 -Path: /sitecore/content/Shared/Dictionary/R +Path: /sitecore/content/Habitat/Global/Dictionary/R SharedFields: - ID: 06d5295c-ed2f-4a54-9bf2-26228d113318 # __Icon diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Dictionary/R/Read more.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Dictionary/R/Read more.yml similarity index 88% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Dictionary/R/Read more.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Dictionary/R/Read more.yml index c7c3be1ecf..85c245ee4e 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Dictionary/R/Read more.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Dictionary/R/Read more.yml @@ -2,7 +2,7 @@ ID: 61656520-8e0b-4df0-97fe-562a20b936c4 Parent: 0bb1f3d4-0f46-4a82-b4d3-c1f42e067e70 Template: 6d1cd897-1936-4a3a-a511-289a94c2a7b1 -Path: /sitecore/content/Shared/Dictionary/R/Read more +Path: /sitecore/content/Habitat/Global/Dictionary/R/Read more SharedFields: - ID: 580c75a8-c01a-4580-83cb-987776ceb3af # Key diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media.yml similarity index 73% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media.yml index 56221f3ec0..9f6dd4c143 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media.yml @@ -1,8 +1,8 @@ --- ID: ea13174a-b43e-4f68-b474-b41188771a9e -Parent: 75bc9ee3-894a-4e87-bcde-2a7443807f60 +Parent: 4b67a7f9-7246-4a59-a051-961095c2dc70 Template: 920a1781-559f-4e1c-bb2e-6b9a2113fe6b -Path: /sitecore/content/Shared/Media +Path: /sitecore/content/Habitat/Global/Media Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Architecture Introduction.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Architecture Introduction.yml similarity index 91% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Architecture Introduction.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Architecture Introduction.yml index 60b461c0ce..ab61d0d615 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Architecture Introduction.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Architecture Introduction.yml @@ -2,7 +2,7 @@ ID: 435ec034-ef69-446f-8ee5-b589fad3519b Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: f1c095e2-b3e0-46d0-b838-02a9e8b880d9 -Path: /sitecore/content/Shared/Media/Architecture Introduction +Path: /sitecore/content/Habitat/Global/Media/Architecture Introduction Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Carousel.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Carousel.yml similarity index 92% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Carousel.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Carousel.yml index fded6998f0..93aefcbe7d 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Carousel.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Carousel.yml @@ -2,7 +2,7 @@ ID: 6b3e2125-9402-4abe-be65-1dc375b2111e Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: c18d3794-d126-4548-bfc8-89358de6e9c1 -Path: /sitecore/content/Shared/Media/Carousel +Path: /sitecore/content/Habitat/Global/Media/Carousel Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies_153dd91b-8f8b-4f76-8879-62d30283bc7e.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Dependencies.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies_153dd91b-8f8b-4f76-8879-62d30283bc7e.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Dependencies.yml index 8b1dc634ba..cf907ff69f 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies_153dd91b-8f8b-4f76-8879-62d30283bc7e.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Dependencies.yml @@ -2,7 +2,7 @@ ID: 153dd91b-8f8b-4f76-8879-62d30283bc7e Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: c18d3794-d126-4548-bfc8-89358de6e9c1 -Path: /sitecore/content/Shared/Media/Dependencies +Path: /sitecore/content/Habitat/Global/Media/Dependencies Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Dependencies_4b86cb93-0ae5-4845-877b-6a045eac5707.yml similarity index 83% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Dependencies_4b86cb93-0ae5-4845-877b-6a045eac5707.yml index 82659a88a7..fd7d6d5c96 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Dependencies.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Dependencies_4b86cb93-0ae5-4845-877b-6a045eac5707.yml @@ -2,7 +2,7 @@ ID: 4b86cb93-0ae5-4845-877b-6a045eac5707 Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: 920a1781-559f-4e1c-bb2e-6b9a2113fe6b -Path: /sitecore/content/Shared/Media/Dependencies +Path: /sitecore/content/Habitat/Global/Media/Dependencies Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Experience.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Experience.yml similarity index 94% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Experience.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Experience.yml index 5b4b912ecb..cbbee4348f 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Experience.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Experience.yml @@ -2,7 +2,7 @@ ID: 98d1970c-e669-448f-9e2a-de9087a46f58 Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: f1c095e2-b3e0-46d0-b838-02a9e8b880d9 -Path: /sitecore/content/Shared/Media/Experience +Path: /sitecore/content/Habitat/Global/Media/Experience Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Extensibility.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Extensibility.yml similarity index 94% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Extensibility.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Extensibility.yml index 6bb35012dc..a242b3ceb7 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Extensibility.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Extensibility.yml @@ -2,7 +2,7 @@ ID: ec545dc1-f12b-4b22-8feb-7f0a4211c0e8 Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: f0369e1a-9030-4a05-a09c-ef09b664ed27 -Path: /sitecore/content/Shared/Media/Extensibility +Path: /sitecore/content/Habitat/Global/Media/Extensibility Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Flexibility.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Flexibility.yml similarity index 94% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Flexibility.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Flexibility.yml index 27372f9059..47625af058 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Flexibility.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Flexibility.yml @@ -2,7 +2,7 @@ ID: 69cf65fb-f46e-4038-bbfb-66695b9178e4 Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: f0369e1a-9030-4a05-a09c-ef09b664ed27 -Path: /sitecore/content/Shared/Media/Flexibility +Path: /sitecore/content/Habitat/Global/Media/Flexibility Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Habitat Getting Started Video.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Habitat Getting Started Video.yml similarity index 92% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Habitat Getting Started Video.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Habitat Getting Started Video.yml index d6b39d9fc9..16c344e9c0 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Habitat Getting Started Video.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Habitat Getting Started Video.yml @@ -2,7 +2,7 @@ ID: a92c04fe-9158-47c5-bca2-14fca32ff772 Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: f1c095e2-b3e0-46d0-b838-02a9e8b880d9 -Path: /sitecore/content/Shared/Media/Habitat Getting Started Video +Path: /sitecore/content/Habitat/Global/Media/Habitat Getting Started Video Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Habitat Introduction Video.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Habitat Introduction Video.yml similarity index 92% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Habitat Introduction Video.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Habitat Introduction Video.yml index 1a4459f533..18c862a2aa 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Habitat Introduction Video.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Habitat Introduction Video.yml @@ -2,7 +2,7 @@ ID: 59745f53-6d22-49b3-8844-98d5b24a8d98 Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: f1c095e2-b3e0-46d0-b838-02a9e8b880d9 -Path: /sitecore/content/Shared/Media/Habitat Introduction Video +Path: /sitecore/content/Habitat/Global/Media/Habitat Introduction Video Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Habitat Layers Video.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Habitat Layers Video.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Habitat Layers Video.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Habitat Layers Video.yml index d8922790e4..f0cd90192b 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Habitat Layers Video.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Habitat Layers Video.yml @@ -2,7 +2,7 @@ ID: a7044280-3047-4e6f-9c9f-a6dbbb741933 Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: f1c095e2-b3e0-46d0-b838-02a9e8b880d9 -Path: /sitecore/content/Shared/Media/Habitat Layers Video +Path: /sitecore/content/Habitat/Global/Media/Habitat Layers Video Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Habitat Modules Video.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Habitat Modules Video.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Habitat Modules Video.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Habitat Modules Video.yml index 01535e86d6..b50a7004cf 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Habitat Modules Video.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Habitat Modules Video.yml @@ -2,7 +2,7 @@ ID: e67e0bb9-d9cb-4afb-97c8-575e655f52ce Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: f1c095e2-b3e0-46d0-b838-02a9e8b880d9 -Path: /sitecore/content/Shared/Media/Habitat Modules Video +Path: /sitecore/content/Habitat/Global/Media/Habitat Modules Video Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Lightbox Image Documentation.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Lightbox Image Documentation.yml similarity index 92% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Lightbox Image Documentation.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Lightbox Image Documentation.yml index 05a72aebb7..53fc84fe28 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Lightbox Image Documentation.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Lightbox Image Documentation.yml @@ -2,7 +2,7 @@ ID: b488057d-9e60-42d5-9ed0-71f722fa5fb1 Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: f0369e1a-9030-4a05-a09c-ef09b664ed27 -Path: /sitecore/content/Shared/Media/Lightbox Image Documentation +Path: /sitecore/content/Habitat/Global/Media/Lightbox Image Documentation Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Lightbox Video Documentation.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Lightbox Video Documentation.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Lightbox Video Documentation.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Lightbox Video Documentation.yml index 41003c5915..0abd75ccb4 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Lightbox Video Documentation.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Lightbox Video Documentation.yml @@ -2,7 +2,7 @@ ID: 20cb5bbb-3700-4ff9-a59a-2b4f70c5be31 Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: f1c095e2-b3e0-46d0-b838-02a9e8b880d9 -Path: /sitecore/content/Shared/Media/Lightbox Video Documentation +Path: /sitecore/content/Habitat/Global/Media/Lightbox Video Documentation Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Simplicity.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Simplicity.yml similarity index 95% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Simplicity.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Simplicity.yml index ee19046394..8d403ba65c 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Media/Simplicity.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Media/Simplicity.yml @@ -2,7 +2,7 @@ ID: 12cfa7c1-b5bd-4c99-b6f4-221423f2e0e1 Parent: ea13174a-b43e-4f68-b474-b41188771a9e Template: f0369e1a-9030-4a05-a09c-ef09b664ed27 -Path: /sitecore/content/Shared/Media/Simplicity +Path: /sitecore/content/Habitat/Global/Media/Simplicity Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Social.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Social.yml similarity index 79% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Social.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Social.yml index fba7f66c59..7cd9d0cf76 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Social.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Social.yml @@ -1,8 +1,8 @@ --- ID: 1121e629-34c8-478e-9b33-8b54951c195f -Parent: 75bc9ee3-894a-4e87-bcde-2a7443807f60 +Parent: 4b67a7f9-7246-4a59-a051-961095c2dc70 Template: a87a00b1-e6db-45ab-8b54-636fec3b5523 -Path: /sitecore/content/Shared/Social +Path: /sitecore/content/Habitat/Global/Social Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Social/Twitter feeds.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Social/Twitter feeds.yml similarity index 83% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Social/Twitter feeds.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Social/Twitter feeds.yml index 12d675532b..293f1056a2 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Social/Twitter feeds.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Social/Twitter feeds.yml @@ -2,7 +2,7 @@ ID: 20507226-1c3b-4d7a-89d4-de00706e59b6 Parent: 1121e629-34c8-478e-9b33-8b54951c195f Template: 4de2d9d9-0781-47ad-8f5d-52f2ad920d83 -Path: /sitecore/content/Shared/Social/Twitter feeds +Path: /sitecore/content/Habitat/Global/Social/Twitter feeds Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Social/Twitter feeds/sitecorehabitat.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Social/Twitter feeds/sitecorehabitat.yml similarity index 89% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Social/Twitter feeds/sitecorehabitat.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Social/Twitter feeds/sitecorehabitat.yml index 3d167cc9e1..83f66cf56b 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Social/Twitter feeds/sitecorehabitat.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Social/Twitter feeds/sitecorehabitat.yml @@ -2,7 +2,7 @@ ID: 98e48045-dfc7-4a70-9bed-5c40ab6558a6 Parent: 20507226-1c3b-4d7a-89d4-de00706e59b6 Template: 773a96f7-2752-4da2-a2f5-6119a21a24f3 -Path: /sitecore/content/Shared/Social/Twitter feeds/sitecorehabitat +Path: /sitecore/content/Habitat/Global/Social/Twitter feeds/sitecorehabitat Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers.yml similarity index 73% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers.yml index 05fb1a0209..ab4d50f9c8 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers.yml @@ -1,8 +1,8 @@ --- ID: 6aa25831-0944-4a79-9aff-7bac39e03557 -Parent: 75bc9ee3-894a-4e87-bcde-2a7443807f60 +Parent: 4b67a7f9-7246-4a59-a051-961095c2dc70 Template: 29d4b405-39eb-487d-9d6b-3f8467ab167d -Path: /sitecore/content/Shared/Teasers +Path: /sitecore/content/Habitat/Global/Teasers Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/About Habitat.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/About Habitat.yml similarity index 94% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/About Habitat.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/About Habitat.yml index 203a0a4f6e..2a14a7a2c6 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/About Habitat.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/About Habitat.yml @@ -2,7 +2,7 @@ ID: d24907f7-1a25-43dc-a5a2-fcb1e55ebbb6 Parent: 6aa25831-0944-4a79-9aff-7bac39e03557 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/About Habitat +Path: /sitecore/content/Habitat/Global/Teasers/About Habitat SharedFields: - ID: e8ab122c-6f54-4d4e-aec6-f81addc558fc # TeaserLink diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Accordeon.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Accordeon.yml similarity index 91% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Accordeon.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Accordeon.yml index 3ae32df949..3dc97e68be 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Accordeon.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Accordeon.yml @@ -2,7 +2,7 @@ ID: 1ce39f86-2f0b-4f4c-b94d-8ec78a04a827 Parent: 6aa25831-0944-4a79-9aff-7bac39e03557 Template: f5f30cdc-9003-4015-84ec-c3a7e3e50d5e -Path: /sitecore/content/Shared/Teasers/Accordeon +Path: /sitecore/content/Habitat/Global/Teasers/Accordeon Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content.yml similarity index 84% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content.yml index 15e94e733a..952238fa94 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content.yml @@ -2,7 +2,7 @@ ID: 8508f499-b20d-4505-a5c8-66cdb715d748 Parent: 6aa25831-0944-4a79-9aff-7bac39e03557 Template: 29d4b405-39eb-487d-9d6b-3f8467ab167d -Path: /sitecore/content/Shared/Teasers/Content +Path: /sitecore/content/Habitat/Global/Teasers/Content Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/Example Divider.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/Example Divider.yml similarity index 84% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/Example Divider.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/Example Divider.yml index aa99b1ab71..be34450a1e 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/Example Divider.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/Example Divider.yml @@ -2,7 +2,7 @@ ID: 2d415dbb-9afe-4e75-a264-dfce07b11d26 Parent: 8508f499-b20d-4505-a5c8-66cdb715d748 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Content/Example Divider +Path: /sitecore/content/Habitat/Global/Teasers/Content/Example Divider Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/Recommended Reading.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/Recommended Reading.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/Recommended Reading.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/Recommended Reading.yml index 6af6e02a2d..d01364dcbd 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/Recommended Reading.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/Recommended Reading.yml @@ -2,7 +2,7 @@ ID: e732ab5a-24ae-40d8-8f93-05dad455e259 Parent: 8508f499-b20d-4505-a5c8-66cdb715d748 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Content/Recommended Reading +Path: /sitecore/content/Habitat/Global/Teasers/Content/Recommended Reading SharedFields: - ID: e8ab122c-6f54-4d4e-aec6-f81addc558fc # TeaserLink diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Common Closure Principle.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Common Closure Principle.yml similarity index 90% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Common Closure Principle.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Common Closure Principle.yml index 982153330c..f54b157fc8 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Common Closure Principle.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Common Closure Principle.yml @@ -2,7 +2,7 @@ ID: bc2d52ee-2bd9-4322-afba-8c78669d2b19 Parent: 8508f499-b20d-4505-a5c8-66cdb715d748 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Content/The Common Closure Principle +Path: /sitecore/content/Habitat/Global/Teasers/Content/The Common Closure Principle SharedFields: - ID: e8ab122c-6f54-4d4e-aec6-f81addc558fc # TeaserLink diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Common Reuse Principle.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Common Reuse Principle.yml similarity index 91% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Common Reuse Principle.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Common Reuse Principle.yml index 1d3fd49855..6a2313f5cd 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Common Reuse Principle.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Common Reuse Principle.yml @@ -2,7 +2,7 @@ ID: 5c363faa-b7d5-4b1d-9e4f-b2699bb529ad Parent: 8508f499-b20d-4505-a5c8-66cdb715d748 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Content/The Common Reuse Principle +Path: /sitecore/content/Habitat/Global/Teasers/Content/The Common Reuse Principle SharedFields: - ID: e8ab122c-6f54-4d4e-aec6-f81addc558fc # TeaserLink diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Release Reuse Equivalency Principle.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Release Reuse Equivalency Principle.yml similarity index 90% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Release Reuse Equivalency Principle.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Release Reuse Equivalency Principle.yml index 081c4d5dbc..26108943de 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Release Reuse Equivalency Principle.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Release Reuse Equivalency Principle.yml @@ -2,7 +2,7 @@ ID: d8b82e2a-8b5d-48d1-be62-8575ba861556 Parent: 8508f499-b20d-4505-a5c8-66cdb715d748 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Content/The Release Reuse Equivalency Principle +Path: /sitecore/content/Habitat/Global/Teasers/Content/The Release Reuse Equivalency Principle SharedFields: - ID: e8ab122c-6f54-4d4e-aec6-f81addc558fc # TeaserLink diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Stable Abstractions Principle.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Stable Abstractions Principle.yml similarity index 91% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Stable Abstractions Principle.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Stable Abstractions Principle.yml index 37ac75b8c1..23a83f1a9a 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Stable Abstractions Principle.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Stable Abstractions Principle.yml @@ -2,7 +2,7 @@ ID: de020ad2-fb43-436c-b82b-2672b7dd5bc9 Parent: 8508f499-b20d-4505-a5c8-66cdb715d748 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Content/The Stable Abstractions Principle +Path: /sitecore/content/Habitat/Global/Teasers/Content/The Stable Abstractions Principle SharedFields: - ID: e8ab122c-6f54-4d4e-aec6-f81addc558fc # TeaserLink diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Stable Dependencies Principle.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Stable Dependencies Principle.yml similarity index 91% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Stable Dependencies Principle.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Stable Dependencies Principle.yml index 8520d1c8cc..0e7c26e468 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/The Stable Dependencies Principle.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/The Stable Dependencies Principle.yml @@ -2,7 +2,7 @@ ID: 844a6ac4-4696-4ea3-b0f9-e1e502d3cddf Parent: 8508f499-b20d-4505-a5c8-66cdb715d748 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Content/The Stable Dependencies Principle +Path: /sitecore/content/Habitat/Global/Teasers/Content/The Stable Dependencies Principle SharedFields: - ID: e8ab122c-6f54-4d4e-aec6-f81addc558fc # TeaserLink diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/TitleSummaryTeaser.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/TitleSummaryTeaser.yml similarity index 91% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/TitleSummaryTeaser.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/TitleSummaryTeaser.yml index b8325212fc..d0e83265ca 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Content/TitleSummaryTeaser.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Content/TitleSummaryTeaser.yml @@ -2,7 +2,7 @@ ID: 389e6ae3-14af-4ed1-a0fa-c3a4cc5cae65 Parent: 8508f499-b20d-4505-a5c8-66cdb715d748 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Content/TitleSummaryTeaser +Path: /sitecore/content/Habitat/Global/Teasers/Content/TitleSummaryTeaser SharedFields: - ID: e8ab122c-6f54-4d4e-aec6-f81addc558fc # TeaserLink diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Extensibility.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Extensibility.yml similarity index 94% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Extensibility.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Extensibility.yml index aa22c804ba..117b3e162d 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Extensibility.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Extensibility.yml @@ -2,7 +2,7 @@ ID: 8abb8e75-e21c-4667-b277-c125b8e3a01f Parent: 6aa25831-0944-4a79-9aff-7bac39e03557 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Extensibility +Path: /sitecore/content/Habitat/Global/Teasers/Extensibility SharedFields: - ID: e8ab122c-6f54-4d4e-aec6-f81addc558fc # TeaserLink diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Flexibility.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Flexibility.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Flexibility.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Flexibility.yml index 5b4c1e4c2f..ae6a587f33 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Flexibility.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Flexibility.yml @@ -2,7 +2,7 @@ ID: 6086f621-4a0e-4724-9d6f-ea7ba8139f57 Parent: 6aa25831-0944-4a79-9aff-7bac39e03557 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Flexibility +Path: /sitecore/content/Habitat/Global/Teasers/Flexibility Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Lighboxes.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Lighboxes.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Lighboxes.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Lighboxes.yml index 014294acae..01f367e2bd 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Lighboxes.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Lighboxes.yml @@ -2,7 +2,7 @@ ID: 4a1e242e-fd29-4529-bee0-3a9b1cac30ab Parent: 6aa25831-0944-4a79-9aff-7bac39e03557 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Lighboxes +Path: /sitecore/content/Habitat/Global/Teasers/Lighboxes Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Media Documentation.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Media Documentation.yml similarity index 91% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Media Documentation.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Media Documentation.yml index c078b4be85..6f2df92740 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Media Documentation.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Media Documentation.yml @@ -2,7 +2,7 @@ ID: fa333fc7-7f62-499b-8cea-e2cb837f208d Parent: 6aa25831-0944-4a79-9aff-7bac39e03557 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Media Documentation +Path: /sitecore/content/Habitat/Global/Teasers/Media Documentation Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Simplicity.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Simplicity.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Simplicity.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Simplicity.yml index 2e405e4fe5..2d4061654e 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Simplicity.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Simplicity.yml @@ -2,7 +2,7 @@ ID: ef593c2a-f3f8-421a-9368-0e189a689dbd Parent: 6aa25831-0944-4a79-9aff-7bac39e03557 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Simplicity +Path: /sitecore/content/Habitat/Global/Teasers/Simplicity Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Sitecore Experience Platform.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Sitecore Experience Platform.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Sitecore Experience Platform.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Sitecore Experience Platform.yml index a6a216bbca..f7e8ccc36d 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Sitecore Experience Platform.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Sitecore Experience Platform.yml @@ -2,7 +2,7 @@ ID: ad50901f-da3e-48f3-9519-d6c21c978925 Parent: 6aa25831-0944-4a79-9aff-7bac39e03557 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Sitecore Experience Platform +Path: /sitecore/content/Habitat/Global/Teasers/Sitecore Experience Platform SharedFields: - ID: e8ab122c-6f54-4d4e-aec6-f81addc558fc # TeaserLink diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Teasers Documentation.yml b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Teasers Documentation.yml similarity index 93% rename from src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Teasers Documentation.yml rename to src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Teasers Documentation.yml index 668f91b79e..257858734b 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared/Teasers/Teasers Documentation.yml +++ b/src/Project/Habitat/serialization/Habitat.Website.Content/Habitat/Global/Teasers/Teasers Documentation.yml @@ -2,7 +2,7 @@ ID: 067abed5-cb79-46c0-9019-c9e7b01af3e6 Parent: 6aa25831-0944-4a79-9aff-7bac39e03557 Template: c7d9d293-4ef8-4380-8e10-c4632e729f39 -Path: /sitecore/content/Shared/Teasers/Teasers Documentation +Path: /sitecore/content/Habitat/Global/Teasers/Teasers Documentation SharedFields: - ID: e8ab122c-6f54-4d4e-aec6-f81addc558fc # TeaserLink diff --git a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared.yml b/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared.yml deleted file mode 100644 index 69cd6060b0..0000000000 --- a/src/Project/Habitat/serialization/Habitat.Website.SharedContent/Shared.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -ID: 75bc9ee3-894a-4e87-bcde-2a7443807f60 -Parent: 0de95ae4-41ab-4d01-9eb0-67441b7c2450 -Template: a87a00b1-e6db-45ab-8b54-636fec3b5523 -Path: /sitecore/content/Shared -Languages: -- Language: en - Versions: - - Version: 1 - Fields: - - ID: 25bed78c-4957-4165-998a-ca1b52f67497 - # __Created - Value: 20150827T063011Z - - ID: 5dd74568-4d4b-44c1-b513-0af5f4cda34f - # __Created by - Value: sitecore\admin From 241a7182930ea13f886348cbe77014f67059fb1f Mon Sep 17 00:00:00 2001 From: Thomas Eldblom Date: Tue, 15 Dec 2015 22:46:36 +1100 Subject: [PATCH 4/9] fixed site config order --- .../Demo/code/App_Config/Include/Project/Demo.Website.config | 2 +- .../code/App_Config/Include/Project/Habitat.Website.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.config b/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.config index 11090bd8dd..873411e577 100644 --- a/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.config +++ b/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.config @@ -19,7 +19,7 @@ - + diff --git a/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config b/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config index f5f915f7fe..d57c60b1fc 100644 --- a/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config +++ b/src/Project/Habitat/code/App_Config/Include/Project/Habitat.Website.config @@ -19,7 +19,7 @@ - + From 7a0baa6d9e166a4915a2d83504b42cc945717911 Mon Sep 17 00:00:00 2001 From: Thomas Eldblom Date: Wed, 16 Dec 2015 15:19:26 +1100 Subject: [PATCH 5/9] Moved columns to Common project --- .../code/Views/Search/SearchSettings.cshtml | 32 +++------- .../Sitecore.Common.Website.csproj.sitecore | 57 ++++++++++++++++++ .../Views/Common}/Sublayouts/1 Column.cshtml | 0 .../Common}/Sublayouts/2 Column 3-9.cshtml | 0 .../Common}/Sublayouts/2 Column 4-8.cshtml | 0 .../Common}/Sublayouts/2 Column 6-6.cshtml | 0 .../Common}/Sublayouts/2 Column 8-4.cshtml | 0 .../Common}/Sublayouts/2 Column 9-3.cshtml | 0 .../Common}/Sublayouts/3 Column 3-3-6.cshtml | 0 .../Common}/Sublayouts/3 Column 4-4-4.cshtml | 0 .../Common}/Sublayouts/3 Column 6-3-3.cshtml | 0 .../Sublayouts/4 Column 3-3-3-3.cshtml | 0 .../Sublayouts/6 Column 2-2-2-2-2-2.cshtml | 0 .../Views/Common}/Sublayouts/Footer.cshtml | 0 .../Sublayouts/Inner}/Inner 1 Column.cshtml | 0 .../Inner}/Inner 2 Column 4-8.cshtml | 0 .../Inner}/Inner 2 Column 6-6.cshtml | 0 .../Inner}/Inner 2 Column 8-4.cshtml | 0 .../Common}/Sublayouts/PageHeading.cshtml | 0 .../Common}/Sublayouts/PageSidebarLeft.cshtml | 0 .../Sublayouts/PageSidebarRight.cshtml | 0 .../Common}/1 Column.yml | 6 +- .../Common}/2 Column 3-9.yml | 6 +- .../Common}/2 Column 4-8.yml | 6 +- .../Common}/2 Column 6-6.yml | 6 +- .../Common}/2 Column 8-4.yml | 6 +- .../Common}/2 Column 9-3.yml | 6 +- .../Common}/3 Column 3-3-6.yml | 6 +- .../Common}/3 Column 4-4-4.yml | 6 +- .../Common/3 Column 6-3-3.yml | 29 +++++++++ .../Common}/4 Column 3-3-3-3.yml | 6 +- .../Common}/6 Column 2-2-2-2-2-2.yml | 6 +- .../Common/Footer.yml | 23 ++++++++ .../Common}/Inner.yml | 4 +- .../Common}/Inner/Inner 1 Column.yml | 4 +- .../Common}/Inner/Inner 2 Column 4-8.yml | 4 +- .../Common}/Inner/Inner 2 Column 6-6.yml | 4 +- .../Common}/Inner/Inner 2 Column 8-4.yml | 4 +- .../Common}/PageHeading.yml | 6 +- .../Common}/PageSidebarLeft.yml | 6 +- .../Common}/PageSidebarRight.yml | 6 +- .../code/Habitat.Website.csproj.sitecore | 59 ------------------- .../code/Sitecore.Habitat.Website.csproj | 23 +------- .../Sitecore.Habitat.Website.csproj.sitecore | 5 ++ 44 files changed, 173 insertions(+), 153 deletions(-) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/1 Column.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/2 Column 3-9.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/2 Column 4-8.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/2 Column 6-6.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/2 Column 8-4.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/2 Column 9-3.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/3 Column 3-3-6.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/3 Column 4-4-4.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/3 Column 6-3-3.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/4 Column 3-3-3-3.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/6 Column 2-2-2-2-2-2.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/Footer.cshtml (100%) rename src/Project/{Habitat/code/Views/Website/Sublayouts => Common/code/Views/Common/Sublayouts/Inner}/Inner 1 Column.cshtml (100%) rename src/Project/{Habitat/code/Views/Website/Sublayouts => Common/code/Views/Common/Sublayouts/Inner}/Inner 2 Column 4-8.cshtml (100%) rename src/Project/{Habitat/code/Views/Website/Sublayouts => Common/code/Views/Common/Sublayouts/Inner}/Inner 2 Column 6-6.cshtml (100%) rename src/Project/{Habitat/code/Views/Website/Sublayouts => Common/code/Views/Common/Sublayouts/Inner}/Inner 2 Column 8-4.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/PageHeading.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/PageSidebarLeft.cshtml (100%) rename src/Project/{Habitat/code/Views/Website => Common/code/Views/Common}/Sublayouts/PageSidebarRight.cshtml (100%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/1 Column.yml (77%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/2 Column 3-9.yml (82%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/2 Column 4-8.yml (82%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/2 Column 6-6.yml (76%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/2 Column 8-4.yml (82%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/2 Column 9-3.yml (82%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/3 Column 3-3-6.yml (80%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/3 Column 4-4-4.yml (75%) create mode 100644 src/Project/Common/serialization/Common.Website.Renderings/Common/3 Column 6-3-3.yml rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/4 Column 3-3-3-3.yml (75%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/6 Column 2-2-2-2-2-2.yml (64%) create mode 100644 src/Project/Common/serialization/Common.Website.Renderings/Common/Footer.yml rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/Inner.yml (71%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/Inner/Inner 1 Column.yml (82%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/Inner/Inner 2 Column 4-8.yml (81%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/Inner/Inner 2 Column 6-6.yml (81%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/Inner/Inner 2 Column 8-4.yml (81%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/PageHeading.yml (76%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/PageSidebarLeft.yml (79%) rename src/Project/{Habitat/serialization/Habitat.Website.Renderings/Habitat => Common/serialization/Common.Website.Renderings/Common}/PageSidebarRight.yml (76%) delete mode 100644 src/Project/Habitat/code/Habitat.Website.csproj.sitecore create mode 100644 src/Project/Habitat/code/Sitecore.Habitat.Website.csproj.sitecore diff --git a/src/Feature/Search/code/Views/Search/SearchSettings.cshtml b/src/Feature/Search/code/Views/Search/SearchSettings.cshtml index a83c907947..0e590b0251 100644 --- a/src/Feature/Search/code/Views/Search/SearchSettings.cshtml +++ b/src/Feature/Search/code/Views/Search/SearchSettings.cshtml @@ -2,31 +2,13 @@ @model Sitecore.Feature.Search.Models.SearchSettings
-
- - - - -
-

@DictionaryRepository.Get("/search/facets/ContentTypes", "Content Types")

-
- -
-
- - -
-
- +
+
+ + + + +
\ No newline at end of file diff --git a/src/Project/Common/code/Sitecore.Common.Website.csproj.sitecore b/src/Project/Common/code/Sitecore.Common.Website.csproj.sitecore index 1148f57560..40deb12e51 100644 --- a/src/Project/Common/code/Sitecore.Common.Website.csproj.sitecore +++ b/src/Project/Common/code/Sitecore.Common.Website.csproj.sitecore @@ -2,4 +2,61 @@ + + {0AD8EC59-33EC-4103-AAD4-F3A49BFDB92C} + + + {AB7054DD-B8E3-41D6-A75F-B54F2F37D08B} + + + {E6D8107A-D811-4826-82BB-1A6279830C5A} + + + {1B92270B-EC01-4939-B579-0ADFEB758A95} + + + {4ACD4C20-28D1-46F7-8FBA-A35778937BD1} + + + {CB27D488-5DF8-48B9-B096-D68B2DA637E3} + + + {DB4DA660-2D4A-4214-8896-9724E165DA44} + + + {7074CA39-734D-4953-A3D5-B7D09C37CE3B} + + + {B21C8A38-51BC-4866-9589-6062D6390247} + + + {DE648E12-A568-4919-802E-A688EBC9B9F3} + + + {29270EFB-34BD-4472-B799-76E6D7D6705C} + + + {299FD8EA-2CFD-4A69-9CA4-7EA24CD34A46} + + + {03112E88-1499-4132-9D5F-E213AFD2019C} + + + {831876B6-F9F1-463E-9DD5-7F93F1640590} + + + {50F6052C-4FC2-4AA6-9399-FFC6055CF19F} + + + {45CE489D-FA30-473E-9751-142BD06CCB33} + + + {A2216CA7-B205-4042-A345-72117D0086C3} + + + {EADA94FA-315F-4DF2-AC49-13346DFDAF12} + + + {CF750731-1275-4CC7-A9E6-809515CB4DD1} + \ No newline at end of file diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/1 Column.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/1 Column.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/1 Column.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/1 Column.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/2 Column 3-9.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/2 Column 3-9.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/2 Column 3-9.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/2 Column 3-9.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/2 Column 4-8.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/2 Column 4-8.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/2 Column 4-8.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/2 Column 4-8.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/2 Column 6-6.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/2 Column 6-6.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/2 Column 6-6.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/2 Column 6-6.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/2 Column 8-4.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/2 Column 8-4.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/2 Column 8-4.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/2 Column 8-4.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/2 Column 9-3.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/2 Column 9-3.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/2 Column 9-3.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/2 Column 9-3.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/3 Column 3-3-6.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/3 Column 3-3-6.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/3 Column 3-3-6.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/3 Column 3-3-6.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/3 Column 4-4-4.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/3 Column 4-4-4.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/3 Column 4-4-4.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/3 Column 4-4-4.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/3 Column 6-3-3.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/3 Column 6-3-3.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/3 Column 6-3-3.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/3 Column 6-3-3.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/4 Column 3-3-3-3.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/4 Column 3-3-3-3.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/4 Column 3-3-3-3.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/4 Column 3-3-3-3.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/6 Column 2-2-2-2-2-2.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/6 Column 2-2-2-2-2-2.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/6 Column 2-2-2-2-2-2.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/6 Column 2-2-2-2-2-2.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/Footer.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/Footer.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/Footer.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/Footer.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/Inner 1 Column.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/Inner/Inner 1 Column.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/Inner 1 Column.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/Inner/Inner 1 Column.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/Inner 2 Column 4-8.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/Inner/Inner 2 Column 4-8.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/Inner 2 Column 4-8.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/Inner/Inner 2 Column 4-8.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/Inner 2 Column 6-6.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/Inner/Inner 2 Column 6-6.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/Inner 2 Column 6-6.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/Inner/Inner 2 Column 6-6.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/Inner 2 Column 8-4.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/Inner/Inner 2 Column 8-4.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/Inner 2 Column 8-4.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/Inner/Inner 2 Column 8-4.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/PageHeading.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/PageHeading.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/PageHeading.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/PageHeading.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/PageSidebarLeft.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/PageSidebarLeft.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/PageSidebarLeft.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/PageSidebarLeft.cshtml diff --git a/src/Project/Habitat/code/Views/Website/Sublayouts/PageSidebarRight.cshtml b/src/Project/Common/code/Views/Common/Sublayouts/PageSidebarRight.cshtml similarity index 100% rename from src/Project/Habitat/code/Views/Website/Sublayouts/PageSidebarRight.cshtml rename to src/Project/Common/code/Views/Common/Sublayouts/PageSidebarRight.cshtml diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/1 Column.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/1 Column.yml similarity index 77% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/1 Column.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/1 Column.yml index 438eef6f6b..691c6f4299 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/1 Column.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/1 Column.yml @@ -1,12 +1,12 @@ --- ID: 0ad8ec59-33ec-4103-aad4-f3a49bfdb92c -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/1 Column +Path: /sitecore/layout/Renderings/Project/Common/1 Column SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/1 Column.cshtml + Value: /Views/Common/Sublayouts/1 Column.cshtml - ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 # Parameters Template Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 3-9.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 3-9.yml similarity index 82% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 3-9.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 3-9.yml index bc394f1453..e5297b332b 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 3-9.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 3-9.yml @@ -1,12 +1,12 @@ --- ID: ab7054dd-b8e3-41d6-a75f-b54f2f37d08b -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/2 Column 3-9 +Path: /sitecore/layout/Renderings/Project/Common/2 Column 3-9 SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/2 Column 3-9.cshtml + Value: /Views/Common/Sublayouts/2 Column 3-9.cshtml - ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 # Parameters Template Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 4-8.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 4-8.yml similarity index 82% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 4-8.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 4-8.yml index fd9a7acdcf..8e004be6f5 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 4-8.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 4-8.yml @@ -1,12 +1,12 @@ --- ID: e6d8107a-d811-4826-82bb-1a6279830c5a -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/2 Column 4-8 +Path: /sitecore/layout/Renderings/Project/Common/2 Column 4-8 SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/2 Column 4-8.cshtml + Value: /Views/Common/Sublayouts/2 Column 4-8.cshtml - ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 # Parameters Template Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 6-6.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 6-6.yml similarity index 76% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 6-6.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 6-6.yml index 9e1b4c8e5d..09949c8251 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 6-6.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 6-6.yml @@ -1,12 +1,12 @@ --- ID: 1b92270b-ec01-4939-b579-0adfeb758a95 -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/2 Column 6-6 +Path: /sitecore/layout/Renderings/Project/Common/2 Column 6-6 SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/2 Column 6-6.cshtml + Value: /Views/Common/Sublayouts/2 Column 6-6.cshtml - ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 # Parameters Template Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 8-4.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 8-4.yml similarity index 82% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 8-4.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 8-4.yml index 3d2213b7dd..47dd3e6c77 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 8-4.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 8-4.yml @@ -1,12 +1,12 @@ --- ID: 4acd4c20-28d1-46f7-8fba-a35778937bd1 -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/2 Column 8-4 +Path: /sitecore/layout/Renderings/Project/Common/2 Column 8-4 SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/2 Column 8-4.cshtml + Value: /Views/Common/Sublayouts/2 Column 8-4.cshtml - ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 # Parameters Template Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 9-3.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 9-3.yml similarity index 82% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 9-3.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 9-3.yml index 6b88f6948f..2987a6bec5 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/2 Column 9-3.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/2 Column 9-3.yml @@ -1,12 +1,12 @@ --- ID: cb27d488-5df8-48b9-b096-d68b2da637e3 -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/2 Column 9-3 +Path: /sitecore/layout/Renderings/Project/Common/2 Column 9-3 SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/2 Column 9-3.cshtml + Value: /Views/Common/Sublayouts/2 Column 9-3.cshtml - ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 # Parameters Template Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/3 Column 3-3-6.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/3 Column 3-3-6.yml similarity index 80% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/3 Column 3-3-6.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/3 Column 3-3-6.yml index 035cce2e10..7ca8b4013e 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/3 Column 3-3-6.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/3 Column 3-3-6.yml @@ -1,12 +1,12 @@ --- ID: db4da660-2d4a-4214-8896-9724e165da44 -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/3 Column 3-3-6 +Path: /sitecore/layout/Renderings/Project/Common/3 Column 3-3-6 SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/3 Column 3-3-6.cshtml + Value: /Views/Common/Sublayouts/3 Column 3-3-6.cshtml - ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 # Parameters Template Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/3 Column 4-4-4.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/3 Column 4-4-4.yml similarity index 75% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/3 Column 4-4-4.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/3 Column 4-4-4.yml index 83f0a9db6b..2350392a22 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/3 Column 4-4-4.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/3 Column 4-4-4.yml @@ -1,12 +1,12 @@ --- ID: 7074ca39-734d-4953-a3d5-b7d09c37ce3b -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/3 Column 4-4-4 +Path: /sitecore/layout/Renderings/Project/Common/3 Column 4-4-4 SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/3 Column 4-4-4.cshtml + Value: /Views/Common/Sublayouts/3 Column 4-4-4.cshtml - ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 # Parameters Template Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} diff --git a/src/Project/Common/serialization/Common.Website.Renderings/Common/3 Column 6-3-3.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/3 Column 6-3-3.yml new file mode 100644 index 0000000000..5b38fcbd3e --- /dev/null +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/3 Column 6-3-3.yml @@ -0,0 +1,29 @@ +--- +ID: b21c8a38-51bc-4866-9589-6062d6390247 +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 +Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 +Path: /sitecore/layout/Renderings/Project/Common/3 Column 6-3-3 +SharedFields: +- ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 + # Path + Value: /Views/Common/Sublayouts/3 Column 6-3-3.cshtml +- ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 + # Parameters Template + Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} +- ID: e441abe7-2ca3-4640-ae26-3789967925d7 + # Compatible Renderings + Type: Treelist + Value: | + {B21C8A38-51BC-4866-9589-6062D6390247} + {DB4DA660-2D4A-4214-8896-9724E165DA44} +- ID: ef7c5528-7307-4e19-863b-da19eed6a9ed + # Open Properties after Add + Value: 1 +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: 25bed78c-4957-4165-998a-ca1b52f67497 + # __Created + Value: 20150921T023029Z diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/4 Column 3-3-3-3.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/4 Column 3-3-3-3.yml similarity index 75% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/4 Column 3-3-3-3.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/4 Column 3-3-3-3.yml index 1db1a9df8f..ef47d44d6c 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/4 Column 3-3-3-3.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/4 Column 3-3-3-3.yml @@ -1,12 +1,12 @@ --- ID: de648e12-a568-4919-802e-a688ebc9b9f3 -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/4 Column 3-3-3-3 +Path: /sitecore/layout/Renderings/Project/Common/4 Column 3-3-3-3 SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/4 Column 3-3-3-3.cshtml + Value: /Views/Common/Sublayouts/4 Column 3-3-3-3.cshtml - ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 # Parameters Template Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/6 Column 2-2-2-2-2-2.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/6 Column 2-2-2-2-2-2.yml similarity index 64% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/6 Column 2-2-2-2-2-2.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/6 Column 2-2-2-2-2-2.yml index 514d22ded6..039e7787fe 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/6 Column 2-2-2-2-2-2.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/6 Column 2-2-2-2-2-2.yml @@ -1,12 +1,12 @@ --- ID: 29270efb-34bd-4472-b799-76e6d7d6705c -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/6 Column 2-2-2-2-2-2 +Path: /sitecore/layout/Renderings/Project/Common/6 Column 2-2-2-2-2-2 SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/6 Column 2-2-2-2-2-2.cshtml + Value: /Views/Common/Sublayouts/6 Column 2-2-2-2-2-2.cshtml Languages: - Language: en Versions: diff --git a/src/Project/Common/serialization/Common.Website.Renderings/Common/Footer.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/Footer.yml new file mode 100644 index 0000000000..3802bfd5a2 --- /dev/null +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/Footer.yml @@ -0,0 +1,23 @@ +--- +ID: 299fd8ea-2cfd-4a69-9ca4-7ea24cd34a46 +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 +Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 +Path: /sitecore/layout/Renderings/Project/Common/Footer +SharedFields: +- ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 + # Path + Value: /Views/Common/Sublayouts/Footer.cshtml +- ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 + # Parameters Template + Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} +- ID: ef7c5528-7307-4e19-863b-da19eed6a9ed + # Open Properties after Add + Value: 1 +Languages: +- Language: en + Versions: + - Version: 1 + Fields: + - ID: 25bed78c-4957-4165-998a-ca1b52f67497 + # __Created + Value: 20150918T225014Z diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/Inner.yml similarity index 71% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/Inner.yml index 0bec513b04..351c084b56 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/Inner.yml @@ -1,8 +1,8 @@ --- ID: a033c041-5aee-4b43-a0f7-119f790553d5 -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 7ee0975b-0698-493e-b3a2-0b2ef33d0522 -Path: /sitecore/layout/Renderings/Project/Habitat/Inner +Path: /sitecore/layout/Renderings/Project/Common/Inner Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner/Inner 1 Column.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/Inner/Inner 1 Column.yml similarity index 82% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner/Inner 1 Column.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/Inner/Inner 1 Column.yml index 43b575695e..f5449022c2 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner/Inner 1 Column.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/Inner/Inner 1 Column.yml @@ -2,11 +2,11 @@ ID: 03112e88-1499-4132-9d5f-e213afd2019c Parent: a033c041-5aee-4b43-a0f7-119f790553d5 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/Inner/Inner 1 Column +Path: /sitecore/layout/Renderings/Project/Common/Inner/Inner 1 Column SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/Inner 1 Column.cshtml + Value: /Views/Common/Sublayouts/Inner/Inner 1 Column.cshtml - ID: e441abe7-2ca3-4640-ae26-3789967925d7 # Compatible Renderings Type: Treelist diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner/Inner 2 Column 4-8.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/Inner/Inner 2 Column 4-8.yml similarity index 81% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner/Inner 2 Column 4-8.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/Inner/Inner 2 Column 4-8.yml index 100054a5a9..7c2d9b04f8 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner/Inner 2 Column 4-8.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/Inner/Inner 2 Column 4-8.yml @@ -2,11 +2,11 @@ ID: 831876b6-f9f1-463e-9dd5-7f93f1640590 Parent: a033c041-5aee-4b43-a0f7-119f790553d5 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/Inner/Inner 2 Column 4-8 +Path: /sitecore/layout/Renderings/Project/Common/Inner/Inner 2 Column 4-8 SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/Inner 2 Column 4-8.cshtml + Value: /Views/Common/Sublayouts/Inner/Inner 2 Column 4-8.cshtml - ID: e441abe7-2ca3-4640-ae26-3789967925d7 # Compatible Renderings Type: Treelist diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner/Inner 2 Column 6-6.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/Inner/Inner 2 Column 6-6.yml similarity index 81% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner/Inner 2 Column 6-6.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/Inner/Inner 2 Column 6-6.yml index cfcb4aedbb..5a281567ef 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner/Inner 2 Column 6-6.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/Inner/Inner 2 Column 6-6.yml @@ -2,11 +2,11 @@ ID: 50f6052c-4fc2-4aa6-9399-ffc6055cf19f Parent: a033c041-5aee-4b43-a0f7-119f790553d5 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/Inner/Inner 2 Column 6-6 +Path: /sitecore/layout/Renderings/Project/Common/Inner/Inner 2 Column 6-6 SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/Inner 2 Column 6-6.cshtml + Value: /Views/Common/Sublayouts/Inner/Inner 2 Column 6-6.cshtml - ID: e441abe7-2ca3-4640-ae26-3789967925d7 # Compatible Renderings Type: Treelist diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner/Inner 2 Column 8-4.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/Inner/Inner 2 Column 8-4.yml similarity index 81% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner/Inner 2 Column 8-4.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/Inner/Inner 2 Column 8-4.yml index 40e2728449..2d9208c2da 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/Inner/Inner 2 Column 8-4.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/Inner/Inner 2 Column 8-4.yml @@ -2,11 +2,11 @@ ID: 45ce489d-fa30-473e-9751-142bd06ccb33 Parent: a033c041-5aee-4b43-a0f7-119f790553d5 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/Inner/Inner 2 Column 8-4 +Path: /sitecore/layout/Renderings/Project/Common/Inner/Inner 2 Column 8-4 SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/Inner 2 Column 8-4.cshtml + Value: /Views/Common/Sublayouts/Inner/Inner 2 Column 8-4.cshtml - ID: e441abe7-2ca3-4640-ae26-3789967925d7 # Compatible Renderings Type: Treelist diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/PageHeading.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/PageHeading.yml similarity index 76% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/PageHeading.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/PageHeading.yml index c009b8dfcc..8a266a6758 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/PageHeading.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/PageHeading.yml @@ -1,12 +1,12 @@ --- ID: a2216ca7-b205-4042-a345-72117d0086c3 -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/PageHeading +Path: /sitecore/layout/Renderings/Project/Common/PageHeading SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/PageHeading.cshtml + Value: /Views/Common/Sublayouts/PageHeading.cshtml - ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 # Parameters Template Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/PageSidebarLeft.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/PageSidebarLeft.yml similarity index 79% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/PageSidebarLeft.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/PageSidebarLeft.yml index 9471d66f4b..099a7a27fd 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/PageSidebarLeft.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/PageSidebarLeft.yml @@ -1,12 +1,12 @@ --- ID: eada94fa-315f-4df2-ac49-13346dfdaf12 -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/PageSidebarLeft +Path: /sitecore/layout/Renderings/Project/Common/PageSidebarLeft SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/PageSidebarLeft.cshtml + Value: /Views/Common/Sublayouts/PageSidebarLeft.cshtml - ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 # Parameters Template Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} diff --git a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/PageSidebarRight.yml b/src/Project/Common/serialization/Common.Website.Renderings/Common/PageSidebarRight.yml similarity index 76% rename from src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/PageSidebarRight.yml rename to src/Project/Common/serialization/Common.Website.Renderings/Common/PageSidebarRight.yml index 7cce87286e..bfd94f894f 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Renderings/Habitat/PageSidebarRight.yml +++ b/src/Project/Common/serialization/Common.Website.Renderings/Common/PageSidebarRight.yml @@ -1,12 +1,12 @@ --- ID: cf750731-1275-4cc7-a9e6-809515cb4dd1 -Parent: 5150f78a-0061-4609-9c6c-c5b3bc6d7ebc +Parent: 4935d7de-c715-46e5-862e-44adf1bc61e8 Template: 99f8905d-4a87-4eb8-9f8b-a9bebfb3add6 -Path: /sitecore/layout/Renderings/Project/Habitat/PageSidebarRight +Path: /sitecore/layout/Renderings/Project/Common/PageSidebarRight SharedFields: - ID: 51b435bc-f7b9-478a-9c51-52916af96ff5 # Path - Value: /Views/Website/Sublayouts/PageSidebarRight.cshtml + Value: /Views/Common/Sublayouts/PageSidebarRight.cshtml - ID: 7d24e54f-5c16-4314-90c9-6051aa1a7da1 # Parameters Template Value: {4654D5F0-9B39-426A-992D-1D42E356FB0A} diff --git a/src/Project/Habitat/code/Habitat.Website.csproj.sitecore b/src/Project/Habitat/code/Habitat.Website.csproj.sitecore deleted file mode 100644 index ec9a2441cf..0000000000 --- a/src/Project/Habitat/code/Habitat.Website.csproj.sitecore +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - {A2216CA7-B205-4042-A345-72117D0086C3} - - - {EADA94FA-315F-4DF2-AC49-13346DFDAF12} - - - {CB27D488-5DF8-48B9-B096-D68B2DA637E3} - - - {299FD8EA-2CFD-4A69-9CA4-7EA24CD34A46} - - - {0AD8EC59-33EC-4103-AAD4-F3A49BFDB92C} - - - {AB7054DD-B8E3-41D6-A75F-B54F2F37D08B} - - - {E6D8107A-D811-4826-82BB-1A6279830C5A} - - - {1B92270B-EC01-4939-B579-0ADFEB758A95} - - - {4ACD4C20-28D1-46F7-8FBA-A35778937BD1} - - - {DB4DA660-2D4A-4214-8896-9724E165DA44} - - - {7074CA39-734D-4953-A3D5-B7D09C37CE3B} - - - {B21C8A38-51BC-4866-9589-6062D6390247} - - - {DE648E12-A568-4919-802E-A688EBC9B9F3} - - - {831876B6-F9F1-463E-9DD5-7F93F1640590} - - - {50F6052C-4FC2-4AA6-9399-FFC6055CF19F} - - - {45CE489D-FA30-473E-9751-142BD06CCB33} - - - {CF750731-1275-4CC7-A9E6-809515CB4DD1} - - - {03112E88-1499-4132-9D5F-E213AFD2019C} - - \ No newline at end of file diff --git a/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj b/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj index 4556073cbd..558adfd0a9 100644 --- a/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj +++ b/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj @@ -173,28 +173,11 @@ - - - - - - - - - - - - - - - - - - - - + + + {7E46FF93-EE05-412C-AC47-2A59A13DA73C} diff --git a/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj.sitecore b/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj.sitecore new file mode 100644 index 0000000000..1148f57560 --- /dev/null +++ b/src/Project/Habitat/code/Sitecore.Habitat.Website.csproj.sitecore @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From c0de159e22960e49e05ea4af53a6fa32f9b20bd6 Mon Sep 17 00:00:00 2001 From: Thomas Eldblom Date: Wed, 16 Dec 2015 15:20:32 +1100 Subject: [PATCH 6/9] Moved layout parameters to Common project --- .../Common.Website.Templates/Common}/Parameters.yml | 4 ++-- .../Common.Website.Templates/Common}/Parameters/Layout.yml | 2 +- .../Common}/Parameters/Layout/Page Layout.yml | 2 +- .../Parameters/Layout/Page Layout/ContainerIsFluid.yml | 2 +- .../Layout/Page Layout/UseStaticPlaceholderNames.yml | 2 +- .../Common}/Parameters/Layout/__Standard Values.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename src/Project/{Habitat/serialization/Habitat.Website.Templates/Habitat => Common/serialization/Common.Website.Templates/Common}/Parameters.yml (78%) rename src/Project/{Habitat/serialization/Habitat.Website.Templates/Habitat => Common/serialization/Common.Website.Templates/Common}/Parameters/Layout.yml (92%) rename src/Project/{Habitat/serialization/Habitat.Website.Templates/Habitat => Common/serialization/Common.Website.Templates/Common}/Parameters/Layout/Page Layout.yml (84%) rename src/Project/{Habitat/serialization/Habitat.Website.Templates/Habitat => Common/serialization/Common.Website.Templates/Common}/Parameters/Layout/Page Layout/ContainerIsFluid.yml (87%) rename src/Project/{Habitat/serialization/Habitat.Website.Templates/Habitat => Common/serialization/Common.Website.Templates/Common}/Parameters/Layout/Page Layout/UseStaticPlaceholderNames.yml (84%) rename src/Project/{Habitat/serialization/Habitat.Website.Templates/Habitat => Common/serialization/Common.Website.Templates/Common}/Parameters/Layout/__Standard Values.yml (83%) diff --git a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters.yml b/src/Project/Common/serialization/Common.Website.Templates/Common/Parameters.yml similarity index 78% rename from src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters.yml rename to src/Project/Common/serialization/Common.Website.Templates/Common/Parameters.yml index 1c4be454a2..1df0c0258b 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters.yml +++ b/src/Project/Common/serialization/Common.Website.Templates/Common/Parameters.yml @@ -1,8 +1,8 @@ --- ID: 78fc406f-fb34-42da-8f10-b955fe9f5a4e -Parent: 6c3b2801-5573-40cf-87ad-a2cb94fce40e +Parent: 104e6124-706d-4620-9db6-f8814be5f471 Template: 0437fee2-44c9-46a6-abe9-28858d9fee8c -Path: /sitecore/templates/Project/Habitat/Parameters +Path: /sitecore/templates/Project/Common/Parameters Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout.yml b/src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout.yml similarity index 92% rename from src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout.yml rename to src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout.yml index e98e4eb934..761b0bb674 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout.yml +++ b/src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout.yml @@ -2,7 +2,7 @@ ID: 4654d5f0-9b39-426a-992d-1d42e356fb0a Parent: 78fc406f-fb34-42da-8f10-b955fe9f5a4e Template: ab86861a-6030-46c5-b394-e8f99e8b87db -Path: /sitecore/templates/Project/Habitat/Parameters/Layout +Path: /sitecore/templates/Project/Common/Parameters/Layout SharedFields: - ID: 06d5295c-ed2f-4a54-9bf2-26228d113318 # __Icon diff --git a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout/Page Layout.yml b/src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout/Page Layout.yml similarity index 84% rename from src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout/Page Layout.yml rename to src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout/Page Layout.yml index 8db50e302d..c1c9cae3e6 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout/Page Layout.yml +++ b/src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout/Page Layout.yml @@ -2,7 +2,7 @@ ID: f0d72037-9f79-4fa9-a82f-4f67206e12cb Parent: 4654d5f0-9b39-426a-992d-1d42e356fb0a Template: e269fbb5-3750-427a-9149-7aa950b49301 -Path: /sitecore/templates/Project/Habitat/Parameters/Layout/Page Layout +Path: /sitecore/templates/Project/Common/Parameters/Layout/Page Layout Languages: - Language: en Versions: diff --git a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout/Page Layout/ContainerIsFluid.yml b/src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout/Page Layout/ContainerIsFluid.yml similarity index 87% rename from src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout/Page Layout/ContainerIsFluid.yml rename to src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout/Page Layout/ContainerIsFluid.yml index 13d26d1017..f0d41e4738 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout/Page Layout/ContainerIsFluid.yml +++ b/src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout/Page Layout/ContainerIsFluid.yml @@ -2,7 +2,7 @@ ID: 8f49d801-02b0-4db7-90db-5742d1662cf1 Parent: f0d72037-9f79-4fa9-a82f-4f67206e12cb Template: 455a3e98-a627-4b40-8035-e683a0331ac7 -Path: /sitecore/templates/Project/Habitat/Parameters/Layout/Page Layout/ContainerIsFluid +Path: /sitecore/templates/Project/Common/Parameters/Layout/Page Layout/ContainerIsFluid SharedFields: - ID: ab162cc0-dc80-4abf-8871-998ee5d7ba32 # Type diff --git a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout/Page Layout/UseStaticPlaceholderNames.yml b/src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout/Page Layout/UseStaticPlaceholderNames.yml similarity index 84% rename from src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout/Page Layout/UseStaticPlaceholderNames.yml rename to src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout/Page Layout/UseStaticPlaceholderNames.yml index df3f581fb3..9d2dda576e 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout/Page Layout/UseStaticPlaceholderNames.yml +++ b/src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout/Page Layout/UseStaticPlaceholderNames.yml @@ -2,7 +2,7 @@ ID: 197e0176-fb2c-4f78-acb9-664660564f6d Parent: f0d72037-9f79-4fa9-a82f-4f67206e12cb Template: 455a3e98-a627-4b40-8035-e683a0331ac7 -Path: /sitecore/templates/Project/Habitat/Parameters/Layout/Page Layout/UseStaticPlaceholderNames +Path: /sitecore/templates/Project/Common/Parameters/Layout/Page Layout/UseStaticPlaceholderNames SharedFields: - ID: ab162cc0-dc80-4abf-8871-998ee5d7ba32 # Type diff --git a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout/__Standard Values.yml b/src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout/__Standard Values.yml similarity index 83% rename from src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout/__Standard Values.yml rename to src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout/__Standard Values.yml index b8b05a5301..45e49a5113 100644 --- a/src/Project/Habitat/serialization/Habitat.Website.Templates/Habitat/Parameters/Layout/__Standard Values.yml +++ b/src/Project/Common/serialization/Common.Website.Templates/Common/Parameters/Layout/__Standard Values.yml @@ -2,7 +2,7 @@ ID: 3acba3a7-fd6c-4c3e-ae68-da2aa6c3ae95 Parent: 4654d5f0-9b39-426a-992d-1d42e356fb0a Template: 4654d5f0-9b39-426a-992d-1d42e356fb0a -Path: /sitecore/templates/Project/Habitat/Parameters/Layout/__Standard Values +Path: /sitecore/templates/Project/Common/Parameters/Layout/__Standard Values Languages: - Language: en Versions: From 4135b45e7898f943eb59fc424e67ded327c58671 Mon Sep 17 00:00:00 2001 From: Thomas Eldblom Date: Wed, 16 Dec 2015 15:37:19 +1100 Subject: [PATCH 7/9] Added layouts to project too --- .../code/Sitecore.Common.Website.csproj | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/Project/Common/code/Sitecore.Common.Website.csproj b/src/Project/Common/code/Sitecore.Common.Website.csproj index 678a19188d..770e345746 100644 --- a/src/Project/Common/code/Sitecore.Common.Website.csproj +++ b/src/Project/Common/code/Sitecore.Common.Website.csproj @@ -136,6 +136,25 @@ Designer + + + + + + + + + + + + + + + + + + + From 469c58b73dd77ee5fa34cdd6203ca4e009ea0610 Mon Sep 17 00:00:00 2001 From: OlegJytnik Date: Fri, 18 Dec 2015 13:11:39 +0200 Subject: [PATCH 8/9] Predicate order has been changed. --- .../Include/Project/Demo.Website.Serialization.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.Serialization.config b/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.Serialization.config index 0d10a95f73..448bf767d3 100644 --- a/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.Serialization.config +++ b/src/Project/Demo/code/App_Config/Include/Project/Demo.Website.Serialization.config @@ -5,8 +5,8 @@ + - From 657fa89c70c136f325cde0b9159f7da2096d9ecf Mon Sep 17 00:00:00 2001 From: OlegJytnik Date: Fri, 18 Dec 2015 13:17:11 +0200 Subject: [PATCH 9/9] Solution structure issue has been resolved. --- Habitat.sln | 1 + 1 file changed, 1 insertion(+) diff --git a/Habitat.sln b/Habitat.sln index e7f504cdf5..0b132fcb0b 100644 --- a/Habitat.sln +++ b/Habitat.sln @@ -164,6 +164,7 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Demo.Website", "src\Project\Demo\code\Sitecore.Demo.Website.csproj", "{D584C2DC-7F5F-447A-831C-8C5A75277FAF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{BC277CB0-BAA3-4C15-973F-3F9C10B77278}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Multisite", "Multisite", "{AC21E230-C263-4FE0-8614-D6783D1FFC86}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.Feature.MultiSite", "src\Feature\Multisite\code\Sitecore.Feature.MultiSite.csproj", "{64CB17EE-49BF-44A6-98F0-4F72EE89073B}"