Skip to content

Commit

Permalink
Releasing 1000.0.5
Browse files Browse the repository at this point in the history
Related work items: #5347, #5423, #5437, #5479, #5488, #5491, #5492, #5534
  • Loading branch information
jeanfrancoislarente committed Nov 10, 2020
2 parents f1d5d19 + e55f4ad commit 53029b2
Show file tree
Hide file tree
Showing 68 changed files with 942 additions and 307 deletions.
2 changes: 1 addition & 1 deletion FrontEnd/Lighthouse/gulp/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
sassSourceMap: false,
// Please configure
serverOptions: {
server: 'http://127.0.0.1:44001', //need to be changed
server: 'https://cm.lighthouse.localhost', //need to be changed
removeScriptPath: '/-/script/v2/master/RemoveMedia',
uploadScriptPath: '/sitecore modules/PowerShell/Services/RemoteScriptCall.ashx',
updateTemplatePath: '/-/script/v2/master/ChangeTemplate',
Expand Down
2 changes: 2 additions & 0 deletions FrontEnd/Lighthouse/sass/abstracts/vars/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ $promo-bg-hero:rgba(0, 0, 0, 0.5);
$promo-border:$border-gray;
$promo-hero-text-color: $text-white;
$promo-hero-secondary-text-color: $text-white;
$promo-hero-video-text-color: $primary-color;
$promo-hero-video-secondary-text-color: $secondary-color;
$promo-shadow-border:$border-basic-color;
//Full width Promo
$fw-promo-bg: rgba(255,255,255,0.75);
Expand Down
83 changes: 83 additions & 0 deletions FrontEnd/Lighthouse/sass/styles/promo/promo-hero.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,89 @@
@import "vars";
@import "mixins";
.promo {
&.promo-video {
float: none;
margin-top: 0;
margin-bottom: 2em;
overflow-y: hidden;
height: 200px;

@include respond-to(tablet) {
height: 300px;
}

@include respond-to(desktop) {
height: 500px;
}

@include respond-to(desktop-large) {
height: 600px;
}

>.component-content {
padding: 0;
height: 100%;
>div {
float: none;
width: 100%;
}
}

video {
width: 100%;
}

.video-background {
position: absolute;
top: 0;
left: 0;
min-width: 100%;
}

.hero-content-wrapper {
display: flex;
flex-direction: column;
justify-content: center;
margin: 0 auto;
padding: 0 15px;
max-width: $max-content-width;
height: 100%;
position: relative;
}

.field-herosupertitle {
@include proxima-font;
font-size: 1em;
text-transform: uppercase;
color: $promo-hero-video-secondary-text-color;
}

.field-herotitle {
font-size: 2em;
line-height: 0.9;
font-weight: bold;
margin-bottom: 0.25em;
color: $promo-hero-video-text-color;

@include respond-to(tablet) {
font-size: 5em;
}
}

.field-herolink {
a {
@include btn-primary;
font-size: 1em;
min-width: 300px;
display: none;

@include respond-to(tablet) {
display: inline;
}
}
}
}

&.promo-hero {
float: none;
position: relative;
Expand Down
1 change: 1 addition & 0 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ services:
SOLUTION_IMAGE: ${REGISTRY}build/lighthouse-solution:${SITECORE_VERSION}-${DEMO_VERSION}
BASE_IMAGE: ${REGISTRY}demo/base/lighthouse-xp0-modules-base-cm:${SITECORE_VERSION}-${WINDOWSSERVERCORE_VERSION}-${BASE_MODULE_VERSION}
ASSETS_IMAGE: ${SITECORE_DOCKER_REGISTRY}tools/sitecore-docker-tools-assets:10.0.0-${NANOSERVER_VERSION}
HOTFIX_IMAGE: ${REGISTRY}demo/base/lighthouse-hotfixes:${SITECORE_VERSION}-${NANOSERVER_VERSION}
OPENCALAIS_ACCESSTOKEN: ${OPENCALAIS_ACCESSTOKEN}
mem_limit: 4G
environment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class DeployMarketingDefinitions : TaskBase
public static async Task Run()
{
await Start(typeof(DeployMarketingDefinitions).Name);
await WaitForSitecoreToStart.Run();

var hostCM = Environment.GetEnvironmentVariable("HOST_CM");
var marketingDefinitionsApikey = Environment.GetEnvironmentVariable("MARKETING_DEFINITIONS_APIKEY");
Expand Down
1 change: 1 addition & 0 deletions docker/images/windows/demo-init/Jobs/PublishItems.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class PublishItems : TaskBase
public static async Task Run()
{
await Start(typeof(PublishItems).Name);
await WaitForPublishingServiceToStart.Run();

var hostPS = Environment.GetEnvironmentVariable("HOST_PS");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class RebuildLinkDatabase : TaskBase
public static async Task Run()
{
await Start(typeof(RebuildLinkDatabase).Name);
await WaitForSitecoreToStart.Run();
var hostCM = Environment.GetEnvironmentVariable("HOST_CM");
Console.WriteLine($"RebuildLinkDatabase() started {hostCM}");

Expand Down
1 change: 1 addition & 0 deletions docker/images/windows/demo-init/Jobs/UpdateFieldValues.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class UpdateFieldValues : TaskBase
public static async Task Run()
{
await Start(typeof(UpdateFieldValues).Name);
await WaitForSitecoreToStart.Run();

var hostCM = Environment.GetEnvironmentVariable("HOST_CM");
var user = Environment.GetEnvironmentVariable("ADMIN_USER_NAME").Replace("sitecore\\", string.Empty);
Expand Down
7 changes: 3 additions & 4 deletions docker/images/windows/demo-init/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ public static async Task Main(string[] args)
{
var startTime = DateTime.UtcNow;
Console.WriteLine($"{DateTime.UtcNow} Init started.");
await WaitForPublishingServiceToStart.Run();

Task.WaitAll(PublishItems.Run(), UpdateFieldValues.Run(), DeployMarketingDefinitions.Run(), RebuildLinkDatabase.Run());
Task.WaitAll(WarmupCM.Run(), WarmupCD.Run());
Task.WaitAll(IndexRebuild.Run(), ExperienceGenerator.Run());
await Task.WhenAll(PublishItems.Run(), UpdateFieldValues.Run(), DeployMarketingDefinitions.Run(), RebuildLinkDatabase.Run());
await Task.WhenAll(WarmupCM.Run(), WarmupCD.Run());
await Task.WhenAll(IndexRebuild.Run(), ExperienceGenerator.Run());

Console.WriteLine($"{DateTime.UtcNow} All init tasks complete. See the background jobs status below.");
Console.WriteLine($"Elapsed time: {(DateTime.UtcNow - startTime):c}");
Expand Down
Binary file not shown.

This file was deleted.

7 changes: 5 additions & 2 deletions docker/images/windows/demo-standalone/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,20 @@
ARG BASE_IMAGE
ARG SOLUTION_IMAGE
ARG ASSETS_IMAGE
ARG HOTFIX_IMAGE

FROM $ASSETS_IMAGE as assets
FROM ${SOLUTION_IMAGE} as solution
FROM $ASSETS_IMAGE as assets
FROM $HOTFIX_IMAGE as hotfixes
FROM $BASE_IMAGE as build

ARG OPENCALAIS_ACCESSTOKEN

COPY --from=assets ["/tools/", "/tools/"]
COPY --from=solution /solution/cm/ /inetpub/wwwroot/
COPY --from=hotfixes /cm/ /inetpub/wwwroot/

COPY docker/images/windows/demo-standalone/Data/transforms/ /inetpub/wwwroot/transforms/
COPY docker/images/windows/demo-standalone/Data/bin/ /inetpub/wwwroot/bin/

RUN (Get-Content /inetpub/wwwroot/App_Config/Include/Feature/Sitecore.Demo.Platform.Feature.ContentTagging.config).replace('{calaisAccessToken}', $env:OPENCALAIS_ACCESSTOKEN) | Set-Content /inetpub/wwwroot/App_Config/Include/Feature/Sitecore.Demo.Platform.Feature.ContentTagging.config -Verbose

Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
---
ID: "06a7ea2b-a5c7-4091-8e4b-35001a173758"
Parent: "8061252a-6a94-4681-91c0-a5d430e7e233"
Template: "35e75c72-4985-4e09-88c3-0eac6cd1e64f"
Path: /sitecore/templates/Branches/Feature/Demo Shared/Email/Branded Email
DB: master
SharedFields:
- ID: "06d5295c-ed2f-4a54-9bf2-26228d113318"
Hint: __Icon
Value: Office/32x32/mail_write.png
Languages:
- Language: en
Versions:
- Version: 1
Fields:
- ID: "25bed78c-4957-4165-998a-ca1b52f67497"
Hint: __Created
Value: 20180320T014132Z
- ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
Hint: __Created by
Value: |
sitecore\admin
---
ID: "06a7ea2b-a5c7-4091-8e4b-35001a173758"
Parent: "8061252a-6a94-4681-91c0-a5d430e7e233"
Template: "35e75c72-4985-4e09-88c3-0eac6cd1e64f"
Path: /sitecore/templates/Branches/Feature/Demo Shared/Email/Demo Branded Email
DB: master
SharedFields:
- ID: "06d5295c-ed2f-4a54-9bf2-26228d113318"
Hint: __Icon
Value: Office/32x32/mail_write.png
- ID: "c7c26117-dbb1-42b2-ab5e-f7223845cca3"
Hint: __Thumbnail
Value: |
<image mediaid="{BED90A3D-BFE9-4AB2-8F4A-2C360CC57318}" />
Languages:
- Language: en
Versions:
- Version: 1
Fields:
- ID: "25bed78c-4957-4165-998a-ca1b52f67497"
Hint: __Created
Value: 20180320T014132Z
- ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
Hint: __Created by
Value: |
sitecore\admin
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
---
ID: "e6267a85-945b-444b-b246-400d4522a380"
Parent: "06a7ea2b-a5c7-4091-8e4b-35001a173758"
Template: "078d8a76-f971-4891-b422-76c0bcf9fa03"
Path: /sitecore/templates/Branches/Feature/Demo Shared/Email/Branded Email/$name
DB: master
SharedFields:
- ID: "06d5295c-ed2f-4a54-9bf2-26228d113318"
Hint: __Icon
Value: office/32x32/mail_write.png
- ID: "09ad7c00-a8de-46f7-bc54-e7572e38c136"
Hint: Body
Value: "{D369FEE5-9F71-4A85-BE2D-263D50D4B259}"
Languages:
- Language: en
Versions:
- Version: 1
Fields:
- ID: "25bed78c-4957-4165-998a-ca1b52f67497"
Hint: __Created
Value: 20180320T014132Z
- ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
Hint: __Created by
Value: |
sitecore\admin
---
ID: "e6267a85-945b-444b-b246-400d4522a380"
Parent: "06a7ea2b-a5c7-4091-8e4b-35001a173758"
Template: "078d8a76-f971-4891-b422-76c0bcf9fa03"
Path: /sitecore/templates/Branches/Feature/Demo Shared/Email/Demo Branded Email/$name
DB: master
SharedFields:
- ID: "06d5295c-ed2f-4a54-9bf2-26228d113318"
Hint: __Icon
Value: office/32x32/mail_write.png
- ID: "09ad7c00-a8de-46f7-bc54-e7572e38c136"
Hint: Body
Value: "{D369FEE5-9F71-4A85-BE2D-263D50D4B259}"
Languages:
- Language: en
Versions:
- Version: 1
Fields:
- ID: "25bed78c-4957-4165-998a-ca1b52f67497"
Hint: __Created
Value: 20180320T014132Z
- ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
Hint: __Created by
Value: |
sitecore\admin
Loading

0 comments on commit 53029b2

Please sign in to comment.