Merge pull request #5 from osuosl/antoniagaete/update_site_content

Update site content

config.toml

@@ -32,7 +32,7 @@ theme = 'mainroad'
         [[menu.main]]
             parent = "about"
             name = "FAQ"
-            url = "/faq"
+            url = "/donate/faq"
             weight = 2
         [[menu.main]]
             parent = "about"
@@ -42,16 +42,31 @@ theme = 'mainroad'
         [[menu.main]]
             parent = "about"
             name = "Staff"
-            url = "/people"
+            url = "/about/people"
             weight = 4
         [[menu.main]]
             parent = "about"
             name = "Logos"
-            url = "/logos"
+            url = "/about/logos"
+            weight = 5
         [[menu.main]]
             parent = "about"
             name = "Donate"
             url = "/donate"
+            identifier = "donate"
+            weight = 6
+
+            [[menu.main]]
+                parent = "donate"
+                name = "Hardware Donations"
+                url = "/donate/hardware"
+                weight = 1
+
+            [[menu.main]]
+                parent = "donate"
+                name = "Sponsors"
+                url = "/sponsors"
+                weight = 2
 
     [[menu.main]]
         name = "Services"
@@ -87,7 +102,7 @@ theme = 'mainroad'
             [[menu.main]]
                 parent = "hosting"
                 name = "Request Hosting"
-                url = "/services/request-hosting"
+                url = "/request-hosting"
                 weight = 4
 
         [[menu.main]]
@@ -171,6 +186,11 @@ theme = 'mainroad'
             url = "/services/ibm-z"
             weight = 4
 
+            [[menu.main]]
+                parent = "ibm-z"
+                name = "IBM Z CI Request Form"
+                url = "/services/ibm-z/request_ci"
+
     [[menu.main]]
         name = "Student Experience"
         url = "/students"

content/beaverbarcamp.md → content/about/beaverbarcamp.md

@@ -1,6 +1,6 @@
 ---
 title: "Beaver BarCamp"
