Skip to content

Commit

Permalink
Merge pull request #1 from aem-design/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
wildone authored Sep 20, 2019
2 parents 44e796f + 5b2adcb commit 94df577
Show file tree
Hide file tree
Showing 135 changed files with 3,288 additions and 362 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ before_install:
- if [[ $TRAVIS_BRANCH != "master" && $SONAR_ENABLED == "true" ]]; then mvn sonar:sonar -q "-Dsonar.branch.name=${TRAVIS_BRANCH}" "-Dsonar.branch.target=master" "-Dsonar.host.url=${SONAR_URL}" "-Dsonar.login=${SONAR_TOKEN}" "-Dsonar.organization=${SONAR_ORGANISATION}" && echo "SONAR ON ${TRAVIS_BRANCH} DONE"; fi

install:
- mvn install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -q && echo "INSTALL DONE"
# - mvn install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -q && echo "INSTALL DONE"
- mvn test -q && bash <(curl -s https://codecov.io/bash)
- echo "CODECOVERAGE DONE"

Expand All @@ -40,6 +40,8 @@ deploy:
file:
- aemdesign-aem-core-deploy/target/aemdesign-aem-core-deploy-$CURRENT_VERSION.zip
- aemdesign-aem-services/target/aemdesign-aem-services-$CURRENT_VERSION.jar
- aemdesign-aem-author/target/aemdesign-aem-author-$CURRENT_VERSION.zip
- aemdesign-aem-common/target/aemdesign-aem-common-$CURRENT_VERSION.zip
skip_cleanup: true
on:
branch: master
Expand Down
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,19 @@ Detailed table of component can be found here [Component List](https://github.co

The components' versioning scheme is documented on the [AEM Core WCM Components' versioning policies](https://github.com/adobe/aem-core-wcm-components/wiki/Versioning-policies) wiki page.

## Module Purpose

Following is a description of each repo and their purpose.

For more information see [Project Artifacts](http://aem.design/manifesto/project/#project-artifacts)

| Repo | Notes |
|---------------------------------|---------------------------------------------|
| aemdesign-aem-author/ | has all of the components and configurations that modify/update AEM |
| aemdesign-aem-common/ | has all of the components code |
| aemdesign-aem-core-deploy/ | monolith package for all projects |
| aemdesign-aem-services/ | has all of the code that compiled and installed by common project |

## System Requirements

The latest version of the Core Components, require the below system requirements:
Expand Down
4 changes: 2 additions & 2 deletions aemdesign-aem-author/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>design.aem</groupId>
<artifactId>aemdesign-aem-core</artifactId>
<version>2.0.420</version>
<version>2.0.508</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -17,7 +17,7 @@
<!-- ====================================================================== -->

<artifactId>aemdesign-aem-author</artifactId>
<version>2.0.420</version>
<version>2.0.508</version>
<packaging>content-package</packaging>
<name>AEM Design - Core - AEM Author UI Updates</name>
<description>Updates to OOTB AEM</description>
Expand Down
4 changes: 2 additions & 2 deletions aemdesign-aem-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>design.aem</groupId>
<artifactId>aemdesign-aem-core</artifactId>
<version>2.0.420</version>
<version>2.0.508</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -17,7 +17,7 @@
<!-- ====================================================================== -->

<artifactId>aemdesign-aem-common</artifactId>
<version>2.0.420</version>
<version>2.0.508</version>
<packaging>content-package</packaging>
<name>AEM Design - Core - AEM Common</name>
<description>AEM Design package with all common components</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Component that outputs analytics content into the page
### Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v1
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/analytics/datalayer.html](/content/aemdesign-showcase/en/analytics/datalayer.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/analytics/datalayer/v2/datalayer](/crx/de/#/apps/aemdesign/components/analytics/datalayer/v2/datalayer)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for adding a Redirect Notification to a template to show author in a E
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/common/redirectnotification](/content/aemdesign-showcase/en/component/common/redirectnotification.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/common/redirectnotification/v2/redirectnotification](/crx/de/#/apps/aemdesign/components/common/redirectnotification/v2/redirectnotification)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Add timing statistic to a page
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/staticincludes/staticinclude/v2/staticinclude](/content/aemdesign-showcase/en/component/staticincludes/staticinclude.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/staticincludes/staticinclude/v2/staticinclude](/crx/de/#/apps/aemdesign/components/staticincludes/staticinclude/v2/staticinclude)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for adding a timing information to a page.
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/timings/timing/v2/timing](/content/aemdesign-showcase/en/component/timings/timing.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/timings/timing/v2/timing](/crx/de/#/apps/aemdesign/components/timings/timing/v2/timing)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +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:primaryType="cq:Component"
jcr:title="Content Fragment"
jcr:description="Component that allows to display a single text element or multiple elements of a content fragment."
cq:isContainer="{Boolean}true"
cq:icon="fileTemplate"
sling:resourceSuperType="core/wcm/extension/components/contentfragment/v1/contentfragment"
componentGroup="AEM.Design - Content"/>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for adding Assets from DAM to a page to allow download.
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/content/download](/content/aemdesign-showcase/en/component/content/download.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/content/download/v2/download](/crx/de/#/apps/aemdesign/components/content/download/v2/download)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for adding ad-hoc HTML to pages
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/content/embedsource](/content/aemdesign-showcase/en/component/content/embedsource.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/content/embedsource/v2/embedsource](/crx/de/#/apps/aemdesign/components/content/embedsource/v2/embedsource)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for adding ad-hoc HTML to pages
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/content/embedsource](/content/aemdesign-showcase/en/component/content/embedsource.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/content/embedsource/v2/embedsource](/crx/de/#/apps/aemdesign/components/content/embedsource/v2/embedsource)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Call to Acton can be a Link or a Button.
### Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/content/link/v2/link](/content/aemdesign-showcase/en/component/content/link.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/content/link/v2/link](/crx/de/index.jsp#/apps/aemdesign/components/content/link/v2/link)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for displaying the date on the page
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/content/pageauthor](/content/aemdesign-showcase/en/component/content/pageauthor.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/content/pageauthor/v2/pageauthor](/crx/de/#/apps/aemdesign/components/content/pageauthor/v2/pageauthor)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for displaying the date on the page
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/content/pagedate](/content/aemdesign-showcase/en/component/content/pagedate.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/content/pagedate/v2/pagedate](/crx/de/#/apps/aemdesign/components/content/pagedate/v2/pagedate)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for displaying the jcr:description property of the page
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/content/pagedescription](/content/aemdesign-showcase/en/component/content/pagedescription.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/content/pagedescription/v2/pagedescription](/crx/de/#/apps/aemdesign/components/content/pagedescription/v2/pagedescription)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for displaying the cq:tags property of the page
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/content/pagetags](/content/aemdesign-showcase/en/component/content/pagetags.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/content/pagetags/v2/pagetags](/crx/de/#/apps/aemdesign/components/content/pagetags/v2/pagetags)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for displaying the jcr:title property of the page
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/content/pagetitle](/content/aemdesign-showcase/en/component/content/pagetitle.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/content/pagetitle/v2/pagetitle](/crx/de/#/apps/aemdesign/components/content/pagetitle/v2/pagetitle)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for rendering or including content from other pages
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/content/reference](/content/aemdesign-showcase/en/component/content/reference.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/content/reference/v2/reference](/crx/de/#/apps/aemdesign/components/content/reference/v2/reference)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for adding tables to pages
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v1
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/content/table](/content/aemdesign-showcase/en/component/content/table.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/content/table/v2/table](/crx/de/#/apps/aemdesign/components/content/table/v2/table)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for adding text to pages
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/content/text](/content/aemdesign-showcase/en/component/content/text.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/content/text/v2/text](/crx/de/#/apps/aemdesign/components/content/text/v2/text)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ Tooltip component

Component for adding tooltips to pages to use with other content or images

## Usage Example

If you would like to have an image with points of interest that could be interacted with by user when image is displayed. You could add a contentblock, then add to it an image and a number of tooltips and use Position X and Y as relative coordinates in image. Then you could use Java Script to load those tooltips as overlay icons on the the image.

## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/content/tooltip](/content/aemdesign-showcase/en/component/content/tooltip.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/content/tooltip/v2/tooltip](/crx/de/#/apps/aemdesign/components/content/tooltip/v2/tooltip)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
ValueMap vm = new ValueMapDecorator(new HashMap<String, Object>());
String value = tagId;
String valueAlt = "";
String text = tag.getTitlePath(locale);
if (childVM!=null) {
Expand All @@ -138,11 +139,14 @@
value = childVM.get("value", "");
text = tag.getTitle(locale);
}
valueAlt = childVM.get("valuealt", "");
}
vm.put("value", value);
vm.put("text", text);
vm.put("valueAlt", valueAlt);
return new ValueMapResource(resolver, new ResourceMetadata(), "nt:unstructured", vm);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for adding Contact metadata to a page and Badge config info which is u
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v1
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/details/contact-details](/content/aemdesign-showcase/en/component/details/contact-details.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/details/contact-details/v2/contact-details](/crx/de/#/apps/aemdesign/components/details/contact-details/v2/contact-details)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Component for adding content metadata to a event and Badge config info which is
## Information
* **Vendor**: [AEM.Design](http://aem.design)
* **Version**: v2
* **Compatibility**: AEM 6.4
* **Compatibility**: AEM 6.4+
* **Status**: production-ready
* **Showcase**: [/content/aemdesign-showcase/en/component/details/event-details.html](/content/aemdesign-showcase/en/component/details/event-details.html?wcmmode=disabled)
* **Local Code**: [/apps/aemdesign/components/details/event-details/v2/event-details](/crx/de/#/apps/aemdesign/components/details/event-details/v2/event-details)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
jcr:primaryType="cq:ClientLibraryFolder"
allowProxy="{Boolean}true"
categories="aem.design.components.author.genericdetails"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#base=css
style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#base=js
functions.js
behaviour.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
//genericdetails - behaviour
window.AEMDESIGN = window.AEMDESIGN || {};
window.AEMDESIGN.components = AEMDESIGN.components || {};
window.AEMDESIGN.components.authoring = AEMDESIGN.components.authoring || {};
window.AEMDESIGN.components.authoring.genericdetails = AEMDESIGN.components.authoring.genericdetails || {};


(function ($, $document, Coral, ns, window, undefined) { //NOSONAR convention for wrapping all modules

console.log(["dialog-genericdetails-behaviour","ready"]);
$(document).on('dialog-ready', function () {
console.log(["dialog-genericdetails-behaviour","checking"]);
if ($('#dialog-genericdetails')[0]) {

console.log(["dialog-genericdetails-behaviour","loading"]);

// $document.on('change', '.pageMetaProperty, .pageMetaPropertyContent', function (event) {
//
// var element = event.target,
// parentElement = element.closest('.dialog-genericdetails-costomfields'),
// childpageMetaPropertyElement = parentElement.querySelector('.pageMetaProperty'),
// childpageMetaPropertyContentElement = parentElement.querySelector('.pageMetaPropertyContent')
//
// });

//load content into field
if ($('#dialog-genericdetails').find('.genericdetails-costomfields')[0]) {

var $form = $("#dialog-genericdetails").closest('form');
console.log(['$form', $form]);
var formUrl = $form[0].action;
$.getJSON(formUrl + '.json').done(function (data) {
console.log(data);
var
fieldconfigKey = data.pageMetaProperty,
fieldconfigValue = data.pageMetaPropertyContent;


if (fieldconfigKey) {
//turn plain string into array
if (typeof fieldconfigKey === 'string') {
fieldconfigKey = [fieldconfigKey];
}
//turn plain string into array
if (fieldconfigValue && (typeof fieldconfigValue === 'string')) {
fieldconfigValue = [fieldconfigValue];
}


fieldconfigKey.forEach(function (key, index) {
var curr = $('#dialog-genericdetails').find('.genericdetails-costomfields')[0].items.add();
Coral.commons.ready(curr, function (readyCurr) {
$(readyCurr).find('[name="./pageMetaProperty"]')[0].value = fieldconfigKey[index];
$(readyCurr).find('[name="./pageMetaPropertyContent"]')[0].value = fieldconfigValue[index];

});
});
}
else {
//$('.genericdetails-costomfields')[0].items.add();
}


});

} else {
console.log(["dialog-genericdetails-behaviour","genericdetails-costomfields","not found"]);
}


}
});


})($, $(document), Coral, AEMDESIGN.components.authoring.genericdetails, this); //pass in additional dependencies
Loading

0 comments on commit 94df577

Please sign in to comment.