Updates more GL+ content

gitkraken · Oct 17, 2022 · 5904c4e · 5904c4e
1 parent b579d68
commit 5904c4e
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 119 deletions.
diff --git a/README.md b/README.md
@@ -71,11 +71,11 @@ Here are just some of the **features** that GitLens provides,
 
 # GitLens+ Features [#](#gitlens+-features- 'GitLens+ Features')
 
-Powerful, all-new, and completely optional, features that enhance your GitLens experience.
+All-new, powerful, and completely optional, features that enhance your GitLens experience.
 
 [GitLens+ features](https://gitkraken.com/gitlens/plus-features?utm_source=gitlens-extension&utm_medium=in-app-links&utm_campaign=gitlens-plus-links) are free for local and public repos, no account required, while upgrading to GitLens Pro gives you access on private repos.
 
-> All other GitLens features are always accessible.
+> All other GitLens features can always be used on any repo.
 
 ## Does this affect existing features?
 

diff --git a/package.json b/package.json
@@ -4038,7 +4038,7 @@
 			},
 			{
 				"command": "gitlens.plus.purchase",
-				"title": "Upgrade Your GitLens+ Account...",
+				"title": "Upgrade to GitLens Pro...",
 				"category": "GitLens+"
 			},
 			{
@@ -12164,7 +12164,7 @@
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "Worktrees allow you to easily work on different branches of a repository simultaneously. You can create multiple working trees, each of which can be opened in individual windows or all together in a single workspace."
+				"contents": "Worktrees, a [✨ GitLens+ feature](command:gitlens.plus.learn \"Learn more about GitLens+ features\"), help you multitask, by minimizing the context switching between branches, allowing you to easily work on different branches of a repository simultaneously.\n\nYou can create multiple working trees, each of which can be opened in individual windows or all together in a single workspace."
 			},
 			{
 				"view": "gitlens.views.worktrees",
@@ -12173,28 +12173,23 @@
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "Please verify your email\n\nTo use Worktrees, please verify the email for the account you created.\n\n[Resend verification email](command:gitlens.plus.resendVerification)\n\n[Refresh verification status](command:gitlens.plus.validate)",
+				"contents": "Please verify your email\n\nTo use Worktrees, please verify your email address.\n\n[Resend verification email](command:gitlens.plus.resendVerification)\n\n[Refresh verification status](command:gitlens.plus.validate)",
 				"when": "gitlens:plus:state == -1"
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "Try worktrees now, without an account, for 3 days on public and private repos, or [sign in](command:gitlens.plus.loginOrSignUp \"Sign in to GitLens+\") for use on public repos.\n\n[Try worktrees now](command:gitlens.plus.startPreviewTrial)",
-				"when": "gitlens:plus:state == 0"
+				"contents": "[Try worktrees on private repos](command:gitlens.plus.startPreviewTrial)\n\nTo use worktrees and other [GitLens+ features](command:gitlens.plus.learn) on private repos, start a free trial of GitLens Pro, without an account, or [sign in](command:gitlens.plus.loginOrSignUp).",
+				"when": "gitlens:plus:required && gitlens:plus:state == 0"
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "Sign in to use worktrees and other GitLens+ features on public repos and get a free 7-day trial for both public and private repos.\n\n[Sign in to GitLens+](command:gitlens.plus.loginOrSignUp)",
-				"when": "gitlens:plus:state == 2"
+				"contents": "[Extend Pro Trial](command:gitlens.plus.loginOrSignUp)\n\nYour free 3-day GitLens Pro trial has ended, extend your trial to get an additional 7-days of worktrees and other [GitLens+ features](command:gitlens.plus.learn) on private repos.",
+				"when": "gitlens:plus:required && gitlens:plus:state == 2"
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "[Upgrade your account](command:gitlens.plus.purchase)",
-				"when": "gitlens:plus:state == 4"
-			},
-			{
-				"view": "gitlens.views.worktrees",
-				"contents": "✨ Worktrees are a [GitLens+ feature](command:gitlens.plus.learn) which can be used on public repos with a [free account](command:gitlens.plus.loginOrSignUp) and private repos with a [paid account](command:gitlens.plus.purchase).\n\n🛈 All other GitLens features can always be used on any repo, without an account.\n◴ GitLens+ [introductory pricing](command:gitlens.plus.purchase) will end with the next release (late Sept, early Oct).",
-				"when": "gitlens:plus:state > -1"
+				"contents": "[Upgrade to Pro](command:gitlens.plus.purchase)\n\nYour GitLens Pro trial has ended, please upgrade to GitLens Pro to continue to use worktrees and other [GitLens+ features](command:gitlens.plus.learn) on private repos.",
+				"when": "gitlens:plus:required && gitlens:plus:state == 4"
 			}
 		],
 		"views": {
@@ -12425,7 +12420,7 @@
 					{
 						"id": "gitlens.welcome.plus",
 						"title": "Introducing GitLens+ Features",
-						"description": "Check out the powerfull, all-new, and completely optional, GitLens+ features.\n\n[Learn about GitLens+ features](command:gitlens.plus.learn?false \"Open the GitLens+ features walkthrough\")",
+						"description": "Check out the all-new, powerful, and completely optional, GitLens+ features.\n\n[Learn about GitLens+ features](command:gitlens.plus.learn?false \"Open the GitLens+ features walkthrough\")",
 						"media": {
 							"markdown": "walkthroughs/getting-started/12-plus.md"
 						}
@@ -12437,49 +12432,13 @@
 				"title": "Introducing GitLens+ Features",
 				"description": "Get even more out of GitLens in VS Code!",
 				"steps": [
-					{
-						"id": "gitlens.plus.intro.tryNow",
-						"title": "Introducing GitLens+ Features",
-						"description": "Try GitLens+ features on private repos, free for 3 days, without an account.\n\n[Start a GitLens Pro Trial](command:gitlens.plus.startPreviewTrial)",
-						"media": {
-							"markdown": "walkthroughs/plus/intro.md"
-						},
-						"when": "gitlens:plus:state == 0"
-					},
-					{
-						"id": "gitlens.plus.intro.trial",
-						"title": "Introducing GitLens+ Features",
-						"description": "During your GitLens Pro trial, you have additional access to GitLens+ features on private repos.",
-						"media": {
-							"markdown": "walkthroughs/plus/intro.md"
-						},
-						"when": "gitlens:plus:state == 1 || gitlens:plus:state == 3"
-					},
-					{
-						"id": "gitlens.plus.intro.extend",
-						"title": "Introducing GitLens+ Features",
-						"description": "Do you want to continue to use GitLens+ features on private repos, free for an additional 7-days?\n\n[Extend Trial](command:gitlens.plus.loginOrSignUp)",
-						"media": {
-							"markdown": "walkthroughs/plus/intro.md"
-						},
-						"when": "gitlens:plus:state == 2"
-					},
-					{
-						"id": "gitlens.plus.intro.signIn",
-						"title": "Introducing GitLens+ Features",
-						"description": "Do you want to continue to use GitLens+ features on private repos?\n\n[Upgrade to Pro](command:gitlens.plus.command:gitlens.plus.purchase)",
-						"media": {
-							"markdown": "walkthroughs/plus/intro.md"
-						},
-						"when": "gitlens:plus:state == 4"
-					},
 					{
 						"id": "gitlens.plus.intro",
 						"title": "Introducing GitLens+ Features",
+						"description": "All-new, powerful, and completely optional, features that enhance your current GitLens experience.",
 						"media": {
 							"markdown": "walkthroughs/plus/intro.md"
-						},
-						"when": "gitlens:plus:state == 5"
+						}
 					},
 					{
 						"id": "gitlens.plus.commitGraph",
@@ -12515,34 +12474,34 @@
 					{
 						"id": "gitlens.plus.tryNow",
 						"title": "Try GitLens Pro",
-						"description": "Try GitLens+ features on private repos, free for 3 days, without an account.\n\n[Start a GitLens Pro Trial](command:gitlens.plus.startPreviewTrial)",
+						"description": "To use [GitLens+ features](command:gitlens.plus.learn) on private repos, start a free trial of GitLens Pro, without an account, or [sign in](command:gitlens.plus.loginOrSignUp).\n\n[Start Pro Trial](command:gitlens.plus.startPreviewTrial)",
 						"media": {
 							"markdown": "walkthroughs/plus/try-now.md"
 						},
 						"when": "gitlens:plus:state == 0"
 					},
 					{
-						"id": "gitlens.plus.extend",
-						"title": "Extend Your GitLens Pro Trial",
-						"description": "Extend your trial to get an additional 7-days of GitLens+ features on private repos for free.\n\n[Extend Trial](command:gitlens.plus.loginOrSignUp)",
+						"id": "gitlens.plus.trial",
+						"title": "Trialing GitLens Pro",
+						"description": "During your GitLens Pro trial, you have additional access to [GitLens+ features](command:gitlens.plus.learn) on private repos.\n\n[Upgrade to Pro](command:gitlens.plus.purchase)",
 						"media": {
 							"markdown": "walkthroughs/plus/try-now.md"
 						},
-						"when": "gitlens:plus:state == 2"
+						"when": "gitlens:plus:state == 1 || gitlens:plus:state == 3"
 					},
 					{
-						"id": "gitlens.plus.purchase",
-						"title": "Upgrade to GitLens Pro",
-						"description": "Want to use GitLens+ features on private repos?\n\n[Upgrade to Pro](command:gitlens.plus.purchase)",
+						"id": "gitlens.plus.trial.extend",
+						"title": "Extend GitLens Pro Trial",
+						"description": "Your free 3-day GitLens Pro trial has ended, extend your trial to get an additional free 7-days of [GitLens+ features](command:gitlens.plus.learn) on private repos.\n\n[Extend Pro Trial](command:gitlens.plus.loginOrSignUp)",
 						"media": {
 							"markdown": "walkthroughs/plus/try-now.md"
 						},
-						"when": "gitlens:plus:state == 1 || gitlens:plus:state == 3"
+						"when": "gitlens:plus:state == 2"
 					},
 					{
-						"id": "gitlens.plus.expired",
+						"id": "gitlens.plus.trial.upgrade",
 						"title": "Upgrade to GitLens Pro",
-						"description": "Want to continue to use GitLens+ features on private repos?\n\n[Upgrade to Pro](command:gitlens.plus.purchase)",
+						"description": "Your GitLens Pro trial has ended, please upgrade to GitLens Pro to continue to use [GitLens+ features](command:gitlens.plus.learn) on private repos.\n\n[Upgrade to Pro](command:gitlens.plus.command:gitlens.plus.purchase)",
 						"media": {
 							"markdown": "walkthroughs/plus/try-now.md"
 						},

diff --git a/src/views/nodes/worktreesNode.ts b/src/views/nodes/worktreesNode.ts
@@ -62,7 +62,7 @@ export class WorktreesNode extends ViewNode<WorktreesView | RepositoriesView> {
 		item.contextValue = ContextValues.Worktrees;
 		item.description = access.allowed
 			? undefined
-			: ` ${GlyphChars.Warning}  GitLens+ feature which requires an account`;
+			: ` ${GlyphChars.Warning}  Requires GitLens Pro to access Worktrees on private repos`;
 		// TODO@eamodio `folder` icon won't work here for some reason
 		item.iconPath = new ThemeIcon('folder-opened');
 		return item;

diff --git a/src/webviews/apps/home/components/plus-content.ts b/src/webviews/apps/home/components/plus-content.ts
@@ -8,7 +8,7 @@ const template = html<PlusContent>`
 	${when(
 		x => x.state === SubscriptionState.Free,
 		html<PlusContent>`
-			<p>Powerful, all-new, and completely optional, features that enhance your GitLens experience.</p>
+			<p>All-new, powerful, and completely optional, features that enhance your GitLens experience.</p>
 			<p>
 				GitLens+ features are free for local and public repos, no account required, while upgrading to GitLens
 				Pro gives you access on private repos.
@@ -42,8 +42,13 @@ const template = html<PlusContent>`
 			<p>
 				You have ${x => x.daysRemaining} left in your 3-day
 				<a title="Learn more about GitLens+ features" href="command:gitlens.plus.learn">GitLens Pro trial</a>.
-				Don't worry, once your trial ends, you can extend it for an additional 7-days of GitLens+ features on
-				private repos for free.
+				Don't worry if you need more time, you can extend your trial for an additional free 7-days of GitLens+
+				features on private repos.
+			</p>
+			<p>
+				<vscode-button @click="${x => x.fireAction('command:gitlens.plus.purchase')}"
+					>Upgrade to Pro</vscode-button
+				>
 			</p>
 		`,
 	)}
@@ -64,10 +69,10 @@ const template = html<PlusContent>`
 		html<PlusContent>`
 			<h3>Extend Your GitLens Pro Trial</h3>
 			<p>
-				Your free 3-day GitLens Pro trial has ended, extend your trial to get an additional 7-days of GitLens+
-				features on private repos for free.
+				Your free 3-day GitLens Pro trial has ended, extend your trial to get an additional free 7-days of
+				GitLens+ features on private repos.
 			</p>
-			<p class="mb-1">
+			<p>
 				<vscode-button @click="${x => x.fireAction('command:gitlens.plus.loginOrSignUp')}"
 					>Extend Pro Trial</vscode-button
 				>
@@ -82,7 +87,7 @@ const template = html<PlusContent>`
 				Your GitLens Pro trial has ended, please upgrade to GitLens Pro to continue to use GitLens+ features on
 				private repos.
 			</p>
-			<p class="mb-1">
+			<p>
 				<vscode-button @click="${x => x.fireAction('command:gitlens.plus.purchase')}"
 					>Upgrade to Pro</vscode-button
 				>
@@ -101,15 +106,15 @@ const template = html<PlusContent>`
 					>Resend Verification Email</vscode-button
 				>
 			</p>
-			<p class="mb-1">
+			<p>
 				<vscode-button @click="${x => x.fireAction('command:gitlens.plus.validate')}"
 					>Refresh Verification Status</vscode-button
 				>
 			</p>
 		`,
 	)}
 
-	<p class="mb-0"><code-icon icon="info"></code-icon> All other GitLens features are always accessible</p>
+	<p class="mb-0"><code-icon icon="info"></code-icon> All other GitLens features can always be used on any repo</p>
 `;
 
 const styles = css`

diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx
@@ -598,12 +598,10 @@ export function GraphWrapper({
 					<>
 						<p className="alert__title">GitLens Pro Trial</p>
 						<p className="alert__message">
-							You have {days < 1 ? 'less than one day' : pluralize('day', days)} left in your 3-day{' '}
-							<a title="Learn more about GitLens+ features" href="command:gitlens.plus.learn">
-								GitLens Pro trial
-							</a>
-							. Don't worry, once your trial ends, you can extend it for an additional 7-days of GitLens+
-							features on private repos for free.
+							You have {days < 1 ? 'less than one day' : pluralize('day', days)} left in your 3-day
+							GitLens Pro trial. Don't worry if you need more time, you can extend your trial for an
+							additional free 7-days of the Commit Graph and other{' '}
+							<a href="command:gitlens.plus.learn">GitLens+ features</a> on private repos.
 						</p>
 					</>
 				);
@@ -615,12 +613,10 @@ export function GraphWrapper({
 					<>
 						<p className="alert__title">GitLens Pro Trial</p>
 						<p className="alert__message">
-							You have {days < 1 ? 'less than one day' : pluralize('day', days)} left in your{' '}
-							<a title="Learn more about GitLens+ features" href="command:gitlens.plus.learn">
-								GitLens Pro trial
-							</a>
-							. Once your trial ends, you'll continue to have access to GitLens+ features on local and
-							public repos, while upgrading to GitLens Pro gives you access on private repos.
+							You have {days < 1 ? 'less than one day' : pluralize('day', days)} left in your GitLens Pro
+							trial. Once your trial ends, you'll continue to have access to the Commit Graph and other{' '}
+							<a href="command:gitlens.plus.learn">GitLens+ features</a> on local and public repos, while
+							upgrading to GitLens Pro gives you access on private repos.
 						</p>
 					</>
 				);
@@ -632,8 +628,9 @@ export function GraphWrapper({
 					<>
 						<p className="alert__title">Extend Your GitLens Pro Trial</p>
 						<p className="alert__message">
-							Your free 3-day GitLens Pro trial has ended, extend your trial to get an additional 7-days
-							of GitLens+ features on private repos for free.
+							Your free 3-day GitLens Pro trial has ended, extend your trial to get an additional free
+							7-days of the Commit Graph and other{' '}
+							<a href="command:gitlens.plus.learn">GitLens+ features</a> on private repos.
 						</p>
 					</>
 				);
@@ -650,8 +647,9 @@ export function GraphWrapper({
 					<>
 						<p className="alert__title">GitLens Pro Trial Expired</p>
 						<p className="alert__message">
-							Your GitLens Pro trial has ended, please upgrade to GitLens Pro to continue to use GitLens+
-							features on private repos.
+							Your GitLens Pro trial has ended, please upgrade to GitLens Pro to continue to use the
+							Commit Graph and other <a href="command:gitlens.plus.learn">GitLens+ features</a> on private
+							repos.
 						</p>
 					</>
 				);
@@ -668,8 +666,8 @@ export function GraphWrapper({
 					<>
 						<p className="alert__title">Please verify your email</p>
 						<p className="alert__message">
-							Before you can also use GitLens+ features on private repos, please verify your email
-							address.
+							Before you can use <a href="command:gitlens.plus.learn">GitLens+ features</a> on private
+							repos, please verify your email address.
 						</p>
 					</>
 				);

diff --git a/src/webviews/apps/plus/timeline/partials/state.free-preview-trial-expired.html b/src/webviews/apps/plus/timeline/partials/state.free-preview-trial-expired.html
@@ -1,13 +1,9 @@
 <template id="state:free-preview-trial-expired">
 	<section>
-		<p>
-			Your free 3-day GitLens Pro trial has ended, extend your trial to get an additional 7-days of Visual File
-			History and other GitLens+ features on private repos.
-		</p>
 		<vscode-button data-action="command:gitlens.plus.loginOrSignUp">Extend Pro Trial</vscode-button>
 		<p>
-			<i class="codicon codicon-info"></i>&nbsp;All other GitLens features can always be used on any repo, without
-			an account.
+			Your free 3-day GitLens Pro trial has ended, extend your trial to get an additional free 7-days of the
+			Visual File History and other <a href="command:gitlens.plus.learn">GitLens+ features</a> on private repos.
 		</p>
 	</section>
 </template>
diff --git a/src/webviews/apps/plus/timeline/partials/state.free.html b/src/webviews/apps/plus/timeline/partials/state.free.html
@@ -1,15 +1,12 @@
 <template id="state:free">
 	<section>
-		<p>
-			Try it now on private repos, free for 3 days, without an account or
-			<a href="command:gitlens.plus.loginOrSignUp">sign in to GitLens Pro</a>.
-		</p>
 		<vscode-button data-action="command:gitlens.plus.startPreviewTrial"
-			>Try the Visual File History now</vscode-button
+			>Try the Visual File History on private repos</vscode-button
 		>
 		<p>
-			<i class="codicon codicon-info"></i>&nbsp;All other GitLens features can always be used on any repo, without
-			an account.
+			To use the Visual File History and other <a href="command:gitlens.plus.learn">GitLens+ features</a> on
+			private repos, start a free trial of GitLens Pro, without an account, or
+			<a href="command:gitlens.plus.loginOrSignUp">sign in</a>.
 		</p>
 	</section>
 </template>
diff --git a/src/webviews/apps/plus/timeline/partials/state.plus-trial-expired.html b/src/webviews/apps/plus/timeline/partials/state.plus-trial-expired.html
@@ -1,13 +1,9 @@
 <template id="state:plus-trial-expired">
 	<section>
+		<vscode-button data-action="command:gitlens.plus.purchase">Upgrade to Pro</vscode-button>
 		<p>
-			Your free trial has ended, please upgrade your account to continue to use GitLens+ features, including the
-			Visual File History, on this and other private repos.
-		</p>
-		<vscode-button data-action="command:gitlens.plus.purchase">Upgrade your account</vscode-button>
-		<p>
-			<i class="codicon codicon-info"></i>&nbsp;All other GitLens features can always be used on any repo, without
-			an account.
+			Your GitLens Pro trial has ended, please upgrade to GitLens Pro to continue to use the Visual File History
+			and other <a href="command:gitlens.plus.learn">GitLens+ features</a> on private repos.
 		</p>
 	</section>
 </template>
diff --git a/src/webviews/apps/plus/timeline/partials/state.verify-email.html b/src/webviews/apps/plus/timeline/partials/state.verify-email.html
@@ -1,7 +1,7 @@
 <template id="state:verify-email">
 	<section>
 		<h3>Please verify your email</h3>
-		<p>To use the Visual File History, please verify the email for the account you created.</p>
+		<p>To use the Visual File History, please verify your email address.</p>
 		<vscode-button data-action="command:gitlens.plus.resendVerification">Resend verification email</vscode-button>
 		<vscode-button data-action="command:gitlens.plus.validate">Refresh verification status</vscode-button>
 	</section>

diff --git a/src/webviews/apps/plus/timeline/timeline.html b/src/webviews/apps/plus/timeline/timeline.html
@@ -47,6 +47,10 @@ <h1 data-bind="empty"></h1>
 					>, allows you to quickly see the evolution of a file, including when changes were made, how large
 					they were, and who made them.
 				</p>
+				<p>
+					Use it to quickly find when the most impactful changes were made to a file or who best to talk to
+					about file changes, and more.
+				</p>
 				<div id="overlay-slot"></div>
 			</div>
 		</div>