This repository has been archived by the owner on Dec 20, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #312 from navikt/opptjening-info
Laget nytt faktaark for opptjening
- Loading branch information
Showing
32 changed files
with
325 additions
and
5 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,6 +29,7 @@ | |
| margin-top: 1rem; | ||
| margin-bottom: 1rem; | ||
| text-align: center; | ||
| max-width: 400px; | ||
| } | ||
|
|
||
| &__roundSvgMask { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| import * as React from 'react'; | ||
|
|
||
| import { injectIntl, InjectedIntlProps, InjectedIntl } from 'react-intl'; | ||
| import classnames from 'classnames'; | ||
| import getTranslation from 'app/utils/i18nUtils'; | ||
| import PanelMedIllustrasjon from '../../../components/panel-med-illustrasjon/PanelMedIllustrasjon'; | ||
| import Innhold, { getSource } from 'app/utils/innhold/Innhold'; | ||
| import BEMHelper from 'app/utils/bem'; | ||
| import Tabs from 'nav-frontend-tabs'; | ||
|
|
||
| import './opptjening.less'; | ||
| import LesMer from 'app/components/les-mer/LesMer'; | ||
|
|
||
| const foreldrepengerSvg = require('../../../assets/ark/ark-frister.svg').default; | ||
|
|
||
| interface Props { | ||
| id: string; | ||
| } | ||
|
|
||
| const getTabs = (intl: InjectedIntl) => [ | ||
| { | ||
| label: getTranslation('om_foreldrepenger.opptjening.mor', intl), | ||
| content: getSource('om-foreldrepenger/opptjening/mor', intl) | ||
| }, | ||
| { | ||
| label: getTranslation('om_foreldrepenger.opptjening.farEllerMedmor', intl), | ||
| content: getSource('om-foreldrepenger/opptjening/far-eller-medmor', intl) | ||
| }, | ||
| { | ||
| label: getTranslation('om_foreldrepenger.opptjening.kunFarEllerMedmorHarRett', intl), | ||
| content: getSource('om-foreldrepenger/opptjening/bare-far-eller-medmor-rett', intl) | ||
| } | ||
| ]; | ||
|
|
||
| const cls = BEMHelper('opptjening'); | ||
|
|
||
| const Opptjening: React.StatelessComponent<Props & InjectedIntlProps> = ({ id, intl }) => { | ||
| const [tabIndex, setTabIndex] = React.useState(0); | ||
|
|
||
| const onTabChange = (_: any, newTabIndex: number) => { | ||
| setTabIndex(newTabIndex); | ||
| }; | ||
|
|
||
| const tabs = getTabs(intl); | ||
|
|
||
| return ( | ||
| <PanelMedIllustrasjon | ||
| id={id} | ||
| title={getTranslation('om_foreldrepenger.opptjening.tittel', intl)} | ||
| className={cls.block} | ||
| svg={foreldrepengerSvg}> | ||
| <Innhold source={getSource('om-foreldrepenger/opptjening/ingress', intl)} /> | ||
|
|
||
| <Tabs kompakt={true} tabs={tabs} onChange={onTabChange} /> | ||
| {tabs.map((tab, index) => ( | ||
| <div | ||
| key={index} | ||
| className={classnames( | ||
| 'blokk-m', | ||
| cls.element('tabContent', tabIndex !== index ? 'inactive' : undefined) | ||
| )}> | ||
| <Innhold source={tab.content} /> | ||
| </div> | ||
| ))} | ||
| <Innhold | ||
| source={getSource('om-foreldrepenger/opptjening/spesielt-ved-adopsjon', intl)} | ||
| /> | ||
| <LesMer intro={getTranslation('om_foreldrepenger.opptjening.utbetalinger', intl)}> | ||
| <Innhold | ||
| source={getSource('om-foreldrepenger/opptjening/utbetalinger-nav-teller', intl)} | ||
| /> | ||
| </LesMer> | ||
| <LesMer intro={getTranslation('om_foreldrepenger.opptjening.andreInntekter', intl)}> | ||
| <Innhold | ||
| source={getSource( | ||
| 'om-foreldrepenger/opptjening/andre-inntekter-som-gir-rett', | ||
| intl | ||
| )} | ||
| /> | ||
| </LesMer> | ||
| </PanelMedIllustrasjon> | ||
| ); | ||
| }; | ||
|
|
||
| export default injectIntl(Opptjening); |
21 changes: 21 additions & 0 deletions
21
src/app/pages/om-foreldrepenger/opptjening/opptjening.less
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| @import '../../../styles/variables.less'; | ||
|
|
||
| .opptjening { | ||
| &__tabContent { | ||
| align-self: flex-start; | ||
| width: 100%; | ||
|
|
||
| &--inactive { | ||
| display: none; | ||
| } | ||
| } | ||
|
|
||
| .typo-undertittel { | ||
| align-self: flex-start; | ||
| } | ||
|
|
||
| .nav-frontend-tabs { | ||
| margin-bottom: 1rem; | ||
| align-self: flex-start; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
src/content/om-foreldrepenger/opptjening/andre-inntekter-som-gir-rett.en.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <innhold> | ||
| <avsnitt>Other types of income that entitle the recipient to parental benefit</avsnitt> | ||
| <liste> | ||
| <punkt>compulsory military service in the Norwegian Armed Forces or the Norwegian Civil Defence</punkt> | ||
| <punkt>worked in another EEA country</punkt> | ||
| <punkt>interim pay</punkt> | ||
| <punkt>severance package</punkt> | ||
| <punkt>salary from employer during further or continuing education</punkt> | ||
| </liste> | ||
| </innhold> |
10 changes: 10 additions & 0 deletions
10
src/content/om-foreldrepenger/opptjening/andre-inntekter-som-gir-rett.nn.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <innhold> | ||
| <avsnitt>Desse inntektene tel med som inntekt når du skal ha foreldrepengar</avsnitt> | ||
| <liste> | ||
| <punkt>førstegongsteneste i forsvaret eller sivilforsvaret</punkt> | ||
| <punkt>arbeid i eit anna EØS-land</punkt> | ||
| <punkt>ventelønn</punkt> | ||
| <punkt>sluttpakke</punkt> | ||
| <punkt>lønn frå arbeidsgivar under vidare- eller etterutdanning</punkt> | ||
| </liste> | ||
| </innhold> |
10 changes: 10 additions & 0 deletions
10
src/content/om-foreldrepenger/opptjening/andre-inntekter-som-gir-rett.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <innhold> | ||
| <avsnitt>Disse inntektene teller med som inntekt når du skal ha foreldrepenger</avsnitt> | ||
| <liste> | ||
| <punkt>førstegangstjenesten i forsvaret eller sivilforsvaret</punkt> | ||
| <punkt>jobbet i et annet EØS-land</punkt> | ||
| <punkt>ventelønn</punkt> | ||
| <punkt>sluttpakke</punkt> | ||
| <punkt>lønn fra arbeidsgiver under videre- eller etterutdanning</punkt> | ||
| </liste> | ||
| </innhold> |
Oops, something went wrong.