Skip to content

Commit 4967544

Browse files
author
Joan He
authored
Merge pull request magento#1710 from magento-arcticfoxes/MAGETWO-83184-release-notification-content-update
[arcticfoxes] MAGETWO-83184: Static Content Update for ReleaseNotification Module
2 parents ec8af46 + 9dff3c4 commit 4967544

File tree

9 files changed

+216
-288
lines changed

9 files changed

+216
-288
lines changed

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

Lines changed: 8 additions & 3 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,8 +21,13 @@
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()')) ?>">
25-
<?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
24+
<?php if(isset($_SERVER['HTTP_REFERER'])): ?>
25+
<a href="<?= $block->escapeUrl(__($_SERVER['HTTP_REFERER'])) ?>">
26+
<?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
27+
<?php else: ?>
28+
<a href="<?= $block->escapeHtmlAttr(__('javascript:history.back()')) ?>">
29+
<?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
30+
<?php endif ?>
2631
</span>
2732
</li>
2833
</ul>
Lines changed: 65 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
"Next >","Next >"
22
"< Back","< Back"
33
"Done","Done"
4-
"What's new for Magento 2.2.2","What's new for Magento 2.2.2"
5-
"<p>Magento 2.2.2 offers an exciting set of features and enhancements, including:</p>
4+
"What's new with Magento 2.2.2","What's new with Magento 2.2.2"
5+
"<p>Magento 2.2.2 offers advanced new features, including:</p>
66
<br />
77
<div class=""analytics-highlight"">
88
<h3>Advanced Reporting</h3>
99
<p>Gain valuable insights through a dynamic suite of product, order, and customer reports,
1010
powered by Magento Business Intelligence.</p>
1111
</div>
12-
<div class=""developer-experience-highlight"">
13-
<h3>Developer Experience</h3>
14-
<p>We've improved the entire development lifecycle - installation, development, and maintenance
15-
- while ensuring Magento's commitment to quality.</p>
12+
<div class=""instant-purchase-highlight"">
13+
<h3>Instant Purchase</h3>
14+
<p>Simplify ordering and boost conversion rates by allowing your customers to use stored
15+
payment and shipping information to skip tedious checkout steps.</p>
1616
</div>
17-
<div class=""b2b-highlight"">
18-
<h3>Business-to-Business (B2B) <span>Magento Commerce only</span></h3>
19-
<p>Features to manage your complex company accounts, rapid reordering, new buyers' roles and
20-
permissions, and more.</p>
17+
<div class=""email-marketing-highlight"">
18+
<h3>Email Marketing Automation</span></h3>
19+
<p>Send smarter, faster email campaigns with marketing automation from dotmailer, powered by
20+
your Magento store's live data.</p>
2121
</div>
2222
<p>Release notes and additional details can be found at
2323
<a href=""http://devdocs.magento.com/"" target=""_blank"">Magento DevDocs</a>.
24-
</p>","<p>Magento 2.2.2 offers an exciting set of features and enhancements, including:</p>
24+
</p>","<p>Magento 2.2.2 offers advanced new features, including:</p>
2525
<br />
2626
<div class=""analytics-highlight"">
2727
<h3>Advanced Reporting</h3>
2828
<p>Gain valuable insights through a dynamic suite of product, order, and customer reports,
2929
powered by Magento Business Intelligence.</p>
3030
</div>
31-
<div class=""developer-experience-highlight"">
32-
<h3>Developer Experience</h3>
33-
<p>We've improved the entire development lifecycle - installation, development, and maintenance
34-
- while ensuring Magento's commitment to quality.</p>
31+
<div class=""instant-purchase-highlight"">
32+
<h3>Instant Purchase</h3>
33+
<p>Simplify ordering and boost conversion rates by allowing your customers to use stored
34+
payment and shipping information to skip tedious checkout steps.</p>
3535
</div>
36-
<div class=""b2b-highlight"">
37-
<h3>Business-to-Business (B2B) <span>Magento Commerce only</span></h3>
38-
<p>Features to manage your complex company accounts, rapid reordering, new buyers' roles and
39-
permissions, and more.</p>
36+
<div class=""email-marketing-highlight"">
37+
<h3>Email Marketing Automation</span></h3>
38+
<p>Send smarter, faster email campaigns with marketing automation from dotmailer, powered by
39+
your Magento store's live data.</p>
4040
</div>
4141
<p>Release notes and additional details can be found at
4242
<a href=""http://devdocs.magento.com/"" target=""_blank"">Magento DevDocs</a>.
@@ -46,62 +46,67 @@
4646
provides you with a dynamic suite of reports with rich insights about the health of your
4747
business.</p><br /><p>As part of the Advanced Reporting service, we may also use your customer
4848
data for such purposes as benchmarking, improving our products and services, and providing you
49-
with new and improved analytics.</p><br /><p>By using Magento 2.2, you agree to the Advanced
49+
with new and improved analytics.</p><br /><p>By using Magento 2.2.2, you agree to the Advanced
5050
Reporting <a href=""https://magento.com/legal/terms/privacy"" target=""_blank"">Privacy Policy</a> and
5151
<a href=""https://magento.com/legal/terms/cloud-terms"" target=""_blank"">Terms
5252
of Service</a>. You may opt out at any time from the Stores Configuration page.</p>
5353
","<p>Advanced Reporting
5454
provides you with a dynamic suite of reports with rich insights about the health of your
5555
business.</p><br /><p>As part of the Advanced Reporting service, we may also use your customer
5656
data for such purposes as benchmarking, improving our products and services, and providing you
57-
with new and improved analytics.</p><br /><p>By using Magento 2.2, you agree to the Advanced
57+
with new and improved analytics.</p><br /><p>By using Magento 2.2.2, you agree to the Advanced
5858
Reporting <a href=""https://magento.com/legal/terms/privacy"" target=""_blank"">Privacy Policy</a> and
5959
<a href=""https://magento.com/legal/terms/cloud-terms"" target=""_blank"">Terms
60-
of Service</a>. You may opt out at any time from the Stores Configuration page.</p>
61-
"
62-
"Developer Experience","Developer Experience"
63-
"<p>Magento's 2.2.2 release offers a set of improvements that were developed using increased
64-
quality standards. The release includes these features, among others:
60+
of Service</a>. You may opt out at any time from the Stores Configuration page.</p>"
61+
"Instant Purchase","Instant Purchase"
62+
"<p>Now you can deliver an Amazon-like experience with a new, streamlined checkout option.
63+
Logged-in customers can use previously-stored payment credentials and shipping information
64+
to skip steps, making the process faster and easier, especially for mobile shoppers. Key
65+
features include:
6566
</p>
6667
<ul>
67-
<li><span>GitHub Community Moderator Team</span></li>
68-
<li><span>GitHub Community Videos</span></li>
69-
<li><span>DevDocs Enhancements</span></li>
70-
</ul>
71-
<p>Find the 2.2.2 details and future plans in the
72-
<a href=""http://community.magento.com/devblog"" target=""_blank"">Magento DevBlog</a>.
73-
</p>","<p>Magento's 2.2.2 release offers a set of improvements that were developed using increased
74-
quality standards. The release includes these features, among others:
68+
<li><span>Configurable “Instant Purchase” button to place orders</span></li>
69+
<li><span>Support for all payment solutions using Braintree Vault, including Braintree Credit
70+
Card, Braintree PayPal, and PayPal Payflow Pro.</span></li>
71+
<li><span>Shipping to the customer’s default address using the lowest cost, available shipping
72+
method</span></li>
73+
<li><span>Ability for developers to customize the Instant Purchase business logic to meet
74+
merchant needs</span></li>
75+
</ul>","<p>Now you can deliver an Amazon-like experience with a new, streamlined checkout option.
76+
Logged-in customers can use previously-stored payment credentials and shipping information
77+
to skip steps, making the process faster and easier, especially for mobile shoppers. Key
78+
features include:
7579
</p>
7680
<ul>
77-
<li><span>GitHub Community Moderator Team</span></li>
78-
<li><span>GitHub Community Videos</span></li>
79-
<li><span>DevDocs Enhancements</span></li>
80-
</ul>
81-
<p>Find the 2.2.2 details and future plans in the
82-
<a href=""http://community.magento.com/devblog"" target=""_blank"">Magento DevBlog</a>.
83-
</p>"
84-
"Business-to-Business (B2B) <span>Magento Commerce only</span>","Business-to-Business (B2B) <span>Magento Commerce only</span>"
85-
"<p>Magento Commerce 2.2.2 offers rich new functionality that empowers B2B merchants to transform
86-
their online purchasing experience to achieve greater operational efficiency, improved customer
87-
service, and sales growth. New capabilities include:
81+
<li><span>Configurable “Instant Purchase” button to place orders</span></li>
82+
<li><span>Support for all payment solutions using Braintree Vault, including Braintree Credit
83+
Card, Braintree PayPal, and PayPal Payflow Pro.</span></li>
84+
<li><span>Shipping to the customer’s default address using the lowest cost, available shipping
85+
method</span></li>
86+
<li><span>Ability for developers to customize the Instant Purchase business logic to meet
87+
merchant needs</span></li>
88+
</ul>"
89+
"Email Marketing Automation","Email Marketing Automation"
90+
"<p>Unlock an unparalleled level of insight and control of your eCommerce marketing with
91+
dotmailer Email Marketing Automation. Included with Magento 2.2.2 for easy set-up, dotmailer
92+
ensures every customer’s journey is captured, segmented, and personalized, enabling you to
93+
deliver customer-centric campaigns that beat your results over and over again. Benefits include:
8894
</p>
8995
<ul>
90-
<li><span>Company accounts with multiple tiers of buyers</span></li>
91-
<li><span>Buyer roles and permissions</span></li>
92-
<li><span>Custom catalogs and pricing</span></li>
93-
<li><span>Quoting support</span></li>
94-
<li><span>Rapid reorder experience</span></li>
95-
<li><span>Payments on credit</span></li>
96-
</ul>","<p>Magento Commerce 2.2.2 offers rich new functionality that empowers B2B merchants to transform
97-
their online purchasing experience to achieve greater operational efficiency, improved customer
98-
service, and sales growth. New capabilities include:
96+
<li><span>No obligation 14-day trial.</span></li>
97+
<li><span>Automation campaigns using your live Magento store data that drive revenue,
98+
including abandoned cart, abandoned browse, product replenishment, and many more</span></li>
99+
<li><span>Built-in solution for transactional emails.</span></li>
100+
<li><span>Telephone support and advice from marketing experts included.</span></li>
101+
</ul>","<p>Unlock an unparalleled level of insight and control of your eCommerce marketing with
102+
dotmailer Email Marketing Automation. Included with Magento 2.2.2 for easy set-up, dotmailer
103+
ensures every customer’s journey is captured, segmented, and personalized, enabling you to
104+
deliver customer-centric campaigns that beat your results over and over again. Benefits include:
99105
</p>
100106
<ul>
101-
<li><span>Company accounts with multiple tiers of buyers</span></li>
102-
<li><span>Buyer roles and permissions</span></li>
103-
<li><span>Custom catalogs and pricing</span></li>
104-
<li><span>Quoting support</span></li>
105-
<li><span>Rapid reorder experience</span></li>
106-
<li><span>Payments on credit</span></li>
107+
<li><span>No obligation 14-day trial.</span></li>
108+
<li><span>Automation campaigns using your live Magento store data that drive revenue,
109+
including abandoned cart, abandoned browse, product replenishment, and many more</span></li>
110+
<li><span>Built-in solution for transactional emails.</span></li>
111+
<li><span>Telephone support and advice from marketing experts included.</span></li>
107112
</ul>"

0 commit comments

Comments
 (0)