diff --git a/assets/css/theme_campfire/Header.scss b/assets/css/theme_campfire/Header.scss index 57a1285..33f4446 100644 --- a/assets/css/theme_campfire/Header.scss +++ b/assets/css/theme_campfire/Header.scss @@ -17,6 +17,7 @@ header { .logo, .h-logo { height: 75px; border: solid 3px foundation.$signBrown; + background: white; } .mobile-logos { diff --git a/lib/campfire_social_hour/meetings/hardcoded.ex b/lib/campfire_social_hour/meetings/hardcoded.ex index 13c42f1..5c33d04 100644 --- a/lib/campfire_social_hour/meetings/hardcoded.ex +++ b/lib/campfire_social_hour/meetings/hardcoded.ex @@ -8,55 +8,49 @@ defmodule CampfireSocialHour.Meetings.Hardcoded do topic: "The TAP Room", id: 82_162_938_948, link: "https://westarete.zoom.us/j/82162938948?pwd=S3RoQW01ek1HM1RFbHIyWUgyRi9xdz09", - img_name: "sso.png" + img_name: "CAMPFire_TAPRoom.png" }, %Meeting{ - topic: "Federation & Friendship", + topic: "IAM Navigators", id: 85_188_826_441, link: "https://westarete.zoom.us/j/85188826441?pwd=NjR3dGFGczZoQ0h5dlA0WGsyTDRpdz09", - img_name: "fire-pot.png" + img_name: "CAMPFire_Navigator.png" }, %Meeting{ - topic: "I AM BORG", - id: 82_951_060_700, - link: "https://westarete.zoom.us/j/82951060700?pwd=a2ZQUWNHbGpTejY0K1NmNzN1NjZ3Zz09", - img_name: "compass.png" - }, - %Meeting{ - topic: "Community Canteen", + topic: "Ghost Stories", id: 81_469_598_503, link: "https://westarete.zoom.us/j/81469598503?pwd=M3Y1M1dXUHFkdHRhOENnQStLSHNiUT09", - img_name: "community-chat.png" + img_name: "CAMPFire_GhostStory.png" }, %Meeting{ - topic: "Ghost Stories", + topic: "Camp Fire Clairvoyance", + id: 82_951_060_700, + link: "https://westarete.zoom.us/j/82951060700?pwd=a2ZQUWNHbGpTejY0K1NmNzN1NjZ3Zz09", + img_name: "CAMPFire_CrystalBall.png" + }, + %Meeting{ + topic: "Let's Talk S'More - 1", id: 85_122_377_210, link: "https://westarete.zoom.us/j/85122377210?pwd=RTA5TWk1aUZHWkt5TG9PYlRGM1NwQT09", - img_name: "claw.png" + img_name: "CAMPFire_Smore.png" }, %Meeting{ - topic: "The Mess Hall", + topic: "Let's Talk S'More - 2", id: 86_768_169_687, link: "https://westarete.zoom.us/j/86768169687?pwd=SGNqSk5RR3ZBTG1nY2o2U1NuUXNLdz09", - img_name: "basket.png" - }, - %Meeting{ - topic: "Let's Talk S'More - 1", - id: 82_924_055_582, - link: "https://westarete.zoom.us/j/82924055582?pwd=VExYbHlGMDB4WXl0cG1YQy81dmRzZz09", - img_name: "smore.png" + img_name: "CAMPFire_Smore.png" }, %Meeting{ - topic: "Let's Talk S'More - 2", + topic: "Let's Talk S'More - 3", id: 82_016_201_416, link: "https://westarete.zoom.us/j/82016201416?pwd=YkVCbmROQk9UMndzc2tWNm9oQ2JMQT09", - img_name: "smore.png" + img_name: "CAMPFire_Smore.png" }, %Meeting{ - topic: "Let's Talk S'More - 3", - id: 89_185_203_778, - link: "https://westarete.zoom.us/j/89185203778?pwd=L1MzWVhKaFhuQ0h1eDkyakRlTlQ5UT09", - img_name: "smore.png" + topic: "Let's Talk S'More - 4", + id: 82_924_055_582, + link: "https://westarete.zoom.us/j/82924055582?pwd=VExYbHlGMDB4WXl0cG1YQy81dmRzZz09", + img_name: "CAMPFire_Smore.png" } ] end diff --git a/lib/campfire_social_hour_web/templates/page/_about_content.html.heex b/lib/campfire_social_hour_web/templates/page/_about_content.html.heex index 512eb11..a15191a 100644 --- a/lib/campfire_social_hour_web/templates/page/_about_content.html.heex +++ b/lib/campfire_social_hour_web/templates/page/_about_content.html.heex @@ -1,8 +1,8 @@

