diff --git a/CHANGELOG.md b/CHANGELOG.md index aedbc321b..acf98add6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ Hotfix release for submissions in progress. ### Changed - Changed language on user dash from 'reviews' to 'review tasks' to differentiate between the two +- Changed the project heading block to contain optional image and start contributing button ## [v2.1.0](https://github.com/digirati-co-uk/madoc-platform/compare/v2.0.8...v2.1.0) diff --git a/services/madoc-ts/src/frontend/shared/layout/Surface.tsx b/services/madoc-ts/src/frontend/shared/layout/Surface.tsx index 04b226ec2..978cb4129 100644 --- a/services/madoc-ts/src/frontend/shared/layout/Surface.tsx +++ b/services/madoc-ts/src/frontend/shared/layout/Surface.tsx @@ -45,6 +45,7 @@ const SurfaceStyled = styled.div<{ $background?: string; $color?: string; $textAlign?: 'left' | 'center' | 'right'; + $fullWidth?: boolean; $padding?: 'none' | 'sm' | 'md' | 'lg'; $marginBottom?: 'none' | 'sm' | 'md' | 'lg'; $fontSize?: 'sm' | 'md' | 'lg'; @@ -59,12 +60,15 @@ const SurfaceStyled = styled.div<{ font-family: ${props => (props.$font ? `${props.$font}, sans-serif` : 'inherit')}; text-align: ${props => (props.$textAlign ? props.$textAlign : 'left')}; margin-bottom: ${parseProp('$marginBottom', '0')}; + margin-left: ${props => (props.$fullWidth ? '-2em' : '')}; + margin-right: ${props => (props.$fullWidth ? '-2em' : '')}; `; export type SurfaceProps = { id?: string; background?: string; textColor?: string; + fullWidth?: boolean; textAlign?: 'left' | 'center' | 'right'; font?: string; padding?: 'none' | 'sm' | 'md' | 'lg'; @@ -78,6 +82,7 @@ export const Surface: React.FC = ({ textAlign, textColor, background, + fullWidth, font, fontSize, fontWeight, @@ -94,6 +99,7 @@ export const Surface: React.FC = ({ { const { t } = useTranslation(); @@ -24,10 +23,8 @@ export const CollectionFilterOptions: React.FC = () => { const { filter, page } = useLocationQuery(); const [, showDoneButton] = useSubjectMap(data ? data.subjects : []); const options = useProjectPageConfiguration(); - const { isActive } = useProjectStatus(); - const { showCaptureModelOnManifest } = useProjectShadowConfiguration(); const { - project: { allowCollectionNavigation = true, allowManifestNavigation = true, claimGranularity }, + project: { allowCollectionNavigation = true, allowManifestNavigation = true }, } = useSiteConfiguration(); if (!data) { return null; @@ -35,21 +32,7 @@ export const CollectionFilterOptions: React.FC = () => { return ( <> - - {!options.hideStartContributing && isActive ? ( - claimGranularity === 'manifest' || showCaptureModelOnManifest ? ( - - ) : ( - - ) - ) : null} - + {showDoneButton || filter ? (