Lighten background shading

[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs

index 70dfb5286fc628819c9315618d655040b67221e1..2e9c7f64522544d0ea67964a63a6d866e08c1517 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -82,7 +82,7 @@ const HEADER: &str = r#"<!DOCTYPE html>
      tr.key > th > div > div { width: 5em; transform-origin: bottom left; transform: translateX(1em) rotate(-65deg) }
      td { border: thin solid gray; }
      td.leftover { text-align: left; border: none; padding-left: .4em; }
      tr.key > th > div > div { width: 5em; transform-origin: bottom left; transform: translateX(1em) rotate(-65deg) }
      td { border: thin solid gray; }
      td.leftover { text-align: left; border: none; padding-left: .4em; }
-    td.yes { border: thin solid gray; background-color: #ddd; }
+    td.yes { border: thin solid gray; background-color: #eee; }
      /* h/t https://stackoverflow.com/questions/5687035/css-bolding-some-text-without-changing-its-containers-size/46452396#46452396 */
      .highlight { text-shadow: -0.06ex 0 black, 0.06ex 0 black; }
    </style>
      /* h/t https://stackoverflow.com/questions/5687035/css-bolding-some-text-without-changing-its-containers-size/46452396#46452396 */
      .highlight { text-shadow: -0.06ex 0 black, 0.06ex 0 black; }
    </style>
@@ -313,7 +313,12 @@ fn render_instances(instances: &[Option<String>]) -> HTML {
  
  fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML {
      let row_label = HTML::escape(row.label.as_ref());
  
  fn render_cell(config: &Config, col: &str, row: &mut Row) -> HTML {
      let row_label = HTML::escape(row.label.as_ref());
-    let col_label = HTML::escape(col);
+    let col_label = HTML::escape(
+        config
+            .substitute_labels
+            .get(col)
+            .map_or(col, std::string::String::as_str),
+    );
      let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
      let is_empty = match instances {
          None => true,
      let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
      let is_empty = match instances {
          None => true,
@@ -975,6 +980,25 @@ mod tests {
              ),
              HTML::from(
                  r#"<tr><th id="nope">nope</th><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
              ),
              HTML::from(
                  r#"<tr><th id="nope">nope</th><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
+"#
+            )
+        );
+        assert_eq!(
+            render_row(
+                &Config {
+                    column_threshold: 0,
+                    static_columns: vec![],
+                    hidden_columns: HashSet::new(),
+                    substitute_labels: HashMap::from([("foo".to_owned(), "bar".to_owned())]),
+                },
+                &["foo".to_owned()],
+                &mut Rowlike::Row(Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![None])]),
+                })
+            ),
+            HTML::from(
+                r#"<tr><th id="nope">nope</th><td class="yes" onmouseover="h2('nope','bar')" onmouseout="ch2('nope','bar')">𝍷</td><td class="leftover" onmouseover="highlight('nope')" onmouseout="clear_highlight('nope')"></td></tr>
  "#
              )
          );
  "#
              )
          );