Skip to content

Commit 38d1349

Browse files
PikinerLiliyaPikinerLiliya
authored
Merge pull request #22 from amplience/develop
Develop
2 parents 1dd98c6 + cc61b2b commit 38d1349

File tree

205 files changed

+4193
-4430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+4193
-4430
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ To display image content correctly with roundels, the handlebars template makes
134134
- In the "Additional Parameters" box, enter these parameters:
135135

136136
```
137-
myasset=empty&p1_img=empty&p2_img=empty&p3_img=empty&p4_img=empty&qlt=90&roundelRatio=1&layer0=[src=/i//{$prod_img}&w=1350]&layer1=[src=/i//{$p1_img}&w={376*$roundelRatio}&right=10&bottom=10&anchor=BR&visible={$p1_img!=$myasset}&img404=roundel_fallback]&layer2=[src=/i//{$p2_img}&w={376*$roundelRatio}&left=10&bottom=10&anchor=BL&visible={$p2_img!=$myasset}]&layer3=[src=/i//{$p3_img}&w={376*$roundelRatio}&left=10&top=10&anchor=TL&visible={$p3_img!=$myasset}]&layer4=[src=/i//{$p4_img}&w={376*$roundelRatio}&right=10&top=10&anchor=TR&visible={$p4_img!=$myasset}]
137+
myasset=empty&p1_img=empty&p2_img=empty&p3_img=empty&p4_img=empty&p5_img=empty&qlt=90&roundelRatio=1&layer0=[src=/i//{$prod_img}&w=1350]‌‌&layer1=[src=/i//{$p1_img}&w={376*$roundelRatio}&right=10&bottom=10&anchor=BR&visible={$p1_img!=$myasset}]‌‌&layer2=[src=/i//{$p2_img}&w={376*$roundelRatio}&left=10&bottom=10&anchor=BL&visible={$p2_img!=$myasset}]‌‌&layer3=[src=/i//{$p3_img}&w={376*$roundelRatio}&left=10&top=10&anchor=TL&visible={$p3_img!=$myasset}]‌‌&layer4=[src=/i//{$p4_img}&w={376*$roundelRatio}&right=10&top=10&anchor=TR&visible={$p4_img!=$myasset}]‌‌&layer5=[src=/i//{$p5_img}&w={376*$roundelRatio}&right={$root.layer0.info.canvas.width/2-376*$roundelRatio/2}&top={$root.layer0.info.canvas.height/2-376*$roundelRatio/2}&anchor=TR&visible={$p5_img!=$myasset}]
138138
```
139139

