Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 3cc4070

Browse files
author
rossbrandon
committed
MAGETWO-83184: Static Content Update for ReleaseNotification Module
1 parent 1d2cbdc commit 3cc4070

File tree

8 files changed

+150
-225
lines changed

8 files changed

+150
-225
lines changed

‎app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
?>
1010
<?php
1111
/**
12-
* @see \Magento\Backend\Block\Template
12+
* @see \Magento\Backend\Block\Denied
1313
*/
1414
?>
1515
<hr class="access-denied-hr"/>
@@ -21,9 +21,15 @@
2121
<li><span><?= $block->escapeHtml(__('Contact a system administrator or store owner to gain permissions.')) ?></span></li>
2222
<li>
2323
<span><?= $block->escapeHtml(__('Return to ')) ?>
24-
<a href="<?= $block->escapeHtmlAttr(__('javascript:history.back()')) ?>">
24+
<a href="<?= $block->escapeHtmlAttr(__('javascript:history.back()')) ?>"
25+
onclick="<?= $block->escapeHtmlAttr(__('goBackToReferer(); return false;')) ?>">
2526
<?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
2627
</span>
2728
</li>
2829
</ul>
2930
</div>
31+
<script>
32+
function goBackToReferer() {
33+
window.location.href = document.referrer;
34+
}
35+
</script>

