diff --git a/src/ui-client/public/images/logos/orgs/nida.svg b/src/ui-client/public/images/logos/orgs/nida.svg new file mode 100644 index 000000000..09e2e8b84 --- /dev/null +++ b/src/ui-client/public/images/logos/orgs/nida.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ui-client/src/components/Attestation/AttestationFooter.tsx b/src/ui-client/src/components/Attestation/AttestationFooter.tsx index 63600b18d..601feedc8 100644 --- a/src/ui-client/src/components/Attestation/AttestationFooter.tsx +++ b/src/ui-client/src/components/Attestation/AttestationFooter.tsx @@ -41,22 +41,8 @@ export default class AttestationFooter extends React.PureComponent return createPortal(
- Planning to publish your results? - Great! Please cite this manuscript to ensure we can continue making Leaf even better: -
-
- - - Nicholas J Dobbins, Clifford H Spital, Robert A Black, Jason M Morrison, Bas de Veer, Elizabeth Zampino, Robert D Harrington, - Bethene D Britt, Kari A Stephens, Adam B Wilcox, Peter Tarczy-Hornoch, Sean D Mooney. - - - Leaf: an open-source, model-agnostic, data-driven web application for cohort discovery and translational biomedical research. - - - Journal of the American Medical Informatics Association, ocz165, https://doi.org/10.1093/jamia/ocz165 - - + leaf-logo + For more information about the Leaf data visualization tool, please click here.
, backdrop diff --git a/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx b/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx index cc05d0de8..52e8c515d 100644 --- a/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx +++ b/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx @@ -9,7 +9,6 @@ import React from 'react'; import { Button, Row, Col } from 'reactstrap'; import { SessionType } from '../../models/Session' import { AppConfig, CustomAttestationType } from '../../models/Auth'; -import TextareaAutosize from 'react-textarea-autosize'; interface Props { config?: AppConfig; @@ -33,25 +32,45 @@ export default class CustomAttestationConfirmation extends React.PureComponent

+ {!skipModeSelection && +

+ {useDisplay} - {phiDisplay} +
} +
+ {/* use custom text */} + {useHtml && +
+ } + + {!useHtml && +
+ {config.attestation.text.map((t,i) => { + return

{t}

; + })} +
+ } +
{showText && +
+ -
- - - {useDisplay} - {phiDisplay} - {!(isSubmittingAttestation || hasAttested) && - + - {config && !config.attestation.skipModeSelection && + {" "} + {!skipModeSelection &&
diff --git a/src/ui-client/src/containers/Attestation/Attestation.tsx b/src/ui-client/src/containers/Attestation/Attestation.tsx index 489656063..57fe015b1 100644 --- a/src/ui-client/src/containers/Attestation/Attestation.tsx +++ b/src/ui-client/src/containers/Attestation/Attestation.tsx @@ -154,11 +154,8 @@ class Attestation extends React.PureComponent { v{pkg.version}
-
- iths-logo -
-
- cd2h-logo +
+ nida-logo
{/* Optional instance logo row */} @@ -184,11 +181,9 @@ class Attestation extends React.PureComponent {
- {userContext && !userContext.isPhiOkay &&

Participant data restricted to De-Identified mode only

- } {auth.error &&
diff --git a/src/ui-client/src/containers/Header/Header.tsx b/src/ui-client/src/containers/Header/Header.tsx index a339efa97..bdd6c4390 100644 --- a/src/ui-client/src/containers/Header/Header.tsx +++ b/src/ui-client/src/containers/Header/Header.tsx @@ -24,6 +24,7 @@ import { getPanelItemCount } from '../../utils/panelUtils'; import { logout } from '../../actions/session'; import NewQueryButton from '../../components/Header/NewQueryButton'; import DatabasesButton from '../../components/Header/DatabasesButton'; +import LogoutButton from '../../components/Header/LogoutButton'; import UserButton from '../../components/Header/UserButton'; import ImportButton from '../../components/Header/ImportButton'; import ImportState from '../../models/state/Import'; @@ -89,11 +90,14 @@ class Header extends React.PureComponent { federated={responders.size > 1} imports={importState} helpClickHandler={this.handleGetHelpClick} - logoutClickHandler={this.handleLogoutClick} myLeafModalToggleHandler={this.handleMyleafModalToggleClick} user={user} /> - + {/* Logout */} +
diff --git a/src/ui-client/src/styles/custom.css b/src/ui-client/src/styles/custom.css index ac7943fb7..f6d611469 100644 --- a/src/ui-client/src/styles/custom.css +++ b/src/ui-client/src/styles/custom.css @@ -128,14 +128,43 @@ button.concept-search-roots-dropdown-toggle.dropdown-toggle.btn.btn-secondary:ho } /* Attestation modal */ +.attestation-footer-text .logo { + margin: -4px 0 4px; +} .attestation-leaf-logo { border-radius: 0; } +.attestation-modal-wrap .modal-title { + display: flex; + align-items: center; + justify-content: space-between; +} +.attestation-modal-wrap .attestation-leaf-logo-wrapper { + flex: 3; + margin-top: 8px; +} +.attestation-modal-wrap .attestation-nida-logo-wrapper { + flex: 1; +} +.attestation-modal-wrap .attestation-nida-logo-wrapper img { + height: 48px; +} .attestation-modal-wrap .attestation-title { margin-left: 4px; font-size: 2rem; } - +.attestation-confirmation-settings.custom, +.attestation-session-load-display-container.custom { + text-align: center; +} +.attestation-confirmation-settings.custom button { + font-size: 1.4rem; +} +.attestation-nida-logo { + height: 56px; + -webkit-transform: scale(0.8); + transform: scale(0.8); +} /* Visualize */ .visualization-no-data-container { color: #777;