Skip to content

Commit

Permalink
Merge pull request #3172 from salesforce-ux/fix/welcome-mat-text-updates
Browse files Browse the repository at this point in the history
Fix/welcome mat text updates
  • Loading branch information
zahnster authored Mar 22, 2018
2 parents 86f0269 + 48cd2e9 commit c55fb4c
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 31 deletions.
11 changes: 6 additions & 5 deletions ui/components/welcome-mat/WelcomeMatContent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class WelcomeMatContent extends React.Component {
return (
<React.Fragment>
<h2 id={labelId} className="slds-welcome-mat__info-title">
Empower Your Agents with Service Cloud
The Lightning Experience is here!
</h2>
<div className="slds-welcome-mat__info-description slds-text-longform">
{description}
Expand All @@ -22,7 +22,7 @@ class WelcomeMatContent extends React.Component {
<div className="slds-welcome-mat__info-progress">
<p>
<strong>
{complete}/{total} Walkthroughs completed
{complete}/{total} units completed
</strong>
</p>
</div>
Expand All @@ -48,9 +48,10 @@ WelcomeMatContent.defaultProps = {
labelId: 'welcome-mat-label-1',
description: (
<p>
Your 30-day trial is under way. Learn how easy it is to use and set up
Lightning Service Desk. You'll be your company's service expert by the
time you're done!
Welcome to Lightning Experience, the modern, beautiful user experience
from Salesforce. With a sales-and service-centric mindset, we focused on
reinventing the desktop environment to better support your business
processes.
</p>
)
};
Expand Down
13 changes: 7 additions & 6 deletions ui/components/welcome-mat/WelcomeMatContentTrailhead.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,20 @@ class WelcomeMatContentTrailhead extends React.Component {
<p>Cha-ching! You earned the badge.</p>
) : (
<p>
{complete} of {total} modules completed
{complete}/{total} units completed
</p>
);

return (
<React.Fragment>
<h2 id={labelId} className="slds-welcome-mat__info-title">
Hey there, Trailblazer!
The Lightning Experience is here!
</h2>
<p className="slds-welcome-mat__info-description slds-text-longform">
Your 30-day trial is under way. Learn how easy it is to use and set up
Lightning Service Desk. You'll be your company's service expert by the
time you're done!
Welcome to Lightning Experience, the modern, beautiful user experience
from Salesforce. With a sales-and service-centric mindset, we focused
on reinventing the desktop environment to better support your business
processes.
</p>

<div
Expand All @@ -55,7 +56,7 @@ class WelcomeMatContentTrailhead extends React.Component {
/>
</div>
<p>
<strong>Essentials Explorer</strong>
<strong>Lightning Explorer</strong>
</p>
{badgeProgressMessage}
</div>
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ui/components/welcome-mat/__tests__/enzyme.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ describe('Welcome Mat Content', () => {

it('correctly implements completed count props', () => {
expect(example.find('strong').html()).toBe(
`${complete}/${total} Walkthroughs completed`
`${complete}/${total} units completed`
);
});

Expand All @@ -94,7 +94,7 @@ describe('Welcome Mat Trailhead Content', () => {
});

it('shows the correct initial progress', () => {
const initialText = ['Essentials Explorer', '0 of 5 modules completed'];
const initialText = ['Lightning Explorer', '0/5 units completed'];

shallowNew.find('.slds-welcome-mat__info-progress p').forEach((p, pi) => {
expect(p.text()).toBe(initialText[pi]);
Expand All @@ -103,7 +103,7 @@ describe('Welcome Mat Trailhead Content', () => {

it('shows the correct completed message', () => {
const completedText = [
'Essentials Explorer',
'Lightning Explorer',
'Cha-ching! You earned the badge.'
];

Expand Down
2 changes: 1 addition & 1 deletion ui/components/welcome-mat/docs.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import CodeView from '../../../shared/components/CodeView';

## Overview

* Welcome Mat tiles may trigger walkthroughs or modals, or navigate users to specific URLs.
* Welcome Mat tiles may trigger walkthroughs, modals, videos, or navigate users to specific URLs.
* The Welcome Mat consists of two sections, the informational left pane and the actionable right pane.
* The left pane should be used to educate users as to the theme of the content displayed in the right pane.
* Icon choices, colors, and tile content can be customized to fit your experience.
Expand Down

0 comments on commit c55fb4c

Please sign in to comment.