Hello!

-

After a day of learning, join in one of BaseCAMP's virtual CAMP Fires and immerse yourself in a world of connection, knowledge sharing, and problem-solving. Whether you're discussing best practices for implementing TAP components, exploring the benefits and challenges of InCommon federation, or sharing ghost stories about IAM implementations, CAMP Fires are a great way to connect with your peers for knowledge sharing and camaraderie in a more casual way.

+

After a day of learning, join in one of BaseCAMP’s virtual CAMP Fires to connect, share knowledge, and problem-solve together. Whether you're discussing best practices for implementing TAP components, exploring how to build your IAM roadmap, or sharing ghost stories about IAM implementations, CAMP Fires are a great way to connect with your peers for connection and camaraderie in a more casual way.

-

Each CAMP Fire has a theme - so join the one that is calling to you! Drop into a different CAMP Fire each day to broaden your network and your knowledge. We'll also have a few open CAMP Fires in case you and your colleagues find a different topic you want to discuss. Check out these CAMP Fire themes: +

Each CAMP Fire has a theme - so join the one that is calling to you! Drop into a different CAMP Fire each day to broaden your network and your knowledge. We’ll also have a few open CAMP Fires in case you and your colleagues find a different topic you want to discuss. Check out these CAMP Fire themes:

@@ -31,6 +25,7 @@

With so much to explore, end your day at BaseCAMP around the virtual CAMP Fires and connect with others!

+

Questions? Slack @cbroomfield or email Clara Broomfield at cbroomfield@internet2.edu

Instructions:

diff --git a/lib/campfire_social_hour_web/templates/theme/theme_campfire/_header.html.heex b/lib/campfire_social_hour_web/templates/theme/theme_campfire/_header.html.heex index 40ffaa9..864843f 100644 --- a/lib/campfire_social_hour_web/templates/theme/theme_campfire/_header.html.heex +++ b/lib/campfire_social_hour_web/templates/theme/theme_campfire/_header.html.heex @@ -31,9 +31,13 @@ <%= if assigns[:instructions] do %>

- Join your friends and meet new colleagues in any of the CAMP Fires below. Each CAMP Fire has a theme - so join the one that is calling to you! Drop into a different CAMP Fire each day to broaden your network and your knowledge.

-Click on a CAMP Fire name below to join that Zoom room. Want to switch? Leave the Zoom room and come back here to select another CAMP Fire.

-See CAMP Fire Details to see the descriptions of each room. + At the end of a busy day at BaseCAMP, gather ‘round our virtual CAMP Fires for a more casual experience of knowledge sharing, connection, and camaraderie! Our CAMP Fires take place at the end of each day, Monday-Thursday, from 3:40 - 4:40pm ET.

+ + Join your friends or meet new colleagues in any of the CAMP Fires below. Each CAMP Fire has a theme - so join the one that is calling to you! Drop into a different CAMP Fire each day to broaden your network and your knowledge.

+ + Click on a CAMP Fire name below to join that Zoom room. Want to switch? Leave the Zoom room and come back here to select another CAMP Fire.

+ + Select CAMP Fire Details to see the descriptions of each camp fire room.

