Skip to content

Commit b49e936

Browse files
Merge pull request #27 from exadel-inc/tech/new-graphics
[Tech] Introduced new graphic identity
2 parents db9af33 + 4070c19 commit b49e936

File tree

23 files changed

+58
-25
lines changed

23 files changed

+58
-25
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The tool can be installed using the package or via building the project.
2727
1. Get the latest package version from https://github.com/exadel-inc/etoolbox-rollout-manager/releases
2828
2. Install the package _**etoolbox-rollout-manager.all-XX.zip**_ using the _Package Manager_
2929
3. Ensure that the bundle **_EToolbox Rollout Manager - Core (etoolbox-rollout-manager.core)_** is in _Active_ state.
30-
4. Ensure the nodes **_/content/etoolbox-rollout-manager/servlet_** and **_/apps/wcm/core/content/sites/jcr:content/actions/selection/rollout_** are present.
30+
4. Ensure the nodes **_/content/etoolbox/rollout-manager/servlet_** and **_/apps/wcm/core/content/sites/jcr:content/actions/selection/rollout_** are present.
3131

3232
### How to build
3333

Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
~ Licensed under the Apache License, Version 2.0 (the "License");
4-
~ you may not use this file except in compliance with the License.
5-
~ You may obtain a copy of the License at
6-
~
7-
~ http://www.apache.org/licenses/LICENSE-2.0
8-
~
9-
~ Unless required by applicable law or agreed to in writing, software
10-
~ distributed under the License is distributed on an "AS IS" BASIS,
11-
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
~ See the License for the specific language governing permissions and
13-
~ limitations under the License.
14-
-->
15-
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0"
2+
<jcr:root xmlns:vlt="http://www.day.com/jcr/vault/1.0"
3+
xmlns:jcr="http://www.jcp.org/jcr/1.0"
164
jcr:primaryType="vlt:PackageDefinition"
17-
providerLink="https://github.com/adobe/aem-project-archetype/releases"
18-
providerName="Adobe Systems Inc."
19-
providerUrl="https://www.adobe.com"
20-
testedWith="AEM 6.5">
21-
</jcr:root>
5+
jcr:description="EToolbox Rollout Manager - All-In-One Package">
6+
<thumbnail.png/>
7+
</jcr:root>
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:vlt="http://www.day.com/jcr/vault/1.0"
3+
xmlns:jcr="http://www.jcp.org/jcr/1.0"
4+
jcr:primaryType="vlt:PackageDefinition"
5+
jcr:description="EToolbox Rollout Manager - UI Apps Package">
6+
<thumbnail.png/>
7+
</jcr:root>
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0"
3+
xmlns:jcr="http://www.jcp.org/jcr/1.0"
4+
jcr:primaryType="cq:ClientLibraryFolder"
5+
categories="[coralui3]"/>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
css/styles.css
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
* Licensed under the Apache License, Version 2.0 (the "License").
3+
* You may not use this file except in compliance with the License.
4+
* You may obtain a copy of the License at
5+
*
6+
* http://www.apache.org/licenses/LICENSE-2.0
7+
*
8+
* Unless required by applicable law or agreed to in writing, software
9+
* distributed under the License is distributed on an "AS IS" BASIS,
10+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
* See the License for the specific language governing permissions and
12+
* limitations under the License.
13+
*/
14+
15+
coral-icon[icon="etoolbox-rm-sites"] {
16+
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xml:space='preserve' width='64' height='64' style='shape-rendering:geometricPrecision;text-rendering:geometricPrecision;image-rendering:optimizeQuality;fill-rule:evenodd;clip-rule:evenodd' viewBox='0 0 5.922 5.922'%3E%3Ccircle cx='2.961' cy='2.961' r='2.961' style='fill:%23666'/%3E%3Cpath d='M3.314 4.77h.064a.22.22 0 0 0 .219-.22V2.571a.22.22 0 0 0-.219-.22H1.415a.22.22 0 0 0-.219.22v.063c0 .121.099.22.219.22h1.327L1.28 4.316a.251.251 0 0 0 .355.355l1.46-1.459V4.55c0 .121.098.22.219.22zm1.001-.548h.064a.22.22 0 0 0 .219-.219V1.565a.22.22 0 0 0-.219-.22H1.924a.22.22 0 0 0-.219.22v.063a.22.22 0 0 0 .219.219h2.172v2.156c0 .12.098.219.219.219z' style='fill:%23fff'/%3E%3C/svg%3E"); height: 1.2rem;
17+
background-size: contain;
18+
width: 1.2rem;
19+
}