‎app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,22 @@
6060
<item name="label" xsi:type="string"/>
6161
<item name="additionalClasses" xsi:type="string">release-notification-text</item>
6262
<item name="text" xsi:type="string" translate="true"><![CDATA[
63-
<p>Magento 2.2.2 offers an exciting set of features and enhancements, including:</p>
63+
<p>Magento 2.2.2 offers advanced new features, including:</p>
6464
<br />
6565
<div class="analytics-highlight">
6666
<h3>Advanced Reporting</h3>
6767
<p>Gain valuable insights through a dynamic suite of product, order, and customer reports,
6868
powered by Magento Business Intelligence.</p>
6969
</div>
70-
<div class="developer-experience-highlight">
71-
<h3>Developer Experience</h3>
72-
<p>We've improved the entire development lifecycle - installation, development, and maintenance
73-
- while ensuring Magento's commitment to quality.</p>
70+
<div class="instant-purchase-highlight">
71+
<h3>Instant Purchase</h3>
72+
<p>Simplify ordering and boost conversion rates by allowing your customers to use stored
73+
payment and shipping information to skip tedious checkout steps.</p>
7474
</div>
75-
<div class="b2b-highlight">
76-
<h3>Business-to-Business (B2B) <span>Magento Commerce only</span></h3>
77-
<p>Features to manage your complex company accounts, rapid reordering, new buyers' roles and
78-
permissions, and more.</p>
75+
<div class="email-marketing-highlight">
76+
<h3>Email Marketing Automation</span></h3>
77+
<p>Send smarter, faster email campaigns with marketing automation from dotmailer, powered by
78+
your Magento store's live data.</p>
7979
</div>
8080
<p>Release notes and additional details can be found at
8181
<a href="http://devdocs.magento.com/" target="_blank">Magento DevDocs</a>.
@@ -184,7 +184,7 @@
184184
<item name="actionName" xsi:type="string">closeModal</item>
185185
</item>
186186
<item name="1" xsi:type="array">
187-
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = developer_experience_modal</item>
187+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = instant_purchase_modal</item>
188188
<item name="actionName" xsi:type="string">openModal</item>
189189
</item>
190190
</item>
@@ -198,12 +198,12 @@
198198
</container>
199199
</fieldset>
200200
</modal>
201-
<modal name="developer_experience_modal" component="Magento_ReleaseNotification/js/modal/component">
201+
<modal name="instant_purchase_modal" component="Magento_ReleaseNotification/js/modal/component">
202202
<settings>
203203
<onCancel>actionCancel</onCancel>
204204
<options>
205-
<option name="modalClass" xsi:type="string">developer-experience-modal</option>
206-
<option name="title" xsi:type="string" translate="true">Developer Experience</option>
205+
<option name="modalClass" xsi:type="string">instant-purchase-modal</option>
206+
<option name="title" xsi:type="string" translate="true">Instant Purchase</option>
207207
<option name="type" xsi:type="string">popup</option>
208208
<option name="responsive" xsi:type="boolean">true</option>
209209
<option name="innerScroll" xsi:type="boolean">true</option>
@@ -220,17 +220,20 @@
220220
<item name="label" xsi:type="string"/>
221221
<item name="additionalClasses" xsi:type="string">release-notification-text</item>
222222
<item name="text" xsi:type="string" translate="true"><![CDATA[
223-
<p>Magento's 2.2.2 release offers a set of improvements that were developed using increased
224-
quality standards. The release includes these features, among others:
223+
<p>Now you can deliver an Amazon-like experience with a new, streamlined checkout option.
224+
Logged-in customers can use previously-stored payment credentials and shipping information
225+
to skip steps, making the process faster and easier, especially for mobile shoppers. Key
226+
features include:
225227
</p>
226228
<ul>
227-
<li><span>GitHub Community Moderator Team</span></li>
228-
<li><span>GitHub Community Videos</span></li>
229-
<li><span>DevDocs Enhancements</span></li>
230-
</ul>
231-
<p>Find the 2.2.2 details and future plans in the
232-
<a href="http://community.magento.com/devblog" target="_blank">Magento DevBlog</a>.
233-
</p>]]>
229+
<li><span>Configurable “Instant Purchase” button to place orders</span></li>
230+
<li><span>Support for all payment solutions using Braintree Vault, including Braintree Credit
231+
Card, Braintree PayPal, and PayPal Payflow Pro.</span></li>
232+
<li><span>Shipping to the customer’s default address using the lowest cost, available shipping
233+
method</span></li>
234+
<li><span>Ability for developers to customize the Instant Purchase business logic to meet
235+
merchant needs</span></li>
236+
</ul>]]>
234237
</item>
235238
</item>
236239
</argument>
@@ -247,7 +250,7 @@
247250
<item name="buttonClasses" xsi:type="string">release-notification-button-back</item>
248251
<item name="actions" xsi:type="array">
249252
<item name="0" xsi:type="array">
250-
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = developer_experience_modal</item>
253+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = instant_purchase_modal</item>
251254
<item name="actionName" xsi:type="string">closeModal</item>
252255
</item>
253256
<item name="1" xsi:type="array">
@@ -268,11 +271,11 @@
268271
<item name="buttonClasses" xsi:type="string">release-notification-button-next</item>
269272
<item name="actions" xsi:type="array">
270273
<item name="0" xsi:type="array">
271-
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = developer_experience_modal</item>
274+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = instant_purchase_modal</item>
272275
<item name="actionName" xsi:type="string">closeModal</item>
273276
</item>
274277
<item name="1" xsi:type="array">
275-
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = b2b_modal</item>
278+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = email_marketing_modal</item>
276279
<item name="actionName" xsi:type="string">openModal</item>
277280
</item>
278281
</item>
@@ -286,13 +289,12 @@
286289
</container>
287290
</fieldset>
288291
</modal>
289-
<modal name="b2b_modal" component="Magento_ReleaseNotification/js/modal/component">
292+
<modal name="email_marketing_modal" component="Magento_ReleaseNotification/js/modal/component">
290293
<settings>
291294
<onCancel>actionCancel</onCancel>
292295
<options>
293-
<option name="modalClass" xsi:type="string">b2b-modal</option>
294-
<option name="title" xsi:type="string" translate="true"><![CDATA[Business-to-Business (B2B)
295-
<span>Magento Commerce only</span>]]></option>
296+
<option name="modalClass" xsi:type="string">email-marketing-modal</option>
297+
<option name="title" xsi:type="string" translate="true">Email Marketing Automation</option>
296298
<option name="type" xsi:type="string">popup</option>
297299
<option name="responsive" xsi:type="boolean">true</option>
298300
<option name="innerScroll" xsi:type="boolean">true</option>
@@ -309,17 +311,18 @@
309311
<item name="label" xsi:type="string"/>
310312
<item name="additionalClasses" xsi:type="string">release-notification-text</item>
311313
<item name="text" xsi:type="string" translate="true"><![CDATA[
312-
<p>Magento Commerce 2.2.2 offers rich new functionality that empowers B2B merchants to transform
313-
their online purchasing experience to achieve greater operational efficiency, improved customer
314-
service, and sales growth. New capabilities include:
314+
<p>Unlock an unparalleled level of insight and control of your eCommerce marketing with
315+
dotmailer Email Marketing Automation. Included with Magento 2.2.2 for easy set-up, dotmailer
316+
ensures every customer’s journey is captured, segmented, and personalized, enabling you to
317+
deliver customer-centric campaigns that beat your results over and over again. Benefits include:
315318
</p>
316319
<ul>
317-
<li><span>Company accounts with multiple tiers of buyers</span></li>
318-
<li><span>Buyer roles and permissions</span></li>
319-
<li><span>Custom catalogs and pricing</span></li>
320-
<li><span>Quoting support</span></li>
321-
<li><span>Rapid reorder experience</span></li>
322-
<li><span>Payments on credit</span></li>
320+
<li><span>No obligation 14-day trial.</span></li>
321+
<li><span>Automation campaigns using your live Magento store data that drive revenue,
322+
including abandoned cart, abandoned browse, product replenishment, and many more</span></li>
323+
<li><span>Custom catalogs and pricing.</span></li>
324+
<li><span>Built-in solution for transactional emails.</span></li>
325+
<li><span>Telephone support and advice from marketing experts included.</span></li>
323326
</ul>]]>
324327
</item>
325328
</item>
@@ -337,11 +340,11 @@
337340
<item name="buttonClasses" xsi:type="string">release-notification-button-back</item>
338341
<item name="actions" xsi:type="array">
339342
<item name="0" xsi:type="array">
340-
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = b2b_modal</item>
343+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = email_marketing_modal</item>
341344
<item name="actionName" xsi:type="string">closeModal</item>
342345
</item>
343346
<item name="1" xsi:type="array">
344-
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = developer_experience_modal</item>
347+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = instant_purchase_modal</item>
345348
<item name="actionName" xsi:type="string">openModal</item>
346349
</item>
347350
</item>
@@ -358,7 +361,7 @@
358361
<item name="buttonClasses" xsi:type="string">release-notification-button-next</item>
359362
<item name="actions" xsi:type="array">
360363
<item name="0" xsi:type="array">
361-
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = b2b_modal</item>
364+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = email_marketing_modal</item>
362365
<item name="actionName" xsi:type="string">closeReleaseNotes</item>
363366
</item>
364367
</item>

