From 80cee80c79a24855b1861cee62d8645dbb23ee82 Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Wed, 6 Mar 2024 00:16:36 +0000 Subject: [PATCH 1/4] scroll: remove @ symbol from XML data --- server/scroll.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/scroll.php b/server/scroll.php index ae6ad07..238a5df 100644 --- a/server/scroll.php +++ b/server/scroll.php @@ -69,9 +69,10 @@ $node->{'Time'} = preg_replace('/<[^>]*>/', '', $node->{'Time'}); $node->{'Day'} = preg_replace('/<[^>]*>/', '', $node->{'Day'}); - // Remove Spaces so we can use it for a CSS class + // Remove special chars in Topic from XML request so we can use it for a CSS class $node->{'Topic'} = preg_replace('/\s+/', '', $node->{'Topic'}); $node->{'Topic'} = preg_replace('/\&/', 'and', $node->{'Topic'}); + $node->{'Topic'} = preg_replace('/\@/', '', $node->{'Topic'}); $pos = strpos((string) $node->{'Time'}, ","); $lpos = strrpos((string) $node->{'Time'}, ","); From 7c8bf0443fa1308b14ffe161d22097dc29ce7742 Mon Sep 17 00:00:00 2001 From: carlyn lee Date: Tue, 20 Feb 2024 16:03:06 -0800 Subject: [PATCH 2/4] shorten_topics in scroll.php --- server/scroll.php | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/server/scroll.php b/server/scroll.php index 238a5df..ce7490b 100644 --- a/server/scroll.php +++ b/server/scroll.php @@ -41,26 +41,32 @@ $times = array(); $shorten_topics = array( - "Aerospace" => "Aerospace", - "BoFs" => "BoFs", - "CareerDay" => "Career Day", - "CloudNative" => "CloudNative", - "Developer" => "Developer", - "DevOpsDayLA" => "DevOps", - "Embedded" => "Embedded", - "FOSS@HOME" => "FOSS@HOME", - "General" => "General", - "Keynote" => "Keynote", - "KubernetesCommunityDay" => "Kubernetes Community Day", - "MySQL" => "MySQL", - "NextGeneration" => "Next Generation", - "Observability" => "Observability", - "OpenData" => "Open Data", - "OpenGovernment" => "Open Government", - "PosgreSQL" => "PostgreSQL", - "Security" => "Security", - "Sponsored" => "Sponsored", - "SystemsandInfrastructure" => "Systems and Infrastructure", + "CareerDay" => "Career Day", + "CloudNative" => "Cloud Native", + "DataonKubernetes" => "Data on Kubernetes", + "Developer" => "Developer", + "DevOpsDayLA" => "DevOpsDay LA", + "Embedded" => "Embedded", + "FOSS@HOME" => "FOSS @ HOME", + "General" => "General", + "KernelandLowLevelSystems" => "Kernel and Low Level Systems", + "Keynote" => "Keynote", + "KubernetesCommunityDay" => "Kubernetes Community Day", + "MySQL" => "MySQL", + "NextGeneration" => "Next Generation", + "NixCon" => "NixCon", + "Observability" => "Observability", + "OpenGovernment" => "Open Government", + "OpenSourceAIandAppliedScience" => "Open Source AI and Applied Science", + "PostgreSQL" => "PostgreSQL", + "ReproducibleandImmutableSoftware" => "Reproducible and Immutable Software", + "Security" => "Security", + "Sponsored" => "Sponsored", + "SystemsandInfrastructure" => "Systems and Infrastructure", + "Ubucon" => "Ubucon", + "UpSCALE" => "UpSCALE", + "Workshops" => "Workshops" + ); foreach ($xml->node AS $node) { From c70a4e73542a0a8841c1d4b3860c98ed285d05a1 Mon Sep 17 00:00:00 2001 From: carlyn lee Date: Mon, 4 Mar 2024 09:41:08 -0800 Subject: [PATCH 3/4] track colors in style.css --- README.md | 1 + server/style.css | 259 ++++++++++++----------------------------------- 2 files changed, 63 insertions(+), 197 deletions(-) diff --git a/README.md b/README.md index ac1d175..2692a40 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,7 @@ There is a bit of manual effort necessary from year to year. These tasks include * update `$shorten_topics` in `scroll.php` to reflect the updated track list, matching exactly the keys to what is being supplied by the xml from drupal minus spaces * update `$shorten_topics` in `room.php` to match `scroll.php` * create a style for each of the keys in `$shorten_topics` in `style.css` matching it to the public site +* add colors for topics/tracks in `/server/style.css` * update the sponsor images in `/server/images/sponsors/` to reflect the current year's sponsors, making them 220x220 * update `$sponsors` in `room.php` matching the value to each sponsor image file name * update `$sponsors_to_rooms` in `room.php` matching proper sponsor(s) to room and day by key from `$sponsors` diff --git a/server/style.css b/server/style.css index 453d90b..720897d 100644 --- a/server/style.css +++ b/server/style.css @@ -466,237 +466,102 @@ font { color: #fff !important } -.AdaInitiativeAllyWorkshop { - background-color: #ffa200 !important; - color: #fff !important; -} - -.ApacheBigtop { - background-color: #0A7EF2 !important; - color: #000 !important; -} - -.BeginnerTutorials { - background-color: #3353AF !important; - color: #FFF !important; -} - -.BigData { - background-color: #a6ceff !important; - color: #000 !important; -} - -.BoFs { - background-color: #FFBC00 !important; - color: #000 !important; -} - .CloudNative { - background: #ffa200 !important; - color: #000 !important; + background-color: #6B79B4; + color: #FFF; } - -.Containers { - background: #ffa200 !important; - color: #000 !important; -} - -.ContainerandVirtualization { - background: #ffa200 !important; - color: #000 !important; -} - .Developer { - background: #D65C09 !important; - color: #FFF !important; + background-color: #5795AB; + color: #FFF; } - .DevOpsDayLA { - background: #565448 !important; - color: #fff !important; -} - -.DrupalCamp { - background: #0678be !important; - color: #fff !important; + background-color: #8881CB; + color: #FFF; } - .Embedded { - background: #004a4a !important; - color: #fff !important; + background-color: #85768A; + color: #FFF; } - .Entertainment { - background: #004A4A !important; - color: #ff3 !important; -} - -.Fedora { - background: #A30C0C !important; - color: #fff !important; -} - -.FileSystem { - background: #FFE81F !important; - color: #000 !important; + background-color: #AF5C4B; + color: #FFF; } - .General { - background: #97A67A !important; - color: #fff !important; + background-color: #B17C84; + color: #FFF; } - -.GLADCamp { - background: #0678be !important; - color: FFF !important; - } - - .HAMRadio { - background: #96beef !important; - color: #fff !important; - } - -.HotApplications { - background: #ff0 !important; - color: #000 !important; +.KernelandLowLevelSystems{ + background-color: #AD9134; + color: #FFF; } - -.Kernel { - background: #AD9134 !important; - color: #fff !important; -} - .Keynote { - background: #D31111 !important; - color: #fff !important; + background-color: #8CADCB; + color: #FFF; } - -.Kubeflow { - background: #303030 !important; - color: #a6ceff !important; -} - -.LegalandLicensing { - background: #FFF8DC !important; - color: #000 !important; -} - -.LibreGraphics { - background: #ddd !important; - color: #11a311 !important; -} - -.Mentoring { - background: #998876 !important; - color: #fff !important; -} - -.MySQL { - background: #8B47BB !important; - color: #fff !important; -} - -.NewtoSCALE { - background: #7FFF00 !important; - color: #228B22 !important; +.Observability { + background-color: #F7511D; + color: #FFF; } - .NextGeneration { - background: #96f74b !important; - color: #000 !important; -} - -.OpenNMS { - background: #4D9E00 !important; - color: #fff !important; + background-color: #66AEBC; + color: #FFF; } - -.Observability { - background: #000 !important; - color: #ff0 !important; +.NixCon { + background-color: #A7E5B4; + color: #000; } - -.OpenData { - background: #6c6c6c !important; - color: #fff !important; +.OpenSourceAIandAppliedScience { + background-color: #BA9F78; + color: #FFF; } - .OpenGovernment { - background: #a6ceff !important; - color: #d00 !important; + background-color: #6493B9; + color: #FFF; } - -.OpenMedical { - background: #00ffd8 !important; - color: #000 !important; +.PostgreSQL { + background-color: #F1CC0C; + color: #FFF; } - -.OpenSourceinEnterprises { - background: #ffd672 !important; - color: #000 !important; +.SystemsandInfrastructure { + background-color: #4B5D6B; + color: #FFF; } - -.OpenSourceSoftwareInEducation { - background: #72B20F !important; - color: #fff !important; +.CareerDay{ + background-color: #8A8C82; + color: #FFF; } - -.openSUSE { - background: #669900 !important; - color: #000 !important; +.ReproducibleandImmutableSoftware { + background-color: #955E77; + color: #FFF; } - -.PostgreSQL { - background: #0AACA0 !important; - color: #fff !important; +.KubernetesCommunityDay { + background-color: #6CAF4D; + color: #FFF; } - -.Puppet { - background: #D2A3E8 !important; - color: #000 !important; -} - -.ScaleU { - background: #405E5E !important; - color: #fff !important; +.Workshops { + background-color: #3A3A3A; + color: #FFF; } - .Security { - background: #000 !important; - color: #00FF00 !important; + background-color: #CD5465; + color: #FFF; } - .Sponsored { - background: #007F06 !important; - color: #fff !important; -} - -.SystemsandInfrastructure { - background: #D2A3E8 !important; - color: #000 !important; -} - -.Testing { - background: #EA18E5 !important; - color: #fff !important; -} - -.SysAdmin { - background: #C4C249 !important; - color: #000 !important; + background-color: #FC8B1C; + color: #FFF; } - .Ubucon { - background: #774022 !important; - color: #fff !important; + background-color: #774022; + color: #FFF; } - .UpSCALE { - background: #956140 !important; - color: #fff !important; + background-color: #956140; + color: #FFF; } - -.Youth { - background: #098C09 !important; - color: #fff !important; +.FOSS@HOME { + background-color: #8ADA20; + color: #FFF; } +.DataonKubernetes { + background-color: #fff; + color: #000; From b158167e341e10ad5310a2e89f2b2dcdf26948a6 Mon Sep 17 00:00:00 2001 From: carlyn lee Date: Tue, 5 Mar 2024 13:53:36 -0800 Subject: [PATCH 4/4] rmv special char 'a' from stylesheets, etc --- server/scroll.php | 2 +- server/style.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/scroll.php b/server/scroll.php index ce7490b..fc122da 100644 --- a/server/scroll.php +++ b/server/scroll.php @@ -47,7 +47,7 @@ "Developer" => "Developer", "DevOpsDayLA" => "DevOpsDay LA", "Embedded" => "Embedded", - "FOSS@HOME" => "FOSS @ HOME", + "FOSSHOME" => "FOSS@HOME", "General" => "General", "KernelandLowLevelSystems" => "Kernel and Low Level Systems", "Keynote" => "Keynote", diff --git a/server/style.css b/server/style.css index 720897d..767172b 100644 --- a/server/style.css +++ b/server/style.css @@ -558,7 +558,7 @@ font { background-color: #956140; color: #FFF; } -.FOSS@HOME { +.FOSSHOME { background-color: #8ADA20; color: #FFF; }