Skip to content

Commit

Permalink
Merge pull request #73 from yileifeng/update-storylines-content
Browse files Browse the repository at this point in the history 
Update storylines content (#73)
  • Loading branch information
@szczz
szczz committed Aug 30, 2023
2 parents 826bf4b + efb74bf commit 2ec90d2
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 14 deletions.
Binary file added public/storylines/assets/RAMP2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/storylines/assets/bittern.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/storylines/assets/demo.png
View file
Binary file not shown.
Binary file added public/storylines/assets/heron.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/storylines/assets/plover.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/storylines/assets/substances/1_AuroraNorth_RelDisp_EN.PNG
View file
Binary file not shown.
Binary file removed public/storylines/assets/substances/2_FortHills_RelDisp_EN.PNG
View file
Binary file not shown.
Binary file removed public/storylines/assets/substances/3_Horizon_RelDisp_EN.PNG
View file
Binary file not shown.
Binary file removed public/storylines/assets/substances/AuroraNorth_RelDisp_FR.png
View file
Binary file not shown.
Binary file removed public/storylines/assets/substances/FortHills_RelDisp_FR.PNG
View file
Binary file not shown.
Binary file removed public/storylines/assets/substances/Horizon_RelDisp_FR.PNG
View file
Binary file not shown.
17 changes: 11 additions & 6 deletions public/storylines/storylines_en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"type": "text"
},
{
"src": "storylines/assets/demo.png",
"src": "storylines/assets/RAMP2.png",
"type": "image",
"alt": "A map displaying hundreds of Pulp & Paper facilities across Canada.",
"altText": "A person presenting to their colleagues.",
"fullscreen": false
}
]
Expand Down Expand Up @@ -79,23 +79,28 @@
"panel": {
"images": [
{
"src": "storylines/assets/substances/1_AuroraNorth_RelDisp_EN.PNG",
"src": "storylines/assets/heron.jpg",
"type": "image",
"altText": "A Great Blue Heron takes flight along the shoreline of the Nicomekl River. Source: Tim Fitzgerald, Ducks Unlimited Canada",
"caption": "A Great Blue Heron takes flight along the shoreline of the Nicomekl River. Source: Tim Fitzgerald, Ducks Unlimited Canada",
"fullscreen": false
},
{
"src": "storylines/assets/substances/2_FortHills_RelDisp_EN.PNG",
"src": "storylines/assets/bittern.jpg",
"type": "image",
"altText": "The Least Bittern (Ixobrychus exilis) (female pictured here) is a threatened species in Canada. This small heron breeds in the large cattail marshes that are still present in the St. Lawrence Lowlands. Source: Benoît Jobin",
"caption": "The Least Bittern (Ixobrychus exilis) (female pictured here) is a threatened species in Canada. This small heron breeds in the large cattail marshes that are still present in the St. Lawrence Lowlands. Source: Benoît Jobin",
"fullscreen": false
},
{
"src": "storylines/assets/substances/3_Horizon_RelDisp_EN.PNG",
"src": "storylines/assets/plover.jpg",
"type": "image",
"altText": "The Mountain Plover is a migratory bird and endangered species at risk. Source: Cliff Wallis",
"caption": "The Mountain Plover is a migratory bird and endangered species at risk. Source: Cliff Wallis",
"fullscreen": false
}
],
"loop": true,
"caption": "NPRI substances reported for oil sands mining facilities",
"type": "slideshow",
"fullscreen": false
}
Expand Down
20 changes: 13 additions & 7 deletions public/storylines/storylines_fr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"type": "text"
},
{
"src": "storylines/assets/demo.png",
"src": "storylines/assets/RAMP2.png",
"type": "image",
"alt": "Une carte montrant des centaines d'installations de pâtes et papiers à travers le Canada.",
"altText": "Une personne qui se présente à ses collègues.",
"fullscreen": false
}
]
Expand Down Expand Up @@ -79,24 +79,30 @@
"panel": {
"images": [
{
"src": "storylines/assets/substances/AuroraNorth_RelDisp_FR.PNG",
"src": "storylines/assets/heron.jpg",
"type": "image",
"altText": "Un Grand Héron prend son envol le long du littoral de la rivière Nicomekl River. Source : Tim Fitzgerald, Canards Illimités Canada",
"caption": "Un Grand Héron prend son envol le long du littoral de la rivière Nicomekl River. Source : Tim Fitzgerald, Canards Illimités Canada",
"fullscreen": false
},
{
"src": "storylines/assets/substances/FortHills_RelDisp_FR.PNG",
"src": "storylines/assets/bittern.jpg",
"type": "image",
"altText": "Le Petit Blongios (Ixobrychus exilis) (ici une femelle) est une espèce menacée au Canada. Ce petit héron niche dans les grands marais à quenouilles toujours présents dans les Basses-terres du Saint-Laurent. Source : Benoît Jobin",
"caption": "Le Petit Blongios (Ixobrychus exilis) (ici une femelle) est une espèce menacée au Canada. Ce petit héron niche dans les grands marais à quenouilles toujours présents dans les Basses-terres du Saint-Laurent. Source : Benoît Jobin",
"fullscreen": false
},
{
"src": "storylines/assets/substances/Horizon_RelDisp_FR.PNG",
"src": "storylines/assets/plover.jpg",
"type": "image",
"altText": "Le Pluvier montagnard est une espèce d’oiseau migrateur en péril. Source : Cliff Wallis",
"caption": "Le Pluvier montagnard est une espèce d’oiseau migrateur en péril. Source : Cliff Wallis",
"fullscreen": false
}
],
"loop": true,
"caption": "Résidus miniers déclarés à l’INRP par les installations d’exploitation minière à ciel ouvert de sables bitumineux",
"type": "slideshow"
"type": "slideshow",
"fullscreen": false
}
}
]
Expand Down
2 changes: 2 additions & 0 deletions src/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export default class App extends Vue {
beforeMount() {
if (this.$router.currentRoute.query['lang']) {
this.$i18n.locale = this.$router.currentRoute.query['lang'] as string;
} else {
this.$router.replace({ query: { lang: this.$i18n.locale } });
}
document.title = this.$i18n.t('page.title') as string;
document.documentElement.lang = this.$i18n.locale;
Expand Down
2 changes: 1 addition & 1 deletion src/components/info/storylines.vue
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="storylines bg-white" v-if="loaded && config !== undefined">
<div class="storylines bg-white border-2 border-black" v-if="loaded && config !== undefined">
<header class="gray-200 sticky top-0 h-16 leading-9 w-full z-50 border-b border-gray-500 bg-gray-200">
<div class="flex w-full sm:px-6 py-3 mx-auto">
<storylines-mobile-toc
Expand Down

0 comments on commit 2ec90d2

Please sign in to comment.