Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

topics tracklist #65

Merged
merged 4 commits into from
Mar 6, 2024
+91 −218
Merged

topics tracklist #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80cee80
scroll: remove @ symbol from XML data
sarcasticadmin Mar 6, 2024
7c8bf04
shorten_topics in scroll.php
carlynlee Feb 21, 2024
c70a4e7
track colors in style.css
carlynlee Mar 4, 2024
b158167
rmv special char 'a' from stylesheets, etc
carlynlee Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
49 changes: 28 additions & 21 deletions server/scroll.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"FOSSHOME" => "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) {
Expand All @@ -69,9 +75,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'});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@carlynlee did a little digging, turns out we need to replace the @ in the original Topic name we get from the XML as well. Its due to the lookup that takes place here:

scale-signs/server/scroll.php

Line 257 in 2c23457

if ( array_key_exists($topic, $shorten_topics) ) {

It all looks good for me now 🙂
ss-202403061709684396

I pushed these changes directly on your branch so just pull them down with: git pull -r origin shorten_topics_tracklist and you should these my additions

Copy link
Collaborator Author

@carlynlee carlynlee Mar 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @sarcasticadmin ! Seems like the this pull req is ready to merge. Your changes and it seem to work on my end too:
Screenshot 2024-03-06 at 9 43 21 AM


$pos = strpos((string) $node->{'Time'}, ",");
$lpos = strrpos((string) $node->{'Time'}, ",");
Expand Down
259 changes: 62 additions & 197 deletions server/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
.FOSSHOME {
background-color: #8ADA20;
color: #FFF;
}
.DataonKubernetes {
background-color: #fff;
color: #000;
Loading