-
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor all container usage to use overridable container template.
- Loading branch information
Showing
33 changed files
with
219 additions
and
193 deletions.
There are no files selected for viewing
6 changes: 4 additions & 2 deletions
6
...mdesign/components/details/contact-details/v2/contact-details/contact-details.footer.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| <template data-sly-template.variant="${@ componentProperties}"> | ||
| <sly data-sly-test="${componentProperties.showParsys}"> | ||
| <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly> | ||
| <!--/* template path is this relative to aemdesign/components/details/contact-details */--> | ||
| <sly data-sly-use.container="../../layout/container/par.html" | ||
| data-sly-call="${container.container @ componentProperties=componentProperties}"></sly> | ||
| </sly> | ||
| </template> | ||
| </template> |
6 changes: 4 additions & 2 deletions
6
...mdesign/components/details/contact-details/v3/contact-details/contact-details.footer.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| <template data-sly-template.variant="${@ componentProperties}"> | ||
| <sly data-sly-test="${componentProperties.showParsys}"> | ||
| <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly> | ||
| <!--/* template path is this relative to aemdesign/components/details/contact-details */--> | ||
| <sly data-sly-use.container="../../layout/container/par.html" | ||
| data-sly-call="${container.container @ componentProperties=componentProperties}"></sly> | ||
| </sly> | ||
| </template> | ||
| </template> |
4 changes: 3 additions & 1 deletion
4
...apps/aemdesign/components/details/generic-details/v1/generic-details/field/container.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| <template data-sly-template.field="${@ componentProperties}"> | ||
| <sly data-sly-test="${componentProperties.badgeCustom || 'custom' in componentProperties.variant || componentProperties.legacyBadgeSelected || (( componentProperties.legacyVariant || 'default' in componentProperties.variant) ? !componentProperties.showParsys : true)}"> | ||
| <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly> | ||
| <!--/* template path is this relative to aemdesign/components/details/generic-details */--> | ||
| <sly data-sly-use.container="../../layout/container/par.html" | ||
| data-sly-call="${container.container @ componentProperties=componentProperties}"></sly> | ||
| </sly> | ||
| </template> |
5 changes: 4 additions & 1 deletion
5
...ps/aemdesign/components/details/generic-details/v1/generic-details/field/description.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,8 @@ | ||
| <template data-sly-template.field="${@ componentProperties}"> | ||
| <sly data-sly-test="${componentProperties.badgeCustom || 'custom' in componentProperties.variant || componentProperties.legacyBadgeSelected || (( componentProperties.legacyVariant || 'default' in componentProperties.variant) ? !componentProperties.hideDescription : true)}"> | ||
| <div class="card-text">${componentProperties.badgeDescription @ context = 'html'}</div> | ||
| <div class="card-text" | ||
| data-sly-test="${componentProperties.componentBadgeSelected}">${componentProperties.badgeDescription @ context = 'html'}</div> | ||
| <div class="card-text" | ||
| data-sly-test="${!componentProperties.componentBadgeSelected}">${componentProperties.description @ context = 'html'}</div> | ||
| </sly> | ||
| </template> |
8 changes: 6 additions & 2 deletions
8
...oot/apps/aemdesign/components/details/generic-details/v1/generic-details/field/title.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,10 @@ | ||
| <template data-sly-template.field="${@ componentProperties}"> | ||
| <sly data-sly-test="${componentProperties.badgeCustom || 'custom' in componentProperties.variant || componentProperties.legacyBadgeSelected || (( componentProperties.legacyVariant || 'default' in componentProperties.variant) ? !componentProperties.hideTitle : true)}"> | ||
| <title class="card-title" | ||
| data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}" itemprop="name">${componentProperties.badgeTitle @ context='html'}</title> | ||
| <title class="card-title" | ||
| data-sly-test="${componentProperties.componentBadgeSelected}" | ||
| data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}" itemprop="name">${componentProperties.badgeTitle @ context='html'}</title> | ||
| <title class="card-title" | ||
| data-sly-test="${!componentProperties.componentBadgeSelected}" | ||
| data-sly-element="${componentProperties.titleType @ context='elementName'}" itemprop="name">${componentProperties.title @ context='html'}</title> | ||
| </sly> | ||
| </template> |
7 changes: 5 additions & 2 deletions
7
...aemdesign/components/details/generic-details/v1/generic-details/field/titleformatted.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,9 @@ | ||
| <template data-sly-template.field="${@ componentProperties}"> | ||
| <sly data-sly-test="${componentProperties.badgeCustom || 'custom' in componentProperties.variant || componentProperties.legacyBadgeSelected || (( componentProperties.legacyVariant || 'default' in componentProperties.variant) ? !componentProperties.hideTitle : true)}"> | ||
| <title class="card-title" | ||
| data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}">${componentProperties.titleFormatted @ context='html'}</title> | ||
| <title class="card-title" | ||
| data-sly-element="${componentProperties.badgeTitleType @ context='elementName'}" itemprop="name">${componentProperties.titleFormatted @ context='html'}</title> | ||
| <title class="card-title" | ||
| data-sly-test="${!componentProperties.componentBadgeSelected}" | ||
| data-sly-element="${componentProperties.titleType @ context='elementName'}" itemprop="name">${componentProperties.titleFormatted @ context='html'}</title> | ||
| </sly> | ||
| </template> |
6 changes: 4 additions & 2 deletions
6
...t/apps/aemdesign/components/details/news-details/v2/news-details/news-details.footer.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| <template data-sly-template.variant="${@ componentProperties}"> | ||
| <sly data-sly-test="${componentProperties.showParsys}"> | ||
| <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly> | ||
| <!--/* template path is this relative to aemdesign/components/details/news-details */--> | ||
| <sly data-sly-use.container="../../layout/container/par.html" | ||
| data-sly-call="${container.container @ componentProperties=componentProperties}"></sly> | ||
| </sly> | ||
| </template> | ||
| </template> |
6 changes: 4 additions & 2 deletions
6
...t/apps/aemdesign/components/details/news-details/v3/news-details/news-details.footer.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| <template data-sly-template.variant="${@ componentProperties}"> | ||
| <sly data-sly-test="${componentProperties.showParsys}"> | ||
| <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly> | ||
| <!--/* template path is this relative to aemdesign/components/details/news-details */--> | ||
| <sly data-sly-use.container="../../layout/container/par.html" | ||
| data-sly-call="${container.container @ componentProperties=componentProperties}"></sly> | ||
| </sly> | ||
| </template> | ||
| </template> |
6 changes: 4 additions & 2 deletions
6
...t/apps/aemdesign/components/details/page-details/v2/page-details/page-details.footer.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| <template data-sly-template.variant="${@ componentProperties}"> | ||
| <sly data-sly-test="${componentProperties.showParsys}"> | ||
| <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly> | ||
| <!--/* template path is this relative to aemdesign/components/details/page-details */--> | ||
| <sly data-sly-use.container="../../layout/container/par.html" | ||
| data-sly-call="${container.container @ componentProperties=componentProperties}"></sly> | ||
| </sly> | ||
| </template> | ||
| </template> |
6 changes: 4 additions & 2 deletions
6
...t/apps/aemdesign/components/details/page-details/v3/page-details/page-details.footer.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| <template data-sly-template.variant="${@ componentProperties}"> | ||
| <sly data-sly-test="${componentProperties.showParsys}"> | ||
| <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly> | ||
| <!--/* template path is this relative to aemdesign/components/details/page-details */--> | ||
| <sly data-sly-use.container="../../layout/container/par.html" | ||
| data-sly-call="${container.container @ componentProperties=componentProperties}"></sly> | ||
| </sly> | ||
| </template> | ||
| </template> |
6 changes: 4 additions & 2 deletions
6
...content/jcr_root/apps/aemdesign/components/layout/article/v2/article/variant.default.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| <template data-sly-template.variant="${@ componentProperties}"> | ||
| <article style="${componentProperties.attr.data.style @ context = 'unsafe'}" | ||
| data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}"> | ||
| <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly> | ||
| <!--/* template path is this relative to aemdesign/components/layout/article */--> | ||
| <sly data-sly-use.container="../container/par.html" | ||
| data-sly-call="${container.container @ componentProperties=componentProperties}"></sly> | ||
| </article> | ||
| </template> | ||
| </template> |
6 changes: 4 additions & 2 deletions
6
...ain/content/jcr_root/apps/aemdesign/components/layout/aside/v2/aside/variant.default.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| <template data-sly-template.variant="${@ componentProperties}"> | ||
| <aside style="${componentProperties.attr.data.style @ context = 'unsafe'}" | ||
| data-sly-attribute="${componentProperties.attr.data @ context = 'unsafe'}"> | ||
| <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container', decorationTagName='div'}"></sly> | ||
| <!--/* template path is this relative to aemdesign/components/layout/aside */--> | ||
| <sly data-sly-use.container="../container/par.html" | ||
| data-sly-call="${container.container @ componentProperties=componentProperties}"></sly> | ||
| </aside> | ||
| </template> | ||
| </template> |
17 changes: 8 additions & 9 deletions
17
...-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/.content.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,9 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" | ||
| xmlns:jcr="http://www.jcp.org/jcr/1.0" | ||
| jcr:description="Includes PARSYS or GRID as a container" | ||
| jcr:primaryType="cq:Component" | ||
| jcr:title="Container" | ||
| cq:isContainer="{Boolean}true" | ||
| cq:icon="code" | ||
| sling:resourceSuperType="wcm/foundation/components/responsivegrid" | ||
| componentGroup=".hidden"/> | ||
| <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" | ||
| cq:icon="code" | ||
| cq:isContainer="{Boolean}true" | ||
| jcr:description="Includes PARSYS or GRID as a container" | ||
| jcr:primaryType="cq:Component" | ||
| jcr:title="Container" | ||
| sling:resourceSuperType="wcm/foundation/components/responsivegrid" | ||
| componentGroup=".hidden"/> |
7 changes: 3 additions & 4 deletions
7
...main/content/jcr_root/apps/aemdesign/components/layout/container/_cq_htmlTag/.content.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" | ||
| xmlns:nt="http://www.jcp.org/jcr/nt/1.0" | ||
| jcr:primaryType="nt:unstructured" | ||
| class="responsivegrid"/> | ||
| <jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" | ||
| jcr:primaryType="nt:unstructured" | ||
| class="responsivegrid"/> |
4 changes: 4 additions & 0 deletions
4
...-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/par.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <template data-sly-template.container="${@ componentProperties}"> | ||
| <!--/* TODO: HTL does not allow for expression syntax in resourceType so tenant will need to override this. */--> | ||
| <sly data-sly-resource="${'./par' @ resourceType='aemdesign/components/layout/container' }"></sly> | ||
| </template> |
12 changes: 6 additions & 6 deletions
12
...ntent/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock/.content.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" | ||
| cq:icon="mBox" | ||
| cq:isContainer="{Boolean}true" | ||
| jcr:description="Primary block for content" | ||
| jcr:primaryType="cq:Component" | ||
| jcr:title="Content Block (v2)" | ||
| componentGroup="hidden"/> | ||
| cq:icon="mBox" | ||
| cq:isContainer="{Boolean}true" | ||
| jcr:description="Primary block for content" | ||
| jcr:primaryType="cq:Component" | ||
| jcr:title="Content Block (v2)" | ||
| componentGroup="hidden"/> |
Oops, something went wrong.