<% end %> diff --git a/priv/static/images/theme_campfire/details/banner.png b/priv/static/images/theme_campfire/details/banner.png index b757ce4..1bb207c 100644 Binary files a/priv/static/images/theme_campfire/details/banner.png and b/priv/static/images/theme_campfire/details/banner.png differ diff --git a/priv/static/images/theme_campfire/details/rooms/CAMPFire_CrystalBall.png b/priv/static/images/theme_campfire/details/rooms/CAMPFire_CrystalBall.png new file mode 100644 index 0000000..ddd7b07 Binary files /dev/null and b/priv/static/images/theme_campfire/details/rooms/CAMPFire_CrystalBall.png differ diff --git a/priv/static/images/theme_campfire/details/rooms/CAMPFire_GhostStory.png b/priv/static/images/theme_campfire/details/rooms/CAMPFire_GhostStory.png new file mode 100644 index 0000000..399438f Binary files /dev/null and b/priv/static/images/theme_campfire/details/rooms/CAMPFire_GhostStory.png differ diff --git a/priv/static/images/theme_campfire/details/rooms/CAMPFire_Navigator.png b/priv/static/images/theme_campfire/details/rooms/CAMPFire_Navigator.png new file mode 100644 index 0000000..b4ee032 Binary files /dev/null and b/priv/static/images/theme_campfire/details/rooms/CAMPFire_Navigator.png differ diff --git a/priv/static/images/theme_campfire/details/rooms/CAMPFire_Smore.png b/priv/static/images/theme_campfire/details/rooms/CAMPFire_Smore.png new file mode 100644 index 0000000..87d24f9 Binary files /dev/null and b/priv/static/images/theme_campfire/details/rooms/CAMPFire_Smore.png differ diff --git a/priv/static/images/theme_campfire/details/rooms/CAMPFire_TAPRoom.png b/priv/static/images/theme_campfire/details/rooms/CAMPFire_TAPRoom.png new file mode 100644 index 0000000..6cd36cd Binary files /dev/null and b/priv/static/images/theme_campfire/details/rooms/CAMPFire_TAPRoom.png differ diff --git a/priv/static/images/theme_campfire/details/rooms/basket.png b/priv/static/images/theme_campfire/details/rooms/basket.png deleted file mode 100644 index 28e25d0..0000000 Binary files a/priv/static/images/theme_campfire/details/rooms/basket.png and /dev/null differ diff --git a/priv/static/images/theme_campfire/details/rooms/claw.png b/priv/static/images/theme_campfire/details/rooms/claw.png deleted file mode 100644 index 39032fd..0000000 Binary files a/priv/static/images/theme_campfire/details/rooms/claw.png and /dev/null differ diff --git a/priv/static/images/theme_campfire/details/rooms/community-chat.png b/priv/static/images/theme_campfire/details/rooms/community-chat.png deleted file mode 100644 index 3f78801..0000000 Binary files a/priv/static/images/theme_campfire/details/rooms/community-chat.png and /dev/null differ diff --git a/priv/static/images/theme_campfire/details/rooms/compass.png b/priv/static/images/theme_campfire/details/rooms/compass.png deleted file mode 100644 index 5168f33..0000000 Binary files a/priv/static/images/theme_campfire/details/rooms/compass.png and /dev/null differ diff --git a/priv/static/images/theme_campfire/details/rooms/fire-pot.png b/priv/static/images/theme_campfire/details/rooms/fire-pot.png deleted file mode 100644 index b26e0ae..0000000 Binary files a/priv/static/images/theme_campfire/details/rooms/fire-pot.png and /dev/null differ diff --git a/priv/static/images/theme_campfire/details/rooms/smore.png b/priv/static/images/theme_campfire/details/rooms/smore.png deleted file mode 100644 index c661c45..0000000 Binary files a/priv/static/images/theme_campfire/details/rooms/smore.png and /dev/null differ diff --git a/priv/static/images/theme_campfire/details/rooms/sso.png b/priv/static/images/theme_campfire/details/rooms/sso.png deleted file mode 100644 index 12d5660..0000000 Binary files a/priv/static/images/theme_campfire/details/rooms/sso.png and /dev/null differ diff --git a/priv/static/images/theme_campfire/logos/InCommon.png b/priv/static/images/theme_campfire/logos/InCommon.png index 5ecf801..0841dc3 100644 Binary files a/priv/static/images/theme_campfire/logos/InCommon.png and b/priv/static/images/theme_campfire/logos/InCommon.png differ