Program and logos #46 (#47)

* #38 and #44

* update

* Program and logos #46

* update

* test harmonization

* corrections

* logo correction

* some corrections

Author: ake123

R/schedule.R

@@ -0,0 +1,83 @@
+library(dplyr)
+library(stringr)
+library(kableExtra)
+
+# ---- Read + clean program ----
+df <- read.csv(program_csv, stringsAsFactors = FALSE, na.strings = c("", "NA")) |>
+  mutate(
+    day    = as.integer(day),
+    time   = str_trim(time),
+    type   = str_trim(type),
+    author = str_trim(coalesce(author, "")),
+    title  = str_trim(coalesce(title, "")),
+    info   = str_trim(coalesce(info, ""))
+  ) |>
+  arrange(day, time)
+
+# Optional: shorten repeated phrasing
+df$author <- gsub("Contributed\\s*from\\s*submitted\\s*abstracts", "Contributed abstracts", df$author)
+df$author <- gsub("Contributed\\s*until\\s*the\\s*beginning\\s*of\\s*the\\s*conference", "Contributed pre-conference", df$author)
+
+# Day headers (edit dates if needed)
+day_headers <- c(
+  "Day 1 — Wed. Sep 17, 2025",
+  "Day 2 — Thu. Sep 18, 2025",
+  "Day 3 — Fri. Sep 19, 2025"
+)
+
+# ---- Read palette (optional) ----
+pal <- if (file.exists(colors_csv)) {
+  read.csv(colors_csv, stringsAsFactors = FALSE) |>
+    mutate(
+      type  = str_trim(type),
+      color = str_trim(color)
+    )
+} else {
+  data.frame(type = character(), color = character())
+}
+
+# Attach color per row (keeps row order)
+df2 <- df |>
+  left_join(pal, by = "type")
+
+# Output table data
+df_out <- df2 |> select(time, type, author, title)
+
+# Row indices by day
+idx_by_day <- split(seq_len(nrow(df_out)), df2$day)
+
+# ---- Build table ----
+tbl <- kbl(
+  df_out,
+  escape = TRUE,
+  row.names = FALSE,
+  col.names = c("Time", "Type", "Author", "Title")
+) |>
+  kable_material(full_width = TRUE) |>
+  column_spec(1, width = "12%") |>
+  column_spec(2, width = "18%") |>
+  column_spec(3, width = "28%") |>
+  column_spec(4, width = "42%")
+
+# ---- Apply row colors from CSV ----
+for (i in seq_len(nrow(df2))) {
+  bg <- df2$color[i]
+  if (!is.na(bg) && nzchar(bg)) {
+    tbl <- tbl |> row_spec(i, background = bg)
+  }
+}
+
+# ---- Group by day (only if that day exists) ----
+for (d in seq_along(day_headers)) {
+  key <- as.character(d)
+  if (!is.null(idx_by_day[[key]])) {
+    tbl <- tbl |>
+      pack_rows(
+        day_headers[d],
+        min(idx_by_day[[key]]),
+        max(idx_by_day[[key]])
+      )
+  }
+}
+
+tbl |> cat()

R/sponsors.R

@@ -1,18 +1,24 @@
-# R/sponsors.R ---------------------------------------------------------------
 
 read_sponsors <- function(csv_path) {
   read.csv(csv_path, stringsAsFactors = FALSE)
 }
 
-# Helper: join prefix + path safely (works for URLs and relative paths)
 url_join <- function(prefix, path) {
   if (is.null(prefix) || prefix == "") return(path)
+
+  # Keep "/" as site-root prefix
+  if (identical(prefix, "/")) {
+    path <- sub("^/+", "", path)
+    return(paste0("/", path))
+  }
+
   prefix <- sub("/+$", "", prefix)
   path   <- sub("^/+", "", path)
   paste0(prefix, "/", path)
 }
 
