From 5f1542b8e06e67b2250288c58111d33c437f94e6 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Wed, 13 Apr 2022 20:07:19 -0400 Subject: [PATCH] Continue work --- build.sh | 44 ++++++++++---- css/custom.css | 14 +++-- css/slidy.css | 48 +++++++++++++++ includes/footer.pug | 9 +-- includes/head.pug | 74 ++++++++++++----------- orig/.~lock.Stanitski_website.docx# | 1 + templates/education.pug | 48 +++++++-------- templates/index.pug | 6 +- templates/outreach.pug | 94 ++++++++++++++--------------- templates/teaching.pug | 27 +++++++++ 10 files changed, 228 insertions(+), 137 deletions(-) create mode 100644 css/slidy.css create mode 100644 orig/.~lock.Stanitski_website.docx# create mode 100644 templates/teaching.pug diff --git a/build.sh b/build.sh index 08a7568..23670b0 100755 --- a/build.sh +++ b/build.sh @@ -6,8 +6,7 @@ cd "${BASH_SOURCE[0]%/*}" rm -rf build mkdir build -./node_modules/.bin/pug ./templates/ -mv ./templates/*.html build/ +./node_modules/.bin/pug -o build/ ./templates/ # ( # echo "Building HTML" @@ -23,17 +22,40 @@ render_image() { local SIZE="${1}" FILENAME="${2}" EXTRA_OPTIONS=(-auto-orient) EXTENSION="${FILENAME##*.}" shift 2 - if [[ "${1-}" == "--square" ]]; then - EXTRA_OPTIONS+=(-background none -gravity center -extent "${SIZE}") - fi - convert -resize "${SIZE}^" "${EXTRA_OPTIONS[@]}" "orig/${FILENAME}" "build/images/${FILENAME%.*}-${SIZE}.${EXTENSION}" + if [[ "${SIZE}" != "full" ]]; then + EXTRA_OPTIONS+=(-resize "${SIZE}x${SIZE}^") + if [[ "${1-}" == "--square" ]]; then + EXTRA_OPTIONS+=(-background none -gravity center -extent "${SIZE}x${SIZE}") + fi + fi + convert "${EXTRA_OPTIONS[@]}" "orig/${FILENAME}" "build/images/${FILENAME%.*}-${SIZE}.${EXTENSION}" } -render_image 200x200 "5._Elementary_GLOBE_Climate_Book_Cover.jpg" --square -render_image 200x200 "Diane_Student_Scammon_Bay.png" --square -render_image 200x200 "earth-small.png" --square -render_image 1000x1000 "earth-huge.png" --square -render_image 1000x1000 "Diane_Student_Scammon_Bay.png" +render_image 200 "5._Elementary_GLOBE_Climate_Book_Cover.jpg" --square +render_image 200 "Diane_Student_Scammon_Bay.png" --square +render_image 200 "earth-small.png" --square +render_image 215 "1._TAS_Miss_Cook_Book_Cover.png" +render_image 215 "2._TIA_Book_Cover.png" +render_image 215 "3._TAS_Hydrography_Book_Cover.png" +render_image 215 "4._TAS_Fisheries_book_Cover.png" +render_image 215 "5._Elementary_GLOBE_Climate_Book_Cover.jpg" +render_image full "earth-huge.png" + +# Scammon +render_image full "Scammon_2017-11-04RHawk206AlaskaNOAA.jpg" +render_image full "Scammon_2017-11-04RHawk334AlaskaNOAA.jpg" +render_image full "Scammon_2017-11-04RHawk366AlaskaNOAA.jpg" +render_image full "Scammon_2017-11-04RHawk414AlaskaNOAA.jpg" +render_image full "Scammon_2017-11-04RHawk423AlaskaNOAA.jpg" +render_image full "Diane_Student_Scammon_Bay.png" + +# JASON +render_image full "JASON_3D_Climate_Seas_of_Change_Cover.png" +render_image full "JASON_Learning-_climate_expedition_2.png" +render_image full "JASON_Learning_Climate-Seas_of_Change-Cover-2015.png" +render_image full "Stanitski_Adler_JASON_Argonauts_2.png" +render_image full "Stanitski_Adler_JASON_Argonauts.png" +render_image full "Stanitski_JASON.jpg" echo "Stripping metadata" exiftool -overwrite_original -all= -- build/images/*.* diff --git a/css/custom.css b/css/custom.css index 9b22a2d..b9e2c67 100644 --- a/css/custom.css +++ b/css/custom.css @@ -1,13 +1,17 @@ .left-align { - text-align: left; + text-align: left; } img.thumbnail { - border-radius: 50%; - -webkit-border-radius: 50%; - -moz-border-radius: 50%; + border-radius: 50%; + -webkit-border-radius: 50%; + -moz-border-radius: 50%; } img.big { - width: 100%; + width: 100%; +} + +.float-right { + float: right; } diff --git a/css/slidy.css b/css/slidy.css new file mode 100644 index 0000000..85339e4 --- /dev/null +++ b/css/slidy.css @@ -0,0 +1,48 @@ +@keyframes slideshow { + 0% { + left: 0%; + } + 20% { + left: 0%; + } + 40% { + left: -100%; + } + 55% { + left: -100%; + } + 70% { + left: -200%; + } + 85% { + left: -200%; + } + 100% { + left: -300%; + } +} + +/* +body { + margin: 0; +} +*/ + +div#slider { + overflow: hidden; +} + +div#slider > figure > img { + width: 20%; + float: left; +} + +div#slider > figure { + position: relative; + width: 500%; + margin: 0; + left: 0; + text-align: left; + font-size: 0; + animation: 20s slideshow infinite; +} diff --git a/includes/footer.pug b/includes/footer.pug index 99c15c1..420d603 100644 --- a/includes/footer.pug +++ b/includes/footer.pug @@ -34,9 +34,6 @@ div.section div.section div#credits - div.col - p © Copyright 2017 Company Name. - div.col - p Privacy | Terms of Use | Support | Site Map - div.col - p.right HTML & CSS by MLPdesign + div.col: p © Copyright 2017 Company Name. + div.col: p Privacy | Terms of Use | Support | Site Map + div.col: p.right HTML & CSS by MLPdesign diff --git a/includes/head.pug b/includes/head.pug index a99fa81..c418c28 100644 --- a/includes/head.pug +++ b/includes/head.pug @@ -13,49 +13,53 @@ html(lang="en") title Geocation link(rel="stylesheet" href="css/style.css") link(rel="stylesheet" href="css/custom.css") + link(rel="stylesheet" href="css/slidy.css") body - div(id="menu") - nav - label(for="show-menu" class="responsive") ☰ - input(type="checkbox" id="show-menu" role="button") - ul(id="topnav") - li - span(class="icon") - a(href="#" title="Your Logo" class="logo") 👽 - li - a(href="education.html") Education - li - a(href="outreach.html") Outreach - li - a(href="community-involvement.html") Community Involvement - // li - // a(href="contact.html") Contact - // li - // span.icon - // a(href="#" class="search") 🔍 - span.hide - a(href="#" title="Your Logo" class="logo") 👽 - span.hide - a(href="#" class="search") 🔍 + // div(id="menu") + // nav + // label(for="show-menu" class="responsive") ☰ + // input(type="checkbox" id="show-menu" role="button") + // ul(id="topnav") + // li: span(class="icon") + // a(href="#" title="Your Logo" class="logo") 👽 + // li: a(href="teaching.html") Teaching + // li: a(href="education.html") Education + // li: a(href="outreach.html") Outreach + // li: a(href="community-involvement.html") Community Involvement + // // li: a(href="contact.html") Contact + // // li + // // span.icon + // // a(href="#" class="search") 🔍 + // span.hide: a(href="#" title="Your Logo" class="logo") 👽 + // span.hide: a(href="#" class="search") 🔍 - div(id="container") + // div(id="container") div(id="pageheader") div(class="col") if title h1 a(href="index.html") Geocation - | - #{title} + // | | #{title} else - a(href="index.html") - h1 Geocation + a(href="index.html"): h1 Geocation div(class="col") ul#sub - li - a(href="education.html") Education - li - a(href="outreach.html") Outreach - li - a(href="community-involvement.html") Community Involvement - // li - // a(href="contact.html") Contact + li: a(href="teaching.html") Teaching + li: a(href="education.html") Education + li: a(href="outreach.html") Outreach + li: a(href="community-involvement.html") Community Involvement + // li: a(href="contact.html") Contact + +mixin bigimage(src, alt, ryanhawk) + figure + img.big(src=src, alt=alt) + figcaption + p: block + if ryanhawk + +ryanhawk + +mixin ryanhawk + br + | Photo courtesy: + a(href="https://ryanhawk.com/") RyanHawk.com diff --git a/orig/.~lock.Stanitski_website.docx# b/orig/.~lock.Stanitski_website.docx# new file mode 100644 index 0000000..1df5f02 --- /dev/null +++ b/orig/.~lock.Stanitski_website.docx# @@ -0,0 +1 @@ +,stonewareslord,v0,13.04.2022 18:49,file:///home/stonewareslord/.config/libreoffice/4; \ No newline at end of file diff --git a/templates/education.pug b/templates/education.pug index 6b95655..f49d481 100644 --- a/templates/education.pug +++ b/templates/education.pug @@ -2,36 +2,19 @@ include ../includes/head.pug div.section - div.pageitem - h2 University Teaching - - h3 University-Level Courses Taught - - ul.left-align - // li - // li University of California, Davis – Physical Geography, Analysis of Landforms - p University of California, Davis – Physical Geography, Analysis of Landforms - // li - // li Montana State University – Physical Geography, Weather and Climate - p Montana State University – Physical Geography, Weather and Climate - // li - // li Shippensburg University – Physical Geography, Introduction to the Atmosphere, Climatology, Meteorology, Geography Seminar, Applied Meteorology and Climatology, The Atmospheric Environment; Field courses: Geography of Vietnam, Environmental Science in Australia, Geography and Geology of Northern Arizona - p Shippensburg University – Physical Geography, Introduction to the Atmosphere, Climatology, Meteorology, Geography Seminar, Applied Meteorology and Climatology, The Atmospheric Environment; Field courses: Geography of Vietnam, Environmental Science in Australia, Geography and Geology of Northern Arizona - // li - // li University of Colorado at Boulder – Climate and Vegetation - p University of Colorado at Boulder – Climate and Vegetation - // li - // li US Naval Academy – Global Climate Change - p US Naval Academy – Global Climate Change - div.pageitem h2 Educational Resources h3 Children's Science Books Authored/Co-authored h4 What in the World is Happening to Our Climate? + div(style="display:block;") - p.left-align This Elementary GLOBE Climate Book was co-authored by Becca Hatheway and Diane Stanitski with illustrations by Lisa Gardiner. You can find PDFs of the text in English, Spanish, French and Norwegian, and five teacher activities here: + img.float-right(src="images/5._Elementary_GLOBE_Climate_Book_Cover-215.jpg", alt="Book cover for 'What in the World is Happening to Our Climate?'") + + + p.left-align + | This Elementary GLOBE Climate Book was co-authored by Becca Hatheway and Diane Stanitski with illustrations by Lisa Gardiner. You can find PDFs of the text in English, Spanish, French and Norwegian, and five teacher activities here: a(href="https://www.globe.gov/web/elementary-globe/overview/climate") https://www.globe.gov/web/elementary-globe/overview/climate p.left-align @@ -41,10 +24,21 @@ div.section h4 NOAA Teacher at Sea books - p Teacher at Sea: Miss Cook's Voyage on the Ronald H. Brown - p Teacher in the Air: Dr. Diane's Flight with the NOAA Hurricane Hunters - p Teacher at Sea, Mrs. Armwood's Hydrographic Adventure on the NOAA Ship FAIRWEATHER - p Teacher at Sea: Mr. Tanenbaum Explores Atlantic Fisheries on the NOAA Ship Henry B. Bigelow + div(style="display:block;") + p Teacher at Sea: Miss Cook's Voyage on the Ronald H. Brown + img(src="images/1._TAS_Miss_Cook_Book_Cover-215.png") + + div(style="display:block;") + p Teacher in the Air: Dr. Diane's Flight with the NOAA Hurricane Hunters + img(src="images/2._TIA_Book_Cover-215.png") + + div + p Teacher at Sea, Mrs. Armwood's Hydrographic Adventure on the NOAA Ship FAIRWEATHER + img(src="images/3._TAS_Hydrography_Book_Cover-215.png") + + div + p Teacher at Sea: Mr. Tanenbaum Explores Atlantic Fisheries on the NOAA Ship Henry B. Bigelow + img(src="images/4._TAS_Fisheries_book_Cover-215.png") br p | Diane authored/co-authored four NOAA Teacher at Sea (TAS) books and accompanying teacher activities between 2005 and 2009. The updated TAS website will soon feature the books and lessons here: diff --git a/templates/index.pug b/templates/index.pug index 49f3f82..405da6f 100644 --- a/templates/index.pug +++ b/templates/index.pug @@ -9,17 +9,17 @@ div.section div.pageitem div.col a(href="education.html") - img.thumbnail(src="images/5._Elementary_GLOBE_Climate_Book_Cover-200x200.jpg", alt="Book cover for 'What in the World is Happening to Our Climate?'") + img.thumbnail(src="images/5._Elementary_GLOBE_Climate_Book_Cover-200.jpg", alt="Book cover for 'What in the World is Happening to Our Climate?'") br | Education div.col a(href="outreach.html") - img.thumbnail(src="images/Diane_Student_Scammon_Bay-200x200.png", alt="Diane instructing a student at Scammon Bay, AK") + img.thumbnail(src="images/Diane_Student_Scammon_Bay-200.png", alt="Diane instructing a student at Scammon Bay, AK") br | Outreach div.col a(href="community-involvement.html") - img.thumbnail(src="images/earth-small-200x200.png", alt="The Earth from space") + img.thumbnail(src="images/earth-small-200.png", alt="The Earth from space") br | Community Involvement diff --git a/templates/outreach.pug b/templates/outreach.pug index 1763cac..71619ff 100644 --- a/templates/outreach.pug +++ b/templates/outreach.pug @@ -3,18 +3,56 @@ include ../includes/head.pug div.section div.pageitem - h2 NOAA Teacher at Sea - Scammon Bay, AK + h2 Outreach + + h3 NOAA Teacher at Sea - Scammon Bay, AK figure - img.big(src="images/Diane_Student_Scammon_Bay-1000x1000.png", alt="Diane instructing a student at Scammon Bay, AK") + img.big(src="images/Diane_Student_Scammon_Bay-full.png", alt="Diane instructing a student at Scammon Bay, AK") figcaption NOAA Teacher at Sea, Mary Cook, invited Diane Stanitski and John Adler to Scammon Bay, AK in 2017 to teach and interact with her indigenous Yup'ik students. See the highlights of their trip at a(href="https://ryanhawk.com/noaa-teacher-at-sea-mary") https://ryanhawk.com/noaa-teacher-at-sea-mary include ../includes/hawk.pug + // div#slider + // +bigimage("images/Scammon_2017-11-04RHawk206AlaskaNOAA-full.jpg", "TODO!", true) + // | Scammon_2017-11-04RHawk206AlaskaNOAA-full.jpg + // +bigimage("images/Scammon_2017-11-04RHawk334AlaskaNOAA-full.jpg", "TODO!", true) + // | Scammon_2017-11-04RHawk334AlaskaNOAA-full.jpg + // +bigimage("images/Scammon_2017-11-04RHawk366AlaskaNOAA-full.jpg", "TODO!", true) + // | Scammon_2017-11-04RHawk366AlaskaNOAA-full.jpg + // +bigimage("images/Scammon_2017-11-04RHawk414AlaskaNOAA-full.jpg", "TODO!", true) + // | Scammon_2017-11-04RHawk414AlaskaNOAA-full.jpg + // +bigimage("images/Scammon_2017-11-04RHawk423AlaskaNOAA-full.jpg", "TODO!", true) + // | Scammon_2017-11-04RHawk423AlaskaNOAA-full.jpg - h2 - a(href="https://jason.org/") JASON Learning + + +bigimage("images/Scammon_2017-11-04RHawk206AlaskaNOAA-full.jpg", "TODO!", true) + | Scammon_2017-11-04RHawk206AlaskaNOAA-full.jpg + +bigimage("images/Scammon_2017-11-04RHawk334AlaskaNOAA-full.jpg", "TODO!", true) + | Scammon_2017-11-04RHawk334AlaskaNOAA-full.jpg + +bigimage("images/Scammon_2017-11-04RHawk366AlaskaNOAA-full.jpg", "TODO!", true) + | Scammon_2017-11-04RHawk366AlaskaNOAA-full.jpg + +bigimage("images/Scammon_2017-11-04RHawk414AlaskaNOAA-full.jpg", "TODO!", true) + | Scammon_2017-11-04RHawk414AlaskaNOAA-full.jpg + +bigimage("images/Scammon_2017-11-04RHawk423AlaskaNOAA-full.jpg", "TODO!", true) + | Scammon_2017-11-04RHawk423AlaskaNOAA-full.jpg + + + +bigimage("images/JASON_3D_Climate_Seas_of_Change_Cover-full.png", "TODO!") + | JASON_3D_Climate_Seas_of_Change_Cover.png + +bigimage("images/JASON_Learning-_climate_expedition_2-full.png", "TODO!") + | JASON_Learning-_climate_expedition_2.png + +bigimage("images/JASON_Learning_Climate-Seas_of_Change-Cover-2015-full.png", "TODO!") + | JASON_Learning_Climate-Seas_of_Change-Cover-2015.png + +bigimage("images/Stanitski_Adler_JASON_Argonauts_2-full.png", "TODO!") + | Stanitski_Adler_JASON_Argonauts_2.png + +bigimage("images/Stanitski_Adler_JASON_Argonauts-full.png", "TODO!") + | Stanitski_Adler_JASON_Argonauts.png + +bigimage("images/Stanitski_JASON-full.jpg", "TODO!") + | Stanitski_JASON.jpg + + h2: a(href="https://jason.org/") JASON Learning p | Diane was a JASON Host Researcher for Expedition 2: Climate Connections — Drift and Flow in the JASON Learning Curriculum, @@ -25,9 +63,9 @@ div.section a(href="https://jason.org/live/") JASON Live Events // | ) p - | Diane presented + | Diane presented a(href="https://home.edweb.net/webinar/planet20200114/?_ga=2.130302027.510347060.1649016112-644777626.1649016112") Climate Change and Its Impact on the Ocean – January 14, 2020 - | (Co-hosted by + | (Co-hosted by a(href="https://home.edweb.net/") edWeb.net | and a(href="https://jason.org/") JASON Learning @@ -39,48 +77,4 @@ div.section a(href="https://www.youtube.com/watch?v=lN-flOgkafk&list=PLwR00vai5XqrdNSj7qI3_FWJrFWicu1Vh&index=64") Watch on YouTube | ) - - - h3.left-align University Level Courses Taught - - ul.left-align - li - p University of California, Davis – Physical Geography, Analysis of Landforms - li - p Montana State University – Physical Geography, Weather and Climate - li - p Shippensburg University – Physical Geography, Introduction to the Atmosphere, Climatology, Meteorology, Geography Seminar, Applied Meteorology and Climatology, The Atmospheric Environment; Field courses: Geography of Vietnam, Environmental Science in Australia, Geography and Geology of Northern Arizona - li - p University of Colorado at Boulder – Climate and Vegetation - li - p US Naval Academy – Global Climate Change - - div.pageitem - h2 Educational Resources - - h3 Children's Science Books Authored/Co-authored - - h4 What in the World is Happening to Our Climate? - - p.left-align - | This Elementary GLOBE Climate Book was co-authored by Becca Hatheway and Diane Stanitski with illustrations by Lisa Gardiner. You can find PDFs of the text in English, Spanish, French and Norwegian, and five teacher activities here: - a(href="https://www.globe.gov/web/elementary-globe/overview/climate") https://www.globe.gov/web/elementary-globe/overview/climate - - p.left-align - | GLOBE stands for Global Learning and Observations to Benefit of the Environment ( - a(href="https://www.globe.gov/about") https://www.globe.gov/about - | ) - - h4 NOAA Teacher at Sea books - - p Teacher at Sea: Miss Cook's Voyage on the Ronald H. Brown - p Teacher in the Air: Dr. Diane's Flight with the NOAA Hurricane Hunters - p Teacher at Sea, Mrs. Armwood's Hydrographic Adventure on the NOAA Ship FAIRWEATHER - p Teacher at Sea: Mr. Tanenbaum Explores Atlantic Fisheries on the NOAA Ship Henry B. Bigelow - br - p - | Diane authored/co-authored four NOAA Teacher at Sea (TAS) books and accompanying teacher activities between 2005 and 2009. The updated TAS website will soon feature the books and lessons here: - a(href="https://teacheratsea.noaa.gov") https://teacheratsea.noaa.gov - | . (The site is under construction) - include ../includes/footer.pug diff --git a/templates/teaching.pug b/templates/teaching.pug new file mode 100644 index 0000000..4eaae5c --- /dev/null +++ b/templates/teaching.pug @@ -0,0 +1,27 @@ +- var title = "Teaching" +include ../includes/head.pug + +div.section + div.pageitem + h2 University Teaching + + h3 University-Level Courses Taught + + ul.left-align + // li + // li University of California, Davis – Physical Geography, Analysis of Landforms + p University of California, Davis – Physical Geography, Analysis of Landforms + // li + // li Montana State University – Physical Geography, Weather and Climate + p Montana State University – Physical Geography, Weather and Climate + // li + // li Shippensburg University – Physical Geography, Introduction to the Atmosphere, Climatology, Meteorology, Geography Seminar, Applied Meteorology and Climatology, The Atmospheric Environment; Field courses: Geography of Vietnam, Environmental Science in Australia, Geography and Geology of Northern Arizona + p Shippensburg University – Physical Geography, Introduction to the Atmosphere, Climatology, Meteorology, Geography Seminar, Applied Meteorology and Climatology, The Atmospheric Environment; Field courses: Geography of Vietnam, Environmental Science in Australia, Geography and Geology of Northern Arizona + // li + // li University of Colorado at Boulder – Climate and Vegetation + p University of Colorado at Boulder – Climate and Vegetation + // li + // li US Naval Academy – Global Climate Change + p US Naval Academy – Global Climate Change + +include ../includes/footer.pug