From d1a56087555181f456edd81caedc3cbff5013237 Mon Sep 17 00:00:00 2001
From: John O'Nolan <john@ghost.org>
Date: Wed, 16 Oct 2019 15:27:46 +0700
Subject: [PATCH] Refined copy for members settings (#1366)

no-issue
---
 .../components/gh-members-lab-setting.hbs     | 56 ++++++++++---------
 ghost/admin/app/templates/settings/labs.hbs   | 47 ++++++++--------
 2 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/ghost/admin/app/templates/components/gh-members-lab-setting.hbs b/ghost/admin/app/templates/components/gh-members-lab-setting.hbs
index e5bf49042f..0fe0dafdcc 100644
--- a/ghost/admin/app/templates/components/gh-members-lab-setting.hbs
+++ b/ghost/admin/app/templates/components/gh-members-lab-setting.hbs
@@ -3,8 +3,8 @@
     <section class="bb b--whitegrey pa5">
         <div class="flex justify-between">
             <div>
-                <h4 class="gh-setting-title">Stripe settings</h4>
-                <p class="gh-setting-desc pa0 ma0">Configure Stripe API keys for signups</p>
+                <h4 class="gh-setting-title">Connect to Stripe</h4>
+                <p class="gh-setting-desc pa0 ma0">Configure API keys to create subscriptions and take payments</p>
             </div>
             <div>
                 <button type="button" class="gh-btn" {{action (toggle "membersStripeOpen" this)}} data-test-toggle-membersstripe><span>{{if membersStripeOpen "Close" "Expand"}}</span></button>
@@ -12,8 +12,8 @@
         </div>
 
         {{#liquid-if membersStripeOpen}}
-                <div class="w-50 mb4 mt5">
-                    <label class="fw6 f8">Stripe publishable API key</label>
+                <div class="w-50 mb4 mt8">
+                    <label class="fw6 f8">Stripe Publishable key</label>
                     {{gh-text-input
                             type="password"
                             value=(readonly subscriptionSettings.stripeConfig.public_token)
@@ -22,7 +22,7 @@
                         }}
                 </div>
                 <div class="w-50 mb4">
-                    <label class="fw6 f8 mt4">Stripe secret API key</label>
+                    <label class="fw6 f8 mt4">Stripe Secret key</label>
                     {{gh-text-input
                             type="password"
                             value=(readonly subscriptionSettings.stripeConfig.secret_token)
@@ -30,7 +30,7 @@
                             class="mt1 password"
                         }}
                     <a href="https://dashboard.stripe.com/account/apikeys" target="_blank" class="mt1 fw4 f8">
-                        Where to find Stripe API keys
+                        Find your Stripe API keys here &raquo;
                     </a>
                 </div>
         {{/liquid-if}}
@@ -39,16 +39,16 @@
     <section class="bb b--whitegrey pa5">
         <div class="flex justify-between">
             <div>
-                <h4 class="gh-setting-title">Pricing</h4>
-                <p class="gh-setting-desc pa0 ma0">Set monthly and yearly subscription prices</p>
+                <h4 class="gh-setting-title">Subscription pricing</h4>
+                <p class="gh-setting-desc pa0 ma0">Set monthly and yearly recurring subscription prices</p>
             </div>
             <div>
                 <button type="button" class="gh-btn" {{action (toggle "membersPricingOpen" this)}} data-test-toggle-memberspricing><span>{{if membersPricingOpen "Close" "Expand"}}</span></button>
             </div>
         </div>
-    
+
         {{#liquid-if membersPricingOpen}}
-            <div class="w-50 flex mb4 mt5">
+            <div class="w-50 flex mt8">
                 <div class="w-50 mr3">
                     {{#gh-form-group}}
                     <label class="fw6 f8">Monthly price</label>
@@ -74,14 +74,15 @@
                     {{/gh-form-group}}
                 </div>
             </div>
+            <div class="f8 fw4 midgrey">Currently only USD is supported, more currencies <a href="https://ghost.org/docs/members/" target="_blank" rel="noopener">coming soon</a></div>
         {{/liquid-if}}
     </section>
 
     <section class="bb b--whitegrey pa5">
         <div class="flex justify-between">
             <div>
-                <h4 class="gh-setting-title">Allow free members signup</h4>
-                <p class="gh-setting-desc pa0 ma0">Allow free members signup</p>
+                <h4 class="gh-setting-title">Allow free member signup</h4>
+                <p class="gh-setting-desc pa0 ma0">If disabled, members can only be signed up via payment checkout or API integration</p>
             </div>
             <div>
                 <div class="for-switch">
@@ -101,36 +102,39 @@
         <div class="flex justify-between">
             <div>
                 <h4 class="gh-setting-title">Default post access</h4>
-                <p class="gh-setting-desc pa0 ma0">Configure restrictions for new posts</p>
+                <p class="gh-setting-desc pa0 ma0">When a new post is created, who should have access to it?</p>
             </div>
             <div>
                 <button type="button" class="gh-btn" {{action (toggle "membersPostAccessOpen" this)}} data-test-toggle-memberspostaccess><span>{{if membersPostAccessOpen "Close" "Expand"}}</span></button>
             </div>
         </div>
-    
+
         {{#liquid-if membersPostAccessOpen}}
-        <div class="flex flex-column w-50 flex mb4 mt5">
+        <div class="flex flex-column w-50 flex mt8">
             <div class="gh-radio {{if (eq settings.defaultContentVisibility "public") "active"}}"
                 {{action "setDefaultContentVisibility" "public" on="click"}}>
                 <div class="gh-radio-button" data-test-publishmenu-unpublished-option></div>
                 <div class="gh-radio-content">
-                    <div class="gh-radio-label">Public</div>
+                    <div class="gh-radio-label">Public<br>
+                    <small class="midgrey">All site visitors to your site, no login required</small></div>
                 </div>
             </div>
-            
+
             <div class="gh-radio {{if (eq settings.defaultContentVisibility "members") "active"}}"
                 {{action "setDefaultContentVisibility" "members" on="click"}}>
                 <div class="gh-radio-button" data-test-publishmenu-published-option></div>
                 <div class="gh-radio-content">
-                    <div class="gh-radio-label">Members only</div>
+                    <div class="gh-radio-label">Members only<br>
+                    <small class="midgrey">All logged-in members</small></div>
                 </div>
             </div>
-            
+
             <div class="gh-radio {{if (eq settings.defaultContentVisibility "paid") "active"}}"
                 {{action "setDefaultContentVisibility" "paid" on="click"}}>
                 <div class="gh-radio-button" data-test-publishmenu-published-option></div>
                 <div class="gh-radio-content">
-                    <div class="gh-radio-label">Paid-members only</div>
+                    <div class="gh-radio-label">Paid-members only<br>
+                    <small class="midgrey">Only logged-in members with an active Stripe subscription</small></div>
                 </div>
             </div>
         </div>
@@ -140,18 +144,18 @@
     <section class="bb b--whitegrey pa5">
         <div class="flex justify-between">
             <div>
-                <h4 class="gh-setting-title">Emails</h4>
-                <p class="gh-setting-desc pa0 ma0">Membership related email settings</p>
+                <h4 class="gh-setting-title">Email settings</h4>
+                <p class="gh-setting-desc pa0 ma0">Customise signup, signin and subscription emails</p>
             </div>
             <div>
                 <button type="button" class="gh-btn" {{action (toggle "membersEmailOpen" this)}} data-test-toggle-membersemail><span>{{if membersEmailOpen "Close" "Expand"}}</span></button>
             </div>
         </div>
-    
+
         {{#liquid-if membersEmailOpen}}
-        <div class="flex flex-column w-40 flex mb2 mt5">
+        <div class="flex flex-column w-40 flex mt8">
             {{#gh-form-group}}
-            <label class="fw6 f8">Sender email address</label>
+            <label class="fw6 f8">From Address</label>
             <div class="flex items-center justify-center mt1">
                 {{gh-text-input
                     value=(readonly subscriptionSettings.fromAddress)
@@ -160,7 +164,7 @@
                 }}
                 <span class="ml3"> @{{config.blogDomain}}</span>
             </div>
-            <div class="f8 fw4 midgrey mt1"> "From" address for sign up and sign in emails</div>
+            <div class="f8 fw4 midgrey mt1">Your members will receive system emails from this address</div>
             {{/gh-form-group}}
         </div>
         {{/liquid-if}}
diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs
index 8367c4a3b3..2cb1c06d1b 100644
--- a/ghost/admin/app/templates/settings/labs.hbs
+++ b/ghost/admin/app/templates/settings/labs.hbs
@@ -6,7 +6,7 @@
     </GhCanvasHeader>
 
     <section class="view-container settings-debug">
-        <p class="gh-box gh-box-info">{{svg-jar "idea"}}This is a testing ground for experimental features which aren't quite ready for primetime. They may change, break or inexplicably disappear at any time.</p>
+        <p class="gh-box gh-box-info">{{svg-jar "idea"}}This is a testing ground for new or experimental features. They may change, break or inexplicably disappear at any time.</p>
 
         {{#if session.user.isOwner}}
         <div class="gh-setting-header">Members (BETA) </div>
@@ -25,18 +25,18 @@
         
                     {{#liquid-if feature.labs.members}}
                     {{gh-members-lab-setting
-                                                        settings=settings
-                                                        setDefaultContentVisibility=(action "setDefaultContentVisibility")
-                                                        setMembersSubscriptionSettings=(action "setMembersSubscriptionSettings")
-                                                    }}
+                        settings=settings
+                        setDefaultContentVisibility=(action "setDefaultContentVisibility")
+                        setMembersSubscriptionSettings=(action "setMembersSubscriptionSettings")
+                    }}
         
                     <div class="mt5 pl5 pr5 pb5">
                         {{gh-task-button "Save members settings"
-                                                            task=saveSettings
-                                                            successText="Saved"
-                                                            runningText="Saving"
-                                                            class="gh-btn gh-btn-blue gh-btn-icon"
-                                                        }}
+                            task=saveSettings
+                            successText="Saved"
+                            runningText="Saving"
+                            class="gh-btn gh-btn-blue gh-btn-icon"
+                        }}
                     </div>
                     {{/liquid-if}}
                 </div>
@@ -111,19 +111,6 @@
             </div>
         </div>
 
-        <div class="gh-setting-header">Testing tools</div>
-        <div class="flex flex-column br3 shadow-1 bg-grouped-table pa5 mt2">
-            <div class="gh-setting-first gh-setting-last">
-                <div class="gh-setting-content">
-                    <div class="gh-setting-title">Test email configuration</div>
-                    <div class="gh-setting-desc">Send yourself a test email to make sure everything is working</div>
-                </div>
-                <div class="gh-setting-action">
-                    {{gh-task-button "Send" successText="Sent" task=sendTestEmail class="gh-btn gh-btn-hover-blue gh-btn-icon"}}
-                </div>
-            </div>
-        </div>
-        
         <div class="gh-setting-header">Beta features</div>
         <div class="flex flex-column br3 shadow-1 bg-grouped-table pa5 mt2">
             <div class="gh-setting-first">
@@ -237,6 +224,20 @@
                 {{/gh-uploader}}
             </div>
         </div>
+
+        <div class="gh-setting-header">Testing tools</div>
+        <div class="flex flex-column br3 shadow-1 bg-grouped-table pa5 mt2">
+            <div class="gh-setting-first gh-setting-last">
+                <div class="gh-setting-content">
+                    <div class="gh-setting-title">Test email configuration</div>
+                    <div class="gh-setting-desc">Send yourself a test email to make sure everything is working</div>
+                </div>
+                <div class="gh-setting-action">
+                    {{gh-task-button "Send" successText="Sent" task=sendTestEmail class="gh-btn gh-btn-hover-blue gh-btn-icon"}}
+                </div>
+            </div>
+        </div>
+
     </section>
 </section>