140140
- Click "Create".
@@ -149,7 +149,7 @@ scaleFit=poi&poi={$this.metadata.pointOfInterest.x},{$this.metadata.pointOfInter
149149
To add a roundel transformation template for the banner accelerator, follow the same instructions with "Friendly Name" and "Template Name" set to "banner-roundel", and with these parameters in the "Additional Parameters" box:
150150

151151
```
152-
myasset=empty&p1_img=empty&p2_img=empty&p3_img=empty&p4_img=empty&qlt=90&roundelRatio1=1&roundelRatio2=1&roundelRatio3=1&roundelRatio4=1&layer1=[src=/i//{$p1_img}&w={$root.layer0.info.canvas.width*$roundelRatio1}&left={$root.layer0.info.canvas.width-10}&bottom=10&anchor=BR&visible={$p1_img!=$myasset}&img404=roundel_fallback]&layer2=[src=/i//{$p2_img}&w={$root.layer0.info.canvas.width*$roundelRatio2}&left=10&bottom=10&anchor=BL&visible={$p2_img!=$myasset}]&layer3=[src=/i//{$p3_img}&w={$root.layer0.info.canvas.width*$roundelRatio3}&left=10&top=10&anchor=TL&visible={$p3_img!=$myasset}]&layer4=[src=/i//{$p4_img}&w={$root.layer0.info.canvas.width*$roundelRatio4}&left={$root.layer0.info.canvas.width-10}&top=10&anchor=TR&visible={$p4_img!=$myasset}]
152+
myasset=empty&p1_img=empty&p2_img=empty&p3_img=empty&p4_img=empty&p5_img=empty&qlt=90&roundelRatio1=1&roundelRatio2=1&roundelRatio3=1&roundelRatio4=1&roundelRatio5=1&layer1=[src=/i//{$p1_img}&w={$root.layer0.info.canvas.width*$roundelRatio1}&left={$root.layer0.info.canvas.width-10}&bottom=10&anchor=BR&visible={$p1_img!=$myasset}]‌‌&layer2=[src=/i//{$p2_img}&w={$root.layer0.info.canvas.width*$roundelRatio2}&left=10&bottom=10&anchor=BL&visible={$p2_img!=$myasset}]‌‌&layer3=[src=/i//{$p3_img}&w={$root.layer0.info.canvas.width*$roundelRatio3}&left=10&top=10&anchor=TL&visible={$p3_img!=$myasset}]‌‌&layer4=[src=/i//{$p4_img}&w={$root.layer0.info.canvas.width*$roundelRatio4}&left={$root.layer0.info.canvas.width-10}&top=10&anchor=TR&visible={$p4_img!=$myasset}]‌&layer5=[src=/i//{$p5_img}&w={$root.layer0.info.canvas.width*$roundelRatio5}&right={$root.layer0.info.canvas.width/2-$root.layer0.info.canvas.width*$roundelRatio5/2}&top={$root.layer0.info.canvas.height/2-$root.layer0.info.canvas.width*$roundelRatio5/2}&anchor=TR&visible={$p5_img!=$myasset}]
153153
```
154154

155155
To add a point of interest transformation template for the banner accelerator, follow the same instructions with "Friendly Name" and "Template Name" set to "banner-poi", and with these parameters in the "Additional Parameters" box:

‎content_dependencies.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"banner": [
33
"link"
44
],
5-
"blog": [
5+
"blogPost": [
66
"link",
77
"snippet"
88
],
99
"image": [
1010
"roundel"
1111
],
12-
"promoBanner": [
13-
"promobannersection"
12+
"promoList": [
13+
"promo"
1414
]
1515
}

‎dependencies.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"banner": [
33
"image"
44
],
5-
"blog": [
5+
"blogPost": [
66
"text",
77
"image",
88
"video",
@@ -12,10 +12,10 @@
1212
"cardList"
1313
],
1414
"externalBlock": [],
15-
"homepage": [
15+
"page": [
1616
"slider",
1717
"banner",
18-
"promoBanner",
18+
"promoList",
1919
"video",
2020
"text",
2121
"externalBlock",
@@ -32,7 +32,7 @@
3232
"image",
3333
"card"
3434
],
35-
"promoBanner": [],
35+
"promoList": [],
3636
"slider": [
3737
"banner",
3838
"image",

dist/contentTypes/blog.json renamed to dist/contentTypes/blogpost.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"$schema": "http://bigcontent.io/cms/schema/v1/schema#",
3-
"id": "https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/blog.json",
4-
"title": "Blog Accelerator",
5-
"description": "Blog Accelerator",
3+
"id": "https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/blogpost.json",
4+
"title": "Blog Post Accelerator",
5+
"description": "Blog Post Accelerator",
66
"allOf": [
77
{
88
"$ref": "http://bigcontent.io/cms/schema/v1/core#/definitions/content"
@@ -50,7 +50,7 @@
5050
"https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/video.json",
5151
"https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/text.json",
5252
"https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/cardlist.json",
53-
"https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/blog.json"
53+
"https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/blogpost.json"
5454
]
5555
}
5656
}

dist/contentTypes/homepage.json renamed to dist/contentTypes/page.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"$schema": "http://bigcontent.io/cms/schema/v1/schema#",
3-
"id": "https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/homepage.json",
4-
"title": "Homepage Accelerator",
5-
"description": "Homepage Accelerator",
3+
"id": "https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/page.json",
4+
"title": "Page Accelerator",
5+
"description": "Page Accelerator",
66
"allOf": [
77
{
88
"$ref": "http://bigcontent.io/cms/schema/v1/core#/definitions/content"
@@ -26,7 +26,7 @@
2626
"title": "Content Types",
2727
"enum": [
2828
"https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/slider.json",
29-
"https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/promobanner.json",
29+
"https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/promolist.json",
3030
"https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/video.json",
3131
"https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/text.json",
3232
"https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/externalblock.json",

dist/contentTypes/promobannersection.json renamed to dist/contentTypes/promo.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"$schema": "http://bigcontent.io/cms/schema/v1/schema#",
3-
"id": "https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/promobannersection.json",
4-
"title": "Promo Banner Section",
5-
"description": "Promo Banner Section",
3+
"id": "https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/promo.json",
4+
"title": "Promo List Section",
5+
"description": "Promo List Section",
66
"allOf": [
77
{
88
"$ref": "http://bigcontent.io/cms/schema/v1/core#/definitions/content"
@@ -41,7 +41,7 @@
4141
"minLength": 0,
4242
"maxLength": 500,
4343
"title": "Top Line",
44-
"description": "Enter top line of the promo banner section"
44+
"description": "Enter top line of the promo list section"
4545
},
4646
"toplineColour": {
4747
"type": "string",
@@ -55,7 +55,7 @@
5555
"minLength": 0,
5656
"maxLength": 500,
5757
"title": "Bottom Line",
58-
"description": "Enter bottom line of the promo banner section"
58+
"description": "Enter bottom line of the promo list section"
5959
},
6060
"bottomlineColour": {
6161
"type": "string",

dist/contentTypes/promobanner.json renamed to dist/contentTypes/promolist.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"$schema": "http://bigcontent.io/cms/schema/v1/schema#",
3-
"id": "https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/promobanner.json",
4-
"title": "Promotional Banner",
5-
"description": "Promotional banner",
3+
"id": "https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/promolist.json",
4+
"title": "Promotional List",
5+
"description": "Promotional list",
66
"allOf": [
77
{
88
"$ref": "http://bigcontent.io/cms/schema/v1/core#/definitions/content"
@@ -20,9 +20,9 @@
2020
{
2121
"properties": {
2222
"contentType": {
23-
"title": "Promo section",
23+
"title": "Promo list section",
2424
"enum": [
25-
"https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/promobannersection.json"
25+
"https://s3-eu-west-1.amazonaws.com/dev-solutions/DC-accelerators-v2.0.0/dist/contentTypes/promo.json"
2626
]
2727
}
2828
}

‎dist/contentTypes/roundel.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"roundelRatio": {
2222
"type": "number",
2323
"title": "Roundel Ratio",
24-
"description": "A value between 0 and 10 e.g. 0.6",
24+
"description": "A value between 0 and 10 e.g. 0.6 (1 by default)",
2525
"minimum": 0,
2626
"maximum": 10
2727
},
@@ -34,7 +34,7 @@
3434
"Bottom Right"
3535
],
3636
"title": "Roundel Position",
37-
"description": "Roundel Position"
37+
"description": "Roundel Position (centered by default)"
3838
}
3939
}
4040
}

‎dist/contentTypes/splitblock.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,8 @@
5050
"title": "Split Ratio",
5151
"description": ""
5252
}
53-
}
53+
},
54+
"required": [
55+
"split"
56+
]
5457
}

‎dist/renders/all/libs.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)