Skip to content

Commit

Permalink
Merge pull request #105 from MfN-Berlin/testing-drupal-integration
Browse files Browse the repository at this point in the history
v1.0.6
  • Loading branch information
maxlisewski authored Feb 5, 2025
2 parents 4635b77 + 98790c7 commit ca5a86f
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 26 deletions.
2 changes: 1 addition & 1 deletion gatsby-browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import './src/styles/global.css'

// Version logging
const VERSION = 'v1.0.5'
const VERSION = 'v1.0.6'

export const onClientEntry = () => {
// Temporär Prefetching deaktivieren
Expand Down
2 changes: 1 addition & 1 deletion src/pages/de/forschung.js
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ const VisitPage = () => {
kicker="Forschungsbereich 2"
title="Zentrum für Kultur- und Sozialwissenschaften der Natur"
text="Unsere Arbeitsgruppe widmet sich den Politiken, Geschichten und Kulturen von Natur durch eigenständige Forschung und öffentliche Aktivitäten im Bereich Wissenstransfer. "
link="de/wissenschaft/zentrum-fuer-kultur-und-sozialwissenschaften-der-natur"
link="/de/forschung/zentrum-fuer-kultur-und-sozialwissenschaften-der-natur"
/>
<SlideContent
imageName="large_Header_2023_klein_beschnitten_belichted_7cca538a55.jpg"
Expand Down
10 changes: 5 additions & 5 deletions src/pages/en/museum.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const IndexPage = () => {
{
text: "Press",
variant: "plain",
url: "en/press-releases/"
url: "/en/museum/media/press"
}
]}
/>
Expand Down Expand Up @@ -125,7 +125,7 @@ const IndexPage = () => {
{
text: "Future Plan",
variant: "plain",
url: "en/future/future-plan/"
url: "en/museum/future/future-plan"
}
]}
/>
Expand Down Expand Up @@ -203,7 +203,7 @@ const IndexPage = () => {
spacing: "wide",
alignment: "left"
}}
url="/en/museum/today/themuseumslab"
url="/en/museum/today/museum/themuseumslab"
/>

<Card
Expand Down Expand Up @@ -322,7 +322,7 @@ const IndexPage = () => {
body: "At four locations along the exhibition tour, installations will provide information about the Future Plan from June 11, 2024, until the end of June 2027.",
spacing: "wide"
}}
url="/en/visit/exhibitions/future-plan"
url="/en/museum/exhibitions/zukunftsplan"
/>

<Card
Expand All @@ -339,7 +339,7 @@ const IndexPage = () => {
body: "In our journals Für Natur, we take you along on our journey into the future.",
spacing: "wide"
}}
url="en/future/nature-journals/"
url="/en/museum/media/nature-journals"
/>

<Card
Expand Down
2 changes: 1 addition & 1 deletion src/pages/en/participate.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ const IndexPage = () => {
headlineStyle: "h3",
alignment: "left"
}}
url="/en/science/naturblick-discover-urban-nature"
url="/en/research/naturblick-discovering-nature-city"
/>

<Card
Expand Down
16 changes: 8 additions & 8 deletions src/pages/en/research.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ const ResearchPage = () => {
body: "We are investigating the processes that form the natural world: from evolution and the diversity of species, to the origins of the solar system.",
spacing: "regular"
}}
url="/en/science/dynamics-of-nature"
url="/en/research/research/dynamics-nature"
/>
<Card
variant="green"
Expand All @@ -169,7 +169,7 @@ const ResearchPage = () => {
body: "We curate an open and networked collection which opens up new avenues for research and knowledge transfer through innovative approaches to data and knowledge management – in partnership with stakeholders from science, society and culture.",
spacing: "regular"
}}
url="/en/science/research/collection-future"
url="/en/research/research/collection-future"
/>

<Card
Expand All @@ -187,7 +187,7 @@ const ResearchPage = () => {
body: "We are exploring how participation and knowledge-sharing enrich research and practical knowledge for nature.",
spacing: "regular"
}}
url="/en/science/society-and-nature"
url="/en/research/research/society-and-nature"
/>

