Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Link to GOS 5 Manual #1549

Merged
merged 4 commits into from
Aug 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
[#1507](https://github.com/greenbone/gsa/pull/1507)

### Changed
- Adjust HelpIcons to use GOS 5 manual [#1549](https://github.com/greenbone/gsa/pull/1549)
- Adjust clickable areas for Select and MultiSelect [#1545](https://github.com/greenbone/gsa/pull/1545)
- Redirect to main page when visiting the login page and the user is already
logged in [#1508](https://github.com/greenbone/gsa/pull/1508)
Expand Down
2 changes: 1 addition & 1 deletion gsa/src/gmp/gmpsettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import {isDefined} from './utils/identity';

export const DEFAULT_RELOAD_INTERVAL = 15 * 1000; // fifteen seconds
export const DEFAULT_MANUAL_URL = 'http://docs.greenbone.net/GSM-Manual/gos-4/';
export const DEFAULT_MANUAL_URL = 'http://docs.greenbone.net/GSM-Manual/gos-5/';
export const DEFAULT_PROTOCOLDOC_URL =
'https://docs.greenbone.net/API/GMP/gmp-8.0.html';
export const DEFAULT_LOG_LEVEL = 'warn';
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/alerts/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ const ToolBarIcons = ({
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="alerts"
page="scanning"
anchor="managing-alerts"
title={_('Help: Alerts')}
/>
<ListIcon title={_('Alerts List')} page="alerts" />
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/alerts/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ import AlertTable, {SORT_FIELDS} from './table.js';
const ToolBarIcons = withCapabilities(({capabilities, onAlertCreateClick}) => (
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="alerts"
page="scanning"
anchor="managing-alerts"
title={_('Help: Alerts')}
/>
{capabilities.mayCreate('alert') && (
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/certbund/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ const ToolBarIcons = ({entity, onCertBundAdvDownloadClick}) => (
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="cert-bund"
page="managing-secinfo"
anchor="cert-bund-advisories"
title={_('Help: CERT-Bund Advisories')}
/>
<ListIcon title={_('CERT-Bund Advisories')} page="certbunds" />
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/certbund/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ import CertBundDashboard, {CERTBUND_DASHBOARD_ID} from './dashboard';

const ToolBarIcons = props => (
<ManualIcon
page="vulnerabilitymanagement"
anchor="cert-bund"
page="managing-secinfo"
anchor="cert-bund-advisories"
title={_('Help: CERT-Bund Advisories')}
/>
);
Expand Down
2 changes: 1 addition & 1 deletion gsa/src/web/pages/cpes/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const ToolBarIcons = ({entity, onCpeDownloadClick}) => (
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
page="managing-secinfo"
anchor="cpe"
title={_('Help: CPEs')}
/>
Expand Down
6 changes: 1 addition & 5 deletions gsa/src/web/pages/cpes/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@ import CpesTable from './table';
import CpesDashboard, {CPES_DASHBOARD_ID} from './dashboard';

const ToolBarIcons = props => (
<ManualIcon
page="vulnerabilitymanagement"
anchor="cpe"
title={_('Help: CPEs')}
/>
<ManualIcon page="managing-secinfo" anchor="cpe" title={_('Help: CPEs')} />
);

const Page = ({filter, onFilterChanged, onInteraction, ...props}) => (
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/credentials/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ const ToolBarIcons = ({
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="credentials"
page="scanning"
anchor="managing-credentials"
title={_('Help: Credentials')}
/>
<ListIcon title={_('Credential List')} page="credentials" />
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/credentials/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ const ToolBarIcons = withCapabilities(
({capabilities, onCredentialCreateClick}) => (
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="credentials"
page="scanning"
anchor="managing-credentials"
title={_('Help: Credentials')}
/>
{capabilities.mayCreate('credential') && (
Expand Down
2 changes: 1 addition & 1 deletion gsa/src/web/pages/cves/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const ToolBarIcons = ({entity, onCveDownloadClick}) => (
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
page="managing-secinfo"
anchor="cve"
title={_('Help: CVEs')}
/>
Expand Down
6 changes: 1 addition & 5 deletions gsa/src/web/pages/cves/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@ import CvesTable from './table';
import CvesDashboard, {CVES_DASHBOARD_ID} from './dashboard';

const ToolBarIcons = () => (
<ManualIcon
page="vulnerabilitymanagement"
anchor="cve"
title={_('Help: CVEs')}
/>
<ManualIcon page="managing-secinfo" anchor="cve" title={_('Help: CVEs')} />
);

const Page = ({filter, onFilterChanged, onInteraction, ...props}) => (
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/dfncert/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ const ToolBarIcons = ({entity, onDfnCertAdvDownloadClick}) => (
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="id15"
page="managing-secinfo"
anchor="dfn-cert-advisories"
title={_('Help: DFN-CERT Advisories')}
/>
<ListIcon title={_('DFN-CERT Advisories')} page="dfncerts" />
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/dfncert/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ import DfnCertDashboard, {DFNCERT_DASHBOARD_ID} from './dashboard';

const ToolBarIcons = () => (
<ManualIcon
page="vulnerabilitymanagement"
anchor="id15"
page="managing-secinfo"
anchor="dfn-cert-advisories"
title={_('Help: DFN-CERT Advisories')}
/>
);
Expand Down
2 changes: 1 addition & 1 deletion gsa/src/web/pages/extras/cvsscalculatorpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const StyledTextField = styled(TextField)`

const ToolBarIcons = () => (
<ManualIcon
page="vulnerabilitymanagement"
page="managing-secinfo"
anchor="cvss"
size="small"
title={_('Help: CVSS Base Score Calculator')}
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/extras/feedstatuspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ import withGmp from 'web/utils/withGmp';

const ToolBarIcons = () => (
<ManualIcon
page="search"
searchTerm="feed"
page="web-interface"
anchor="displaying-the-feed-status"
size="small"
title={_('Help: Feed Status')}
/>
Expand Down
6 changes: 5 additions & 1 deletion gsa/src/web/pages/extras/trashcanpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,11 @@ const Col = styled.col`
`;

const ToolBarIcons = () => (
<ManualIcon page="search" searchTerm="trashcan" title={_('Help: Trashcan')} />
<ManualIcon
page="web-interface"
anchor="using-the-trashcan"
title={_('Help: Trashcan')}
/>
);

const EmptyTrashButton = withCapabilities(({onClick, capabilities}) => {
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/filters/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ const ToolBarIcons = ({
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="search"
searchTerm="filter"
page="web-interface"
anchor="managing-powerfilters"
title={_('Help: Filters')}
/>
<ListIcon title={_('Filter List')} page="filters" />
Expand Down
6 changes: 5 additions & 1 deletion gsa/src/web/pages/filters/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ import FiltersTable, {SORT_FIELDS} from './table';

const ToolBarIcons = withCapabilities(({capabilities, onFilterCreateClick}) => (
<IconDivider>
<ManualIcon page="search" searchTerm="filter" title={_('Help: Filters')} />
<ManualIcon
page="web-interface"
anchor="managing-powerfilters"
title={_('Help: Filters')}
/>
{capabilities.mayCreate('filter') && (
<NewIcon title={_('New Filter')} onClick={onFilterCreateClick} />
)}
Expand Down
6 changes: 3 additions & 3 deletions gsa/src/web/pages/groups/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ const ToolBarIcons = ({
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="gui_administration"
anchor="groups"
title={_('Help: Group Details')}
page="web-interface-access"
anchor="managing-groups"
title={_('Help: Groups')}
/>
<ListIcon title={_('Groups List')} page="groups" />
</IconDivider>
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/groups/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ import Table, {SORT_FIELDS} from './table';
const ToolBarIcons = withCapabilities(({capabilities, onGroupCreateClick}) => (
<IconDivider>
<ManualIcon
page="gui_administration"
anchor="groups"
page="web-interface-access"
anchor="managing-groups"
title={_('Help: Groups')}
/>
{capabilities.mayCreate('group') && (
Expand Down
6 changes: 3 additions & 3 deletions gsa/src/web/pages/hosts/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ const ToolBarIcons = ({
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="host-details"
title={_('Help: Host Details')}
page="managing-assets"
anchor="managing-hosts"
title={_('Help: Hosts')}
/>
<ListIcon title={_('Host List')} page="hosts" />
</IconDivider>
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/hosts/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ import HostsDashboard, {HOSTS_DASHBOARD_ID} from './dashboard';
const ToolBarIcons = withCapabilities(({capabilities, onHostCreateClick}) => (
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="hosts-view"
page="managing-assets"
anchor="managing-hosts"
title={_('Help: Hosts')}
/>
{capabilities.mayCreate('host') && (
Expand Down
2 changes: 1 addition & 1 deletion gsa/src/web/pages/ldap/ldappage.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ import LdapDialog from './dialog';
const ToolBarIcons = ({onOpenDialogClick}) => (
<IconDivider>
<ManualIcon
page="gui_administration"
page="web-interface-access"
anchor="ldap"
size="small"
title={_('Help: LDAP per-User Authentication')}
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/notes/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ const ToolBarIcons = ({
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="notes"
page="reports"
anchor="managing-notes"
title={_('Help: Notes')}
/>
<ListIcon title={_('Note List')} page="notes" />
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/notes/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ import NoteIcon from 'web/components/icon/noteicon';
const ToolBarIcons = withCapabilities(({capabilities, onNoteCreateClick}) => (
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="notes"
page="reports"
anchor="managing-notes"
title={_('Help: Notes')}
/>
{capabilities.mayCreate('note') && (
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/nvts/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ let ToolBarIcons = ({
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="network-vulnerability-tests"
page="managing-secinfo"
anchor="network-vulnerability-tests-nvt"
title={_('Help: NVTs')}
/>
<ListIcon title={_('NVT List')} page="nvts" />
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/nvts/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ import NvtsDashboard, {NVTS_DASHBOARD_ID} from './dashboard';

const ToolBarIcons = () => (
<ManualIcon
page="vulnerabilitymanagement"
anchor="network-vulnerability-tests"
page="managing-secinfo"
anchor="network-vulnerability-tests-nvt"
title={_('Help: NVTs')}
/>
);
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/operatingsystems/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ let ToolBarIcons = ({
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="operating-systems-view"
page="managing-assets"
anchor="managing-operating-systems"
title={_('Help: Operating Systems')}
/>
<ListIcon title={_('Operating System List')} page="operatingsystems" />
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/operatingsystems/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ import OsDashboard, {OS_DASHBOARD_ID} from './dashboard';
const ToolBarIcons = () => (
<Layout>
<ManualIcon
page="vulnerabilitymanagement"
anchor="operating-systems-view"
page="managing-assets"
anchor="managing-operating-systems"
title={_('Help: Operating Systems')}
/>
</Layout>
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/ovaldefs/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ const ToolBarIcons = ({entity, onOvaldefDownloadClick}) => (
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="oval"
page="managing-secinfo"
anchor="oval-definitions"
title={_('Help: OVAL Definitions')}
/>
<ListIcon title={_('OVAL Definitions List')} page="ovaldefs" />
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/ovaldefs/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ import OvaldefDashboard, {OVALDEF_DASHBOARD_ID} from './dashboard';

const ToolBarIcons = () => (
<ManualIcon
page="vulnerabilitymanagement"
anchor="oval"
page="managing-secinfo"
anchor="oval-definitions"
title={_('Help: OVAL Definitions')}
/>
);
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/overrides/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ const ToolBarIcons = ({
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="overrides-and-false-positives"
page="reports"
anchor="managing-overrides"
title={_('Help: Overrides')}
/>
<ListIcon title={_('Override List')} page="overrides" />
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/overrides/listpage.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ const ToolBarIcons = withCapabilities(
({capabilities, onOverrideCreateClick}) => (
<IconDivider>
<ManualIcon
page="vulnerabilitymanagement"
anchor="overrides-and-false-positives"
page="reports"
anchor="managing-overrides"
title={_('Help: Overrides')}
/>

Expand Down
2 changes: 1 addition & 1 deletion gsa/src/web/pages/performance/performancepage.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ const ToolBar = ({onDurationChangeClick}) => {
<IconDivider>
<ManualIcon
page="performance"
anchor="appliance-performance"
anchor="optimizing-the-appliance-performance"
size="small"
title={_('Help: Performance')}
/>
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/pages/permissions/detailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ const ToolBarIcons = ({
<Divider margin="10px">
<IconDivider>
<ManualIcon
page="gui_administration"
anchor="permissions"
page="web-interface-access"
anchor="managing-permissions"
title={_('Help: Permissions')}
/>
<ListIcon title={_('Permission List')} page="permissions" />
Expand Down
Loading