Skip to content
This repository has been archived by the owner on Dec 6, 2019. It is now read-only.

Commit

Permalink
Merge pull request #61 from Sitecore/infrastructure/multiproject
Browse files Browse the repository at this point in the history
Infrastructure/multiproject
  • Loading branch information
OlegJytnik committed Dec 18, 2015
2 parents 51d9060 + 657fa89 commit 35b2888
Show file tree
Hide file tree
Showing 195 changed files with 1,308 additions and 448 deletions.
28 changes: 28 additions & 0 deletions Habitat.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
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}"
Expand Down Expand Up @@ -553,6 +561,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
{64CB17EE-49BF-44A6-98F0-4F72EE89073B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64CB17EE-49BF-44A6-98F0-4F72EE89073B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64CB17EE-49BF-44A6-98F0-4F72EE89073B}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -665,6 +689,10 @@ 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}
{AC21E230-C263-4FE0-8614-D6783D1FFC86} = {755F9E42-1707-4E1A-AE6D-3FD8A25118C0}
{64CB17EE-49BF-44A6-98F0-4F72EE89073B} = {AC21E230-C263-4FE0-8614-D6783D1FFC86}
{FE63FBCC-D03E-4439-A428-028A6FF8B15A} = {D2CBE02E-6AA7-4343-9A01-891F971A17F5}
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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:" }))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Foundation\Multisite\code\Sitecore.Foundation.MultiSite.csproj">
<Project>{CFA2AE87-7F8D-4CA6-BB72-B16380190DB7}</Project>
<Project>{cfa2ae87-7f8d-4ca6-bb72-b16380190db7}</Project>
<Name>Sitecore.Foundation.MultiSite</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\foundation\SitecoreExtensions\code\Sitecore.Foundation.SitecoreExtensions.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ SharedFields:
- ID: 51b435bc-f7b9-478a-9c51-52916af96ff5
# Path
Value: /Views/Person/PersonPhoto.cshtml
- ID: b5b27af1-25ef-405c-87ce-369b3a004016
# Datasource Location
Value: /sitecore/content/Habitat/Global/Quotes
- ID: ef7c5528-7307-4e19-863b-da19eed6a9ed
# Open Properties after Add
Value: -
Languages:
- Language: en
Versions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ SharedFields:
Value: /Views/Person/Quote.cshtml
- ID: b5b27af1-25ef-405c-87ce-369b3a004016
# Datasource Location
Value: {9F6E51E8-696A-45D5-BAFE-A2D6F2F98CAC}
- ID: ef7c5528-7307-4e19-863b-da19eed6a9ed
# Open Properties after Add
Value: -
Value: query:/sitecore/content/*/Global/Teasers
Languages:
- Language: en
Versions:
Expand Down
32 changes: 7 additions & 25 deletions src/Feature/Search/code/Views/Search/SearchSettings.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,13 @@
@model Sitecore.Feature.Search.Models.SearchSettings

<form action="@Model.SearchResultsUrl" method="GET">
<div class="input-group">
<input type="text" name="query" placeholder="@Model.SearchBoxTitle" value="@Model.Query" class="form-control" autocomplete="off"/>
<span class="input-group-btn">
<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i></button>
</span>
</div>
<h3>@DictionaryRepository.Get("/search/facets/ContentTypes", "Content Types")</h3>
<div class="checkbox">
<label>
<input type="checkbox" value="1" name="type" checked/>
Show all
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" value="2" name="type">
Content Type 1
</label>

</div>
<div class="checkbox">
<label>
<input type="checkbox" value="">
Content Type 2
</label>
<div class="form-group">
<div class="input-group">
<input type="text" name="query" placeholder="@Model.SearchBoxTitle" value="@Model.Query" class="form-control" autocomplete="off" />
<span class="input-group-btn">
<button class="btn btn-primary" type="submit"><i class="fa fa-search"></i></button>
</span>
</div>
</div>
<button type="submit" class="btn btn-default">@DictionaryRepository.Get("/search/facets/Update", "Update")</button>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/Feature/Teasers/code/Models/AccordeonModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public AccordeonModel(Item item)

public IEnumerable<AccordeonElement> Elements => new[]
{
//TODO: Hardcoded
new AccordeonElement("Test1"), new AccordeonElement("Test2"), new AccordeonElement("Test3")
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Path: /sitecore/templates/Feature/Teasers/_Accordeon/Content/AccordeonSelector
SharedFields:
- ID: 1eb8ae32-e190-44a6-968d-ed904c794ebf
# Source
Value: query:/sitecore/content/Shared/Teasers//*[@@templateid='{C7D9D293-4EF8-4380-8E10-C4632E729F39}']
Value: query:/sitecore/content/*/global/Teasers
- ID: ab162cc0-dc80-4abf-8871-998ee5d7ba32
# Type
Value: Multilist
Value: Treelist
Languages:
- Language: en
Versions:
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
</pipelines>
<settings>
<setting name="WebStylesheet" value="/assets/Sitecore.Foundation.Theming.Editor.css" />
<setting name="WFM.EnableBootstrapCssRendering" >
<patch:attribute name="value" value="false" />
</setting>
</settings>
</sitecore>
</configuration>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
<sitecore>
<unicorn>
<configurations>
<configuration name="Project.Common.Website" description="Common content and settings" patch:after="configuration[@name='Foundation.Serialization']">
<targetDataStore physicalRootPath="$(sourceFolder)\project\common\serialization" type="Rainbow.Storage.SerializationFileSystemDataStore, Rainbow" useDataCache="false" singleInstance="true" />
<predicate type="Unicorn.Predicates.SerializationPresetPredicate, Unicorn" singleInstance="true">
<include name="Common.Website.Templates" database="master" path="/sitecore/templates/Project/Common" />
<include name="Common.Website.Renderings" database="master" path="/sitecore/layout/renderings/Project/Common" />
<include name="Common.Website.Layouts" database="master" path="/sitecore/layout/layouts/Project/Common" />
<include name="Common.Website.PlaceholderSettings" database="master" path="/sitecore/layout/placeholder settings/Project/Common" />

<include name="Common.Website.UserProfiles" database="core" path="/sitecore/system/Settings/Security/Profiles/Common" />
</predicate>
</configuration>
</configurations>
</unicorn>
</sitecore>
</configuration>
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0"?>

<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/">
<sitecore>
<events>
<event name="publish:end">
<handler type="Sitecore.Publishing.HtmlCacheClearer, Sitecore.Kernel" method="ClearCache">
<sites hint="list">
<site hint="website">
<patch:delete/>
</site>
</sites>
</handler>
</event>
<event name="publish:end:remote">
<handler type="Sitecore.Publishing.HtmlCacheClearer, Sitecore.Kernel" method="ClearCache">
<sites hint="list">
<site hint="website">
<patch:delete/>
</site>
</sites>
</handler>
</event>
</events>
<sites>
<site name="website">
<patch:delete/>
</site>
</sites>
<cacheSizes>
<sites>
<website>
<patch:delete />
</website>
</sites>
</cacheSizes>
</sitecore>
</configuration>
35 changes: 35 additions & 0 deletions src/Project/Common/code/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -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")]
Loading

0 comments on commit 35b2888

Please sign in to comment.