-# ---- (1) Harmonize one logo into a fixed canvas and save it ----------------
+
+# ---- (1) Harmonize one logo into a fixed canvas and save it
 harmonize_logo <- function(input_fs,
                            output_fs,
                            canvas_w = 800,
@@ -21,23 +27,23 @@ harmonize_logo <- function(input_fs,
   if (!requireNamespace("magick", quietly = TRUE)) {
     stop("Package 'magick' is required for harmonization. Install with install.packages('magick').")
   }
-  
+
   img <- magick::image_read(input_fs)
-  
+
   # Scale logo to fit inside (canvas - padding) while preserving aspect ratio
   target_w <- max(1, canvas_w - 2 * padding)
   target_h <- max(1, canvas_h - 2 * padding)
-  
+
   img2 <- magick::image_resize(img, geometry = paste0(target_w, "x", target_h, ">"))
-  
+
   # Create transparent canvas and center the resized logo
   canvas <- magick::image_blank(width = canvas_w, height = canvas_h, color = "none")
   composed <- magick::image_composite(canvas, img2, operator = "over", gravity = "center")
-  
+
   # Ensure output directory exists
   out_dir <- dirname(output_fs)
   if (!dir.exists(out_dir)) dir.create(out_dir, recursive = TRUE, showWarnings = FALSE)
-  
+
   magick::image_write(composed, path = output_fs, format = "png")
   invisible(output_fs)
 }
@@ -50,50 +56,57 @@ harmonize_sponsor_logos <- function(df,
                                     canvas_h = 240,
                                     padding = 24) {
   stopifnot("image" %in% names(df))
-  
+
+  # If magick missing, do nothing (keep original df$image)
   if (!requireNamespace("magick", quietly = TRUE)) {
     warning("Package 'magick' not installed; skipping harmonization.")
     return(df)
   }
-  
-  # Create a copy so we can overwrite df$image to point to harmonized images
+
   df2 <- df
-  
+
   for (i in seq_len(nrow(df2))) {
     in_rel <- df2$image[i]
-    in_fs  <- url_join(fs_prefix, in_rel)
-    
-    # Make stable output filename
+
+    # filesystem input (prefix applies)
+    in_fs <- file.path(fs_prefix, in_rel)
+
+    # stable output name
     base <- tools::file_path_sans_ext(basename(in_rel))
-    out_rel <- file.path(harmonized_dir, paste0(base, ".png"))
-    out_fs  <- out_rel
-    
-    # Only (re)render if missing, or input is newer
-    need <- TRUE
-    if (file.exists(out_fs) && file.exists(in_fs)) {
-      need <- file.info(out_fs)$mtime < file.info(in_fs)$mtime
-    } else if (file.exists(out_fs) && !file.exists(in_fs)) {
-      # If input_fs is not readable in this working dir, don't overwrite
-      need <- FALSE
-    }
-    
-    if (need && file.exists(in_fs)) {
-      harmonize_logo(
-        input_fs  = in_fs,
-        output_fs = out_fs,
-        canvas_w  = canvas_w,
-        canvas_h  = canvas_h,
-        padding   = padding
-      )
+    out_rel <- file.path(harmonized_dir, paste0(base, ".png"))   # WEB PATH (no fs_prefix)
+    out_fs  <- file.path(fs_prefix, out_rel)                     # FILESYSTEM PATH
+
+    # Only harmonize if we can read the input
+    if (file.exists(in_fs)) {
+
+      # render if missing or stale
+      need <- !file.exists(out_fs) ||
+        (file.info(out_fs)$mtime < file.info(in_fs)$mtime)
+
+      if (need) {
+        harmonize_logo(
+          input_fs  = in_fs,
+          output_fs = out_fs,
+          canvas_w  = canvas_w,
+          canvas_h  = canvas_h,
+          padding   = padding
+        )
+      }
+
+      # Only switch to harmonized image if the file actually exists
+      if (file.exists(out_fs)) {
+        df2$image[i] <- out_rel
+      }
+    } else {
+      # input not found -> keep original df2$image[i]
+      # (this is the critical difference vs your current code)
     }
-    
-    # Point to the harmonized relative path for rendering
-    df2$image[i] <- out_rel
   }
-  
+
   df2
 }
 
+
 # ---- (2) Render grid; optionally harmonize and USE harmonized images --------
 render_sponsor_grid <- function(df,
                                 ncol = 4,
@@ -104,15 +117,17 @@ render_sponsor_grid <- function(df,
                                 harmonized_dir = "images/partners_harmonized",
                                 canvas_w = 800,
                                 canvas_h = 240,
-                                padding = 24) {
+                                padding = 24,
+                                left_margin = 10,
+                                inner_width = 80) {
   stopifnot(all(c("image", "website") %in% names(df)))
   if (nrow(df) == 0) return(invisible(NULL))
-  
-  ncol <- min(ncol, nrow(df))
+
+  ncol  <- min(ncol, nrow(df))
   width <- floor(100 / ncol)
-  
-  # Harmonize first (updates df$image to harmonized paths)
-  if (harmonize) {
+
+  # If you want to harmonize on render time, do it here (optional)
+  if (isTRUE(harmonize)) {
     df <- harmonize_sponsor_logos(
       df,
       fs_prefix = fs_prefix,
@@ -121,62 +136,72 @@ render_sponsor_grid <- function(df,
       canvas_h = canvas_h,
       padding = padding
     )
+  } else {
+    # Even if we don't harmonize now, prefer an already-existing harmonized image
+    for (i in seq_len(nrow(df))) {
+      base    <- tools::file_path_sans_ext(basename(df$image[i]))
+      harm_rel <- file.path(harmonized_dir, paste0(base, ".png"))
+      harm_fs  <- file.path(fs_prefix, harm_rel)
+      if (file.exists(harm_fs)) df$image[i] <- harm_rel
+    }
   }
-  
-  out <- c()
+
+  out <- character()
+
   out <- c(out, ":::: {.columns}")
-  out <- c(out, "::: {.column width=\"10%\"}")
+  out <- c(out, sprintf("::: {.column width=\"%s%%\"}", left_margin))
   out <- c(out, ":::")
-  out <- c(out, "::: {.column width=\"90%\"}", "")
+  out <- c(out, sprintf("::: {.column width=\"%s%%\"}", inner_width), "")
   out <- c(out, ":::: {.columns}")
-  
+
   for (i in seq_len(nrow(df))) {
-    # df$image is now the harmonized relative path (or original if harmonize=FALSE)
     img_src <- url_join(web_prefix, df$image[i])
-    
+    alt_txt <- ""
+
     out <- c(out, sprintf("::: {.column width=\"%s%%\"}", width))
-    
+
+    # Quarto supports target="_blank" on markdown links with an attribute block
+    # If your setup doesn’t, you can remove `{target="_blank"}`
     out <- c(out, sprintf(
-      "<a href='%s' target='_blank' class='sponsor-link'>%s</a>",
-      df$website[i],
-      sprintf(
-        "<img src='%s' alt='%s' class='sponsor-logo'>",
-        img_src,
-        if ("name" %in% names(df)) df$name[i] else "Sponsor logo"
-      )
+      "[![%s](%s)](%s){target=\"_blank\"}",
+      alt_txt, img_src, df$website[i]
     ))
-    
-    if (show_name && ("name" %in% names(df)) && nzchar(df$name[i])) {
-      out <- c(out, sprintf("<div class='sponsor-name'>%s</div>", df$name[i]))
+
+    if (isTRUE(show_name) && ("name" %in% names(df)) && nzchar(df$name[i])) {
+      out <- c(out, "", df$name[i])
     }
-    
+
     out <- c(out, ":::")
   }
-  
+
   out <- c(out, "::::", "")
+  out <- c(out, ":::")  # close inner width column
+  out <- c(out, sprintf("::: {.column width=\"%s%%\"}", left_margin))
   out <- c(out, ":::")
-  out <- c(out, "::: {.column width=\"10%\"}")
-  out <- c(out, ":::")
-  out <- c(out, "::::")
-  
+  out <- c(out, "::::") # close outer columns
+
   cat(paste(out, collapse = "\n"))
 }
 
+
 render_sponsors_home <- function(csv_path, title = "", ncol = 4,
+                                 fs_prefix = "",
+                                 web_prefix = "",
                                  harmonize = TRUE,
                                  harmonized_dir = "images/partners_harmonized") {
   df <- read_sponsors(csv_path)
-  cat(sprintf("# %s\n\n", title))
+
   render_sponsor_grid(
     df,
     ncol = ncol,
-    fs_prefix = "",
-    web_prefix = "",
+    fs_prefix = fs_prefix,
+    web_prefix = web_prefix,
     harmonize = harmonize,
     harmonized_dir = harmonized_dir
   )
 }
 
+
 render_sponsors_by_level <- function(
     csv_path,
     level_order = c("Diamond", "Gold", "Silver", "Bronze", "Supporter"),
@@ -188,28 +213,28 @@ render_sponsors_by_level <- function(
     harmonized_dir = "images/partners_harmonized"
 ) {
   heading <- match.arg(heading)
-  
+
   df <- read_sponsors(csv_path)
   if (!("level" %in% names(df))) stop("CSV must include a 'level' column.")
-  
+
   df$level <- factor(df$level, levels = level_order)
-  
+
   levels_present <- unique(as.character(df$level))
   levels_present <- level_order[level_order %in% levels_present]
-  
+
   for (lvl in levels_present) {
     df_lvl <- df[as.character(df$level) == lvl, , drop = FALSE]
     if (nrow(df_lvl) == 0) next
-    
+
     if (heading == "h2") {
       cat(sprintf("\n## %s\n\n", lvl))
     } else {
       cat(sprintf("\n**%s**\n\n", lvl))
     }
-    
+
     ncol <- unname(ncol_by_level[lvl])
     if (is.na(ncol)) ncol <- 4
-    
+
     render_sponsor_grid(
       df_lvl,
       ncol = ncol,

_quarto.yml

@@ -13,7 +13,7 @@ website:
     title: false
     collapse-below: lg
     right:
-      #- href: pages/schedule.qmd
+      - href: pages/schedule.qmd
       - href: pages/speakers.qmd
       - href: pages/submissions.qmd
       - href: pages/registration.qmd