-slug: /about/beaverbarcamp
+slug: beaverbarcamp
 ---
 
 ![Beaver Bar Camp](/images/barcamp.png#right-barcamp)

content/education.md → content/about/education.md

@@ -1,6 +1,6 @@
 ---
 title: "Education"
-slug: /about/education
+slug: education
 author: Amanda Kelner
 ---
 

content/employement.md → content/about/employement.md

@@ -1,6 +1,6 @@
 ---
 title: Employement
-slug: about/employement
+slug: employement
 ---
 
 ![CASS Signs Installed](/images/CASSSignsInstalled.JPG)

content/gsoc.md → content/about/gsoc.md

@@ -1,6 +1,6 @@
 ---
 title: Google Summer of Code
-slug: about/gsoc
+slug: gsoc
 ---
 
 ![Google Summer of Code](/images/gsoc.jpg#right)

content/about_logos.md → content/about/logos.md

@@ -1,6 +1,6 @@
 ---
 title: "Open Source Lab Logos"
-slug: /logos
+slug: logos
 ---
 
 Below are the four versions of our logo.

content/about_people.md → content/about/people.md

@@ -1,9 +1,9 @@
 ---
 title: "Staff"
-slug: /people
+slug: people
 ---
 
-Lance Albertson
+[Lance Albertson](#lance-albertson){#lance-albertson}
 ------------------
 
   **Director**
@@ -29,7 +29,7 @@ Ramereth
 
 {{< line_break >}}
 
-Max Schmidt
+[Max Schmidt](#max-schmidt){#max-schmidt}
 ------------------
 
   **Faculty Research Assistant - Computational Scientist**
@@ -55,93 +55,98 @@ madmax-cw
 
 {{< line_break >}}
 
-Ethan Hampton
-----------------
+[Sharon Bousso](#sharon-bousso){#sharon-bousso}
+------------------
 
-  **Student Systems Engineer**
+![Sharon Bousso](/images/sharon_bousso.png#right-people)
 
-![Ethan Hampton](/images/hamptone.jpg#right-people)
+  **Student Systems Engineer**
 
-Ethan joined the OSL in June of 2020 studying Computer Science. He is enthusiastic about all the opportunities
-available to him here and is grateful for this chance to learn more about the OSS ecosystem. Ethan's first introduction
-to OSS was when he installed Ubuntu on his desktop in middle school and has loved it ever since. His first programming
-experience was in FIRST LEGO League robotics and continues to love elegant solutions to complex problems. If he isn't
-working with technology, Ethan enjoys playing piano, reading, hiking and tinkering.
+Sharon joined OSL in June of 2023 and is studying Computer Science. She had her first Linux machine in fourth grade, it
+was an ancient Thinkpad running Lubuntu, and that was just the beginning of her Linux journey. Sharon got interested in
+Computer Science and Computer Security from a young age, and went on to work as a Security Engineer at a small company
+based in San Francisco. She is very passionate about Linux and the open source movement and is thrilled to partake in
+the community. In her free time, Sharon likes to rock climb and read, and has many software development side projects
+she works on.
 
-   **GitHub Account**
+  **GitHub Account**
 
-https://github.com/EMH333
+https://github.com/sharoninator
 
-   **Nick on irc.libera.chat**
+  **Nick on irc.libera.chat**
 
-EMH333
+sharon123
 
 {{< line_break >}}
 
-Violet Kurtz
----------------
+[Antonia Gaete](#antonia-gaete){#antonia-gaete}
+--------------------
 
   **Student Systems Engineer**
 
-![Violet Kurtz](/images/vikurtz.jpg#right-people)
+![Antonia Gaete](/images/antonia_gaete.jpg#right-people)
 
-Violet joined the OSL in August 2021. She first heard of the OSL while doing routine maintenance on her Arch Linux
-system by noticing it provides mirroring services for Arch,  and later discovered it again while looking for software
-and computing groups on campus. She hopes that working at the OSL will help her to develop professional skills working
-in the industry, in teams, and with clients, as well as help her round out her capabilities. In her free time, Violet
-enjoys playing video games and analyzing the themes that can be expressed only through interactive media, producing
-simple videos for YouTube, using mathematics for optimization and data analysis, and learning every little thing she
-can.
+Antonia joined the OSL in June 2022. She was intersted in joining OSL as a learning opportunity for career skills, in hopes of finding her niche as a Computer Science major. Antonia is most interested in development and hopes to learn skills from OSL that are needed to pursue a career in such areas. In her free time, Antonia enjoys playing/watching soccer, playing instruments, reading, and listening to music.
 
   **GitHub Account**
 
-https://github.com/OniLink
+https://github.com/antoniagaete
 
   **Nick on irc.libera.chat**
 
-vikurtz
+antoniagaete
 
 {{< line_break >}}
 
-Antonia Gaete
---------------------
+[Ayden Murphy-Kirsch](#ayden-murphy-kirsch){#ayden-murphy-kirsch}
+----------------------
 
-  **Student Systems Engineer**
+![Ayden Murphy-Kirsch](/images/ayden_murphy-kirsch.webp#right-people)
 
-![Antonia Gaete](/images/antonia_gaete.jpg#right-people)
+  **Student Systems Engineer**
 
-Antonia joined the OSL in June 2022. She was intersted in joining OSL as a learning opportunity for career skills, in hopes of finding her niche as a Computer Science major. Antonia is most interested in development and hopes to learn skills from OSL that are needed to pursue a career in such areas. In her free time, Antonia enjoys playing/watching soccer, playing instruments, reading, and listening to music.
+Ayden joined the OSL in July of 2023 as a computer and electrical engineering 
+student. For multiple years, Ayden has been immersed in the open source ecosystem, 
+starting with the introduction to Linux in High school and a recent growing 
+familiarity with Open Source and the Foss Ecosystem--including many projects 
+spanning a variety of fields. Open Source hardware, such as RISK V, open personal 
+computing devices and numerous Virtual Reality projects are a current fascination. 
+Ayden enjoys Virtual Reality, tinkering on computers, 3D Design, server/network
+design, and DIY projects that never seem to go as planned.
 
   **GitHub Account**
 
-https://github.com/antoniagaete
+https://github.com/starboundstitch
 
   **Nick on irc.libera.chat**
 
-antoniagaete
+starboundstitch
 
 {{< line_break >}}
 
-Zachary Wallace
-------------------
+[Grant O'Connor](#grant-oconnor){#grant-oconnor}
+-----------------
+
+![Grant O'Connor](/images/grant.jpg#right-people)
 
   **Student Systems Engineer**
 
-![Zach Wallace](/images/zwall.png#right-people)
-
-Starting in November of 2022, Zach was brought aboard during his Junior year of his college career as a Computer Science major. Zach's first introduction to programming dated back to the fifth grade, in 2013, where he did a presentation on "How to Create an Adder in Lua". His first experience with the Linux environment started in late-2019, when he used a Raspberry-Pi to set up a local file sharing server; and ever since then he's used some flavor of Linux as a daily driver for both personal and server use. Outside of the office and classroom, Zach enjoys modding games, with an added interest in level design. With now being employed at the Open Source Lab, he hopes to further understand the duties of a systems administrator while also providing assistance in service hosting for the FOSS community.
+Grant joined the OSL in July 2023 as a Sophomore Computer Science major in order to grow his technical knowledge and 
+gain experience. Grant was first introduced to programming in his Freshman year of high school where he learned the 
+basics of game development in Unity. In his free time, Grant enjoys playing board games and video games as well as 
+designing and developing video games.
 
   **GitHub Account**
 
-https://github.com/sectopodwreck
+https://github.com/GrantAOConnor
 
   **Nick on irc.libera.chat**
 
-zwall
+GrantOC
 
 {{< line_break >}}
 
-Paul Simko
+[Paul Simko](#paul-simko){#paul-simko}
 ---------------
 
   **Student Systems Engineer**
@@ -167,7 +172,26 @@ paul-osl
 
 {{< line_break >}}
 
-Abigail Whittle
+[Zachary Wallace](#zachary-wallace){#zachary-wallace}
+------------------
+
+  **Student Systems Engineer**
+
+![Zach Wallace](/images/zwall.png#right-people)
+
+Starting in November of 2022, Zach was brought aboard during his Junior year of his college career as a Computer Science major. Zach's first introduction to programming dated back to the fifth grade, in 2013, where he did a presentation on "How to Create an Adder in Lua". His first experience with the Linux environment started in late-2019, when he used a Raspberry-Pi to set up a local file sharing server; and ever since then he's used some flavor of Linux as a daily driver for both personal and server use. Outside of the office and classroom, Zach enjoys modding games, with an added interest in level design. With now being employed at the Open Source Lab, he hopes to further understand the duties of a systems administrator while also providing assistance in service hosting for the FOSS community.
+
+  **GitHub Account**
+
+https://github.com/sectopodwreck
+
+  **Nick on irc.libera.chat**
+
+zwall
+
+{{< line_break >}}
+
+[Abigail Whittle](#abigail-whittle){#abigail-whittle}
 ------------------
 
   **Student Systems Engineer**
@@ -190,7 +214,7 @@ awhittle2
 
 {{< line_break >}}
 
-Oria Weng
+[Oria Weng](#oria-weng){#oria-weng}
 ------------------
 
   **Student Systems Engineer**

content/contact.md

@@ -33,21 +33,21 @@ Mailing Addresses
 
 **Shipping Address (for small parts and snail mail)**
 
-ATTN: Lance Albertson 
-OSU Open Source Lab
-224 Milne Computer Center
-1800 SW Campus Way
-Corvallis, OR 97331
+ATTN: Lance Albertson  
+OSU Open Source Lab  
+224 Milne Computer Center  
+1800 SW Campus Way  
+Corvallis, OR 97331  
 
 
 **Shipping Address (for large servers)**
 
 *Please consult with us prior to sending anything to this address*
 
-ATTN: Lance Albertson
-OSU Open Source Lab
-191 S.W. 35th St.
-Corvallis, OR 97331
+ATTN: Lance Albertson  
+OSU Open Source Lab  
+191 S.W. 35th St.  
+Corvallis, OR 97331  
 
 Phone
 -----

content/donate.md → content/donate/_index.md

@@ -1,6 +1,6 @@
 ---
 title: Donate
-slug: donate
+slug: /donate
 ---
 
 The OSL offers support services to the world's leading open source projects as part of its mission to contribute to the

content/donate_faq.md → content/donate/faq.md

@@ -1,6 +1,6 @@
 ---
 title: "FAQ"
-slug: /faq
+slug: faq
 ---
 
 1. [How are you associated with Oregon State University?](#how-are-you-associated-with-oregon-state-university)

content/hardware.md → content/donate/hardware.md

@@ -1,6 +1,6 @@
 ---
 title: Hardware Donations
-slug: donate/hardware
+slug: hardware
 ---
 
 The OSL has a very limited budget to purchase additional hardware which supports the projects we host. We rely heavily

content/form_submitted.md

@@ -0,0 +1,8 @@
+---
+title: "Form Submitted"
+slug: /form-submitted
+---
+
+Thank you for submitting your information via one of our forms. You should hear back from us within 2-3 business days.
+If you don't hear back from us by then, please contact us via IRC on [Libera Chat](https://libera.chat/) in **#osuosl**. If you haven't
+heard from us within 5 business days, please email an email to [email protected] directly for more assistance.

content/services/aarch64_request_hosting.md

@@ -161,7 +161,7 @@ For proprietary sourced projects or products please contact [info@amperecomputin
       <input type="hidden" name="last_name" value="" />
       <input type="hidden" name="token" value="15674hsda//*q23%^13jnxccv3ds54sa4g4sa532323!OoRdsfISDIdks38*(dsfjk)aS" />
       <!-- The following must be set to http://www.osuosl.org/services/powerdev/request_hosting in production -->
-      <input type="hidden" name="redirect" value="https://www.osuosl.org/form-submitted" />
+      <input type="hidden" name="redirect" value="/form-submitted" />
       <input type="hidden" name="mail_subject_prefix" value="New AARCH64 Hosting Request" />
       <input type="hidden" name="mail_subject_key" value="project_name" />
       <input type="hidden" name="send_to" value="AARCH64-Hosting" />

content/services/current_AARCH64_projects.md

@@ -5,4 +5,7 @@ slug: /aarch64/current-projects
 
 Below are a list of currently hosted AARCH64 projects
 
+[FOSS Projects](#foss-projects)
+
+### FOSS Projects {#foss-projects}
 {{< project_table file="aarch64_open_source_projects" table_title="FOSS Projects" project_count="34" >}}