<Card
Expand Down Expand Up @@ -332,7 +332,7 @@ const ResearchPage = () => {
kicker="Research Area 1"
title="Palaeobotany Working Group"
text="The Palaeobotany Working Group conducts research on the evolution and diversity of fossilised plants. Our focus is on reconstructing extinct plants and their habitats."
link="/en/science/paleobotany-working-group"
link="/en/research/palaeobotany-lab"
/>

<SlideContent
Expand All @@ -341,7 +341,7 @@ const ResearchPage = () => {
kicker="Research Area 1"
title="Dunlop Working Group"
text="The Dunlop Working Group is investigating the evolution and taxonomy of fossilised and living arachnids, with a particular focus on spiders and scorpions."
link="/en/science/dunlop-working-group"
link="/en/research/dunlop-lab"
/>

<SlideContent
Expand All @@ -368,7 +368,7 @@ const ResearchPage = () => {
kicker="Research Area 2"
title="Centre for Nature in Cultural and Social Sciences"
text="Our working group is dedicated to the politics, history and culture of nature, conducting independent research and public knowledge transfer activities."
link="/en/science/cultural-social-sciences"
link="/en/research/center-humanities-nature"
/>

<SlideContent
Expand All @@ -377,7 +377,7 @@ const ResearchPage = () => {
kicker="Research Area 3"
title="Human-Nature Relationships in the Anthropocene"
text="Inter and trans-disciplinary research on the interactions between humans, nature and digital transformation."
link="/en/science/human-nature-relations"
link="/en/human-nature-relationships-anthropocene"
/>

<SlideContent
Expand All @@ -386,7 +386,7 @@ const ResearchPage = () => {
kicker="Research Area 3"
title="Public Engagement and Impact"
text="We promote the strategic anchoring of public engagement in science and scientific institutions. We do this by opening up the culture and processes of science to non-academic stakeholders, using a wide range of formats and methods."
link="/en/science/public-engagement"
link="/en/research/ieti-impact-oriented-public-engagement"
/>
</Slideshow>
</Section>
Expand Down
27 changes: 17 additions & 10 deletions src/pages/en/visit.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ const IndexPage = () => {
<AccordionSpacer>
<div className="p-0 flex flex-col justify-center items-center gap-0">
<div className="text-center text-Green-600 typography-kicker">
Saturday, Sunday, and on <a href="en/special-opening-times" className="underline">public holidays</a>
Saturday, Sunday, and on public holidays
</div>
<div className="text-center text-Black-900 font-bold text-[34px] py-2">
10:00am to 6:00pm
Expand Down Expand Up @@ -471,7 +471,7 @@ const IndexPage = () => {
imageName="zp_1200x675_WEBSEITE.jpg"
title="Zukunftsplan – The Museum in Motion"
kicker="Installation in the museum from 11 June 2024 to the end of June 2027"
link="/en/visit/exhibitions/zukunftsplan"
link="/en/museum/exhibitions/zukunftsplan"
altText="Visualization of the future plan for the Museum für Naturkunde Berlin"
/>
<SlideContent
Expand All @@ -485,7 +485,7 @@ const IndexPage = () => {
imageName="1200x800_0.jpg"
title="Dinosaurs!"
kicker="Our Exhibitions"
link="/en/museum/exhibitions/dinosaurs-age-of-giant-reptiles"
link="/en/visit/exhibitions/dinosaurs-age-giant-lizards"
altText="Dinosaurs! Age of Giant Reptiles"
/>
<SlideContent
Expand All @@ -499,7 +499,7 @@ const IndexPage = () => {
imageName="sauriersaal_04_c_carola-radke-mfn.jpg"
title="World of Dinosaurs"
kicker="Our Exhibitions"
link="/en/museum/exhibitions/world-of-dinosaurs"
link="en/visit/exhibitions/world-dinosaurs"
altText="Dinosaur skeletons in the Dinosaur Hall"
/>
<SlideContent
Expand Down Expand Up @@ -541,7 +541,7 @@ const IndexPage = () => {
imageName="2015_bobby_c_carola-radke_mfn_0.jpg"
title="Highlights of Taxidermy"
kicker="Our Exhibitions"
link="/en/museum/exhibitions/highlights-of-taxidermy"
link="/en/visit/exhibitions/highlights-taxidermy"
altText="The face of the gorilla Bobby, behind it the specimen of a giant eland antelope"
/>
<SlideContent
Expand All @@ -562,14 +562,14 @@ const IndexPage = () => {
imageName="100423_parasiten_03_c_hwaja-goetz_mfn_0.jpg"
title="Traveling Exhibitions"
kicker="Our Exhibitions"
link="/en/museum/traveling-exhibitions"
link="/en/museum/touring-exhibitions"
altText="The photo shows a prepared springbok with oxpeckers"
/>
<SlideContent
imageName="federband_c_hwaja-goetz_mfn.jpg"
title="Archive: Special Exhibitions"
kicker="Our Exhibitions"
link="/en/museum/exhibitions/archive-special-exhibitions"
link="/en/visit/exhibitions/archive-special-exhibition"
altText="Feather band made of different colored feathers"
/>
</Slideshow>
Expand All @@ -591,7 +591,7 @@ const IndexPage = () => {
spacing: "regular",
headlineStyle: "h3"
}}
url="/en/visit/events"
url="/en/participate/events"
/>
</div>

Expand Down Expand Up @@ -669,9 +669,16 @@ const IndexPage = () => {
<CardText
headline="Special Visits"
headlineStyle="h1"
body="We are more than happy to host group visits and special events. All education offers"
body="We are more than happy to host group visits and special events."
spacing="wide"
alignment="center"
buttons={[
{
text: "All Education Offers",
url: "/en/participate/education",
variant: "plain"
}
]}
/>
</Section>

Expand Down Expand Up @@ -748,7 +755,7 @@ const IndexPage = () => {
buttons={[
{
text: "More FAQs",
url: "/en/visit/faq",
url: "/en/visitor-faqs",
variant: "plain"
}
]}
Expand Down

0 comments on commit ca5a86f

Please sign in to comment.