From ee36b90e8e0baefc5923ab3f56916dbb1a9c9afa Mon Sep 17 00:00:00 2001 From: Roland Date: Fri, 24 Jan 2025 14:28:04 -0700 Subject: [PATCH] Renaming HelpPopup to InfoPopup to avoid confusion with future Help features. --- app/src/components/Archive.js | 4 ++-- app/src/components/Common.js | 10 ++++----- app/src/components/Download.js | 22 +++++++++---------- app/src/components/Map.js | 10 ++++----- app/src/components/admin/Settings.js | 4 ++-- app/src/components/admin/Status.js | 4 ++-- .../calculators/ElectricalCalculators.js | 4 ++-- app/src/hooks/useForm.js | 4 ++-- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/src/components/Archive.js b/app/src/components/Archive.js index 0a174398..b11ed6fd 100644 --- a/app/src/components/Archive.js +++ b/app/src/components/Archive.js @@ -24,7 +24,7 @@ import { ExternalCardLink, FileIcon, findPosterPath, - HelpHeader, + InfoHeader, humanFileSize, isoDatetimeToAgoPopup, mimetypeColor, @@ -268,7 +268,7 @@ function ArchivePage() { - diff --git a/app/src/components/Common.js b/app/src/components/Common.js index 3be67793..8fff23ca 100644 --- a/app/src/components/Common.js +++ b/app/src/components/Common.js @@ -724,7 +724,7 @@ export function CardPoster({to, file}) { } } -export function HelpPopup({ +export function InfoPopup({ icon = 'info circle', size = null, content, @@ -743,7 +743,7 @@ export function HelpPopup({ /> } -export function HelpHeader({ +export function InfoHeader({ icon, headerSize = 'h2', iconSize, @@ -759,7 +759,7 @@ export function HelpHeader({
{headerContent} {required && }
- + } @@ -774,7 +774,7 @@ export function HotspotToggle() { checked={on === true} onChange={checked => setHotspot(checked)} /> - {disabled && } + {disabled && } ; } @@ -788,7 +788,7 @@ export function ThrottleToggle() { checked={on === true} onChange={checked => setThrottle(checked)} /> - {disabled && } + {disabled && } ; } diff --git a/app/src/components/Download.js b/app/src/components/Download.js index e86d77e6..c022865c 100644 --- a/app/src/components/Download.js +++ b/app/src/components/Download.js @@ -3,8 +3,8 @@ import {getDownloaders, postDownload, putDownload} from "../api"; import { APIButton, DirectorySearch, - HelpHeader, - HelpPopup, + InfoHeader, + InfoPopup, mergeDeep, RequiredAsterisk, useLocalStorage @@ -57,7 +57,7 @@ export function MaximumPagesInputForm({form, required, name = 'max_pages', path export function DestinationForm({ form, - helpContent, + infoContent, label = 'Destination', name = 'destination', path = 'destination', @@ -65,9 +65,9 @@ export function DestinationForm({ }) { const [inputProps, inputAttrs] = form.getCustomProps({name, path, required}); const {disabled, value, onChange} = inputProps; - const helpPopup = helpContent ? : null; + const infoPopup = infoContent ? : null; return - + - - - - - } - let spaceHelpPopup = ; - let timeHelpPopup = ; + let timeInfoPopup = ; return @@ -263,8 +263,8 @@ class ManageMap extends React.Component { PBF File Imported Size - Space Required {spaceHelpPopup} - Time to Import {timeHelpPopup} + Space Required {spaceInfoPopup} + Time to Import {timeInfoPopup} diff --git a/app/src/components/admin/Settings.js b/app/src/components/admin/Settings.js index 8da4bafd..39d71cf1 100644 --- a/app/src/components/admin/Settings.js +++ b/app/src/components/admin/Settings.js @@ -19,7 +19,7 @@ import {ButtonGroup, Container, Dimmer, Dropdown, GridColumn, GridRow, Icon, Inp import { APIButton, ErrorMessage, - HelpPopup, + InfoPopup, HotspotToggle, ThrottleToggle, Toggle, @@ -318,7 +318,7 @@ export function SettingsPage() { Download Timeout - } value={state.download_timeout} diff --git a/app/src/components/admin/Status.js b/app/src/components/admin/Status.js index 94ea2bc7..00d63b73 100644 --- a/app/src/components/admin/Status.js +++ b/app/src/components/admin/Status.js @@ -1,6 +1,6 @@ import {Accordion, Header, Progress, Segment, Statistic, StatisticGroup, Table} from "../Theme"; import React, {useContext} from "react"; -import {HelpHeader, humanBandwidth, humanFileSize, LoadStatistic, useTitle} from "../Common"; +import {InfoHeader, humanBandwidth, humanFileSize, LoadStatistic, useTitle} from "../Common"; import {ProgressPlaceholder} from "../Placeholder"; import Grid from "semantic-ui-react/dist/commonjs/collections/Grid"; import {Media, SettingsContext, StatusContext, ThemeContext} from "../../contexts/contexts"; @@ -281,7 +281,7 @@ export function StatusPage() { - { /> - diff --git a/app/src/hooks/useForm.js b/app/src/hooks/useForm.js index bf033a13..d26c8eb2 100644 --- a/app/src/hooks/useForm.js +++ b/app/src/hooks/useForm.js @@ -1,6 +1,6 @@ import React from "react"; import _ from "lodash"; -import {HelpPopup, RequiredAsterisk, Toggle, validURL, validURLs} from "../components/Common"; +import {InfoPopup, RequiredAsterisk, Toggle, validURL, validURLs} from "../components/Common"; import {FormInput, Icon, TextArea} from "../components/Theme"; import Message from "semantic-ui-react/dist/commonjs/collections/Message"; @@ -310,7 +310,7 @@ export function InputForm({