Skip to content

Commit

Permalink
fix: open urls in _blank not _new
Browse files Browse the repository at this point in the history
  • Loading branch information
Julusian committed Feb 6, 2025
1 parent b717c30 commit 80b9d93
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion webui/src/Cloud/UserPass.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const CloudUserPass = memo(function CloudUserPass({
<CCol sm={12}>
<CAlert color="info">
<FontAwesomeIcon icon={faInfoCircle} /> &nbsp;Companion Cloud is a premium service. Learn more and sign up{' '}
<a target="_new" href="https://bfoc.us/ezzaf9tfeg">
<a target="_blank" href="https://bfoc.us/ezzaf9tfeg">
here
</a>
.
Expand Down
2 changes: 1 addition & 1 deletion webui/src/Cloud/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export function CloudPage() {
When enabled, Companion will make several persistent secure connections to different Bitfocus Cloud regions for
redundancy. You can learn more about the service, the service provider and the safety of your data in the
Companion Cloud documentation{' '}
<a target="_new" href="https://user.bitfocus.io/docs/companion-cloud">
<a target="_blank" href="https://user.bitfocus.io/docs/companion-cloud">
here
</a>
.
Expand Down
4 changes: 2 additions & 2 deletions webui/src/Connections/AddConnectionPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export const AddConnectionsPanel = observer(function AddConnectionsPanel({
<p>
Companion currently supports over {modules.storeList.size} different things, and the list grows every day.
If you can't find the device you're looking for, please{' '}
<a target="_new" href="https://github.com/bitfocus/companion-module-requests">
<a target="_blank" href="https://bfoc.us/5xcykgx03n">
add a request
</a>{' '}
on GitHub
Expand All @@ -101,7 +101,7 @@ export const AddConnectionsPanel = observer(function AddConnectionsPanel({
Companion currently hundreds of different things, and the list grows every day. If you have an active
internet connection you can search for and install modules to support additional devices. Otherwise you can
install download and load in a module bundle from the website.
<a target="_new" href="https://user.bitfocus.io/download">
<a target="_blank" href="https://user.bitfocus.io/download">
the website
</a>{' '}
</p>
Expand Down
2 changes: 1 addition & 1 deletion webui/src/GettingStarted/GettingStarted.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ function RenderSubsection({ subsect, visibleFiles, triggerScroll }: RenderSubsec
<>
<a
href={`https://github.com/bitfocus/companion/blob/main/docs/${subsect.file}`}
target="_new"
target="_blank"
style={style.contentGithubLink}
>
{subsect.file} <img src="/img/link.png" alt="Link" style={style.imgLink} />
Expand Down
2 changes: 1 addition & 1 deletion webui/src/ImportExport/Import/Full.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ function FullImportTab({ snapshot }: FullImportTabProps) {

<p>It is recommended to export the system configuration first.</p>

<CButton color="success" href="/int/export/full" target="_new">
<CButton color="success" href="/int/export/full" target="_blank">
<FontAwesomeIcon icon={faDownload} /> Export
</CButton>

Expand Down
2 changes: 1 addition & 1 deletion webui/src/ImportExport/Import/Page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ const ImportRemapRow = observer(function ImportRemapRow({
<tr>
<td>
<CFormSelect value={connectionRemap[id] ?? ''} onChange={onChange}>
<option value="_new">[ Create new connection ]</option>
<option value="_blank">[ Create new connection ]</option>
<option value="_ignore">[ Ignore ]</option>
{currentConnections.map(([id, conn]) => (
<option key={id} value={id}>
Expand Down
2 changes: 1 addition & 1 deletion webui/src/ImportExport/Reset.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ function ResetBeginStep() {
</p>
<p>It is recommended to export the system configuration first.</p>

<CButton color="success" href="/int/export/full" target="_new">
<CButton color="success" href="/int/export/full" target="_blank">
<FontAwesomeIcon icon={faDownload} /> Export
</CButton>
</div>
Expand Down
4 changes: 2 additions & 2 deletions webui/src/Layout/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ export const MyHeader = observer(function MyHeader({ canLock, setLocked }: MyHea
)}

<CNavItem>
<CNavLink target="_new" title={buildString} href="https://bitfocus.io/companion/">
<CNavLink target="_blank" title={buildString} href="https://bitfocus.io/companion/">
{versionString}
</CNavLink>
</CNavItem>

{updateData?.message ? (
<CNavItem className="header-update-warn">
<CNavLink target="_new" href={updateData?.link || 'https://bitfocus.io/companion/'}>
<CNavLink target="_blank" href={updateData?.link || 'https://bitfocus.io/companion/'}>
<FontAwesomeIcon icon={faTriangleExclamation} className="header-update-icon" />
{updateData.message}
</CNavLink>
Expand Down
14 changes: 7 additions & 7 deletions webui/src/Layout/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -199,18 +199,18 @@ export const MySidebar = memo(function MySidebar() {
<SidebarMenuItem name="Cloud" icon={faCloud} path="/cloud" />
)}
<SidebarMenuItemGroup name="Interactive Buttons" icon={faSquareCaretRight}>
<SidebarMenuItem name="Emulator" icon={null} path="/emulator" target="_new" />
<SidebarMenuItem name="Web buttons" icon={null} path="/tablet" target="_new" />
<SidebarMenuItem name="Emulator" icon={null} path="/emulator" target="_blank" />
<SidebarMenuItem name="Web buttons" icon={null} path="/tablet" target="_blank" />
</SidebarMenuItemGroup>
</CSidebarNav>
<CSidebarNav className="nav-secondary">
<SidebarMenuItem name="What's New" icon={faStar} onClick={whatsNewOpen} />
<SidebarMenuItem name="Getting Started" icon={faInfo} path="/getting-started" target="_new" />
<SidebarMenuItem name="Getting Started" icon={faInfo} path="/getting-started" target="_blank" />
<SidebarMenuItemGroup name="Help & Community" icon={faQuestionCircle}>
<SidebarMenuItem name="Bugs & Features" icon={faBug} path="https://bfoc.us/fiobkz0yqs" target="_new" />
<SidebarMenuItem name="Community Forum" icon={faUsers} path="https://bfoc.us/qjk0reeqmy" target="_new" />
<SidebarMenuItem name="Slack Chat" icon={faComments} path="https://bfoc.us/ke7e9dqgaz" target="_new" />
<SidebarMenuItem name="Donate" icon={faDollarSign} path="https://bfoc.us/ccfbf8wm2x" target="_new" />
<SidebarMenuItem name="Bugs & Features" icon={faBug} path="https://bfoc.us/fiobkz0yqs" target="_blank" />
<SidebarMenuItem name="Community Forum" icon={faUsers} path="https://bfoc.us/qjk0reeqmy" target="_blank" />
<SidebarMenuItem name="Slack Chat" icon={faComments} path="https://bfoc.us/ke7e9dqgaz" target="_blank" />
<SidebarMenuItem name="Donate" icon={faDollarSign} path="https://bfoc.us/ccfbf8wm2x" target="_blank" />
</SidebarMenuItemGroup>
</CSidebarNav>
<CSidebarHeader className="border-top d-none d-lg-flex sidebar-header-toggler">
Expand Down
2 changes: 1 addition & 1 deletion webui/src/LogPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const LogPanel = memo(function LogPanel() {
}}
size="sm"
href={`/int/export/log`}
target="_new"
target="_blank"
>
<FontAwesomeIcon icon={faFileExport} /> Export log
</CButton>
Expand Down
4 changes: 2 additions & 2 deletions webui/src/Modules/ModulesList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export const ModulesList = observer(function ModulesList({ doManageModule, selec
<br />
If you have an active internet connection, you can search for and install modules to support additional devices.
If you can't find the device you're looking for, please{' '}
<a target="_new" href="https://github.com/bitfocus/companion-module-requests">
<a target="_blank" href="https://github.com/bitfocus/companion-module-requests">
add a request
</a>{' '}
on GitHub
Expand All @@ -123,7 +123,7 @@ export const ModulesList = observer(function ModulesList({ doManageModule, selec
The module system is currently in development.
<br />
You can get the latest offline module bundle from{' '}
<a href="https://codeload.github.com/bitfocus/companion-bundled-modules/tar.gz/refs/heads/main" target="_new">
<a href="https://codeload.github.com/bitfocus/companion-bundled-modules/tar.gz/refs/heads/main" target="_blank">
GitHub here
</a>
</CAlert>
Expand Down
2 changes: 1 addition & 1 deletion webui/src/Surfaces/SurfaceDiscoveryTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ function SatelliteRow({ surfaceInfo, showSetupSatellite }: SatelliteRowProps) {
{addresses.map((address) => (
<p key={address} className="p-no-margin">
{surfaceInfo.apiEnabled ? (
<a href={`http://${address}:${surfaceInfo.port}`} target="_new">
<a href={`http://${address}:${surfaceInfo.port}`} target="_blank">
{address}
</a>
) : (
Expand Down
2 changes: 1 addition & 1 deletion webui/src/Triggers/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ function TriggersTableRow({ controlId, item, editItem, moveTrigger }: TriggersTa
<CButton
color="white"
href={`/int/export/triggers/single/${exportId}`}
target="_new"
target="_blank"
disabled={!exportId}
title="Export"
>
Expand Down
6 changes: 3 additions & 3 deletions webui/src/UserConfig/Sections/ArtnetProtocol.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ export function ArtnetProtocol() {
return (
<>
<p>
<CButton color="success" href="/Bitfocus_Companion_v20.d4" target="_new">
<CButton color="success" href="/Bitfocus_Companion_v20.d4" target="_blank">
<FontAwesomeIcon icon={faFileImport} /> Download Avolites Fixture file (v2.0)
</CButton>
</p>
<p>
<CButton color="success" href="/bitfocus@companion_v2.0@00.xml" target="_new">
<CButton color="success" href="/bitfocus@companion_v2.0@00.xml" target="_blank">
<FontAwesomeIcon icon={faFileImport} /> Download GrandMA2 Fixture file (v2.0)
</CButton>
</p>
<p>
<CButton color="success" href="/Bitfocus Companion Fixture.v3f" target="_new">
<CButton color="success" href="/Bitfocus Companion Fixture.v3f" target="_blank">
<FontAwesomeIcon icon={faFileImport} /> Download Vista Fixture file (v2.0)
</CButton>
</p>
Expand Down

0 comments on commit 80b9d93

Please sign in to comment.