‎app/design/adminhtml/Magento/backend/Magento_ReleaseNotification/web/css/source/_module.less

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Magento_ReleaseNotification Modal on dashboard
88
// ---------------------------------------------
99

10-
.release-notification-modal, .analytics-subscription-modal, .developer-experience-modal, .b2b-modal {
10+
.release-notification-modal, .analytics-subscription-modal, .instant-purchase-modal, .email-marketing-modal {
1111
-webkit-transition: visibility 0s .5s, opacity .5s ease;
1212
transition: visibility 0s .5s, opacity .5s ease;
1313

@@ -54,7 +54,9 @@
5454

5555
span {
5656
font-size: @font-size__base;
57-
margin-left: 2rem;
57+
vertical-align: middle;
58+
position: relative;
59+
left: 1rem;
5860
}
5961
}
6062
}
@@ -77,17 +79,17 @@
7779
background-size: 65px 58px;
7880
}
7981

80-
.b2b-highlight {
81-
background: url("Magento_ReleaseNotification::images/b2b-icon.svg") no-repeat;
82+
.email-marketing-highlight {
83+
background: url("Magento_ReleaseNotification::images/email-marketing-icon.svg") no-repeat;
8284
background-size: 65px 53.37px;
8385
}
8486

85-
.developer-experience-highlight {
86-
background: url("Magento_ReleaseNotification::images/developer-experience-icon.svg") no-repeat;
87+
.instant-purchase-highlight {
88+
background: url("Magento_ReleaseNotification::images/instant-purchase-icon.svg") no-repeat;
8789
background-size: 65px 59px;
8890
}
8991

90-
.analytics-highlight, .b2b-highlight, .developer-experience-highlight {
92+
.analytics-highlight, .email-marketing-highlight, .instant-purchase-highlight {
9193
padding: 0 0 2rem 8.5rem;
9294
margin-left: 1rem;
9395

@@ -110,17 +112,17 @@
110112
}
111113
}
112114

113-
.b2b-modal {
115+
.email-marketing-modal {
114116
h1:first-of-type {
115-
background: url("Magento_ReleaseNotification::images/b2b-icon.svg") no-repeat;
117+
background: url("Magento_ReleaseNotification::images/email-marketing-icon.svg") no-repeat;
116118
background-size: 55px 49.92px;
117119
padding: 1.5rem 0 2rem 7rem;
118120
}
119121
}
120122

121-
.developer-experience-modal {
123+
.instant-purchase-modal {
122124
h1:first-of-type {
123-
background: url("Magento_ReleaseNotification::images/developer-experience-icon.svg") no-repeat;
125+
background: url("Magento_ReleaseNotification::images/instant-purchase-icon.svg") no-repeat;
124126
background-size: 55px 46px;
125127
padding: 1.5rem 0 2rem 7rem;
126128
}

0 commit comments

Comments
 (0)