Skip to content

Commit

Permalink
Merge pull request #13 from aem-design/feature/11-blueprint-config
Browse files Browse the repository at this point in the history
Feature/11 blueprint config
  • Loading branch information
wildone authored Dec 7, 2019
2 parents 9d24ae0 + 353d875 commit 3e0d8fe
Show file tree
Hide file tree
Showing 20 changed files with 630 additions and 76 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@

<filter root="/content/experience-fragments/aemdesign" mode="update"/>

<filter root="/apps/msm/aemdesign" mode="update"/>



</workspaceFilter>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
jcr:primaryType="sling:OrderedFolder">
<blueprintconfigs/>
</jcr:root>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
jcr:primaryType="sling:OrderedFolder">
<aemdesign/>
</jcr:root>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?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" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
jcr:primaryType="cq:Page">
<jcr:content
cq:template="/libs/wcm/msm/templates/blueprint"
jcr:primaryType="nt:unstructured"
jcr:title="AEM.Design"
sling:resourceType="wcm/msm/components/blueprint"
sitePath="/content/aemdesign/language-masters">
<dialog/>
<thumbnail/>
</jcr:content>
</jcr:root>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?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"
jcr:primaryType="cq:Dialog"
title="AEM.Design Blueprint">
<items jcr:primaryType="cq:WidgetCollection">
<tabs jcr:primaryType="cq:TabPanel">
<items jcr:primaryType="cq:WidgetCollection">
<tab_lan
jcr:primaryType="cq:Widget"
path="/libs/wcm/msm/templates/blueprint/defaults/language_tab.infinity.json"
xtype="cqinclude"/>
<tab_chap
jcr:primaryType="cq:Widget"
path="/libs/wcm/msm/templates/blueprint/defaults/chapters_tab.infinity.json"
xtype="cqinclude"/>
<tab_lc
jcr:primaryType="cq:Widget"
path="/libs/wcm/msm/templates/blueprint/defaults/livecopy_tab.infinity.json"
xtype="cqinclude"/>
</items>
</tabs>
</items>
</jcr:root>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
jcr:primaryType="nt:file">
<jcr:content
jcr:lastModifiedBy="admin"
jcr:mimeType="image/png"
jcr:primaryType="oak:Resource"/>
</jcr:root>
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
jcr:primaryType="cq:Page">
<jcr:content
cq:allowedTemplates="[/conf/aemdesign/settings/wcm/templates/.*]"
cq:deviceGroups="[mobile/groups/responsive]"
cq:designPath="/apps/settings/wcm/designs/aemdesign"
cq:deviceGroups="[mobile/groups/responsive]"
cq:template="/conf/aemdesign/settings/wcm/templates/twocolumn"
jcr:isCheckedOut="{Boolean}true"
jcr:mixinTypes="[mix:versionable]"
jcr:primaryType="cq:PageContent"
jcr:title="AEM.Design"
jcr:uuid="61664baf-69dd-4bf4-84a1-39c2543710a0"
sling:resourceType="aemdesign/components/template/base"
redirectTarget="/content/aemdesign-showcase/en">
<article
Expand All @@ -25,4 +26,6 @@
</par>
</article>
</jcr:content>
<language-masters/>
<au/>
</jcr:root>
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
jcr:mixinTypes="[mix:versionable]"
jcr:primaryType="cq:PageContent"
jcr:title="English"
jcr:uuid="cc438e78-8f5c-4548-b3e8-bf88582ca0de"
sling:resourceType="aemdesign/components/template/base"
hideInNav="true"
redirectTarget="/content/aemdesign-showcase/en/component">
Expand All @@ -20,10 +21,10 @@
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/container">
<text
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/content/text"
text="Country Header"
variant="simple"/>
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/content/text"
text="Country Header"
variant="simple"/>
</par>
</header>
<footer
Expand All @@ -34,10 +35,10 @@
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/container">
<text
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/content/text"
text="Country Footer"
variant="simple"/>
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/content/text"
text="Country Footer"
variant="simple"/>
</par>
</footer>
<article
Expand All @@ -47,11 +48,12 @@
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/container">
<text
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/content/text"
text="Country Content"
variant="simple"/>
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/content/text"
text="Country Content"
variant="simple"/>
</par>
</article>
</jcr:content>
<en/>
</jcr:root>
Original file line number Diff line number Diff line change
Expand Up @@ -2,56 +2,100 @@
<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" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
jcr:primaryType="cq:Page">
<jcr:content
cq:tags="[aemdesign:content-type/page]"
cq:lastModified="{Date}2019-12-02T10:18:23.904+11:00"
cq:lastModifiedBy="admin"
cq:lastRolledout="{Date}2019-12-02T10:18:23.905+11:00"
cq:lastRolledoutBy="admin"
cq:template="/conf/aemdesign/settings/wcm/templates/onecolumn"
jcr:isCheckedOut="{Boolean}true"
jcr:language="en"
jcr:mixinTypes="[mix:versionable]"
jcr:mixinTypes="[cq:LiveRelationship,cq:LiveSync,mix:versionable]"
jcr:primaryType="cq:PageContent"
jcr:title="English"
jcr:uuid="b4c528f7-9553-46ab-881d-48404be379f5"
sling:resourceType="aemdesign/components/template/base"
hideInNav="true"
redirectTarget="/content/aemdesign-showcase/en/component">
navRoot="{Boolean}true">
<header
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/header"
cancelInheritParent="true">
cq:lastRolledout="{Date}2019-12-02T10:18:23.882+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/header"
cancelInheritParent="true"
componentId="header_SFZGQQ0RT">
<par
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/container">
cq:lastRolledout="{Date}2019-12-02T10:18:23.884+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/container">
<text
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/content/text"
text="Language Header"
variant="simple"/>
cq:lastRolledout="{Date}2019-12-02T10:18:23.888+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/content/text"
componentId="text_IYJ25IOXM"
text="Language Master Header"
variant="simple"/>
</par>
</header>
<footer
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/footer"
cancelInheritParent="true">
cq:lastRolledout="{Date}2019-12-02T10:18:23.891+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/footer"
cancelInheritParent="true"
componentId="footer_R5URRUAMR">
<par
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/container">
cq:lastRolledout="{Date}2019-12-02T10:18:23.893+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/container">
<text
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/content/text"
text="Language Footer"
variant="simple"/>
cq:lastRolledout="{Date}2019-12-02T10:18:23.897+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/content/text"
componentId="text_ITYZ1ML5N"
text="Language Master Footer"
variant="simple"/>
</par>
</footer>
<article
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/article">
cq:lastRolledout="{Date}2019-12-02T10:18:23.900+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/article"
componentId="article_2MTJPMDJX">
<par
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/container">
cq:lastRolledout="{Date}2019-12-02T10:18:23.902+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/container">
<text
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/content/text"
text="Language Content"
variant="simple"/>
cq:lastRolledout="{Date}2019-12-02T10:18:23.905+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/content/text"
componentId="text_7JFKQFG1D"
text="Language Master Content"
variant="simple"/>
</par>
</article>
<cq:LiveSyncConfig
cq:isDeep="{Boolean}true"
cq:master="/content/aemdesign/language-masters/en"
cq:rolloutConfigs="[/libs/msm/wcm/rolloutconfigs/default]"
jcr:primaryType="cq:LiveCopy"/>
</jcr:content>
<about/>
<contact-us/>
<privacy-policy/>
<search/>
</jcr:root>
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?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" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
jcr:primaryType="cq:Page">
<jcr:content
cq:allowedTemplates="[/conf/aemdesign/settings/wcm/templates/.*]"
cq:lastModified="{Date}2019-12-02T10:18:23.938+11:00"
cq:lastModifiedBy="admin"
cq:lastRolledout="{Date}2019-12-02T10:18:23.938+11:00"
cq:lastRolledoutBy="admin"
cq:template="/conf/aemdesign/settings/wcm/templates/onecolumn"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="cq:PageContent"
jcr:title="About"
sling:resourceType="aemdesign/components/template/base">
<header
cq:lastRolledout="{Date}2019-12-02T10:18:23.926+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/header"
componentId="header_BXWOMCYQH">
<par
cq:lastRolledout="{Date}2019-12-02T10:18:23.928+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/container"/>
</header>
<article
cq:lastRolledout="{Date}2019-12-02T10:18:23.929+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/article"
componentId="article_KX5LUUSW0">
<par
cq:lastRolledout="{Date}2019-12-02T10:18:23.931+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/container">
<generic_details
cq:lastRolledout="{Date}2019-12-02T10:18:23.935+11:00"
cq:lastRolledoutBy="admin"
jcr:created="{Date}2019-11-23T21:43:15.130+11:00"
jcr:createdBy="admin"
jcr:lastModified="{Date}2019-12-02T10:18:23.933+11:00"
jcr:lastModifiedBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/details/generic-details"
componentId="generic_details_K7HIG8YKY"/>
</par>
</article>
<footer
cq:lastRolledout="{Date}2019-12-02T10:18:23.936+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/footer"
componentId="footer_OSNSWZXGV">
<par
cq:lastRolledout="{Date}2019-12-02T10:18:23.938+11:00"
cq:lastRolledoutBy="admin"
jcr:mixinTypes="[cq:LiveRelationship]"
jcr:primaryType="nt:unstructured"
sling:resourceType="aemdesign/components/layout/container"/>
</footer>
</jcr:content>
</jcr:root>
Loading

0 comments on commit 3e0d8fe

Please sign in to comment.