OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved hint content to placeholders for consistency PROD-204, PROD-203 (#19261)

Browse Source 
refs PROD-204, PROD-203

- Moved fallback value information from hints to placeholders for
consistency and cleaner layout
- Changed setting section label
This commit is contained in:
Djordje Vlaisavljevic 2023-12-06 17:06:21 +00:00 committed by GitHub
parent 3bc068123c
commit 813abb06e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterDetailModal.tsx
View File

@ -73,18 +73,12 @@ const ReplyToEmailField: React.FC<{
setSenderReplyTo(rendered);
};
const hint = (
<>
If left empty, replies go to {newsletterAddress}
</>
);
// Pro users without custom sending domains
return (
<TextField
error={Boolean(errors.sender_reply_to)}
hint={errors.sender_reply_to || hint}
placeholder={''}
hint={errors.sender_reply_to}
placeholder={newsletterAddress || ''}
title="Reply-to email"
value={senderReplyTo}
onBlur={onBlur}
@ -219,8 +213,9 @@ const Sidebar: React.FC<{
return (
<TextField
error={Boolean(errors.sender_email)}
hint={errors.sender_email || `If left empty, ${defaultEmailAddress} will be used`}
rightPlaceholder={`@${sendingDomain(config)}`}
hint={errors.sender_email}
placeholder={defaultEmailAddress}
rightPlaceholder={sendingEmailUsername ? `@${sendingDomain(config)}` : `` }
title="Sender email address"
value={sendingEmailUsername || ''}
onBlur={validate}
@ -257,7 +252,7 @@ const Sidebar: React.FC<{
/>
<TextArea rows={2} title="Description" value={newsletter.description || ''} onChange={e => updateNewsletter({description: e.target.value})} />
</Form>
<Form className='mt-6' gap='sm' margins='lg' title='Email addresses'>
<Form className='mt-6' gap='sm' margins='lg' title='Email info'>
<TextField placeholder={siteTitle} title="Sender name" value={newsletter.sender_name || ''} onChange={e => updateNewsletter({sender_name: e.target.value})} />
{renderSenderEmailField()}
<ReplyToEmailField clearError={clearError} errors={errors} newsletter={newsletter} updateNewsletter={updateNewsletter} validate={validate} />