From eb4f55de85caaf4f5f5959d7eda5af83aa0ad4e3 Mon Sep 17 00:00:00 2001
From: PearsonFlyer <PearsonFlyer@github.com>
Date: Tue, 13 Jul 2021 16:05:10 -0400
Subject: [PATCH] Fixed: Rearranged order of Root Folder setup page to move all
 Calibre Content Server options to the bottom, and moved the hover-over text
 to translate.

---
 .../RootFolder/EditRootFolderModalContent.js  | 166 +++++++++---------
 src/NzbDrone.Core/Localization/Core/en.json   |   5 +-
 2 files changed, 86 insertions(+), 85 deletions(-)

diff --git a/frontend/src/Settings/MediaManagement/RootFolder/EditRootFolderModalContent.js b/frontend/src/Settings/MediaManagement/RootFolder/EditRootFolderModalContent.js
index a1e13c534..0d627511b 100644
--- a/frontend/src/Settings/MediaManagement/RootFolder/EditRootFolderModalContent.js
+++ b/frontend/src/Settings/MediaManagement/RootFolder/EditRootFolderModalContent.js
@@ -111,7 +111,88 @@ function EditRootFolderModalContent(props) {
 
               <FormGroup>
                 <FormLabel>
-                  Use Calibre
+                  Monitor
+
+                  <Popover
+                    anchor={
+                      <Icon
+                        className={styles.labelIcon}
+                        name={icons.INFO}
+                      />
+                    }
+                    title={translate('MonitoringOptions')}
+                    body={<AuthorMonitoringOptionsPopoverContent />}
+                    position={tooltipPositions.RIGHT}
+                  />
+                </FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.MONITOR_BOOKS_SELECT}
+                  name="defaultMonitorOption"
+                  onChange={onInputChange}
+                  {...defaultMonitorOption}
+                  helpText={translate('DefaultMonitorOptionHelpText')}
+                />
+
+              </FormGroup>
+
+              <FormGroup>
+                <FormLabel>
+                  {translate('QualityProfile')}
+                </FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.QUALITY_PROFILE_SELECT}
+                  name="defaultQualityProfileId"
+                  helpText={translate('DefaultQualityProfileIdHelpText')}
+                  {...defaultQualityProfileId}
+                  onChange={onInputChange}
+                />
+              </FormGroup>
+
+              <FormGroup className={showMetadataProfile ? undefined : styles.hideMetadataProfile}>
+                <FormLabel>
+                  Metadata Profile
+                  <Popover
+                    anchor={
+                      <Icon
+                        className={styles.labelIcon}
+                        name={icons.INFO}
+                      />
+                    }
+                    title={translate('MetadataProfile')}
+                    body={<AuthorMetadataProfilePopoverContent />}
+                    position={tooltipPositions.RIGHT}
+                  />
+                </FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.METADATA_PROFILE_SELECT}
+                  name="defaultMetadataProfileId"
+                  helpText={translate('DefaultMetadataProfileIdHelpText')}
+                  {...defaultMetadataProfileId}
+                  includeNone={true}
+                  onChange={onInputChange}
+                />
+              </FormGroup>
+
+              <FormGroup>
+                <FormLabel>
+                  {translate('DefaultReadarrTags')}
+                </FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.TAG}
+                  name="defaultTags"
+                  helpText={translate('DefaultTagsHelpText')}
+                  {...defaultTags}
+                  onChange={onInputChange}
+                />
+              </FormGroup>
+
+              <FormGroup>
+                <FormLabel>
+                  Use Calibre Content Server
                   <Popover
                     anchor={
                       <Icon
@@ -120,7 +201,7 @@ function EditRootFolderModalContent(props) {
                       />
                     }
                     title={translate('CalibreContentServer')}
-                    body={'Using a Calibre content server allows Readarr to add books to your Calibre library and trigger conversions between formats'}
+                    body={translate('CalibreContentServerText')}
                     position={tooltipPositions.RIGHT}
                   />
                 </FormLabel>
@@ -293,87 +374,6 @@ function EditRootFolderModalContent(props) {
                   </div>
               }
 
-              <FormGroup>
-                <FormLabel>
-                  Monitor
-
-                  <Popover
-                    anchor={
-                      <Icon
-                        className={styles.labelIcon}
-                        name={icons.INFO}
-                      />
-                    }
-                    title={translate('MonitoringOptions')}
-                    body={<AuthorMonitoringOptionsPopoverContent />}
-                    position={tooltipPositions.RIGHT}
-                  />
-                </FormLabel>
-
-                <FormInputGroup
-                  type={inputTypes.MONITOR_BOOKS_SELECT}
-                  name="defaultMonitorOption"
-                  onChange={onInputChange}
-                  {...defaultMonitorOption}
-                  helpText={translate('DefaultMonitorOptionHelpText')}
-                />
-
-              </FormGroup>
-
-              <FormGroup>
-                <FormLabel>
-                  {translate('QualityProfile')}
-                </FormLabel>
-
-                <FormInputGroup
-                  type={inputTypes.QUALITY_PROFILE_SELECT}
-                  name="defaultQualityProfileId"
-                  helpText={translate('DefaultQualityProfileIdHelpText')}
-                  {...defaultQualityProfileId}
-                  onChange={onInputChange}
-                />
-              </FormGroup>
-
-              <FormGroup className={showMetadataProfile ? undefined : styles.hideMetadataProfile}>
-                <FormLabel>
-                  Metadata Profile
-                  <Popover
-                    anchor={
-                      <Icon
-                        className={styles.labelIcon}
-                        name={icons.INFO}
-                      />
-                    }
-                    title={translate('MetadataProfile')}
-                    body={<AuthorMetadataProfilePopoverContent />}
-                    position={tooltipPositions.RIGHT}
-                  />
-                </FormLabel>
-
-                <FormInputGroup
-                  type={inputTypes.METADATA_PROFILE_SELECT}
-                  name="defaultMetadataProfileId"
-                  helpText={translate('DefaultMetadataProfileIdHelpText')}
-                  {...defaultMetadataProfileId}
-                  includeNone={true}
-                  onChange={onInputChange}
-                />
-              </FormGroup>
-
-              <FormGroup>
-                <FormLabel>
-                  {translate('DefaultReadarrTags')}
-                </FormLabel>
-
-                <FormInputGroup
-                  type={inputTypes.TAG}
-                  name="defaultTags"
-                  helpText={translate('DefaultTagsHelpText')}
-                  {...defaultTags}
-                  onChange={onInputChange}
-                />
-              </FormGroup>
-
             </Form>
         }
       </ModalBody>
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index bc4171d8d..c25bd9682 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -84,7 +84,8 @@
   "BypassProxyForLocalAddresses": "Bypass Proxy for Local Addresses",
   "Calendar": "Calendar",
   "CalendarWeekColumnHeaderHelpText": "Shown above each column when week is the active view",
-  "CalibreContentServer": "Calibre content server",
+  "CalibreContentServer": "Calibre Content Server",
+  "CalibreContentServerText": "Using a Calibre Content Server (not Calibre Web) allows Readarr to add books to your Calibre library and trigger conversions between formats",
   "CalibreHost": "Calibre Host",
   "CalibreLibrary": "Calibre Library",
   "CalibreMetadata": "Calibre Metadata",
@@ -300,7 +301,7 @@
   "IndexerSettings": "Indexer Settings",
   "Interval": "Interval",
   "ISBN": "ISBN",
-  "IsCalibreLibraryHelpText": "Use Calibre content server to manipulate library",
+  "IsCalibreLibraryHelpText": "Use Calibre Content Server to manipulate library",
   "IsCutoffCutoff": "Cutoff",
   "IsCutoffUpgradeUntilThisQualityIsMetOrExceeded": "Upgrade until this quality is met or exceeded",
   "IsExpandedHideBooks": "Hide books",