ui.apps/src/main/content/jcr_root/apps/etoolbox-rollout-manager/clientlibs/rollout-manager-ui/js/console-ui.actions.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
(function (window, document, $, ns, Granite) {
2020
'use strict';
2121

22-
const COLLECT_LIVE_COPIES_COMMAND = '/content/etoolbox-rollout-manager/servlet/collect-live-copies';
22+
const COLLECT_LIVE_COPIES_COMMAND = '/content/etoolbox/rollout-manager/servlet/collect-live-copies';
2323

2424
/**
2525
* Retrieves data related to eligible for synchronization live copies as a json array. The data is
@@ -38,7 +38,7 @@
3838
});
3939
}
4040

41-
const BLUEPRINT_CHECK_COMMAND = '/content/etoolbox-rollout-manager/servlet/blueprint-check';
41+
const BLUEPRINT_CHECK_COMMAND = '/content/etoolbox/rollout-manager/servlet/blueprint-check';
4242

4343
/**
4444
* Checks if selected page has live relationships eligible for synchronization and thus can be rolled out.
@@ -82,7 +82,7 @@
8282
});
8383
}
8484

85-
const ROLLOUT_COMMAND = '/content/etoolbox-rollout-manager/servlet/rollout';
85+
const ROLLOUT_COMMAND = '/content/etoolbox/rollout-manager/servlet/rollout';
8686
const PROCESSING_ERROR_MSG = Granite.I18n.get('Rollout failed');
8787
const PROCESSING_ERROR_FAILED_PATHS_MSG = Granite.I18n.get('Rollout failed for the following paths:');
8888
const SUCCESS_MSG = Granite.I18n.get('Completed');

ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
action="etoolbox.rollout-manager.show-references-dialog"
2626
activeCondition="etoolbox.rollout-manager.rollout-active-condition"
2727
activeSelectionCount="single"
28-
icon="alias"
28+
icon="etoolbox-rm-sites"
2929
target=".cq-siteadmin-admin-childpages"
3030
text="Rollout"
3131
variant="actionBar">
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:vlt="http://www.day.com/jcr/vault/1.0"
3+
xmlns:jcr="http://www.jcp.org/jcr/1.0"
4+
jcr:primaryType="vlt:PackageDefinition"
5+
jcr:description="EToolbox Rollout Manager - UI Config Package">
6+
<thumbnail.png/>
7+
</jcr:root>
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:vlt="http://www.day.com/jcr/vault/1.0"
3+
xmlns:jcr="http://www.jcp.org/jcr/1.0"
4+
jcr:primaryType="vlt:PackageDefinition"
5+
jcr:description="EToolbox Rollout Manager - UI Content Package">
6+
<thumbnail.png/>
7+
</jcr:root>
Loading

ui.content/src/main/content/META-INF/vault/filter.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
~ limitations under the License.
1414
-->
1515
<workspaceFilter version="1.0">
16-
<filter root="/content/etoolbox-rollout-manager"/>
16+
<filter root="/content/etoolbox/rollout-manager"/>
17+
<filter root="/content/etoolbox-rollout-manager"/> <!-- Removes the obsolete path -->
1718
</workspaceFilter>

0 commit comments

Comments
 (0)