From 0f89ddf779ce9340d2ec08db0353f0a3d33f81cd Mon Sep 17 00:00:00 2001
From: Kim Taylor <kmtaylor@gmx.com>
Date: Tue, 17 Sep 2024 21:19:26 +1000
Subject: [PATCH 1/8] Use pledges.csv files as override of candidates.csv
 files.

---
 pledge-update/main.php | 20 +++++++++++---------
 update-pledges.sh      |  8 ++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pledge-update/main.php b/pledge-update/main.php
index 594084c..b9efc7c 100644
--- a/pledge-update/main.php
+++ b/pledge-update/main.php
@@ -1,15 +1,15 @@
 <?php
 
-$options = getopt("", ["pledges-files:"]);
+$options = getopt("", ["candidates-files:"]);
 
-if (isset($options['pledges-files'])) {
-    $pledges_files = $options['pledges-files'];
+if (isset($options['candidates-files'])) {
+    $candidates_files = $options['candidates-files'];
 } else {
-    error_log("Error: Missing required option '--pledges-files'.");
+    error_log("Error: Missing required option '--candidates-files'.");
     exit(1);
 }
 
-$files = explode(" ", $pledges_files);
+$files = explode(" ", $candidates_files);
 
 $candidate_data = [];
 foreach ($files as $key => $file) {
@@ -23,9 +23,7 @@ foreach ($files as $key => $file) {
         exit(1);
     }
 
-    $candidate_file = dirname($file)."/candidates.csv";
-
-    if (($handle = fopen($candidate_file, "r")) !== FALSE) {
+    if (($handle = fopen($file, "r")) !== FALSE) {
         $headers = fgetcsv($handle);
         while (($data = fgetcsv($handle)) !== FALSE) {
             $candidate = [];
@@ -43,7 +41,11 @@ foreach ($files as $key => $file) {
         exit(1);
     }
 
-    if (($handle = fopen($file, "r")) !== FALSE) {
+    $pledges_file = dirname($file)."/pledges.csv";
+
+    if (!file_exists($pledges_file)) continue;
+
+    if (($handle = fopen($pledges_file, "r")) !== FALSE) {
         $headers = fgetcsv($handle);
         while (($data = fgetcsv($handle)) !== FALSE) {
             $candidate = [];
diff --git a/update-pledges.sh b/update-pledges.sh
index 9283f8a..7385994 100755
--- a/update-pledges.sh
+++ b/update-pledges.sh
@@ -13,14 +13,14 @@
 
 DATA_PATH="../spl-data"
 
-pledges_files=()
+candidates_files=()
 for folder in "$DATA_PATH"/*; do
-    if test -f "$folder"/pledges.csv; then
-        pledges_files+=("$folder"/pledges.csv)
+    if test -f "$folder"/candidates.csv; then
+        candidates_files+=("$folder"/candidates.csv)
     fi
 done
 
-pledge_sed=$(php pledge-update/main.php --pledges-files "${pledges_files[*]}")
+pledge_sed=$(php pledge-update/main.php --candidates-files "${candidates_files[*]}")
 
 content=$(sed "$pledge_sed" ../spl-data/movie-homepage)
 

From 1412c268b5f10672b80395fcd31d76218a38087d Mon Sep 17 00:00:00 2001
From: Kim Taylor <kmtaylor@gmx.com>
Date: Tue, 17 Sep 2024 22:02:09 +1000
Subject: [PATCH 2/8] Move pledge data parsing to separate file.

---
 make-pledge-page.sh                 |  19 ++++++
 pledge-update/homepage.php          |  42 ++++++++++++
 pledge-update/main.php              | 102 ----------------------------
 pledge-update/parse_pledge_data.php |  73 ++++++++++++++++++++
 pledge-update/pledge-page.php       |  44 ++++++++++++
 update-pledges.sh                   |   2 +-
 6 files changed, 179 insertions(+), 103 deletions(-)
 create mode 100755 make-pledge-page.sh
 create mode 100644 pledge-update/homepage.php
 delete mode 100644 pledge-update/main.php
 create mode 100644 pledge-update/parse_pledge_data.php
 create mode 100644 pledge-update/pledge-page.php

diff --git a/make-pledge-page.sh b/make-pledge-page.sh
new file mode 100755
index 0000000..b953b84
--- /dev/null
+++ b/make-pledge-page.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# This script uses the jq, wp, and php commands, make sure they are installed before running this script.
+
+# The folder containing data for each council.
+# Includes the list of candidates and any media.
+DATA_PATH="../spl-data"
+
+# Iterate over folders in data path
+candidates_files=()
+for folder in "$DATA_PATH"/*; do
+    if test -f "$folder"/candidates.csv; then
+        candidates_files+=("$folder"/candidates.csv)
+    fi
+done
+
+content=$(php pledge-update/pledge-page.php --candidates-files "${candidates_files[*]}")
+
+echo $content;
diff --git a/pledge-update/homepage.php b/pledge-update/homepage.php
new file mode 100644
index 0000000..4c941b2
--- /dev/null
+++ b/pledge-update/homepage.php
@@ -0,0 +1,42 @@
+<?php
+
+require_once("parse_pledge_data.php");
+
+$options = getopt("", ["candidates-files:"]);
+
+if (isset($options['candidates-files'])) {
+    $candidates_files = $options['candidates-files'];
+} else {
+    error_log("Error: Missing required option '--candidates-files'.");
+    exit(1);
+}
+
+$candidate_data = parse_pledge_data(explode(" ", $candidates_files));
+
+/* Select people who have taken the pledge */
+$pledgeCandidates = array_filter($candidate_data, function ($candidate) {
+    return $candidate['Pledge'] === 'y';
+});
+
+/* Select 9 random candidates */
+$pledgeKeys = array_rand($pledgeCandidates, 9);
+shuffle($pledgeKeys);
+
+$i = 0;
+foreach ($pledgeKeys as $key) {
+    $image_url = $pledgeCandidates[$key]['image_url'];
+    $image_id = $pledgeCandidates[$key]['image_id'];
+
+    echo "s|pledge_img_".$i."|".$image_url."|\n";
+    echo "s|pledge_id_".$i."|".$image_id."|\n";
+
+    echo "s|pledge_string_".$i."|";
+    echo $pledgeCandidates[$key]['Candidate Name'].
+        " (".
+        $pledgeCandidates[$key]['Council'].
+        ") has taken the pledge!|\n";
+
+    $i++;
+}
+
+exit(0);
diff --git a/pledge-update/main.php b/pledge-update/main.php
deleted file mode 100644
index b9efc7c..0000000
--- a/pledge-update/main.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-$options = getopt("", ["candidates-files:"]);
-
-if (isset($options['candidates-files'])) {
-    $candidates_files = $options['candidates-files'];
-} else {
-    error_log("Error: Missing required option '--candidates-files'.");
-    exit(1);
-}
-
-$files = explode(" ", $candidates_files);
-
-$candidate_data = [];
-foreach ($files as $key => $file) {
-    $config_file = dirname($file)."/config.json";
-    $config_string = file_get_contents($config_file);
-
-    if ($config_string !== FALSE) {
-        $config = json_decode($config_string, true);
-    } else {
-        error_log("Error opening config.json.");
-        exit(1);
-    }
-
-    if (($handle = fopen($file, "r")) !== FALSE) {
-        $headers = fgetcsv($handle);
-        while (($data = fgetcsv($handle)) !== FALSE) {
-            $candidate = [];
-            $candidate['Pledge'] = 'n';
-            foreach ($headers as $key => $value) {
-                $candidate[$value] = $data[$key];
-            }
-            $candidate['Council'] = $config['councilName'];
-            $candidate['Path'] = dirname($file);
-            $candidate_data[$candidate['Candidate Name']] = $candidate;
-        }
-        fclose($handle);
-    } else {
-        error_log('Error opening candidates file');
-        exit(1);
-    }
-
-    $pledges_file = dirname($file)."/pledges.csv";
-
-    if (!file_exists($pledges_file)) continue;
-
-    if (($handle = fopen($pledges_file, "r")) !== FALSE) {
-        $headers = fgetcsv($handle);
-        while (($data = fgetcsv($handle)) !== FALSE) {
-            $candidate = [];
-            foreach ($headers as $key => $value) {
-                $candidate[$value] = $data[$key];
-            }
-            $candidate_data[$candidate['Candidate Name']]['Pledge'] = 
-                $candidate['Pledge'];
-        }
-        fclose($handle);
-    } else {
-        error_log('Error opening pledges file');
-        exit(1);
-    }
-}
-
-/* Select people who have taken the pledge */
-$pledgeCandidates = array_filter($candidate_data, function ($candidate) {
-    return $candidate['Pledge'] === 'y';
-});
-
-/* Select 9 random candidates */
-$pledgeKeys = array_rand($pledgeCandidates, 9);
-shuffle($pledgeKeys);
-
-$i = 0;
-foreach ($pledgeKeys as $key) {
-    $media_desc = $pledgeCandidates[$key]['Path']."/".
-                    $pledgeCandidates[$key]['Picture'].".json";
-    $media_string = file_get_contents($media_desc);
-
-    if ($media_string !== FALSE) {
-        $media = json_decode($media_string, true);
-    } else {
-        error_log("Error opening image descriptor.");
-        exit(1);
-    }
-
-    $image_url = $media['url'];
-    $image_id = $media['id'];
-
-    echo "s|pledge_img_".$i."|".$image_url."|\n";
-    echo "s|pledge_id_".$i."|".$image_id."|\n";
-
-    echo "s|pledge_string_".$i."|";
-    echo $pledgeCandidates[$key]['Candidate Name'].
-        " (".
-        $pledgeCandidates[$key]['Council'].
-        ") has taken the pledge!|\n";
-
-    $i++;
-}
-
-exit(0);
diff --git a/pledge-update/parse_pledge_data.php b/pledge-update/parse_pledge_data.php
new file mode 100644
index 0000000..3cdcf71
--- /dev/null
+++ b/pledge-update/parse_pledge_data.php
@@ -0,0 +1,73 @@
+<?php
+
+function parse_pledge_data($candidates_files) {
+    $candidate_data = [];
+    foreach ($candidates_files as $key => $file) {
+        $config_file = dirname($file)."/config.json";
+        $config_string = file_get_contents($config_file);
+
+        if ($config_string !== FALSE) {
+            $config = json_decode($config_string, true);
+        } else {
+            error_log("Error opening config.json.");
+            exit(1);
+        }
+
+        if (($handle = fopen($file, "r")) !== FALSE) {
+            $headers = fgetcsv($handle);
+            while (($data = fgetcsv($handle)) !== FALSE) {
+                $candidate = [];
+                $candidate['Pledge'] = 'n';
+                $candidate['Picture'] = "";
+                $candidate['image_url'] = "";
+                $candidate['image_id'] = "";
+                foreach ($headers as $key => $value) {
+                    $candidate[$value] = $data[$key];
+                }
+                $candidate['Council'] = $config['councilName'];
+                $candidate['Path'] = dirname($file);
+                $media_desc = $candidate['Path']."/".
+                                $candidate['Picture'].".json";
+                if (file_exists($media_desc)) {
+                    $media_string = file_get_contents($media_desc);
+                    if ($media_string !== FALSE) {
+                        $media = json_decode($media_string, true);
+                    } else {
+                        error_log("Error opening image descriptor.");
+                        exit(1);
+                    }
+                    /* Get photo URL and ID */
+                    $candidate['image_url'] = $media['url'];
+                    $candidate['image_id'] = $media['id'];
+                }
+                $candidate_data[$candidate['Candidate Name']] = $candidate;
+            }
+            fclose($handle);
+        } else {
+            error_log('Error opening candidates file');
+            exit(1);
+        }
+
+        /* Override pledge columns if pledges.csv is present */
+        $pledges_file = dirname($file)."/pledges.csv";
+        if (!file_exists($pledges_file)) continue;
+
+        if (($handle = fopen($pledges_file, "r")) !== FALSE) {
+            $headers = fgetcsv($handle);
+            while (($data = fgetcsv($handle)) !== FALSE) {
+                $candidate = [];
+                foreach ($headers as $key => $value) {
+                    $candidate[$value] = $data[$key];
+                }
+                $candidate_data[$candidate['Candidate Name']]['Pledge'] = 
+                    $candidate['Pledge'];
+            }
+            fclose($handle);
+        } else {
+            error_log('Error opening pledges file');
+            exit(1);
+        }
+    }
+
+    return $candidate_data;
+}
diff --git a/pledge-update/pledge-page.php b/pledge-update/pledge-page.php
new file mode 100644
index 0000000..8128968
--- /dev/null
+++ b/pledge-update/pledge-page.php
@@ -0,0 +1,44 @@
+<?php
+
+require_once("parse_pledge_data.php");
+
+$options = getopt("", ["candidates-files:"]);
+
+if (isset($options['candidates-files'])) {
+    $candidates_files = $options['candidates-files'];
+} else {
+    error_log("Error: Missing required option '--candidates-files'.");
+    exit(1);
+}
+
+$candidate_data = parse_pledge_data(explode(" ", $candidates_files));
+
+/* Select people who have taken the pledge */
+$pledgeCandidates = array_filter($candidate_data, function ($candidate) {
+    return $candidate['Pledge'] === 'y';
+});
+
+print_r($pledgeCandidates);
+
+/* Select 9 random candidates */
+//$pledgeKeys = array_rand($pledgeCandidates, 9);
+//shuffle($pledgeKeys);
+//
+//$i = 0;
+//foreach ($pledgeKeys as $key) {
+//    $image_url = $pledgeCandidates[$key]['image_url'];
+//    $image_id = $pledgeCandidates[$key]['image_id'];
+//
+//    echo "s|pledge_img_".$i."|".$image_url."|\n";
+//    echo "s|pledge_id_".$i."|".$image_id."|\n";
+//
+//    echo "s|pledge_string_".$i."|";
+//    echo $pledgeCandidates[$key]['Candidate Name'].
+//        " (".
+//        $pledgeCandidates[$key]['Council'].
+//        ") has taken the pledge!|\n";
+//
+//    $i++;
+//}
+
+exit(0);
diff --git a/update-pledges.sh b/update-pledges.sh
index 7385994..54a64fc 100755
--- a/update-pledges.sh
+++ b/update-pledges.sh
@@ -20,7 +20,7 @@ for folder in "$DATA_PATH"/*; do
     fi
 done
 
-pledge_sed=$(php pledge-update/main.php --candidates-files "${candidates_files[*]}")
+pledge_sed=$(php pledge-update/homepage.php --candidates-files "${candidates_files[*]}")
 
 content=$(sed "$pledge_sed" ../spl-data/movie-homepage)
 

From 2e444113c82051b8538134b6d8f685679b08fa2a Mon Sep 17 00:00:00 2001
From: Kim Taylor <kmtaylor@gmx.com>
Date: Tue, 17 Sep 2024 22:19:24 +1000
Subject: [PATCH 3/8] Plumb in Matt's PHP template.

---
 pledge-update/page_renderer.php |  28 +++++
 pledge-update/pledge-page.php   |  30 ++---
 pledge-update/template.php      | 198 ++++++++++++++++++++++++++++++++
 3 files changed, 235 insertions(+), 21 deletions(-)
 create mode 100644 pledge-update/page_renderer.php
 create mode 100644 pledge-update/template.php

diff --git a/pledge-update/page_renderer.php b/pledge-update/page_renderer.php
new file mode 100644
index 0000000..773a33a
--- /dev/null
+++ b/pledge-update/page_renderer.php
@@ -0,0 +1,28 @@
+<?php
+
+class SPLPageRenderer {
+    public function renderPledgePage($config, $candidates, $media) {
+        ob_start();
+
+        $didError = false;
+
+        set_error_handler(function($errno, $errstr, $errfile, $errline) use(&$didError) {
+            $didError = true;
+            error_log("Error: $errstr in $errfile on line $errline");
+            return true; // Prevent default error handling
+        });
+
+        require "template.php";
+
+        restore_error_handler();
+
+        $content = ob_get_clean();
+
+        // Explictly return null if we didn't generate any content or if there was an error
+        if (!empty($content) && !$didError) {
+            return $content;
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/pledge-update/pledge-page.php b/pledge-update/pledge-page.php
index 8128968..97de5db 100644
--- a/pledge-update/pledge-page.php
+++ b/pledge-update/pledge-page.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once("parse_pledge_data.php");
+require_once("page_renderer.php");
 
 $options = getopt("", ["candidates-files:"]);
 
@@ -18,27 +19,14 @@ $pledgeCandidates = array_filter($candidate_data, function ($candidate) {
     return $candidate['Pledge'] === 'y';
 });
 
-print_r($pledgeCandidates);
+$renderer = new SPLPageRenderer();
+//print_r($pledgeCandidates);
 
-/* Select 9 random candidates */
-//$pledgeKeys = array_rand($pledgeCandidates, 9);
-//shuffle($pledgeKeys);
-//
-//$i = 0;
-//foreach ($pledgeKeys as $key) {
-//    $image_url = $pledgeCandidates[$key]['image_url'];
-//    $image_id = $pledgeCandidates[$key]['image_id'];
-//
-//    echo "s|pledge_img_".$i."|".$image_url."|\n";
-//    echo "s|pledge_id_".$i."|".$image_id."|\n";
-//
-//    echo "s|pledge_string_".$i."|";
-//    echo $pledgeCandidates[$key]['Candidate Name'].
-//        " (".
-//        $pledgeCandidates[$key]['Council'].
-//        ") has taken the pledge!|\n";
-//
-//    $i++;
-//}
+$pageContent = $renderer->renderPledgePage($councilData, $candidateData, $mediaData);
 
+if ($pageContent === null) {
+    exit(2);
+}
+
+echo $pageContent;
 exit(0);
diff --git a/pledge-update/template.php b/pledge-update/template.php
new file mode 100644
index 0000000..a0cea5c
--- /dev/null
+++ b/pledge-update/template.php
@@ -0,0 +1,198 @@
+<?php 
+
+function sluggify($input) {
+    return strtolower(str_replace(' ', '-', $input));
+}
+
+$surveyLink = "<a href=\"https://forms.gle/gnDNyBiVC64tDo2Y7\">Streets People Love Pledge and Survey</a>";
+if (isset($config["survey"])) {
+    $surveyLink = $config["survey"];
+}
+
+?>
+
+<!-- wp:paragraph -->
+<p>The Streets People Love campaign has created scorecards for candidates in the 2024 council elections. Scorecards have been generated based on a candidate's engagement with the Streets People Love campaign, their commitment to our pledge, their responses to a survey and input from campaign members located in the local government area in which they are running.</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:paragraph -->
+<p>Can't see a candidate you know is running? Candidates who don't take our survey won't appear on this page. Feel free to send your local candidates the <?php echo $surveyLink; ?> and let them know it's important to local residents that they do take part, so that we can vote for those who want to build the streets people love.</p>
+<!-- /wp:paragraph -->
+
+<?php if (isset($media["header.jpg"])): ?>
+<!-- wp:image {"id":<?php echo $media["header.jpg"]['id']; ?>,"aspectRatio":"16/9","scale":"cover","sizeSlug":"full","linkDestination":"none"} -->
+<figure class="wp-block-image size-full"><img src="<?php echo $media["header.jpg"]['url']; ?>" alt="" class="wp-image-<?php echo $media["header.jpg"]['id']; ?>" style="aspect-ratio:16/9;object-fit:cover"/></figure>
+<!-- /wp:image -->
+ <?php endif ?>
+
+ <?php 
+ 
+ $wardCount = count($config['wardNames']);
+
+ if ($wardCount > 1) {
+    $wardsDescription = $config['councilName'] . " is divided into " . $wardCount . " wards:";
+ } else {
+    $wardsDescription = $config['councilName'] . " is unsubdivided and does not contain any wards.";
+ }
+
+ ?>
+
+ <!-- wp:paragraph -->
+<p><?php echo $wardsDescription; ?></p>
+<!-- /wp:paragraph -->
+
+<?php if (isset($media["map.jpg"])): ?>
+<!-- wp:image {"id":<?php echo $media["map.jpg"]['id']; ?>,"width":"550px","sizeSlug":"full","linkDestination":"media","className":"is-style-default"} -->
+<figure class="wp-block-image size-full is-resized is-style-default"><a href="<?php echo $media["map.jpg"]['url']; ?>" target="_blank" rel="noreferrer noopener"><img src="<?php echo $media["map.jpg"]['url']; ?>" alt="" class="wp-image-<?php echo $media["map.jpg"]['id']; ?>" style="width:550px"/></a></figure>
+<!-- /wp:image -->
+<?php endif ?>
+
+<?php if ($wardCount > 1): ?>
+
+    <?php 
+
+    if ($wardCount > 8) {
+        $wardListChunkSize = ceil($wardCount / 2);
+    } else {
+        $wardListChunkSize = $wardCount;
+    }
+
+    $wardChunks = array_chunk($config['wardNames'], $wardListChunkSize);
+
+    ?>
+    <!-- wp:columns {"className":"ward-list-columns"} -->
+    <div class="wp-block-columns ward-list-columns">
+
+    <?php for ($columnIdx = 0; $columnIdx < 4; $columnIdx++): ?>
+        <!-- wp:column {"verticalAlignment":"top","style":{"spacing":{"padding":{"top":"0","bottom":"0"}}}} -->
+        <div class="wp-block-column is-vertically-aligned-top" style="padding-top:0;padding-bottom:0">
+            
+            <?php if (array_key_exists($columnIdx, $wardChunks)): ?>
+                <!-- wp:list {"style":{"spacing":{"margin":{"top":"0","right":"0","bottom":"0","left":"0"}}}} -->
+                <ul style="margin-top:0;margin-right:0;margin-bottom:0;margin-left:0" class="wp-block-list">
+
+                    <?php foreach($wardChunks[$columnIdx] as $wardName): ?>
+                        <!-- wp:list-item -->
+                        <li><a href="#<?php echo sluggify($wardName); ?>"><?php echo $wardName; ?></a></li>
+                        <!-- /wp:list-item -->
+                    <?php endforeach; ?>
+
+                </ul>
+                <!-- /wp:list -->
+            <?php endif; ?>
+
+        </div>
+        <!-- /wp:column -->
+    <?php endfor; ?>
+
+    </div>
+    <!-- /wp:columns -->
+<?php else: ?>
+    <!-- wp:paragraph -->
+    <p></p>
+    <!-- /wp:paragraph -->
+<?php endif; ?>
+
+<?php 
+    if (isset($config['groupNames'])) {
+        $groupNames = $config['groupNames'];
+        $propertyOnCandidate = 'Group';
+    } else {
+        $groupNames = $config['wardNames'];
+        $propertyOnCandidate = 'Ward';
+    }
+?>
+
+<?php foreach ($groupNames as $index => $groupName): ?>
+    <!-- wp:heading {"level":3,"className":"is-style-default"} -->
+    <?php $groupSlug = sluggify($groupName); ?>
+    <h3 class="wp-block-heading is-style-default" id="<?php echo $groupSlug; ?>"><a style="text-decoration: none;" href="#<?php echo $groupSlug; ?>"><?php echo htmlspecialchars($groupName); ?></a></h3>
+    <!-- /wp:heading -->
+
+    <?php
+    $groupCandidates = array_filter($candidates, function ($candidate) use ($groupName, $propertyOnCandidate) {
+        return isset($candidate[$propertyOnCandidate]) && $candidate[$propertyOnCandidate] === $groupName;
+    });
+
+    usort($groupCandidates, function($a, $b) {
+        if ($a == $b) {
+            return 0;
+        }
+        return (((int) $a['Rating']) < ((int) $b['Rating'])) ? 1 : -1;
+    });
+
+    if (count($groupCandidates) > 0):
+    ?>
+
+        <?php
+        $columnCount = 4;
+
+        $chunkedWardCandidates = array_chunk($groupCandidates, $columnCount);
+        ?>
+
+        <?php foreach($chunkedWardCandidates as $chunk): ?>
+            <!-- wp:columns -->
+            <div class="wp-block-columns">
+                
+                <?php for ($columnIdx = 0; $columnIdx < $columnCount; $columnIdx++): ?>
+                    <!-- wp:column -->
+                    <div class="wp-block-column">
+
+                        <?php if (array_key_exists($columnIdx, $chunk)): ?>
+                            <?php 
+                                $candidate = $chunk[$columnIdx];
+
+                                if (isset($candidate['Picture']) && isset($media[$candidate['Picture']])) {
+                                    $candidate_image = $media[$candidate['Picture']];
+                                } else {
+                                    $candidate_image = $media['default.png'];
+                                }
+
+                                $candidate_rating = str_repeat("✔️", max(0, min(5, $candidate['Rating'])));
+
+                                // If string is 5 ticks, insert a zero width space entity between the 3rd and 4th ticks so that it wraps nicer
+                                if ($candidate_rating == "✔️✔️✔️✔️✔️") {
+                                    $candidate_rating = "✔️✔️✔️&#8203;✔️✔️";
+                                }
+                                // If string is 4 ticks, insert a zero width space entity between the 2nd and 3rd ticks so that it wraps nicer
+                                if ($candidate_rating == "✔️✔️✔️✔️") {
+                                    $candidate_rating = "✔️✔️&#8203;✔️✔️";
+                                }
+                            ?>
+
+                            <!-- wp:image {"id":<?php echo $candidate_image['id']; ?>,"width":"200px","height":"200px","scale":"cover","align":"center","style":{"color":{}},"className":"is-resized"} -->
+                            <figure class="wp-block-image aligncenter is-resized"><img src="<?php echo $candidate_image['url']; ?>" alt="" class="wp-image-<?php echo $candidate_image['id']; ?>" style="object-fit:cover;width:200px;height:200px"/></figure>
+                            <!-- /wp:image -->
+
+                            <!-- wp:heading {"textAlign":"center","className":"wp-block-heading has-text-align-center has-medium-font-size","style":{"spacing":{"margin":{"top":"1rem","bottom":"0.5rem"}}}} -->
+                            <h2 class="wp-block-heading has-text-align-center has-medium-font-size" style="margin-top:1rem;margin-bottom:0.5rem"><strong><?php echo htmlspecialchars($candidate['Candidate Name']); ?></strong></h2>
+                            <!-- /wp:heading -->
+
+                            <!-- wp:paragraph {"align":"center","style":{"layout":{"selfStretch":"fit","flexSize":null},"typography":{"lineHeight":"1"},"spacing":{"margin":{"top":"0.5rem","bottom":"1.5rem"}}},"fontSize":"large"} -->
+                            <p class="has-text-align-center has-large-font-size candidate-ticks"><?php echo $candidate_rating; ?></p>
+                            <!-- /wp:paragraph -->
+                        <?php endif; ?>
+
+                    </div>
+                    <!-- /wp:column -->
+                <?php endfor; ?>
+
+            </div>
+            <!-- /wp:columns -->
+        <?php endforeach; ?>
+    
+    <?php else: ?>
+
+        <!-- wp:paragraph -->
+        <p>No candidates in this ward have completed the survey. Send your local candidates the <?php echo $surveyLink; ?> and ask them to take part so that local residents can vote for the candidates who want to build the streets people love.</p>
+        <!-- /wp:paragraph -->
+
+    <?php endif; ?>
+
+<?php endforeach; ?>
+
+<?php if (isset($config['footer'])): ?>
+<!-- wp:paragraph -->
+<p><?php echo $config['footer']; ?></p>
+<!-- /wp:paragraph -->
+<?php endif; ?>
\ No newline at end of file

From 82f65a2050097bf3640a5f03c9e83cc32cbeceba Mon Sep 17 00:00:00 2001
From: Kim Taylor <kmtaylor@gmx.com>
Date: Sat, 21 Sep 2024 16:53:24 +1000
Subject: [PATCH 4/8] Generate pledge council index.

---
 pledge-update/page_renderer.php |  2 +-
 pledge-update/pledge-page.php   | 11 ++++++++-
 pledge-update/template.php      | 41 ++++++++++++---------------------
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/pledge-update/page_renderer.php b/pledge-update/page_renderer.php
index 773a33a..f7ce2dc 100644
--- a/pledge-update/page_renderer.php
+++ b/pledge-update/page_renderer.php
@@ -1,7 +1,7 @@
 <?php
 
 class SPLPageRenderer {
-    public function renderPledgePage($config, $candidates, $media) {
+    public function renderPledgePage($councils, $candidates) {
         ob_start();
 
         $didError = false;
diff --git a/pledge-update/pledge-page.php b/pledge-update/pledge-page.php
index 97de5db..e4a222c 100644
--- a/pledge-update/pledge-page.php
+++ b/pledge-update/pledge-page.php
@@ -22,7 +22,16 @@ $pledgeCandidates = array_filter($candidate_data, function ($candidate) {
 $renderer = new SPLPageRenderer();
 //print_r($pledgeCandidates);
 
-$pageContent = $renderer->renderPledgePage($councilData, $candidateData, $mediaData);
+$councils = [];
+foreach ($pledgeCandidates as $key => $candidate) {
+    $councils[] = $candidate['Council'];
+}
+$councils = array_unique($councils);
+asort($councils);
+
+//print_r($councils);
+
+$pageContent = $renderer->renderPledgePage($councils, $pledgeCandidates);
 
 if ($pageContent === null) {
     exit(2);
diff --git a/pledge-update/template.php b/pledge-update/template.php
index a0cea5c..fe326a3 100644
--- a/pledge-update/template.php
+++ b/pledge-update/template.php
@@ -5,9 +5,6 @@ function sluggify($input) {
 }
 
 $surveyLink = "<a href=\"https://forms.gle/gnDNyBiVC64tDo2Y7\">Streets People Love Pledge and Survey</a>";
-if (isset($config["survey"])) {
-    $surveyLink = $config["survey"];
-}
 
 ?>
 
@@ -27,12 +24,10 @@ if (isset($config["survey"])) {
 
  <?php 
  
- $wardCount = count($config['wardNames']);
+ $councilCount = count($councils);
 
- if ($wardCount > 1) {
-    $wardsDescription = $config['councilName'] . " is divided into " . $wardCount . " wards:";
- } else {
-    $wardsDescription = $config['councilName'] . " is unsubdivided and does not contain any wards.";
+ if ($councilCount > 1) {
+    $wardsDescription = "Candidates from " . $councilCount . " wards have taken the pledge:";
  }
 
  ?>
@@ -41,39 +36,33 @@ if (isset($config["survey"])) {
 <p><?php echo $wardsDescription; ?></p>
 <!-- /wp:paragraph -->
 
-<?php if (isset($media["map.jpg"])): ?>
-<!-- wp:image {"id":<?php echo $media["map.jpg"]['id']; ?>,"width":"550px","sizeSlug":"full","linkDestination":"media","className":"is-style-default"} -->
-<figure class="wp-block-image size-full is-resized is-style-default"><a href="<?php echo $media["map.jpg"]['url']; ?>" target="_blank" rel="noreferrer noopener"><img src="<?php echo $media["map.jpg"]['url']; ?>" alt="" class="wp-image-<?php echo $media["map.jpg"]['id']; ?>" style="width:550px"/></a></figure>
-<!-- /wp:image -->
-<?php endif ?>
-
-<?php if ($wardCount > 1): ?>
+<?php if ($councilCount > 1): ?>
 
     <?php 
 
-    if ($wardCount > 8) {
-        $wardListChunkSize = ceil($wardCount / 2);
+    if ($councilCount > 8) {
+        $councilListChunkSize = ceil($councilCount / 2);
     } else {
-        $wardListChunkSize = $wardCount;
+        $councilListChunkSize = $councilCount;
     }
 
-    $wardChunks = array_chunk($config['wardNames'], $wardListChunkSize);
+    $councilChunks = array_chunk($councils, $councilListChunkSize);
 
     ?>
-    <!-- wp:columns {"className":"ward-list-columns"} -->
-    <div class="wp-block-columns ward-list-columns">
+    <!-- wp:columns {"className":"council-list-columns"} -->
+    <div class="wp-block-columns council-list-columns">
 
     <?php for ($columnIdx = 0; $columnIdx < 4; $columnIdx++): ?>
         <!-- wp:column {"verticalAlignment":"top","style":{"spacing":{"padding":{"top":"0","bottom":"0"}}}} -->
         <div class="wp-block-column is-vertically-aligned-top" style="padding-top:0;padding-bottom:0">
             
-            <?php if (array_key_exists($columnIdx, $wardChunks)): ?>
+            <?php if (array_key_exists($columnIdx, $councilChunks)): ?>
                 <!-- wp:list {"style":{"spacing":{"margin":{"top":"0","right":"0","bottom":"0","left":"0"}}}} -->
                 <ul style="margin-top:0;margin-right:0;margin-bottom:0;margin-left:0" class="wp-block-list">
 
-                    <?php foreach($wardChunks[$columnIdx] as $wardName): ?>
+                    <?php foreach($councilChunks[$columnIdx] as $councilName): ?>
                         <!-- wp:list-item -->
-                        <li><a href="#<?php echo sluggify($wardName); ?>"><?php echo $wardName; ?></a></li>
+                        <li><a href="#<?php echo sluggify($councilName); ?>"><?php echo $councilName; ?></a></li>
                         <!-- /wp:list-item -->
                     <?php endforeach; ?>
 
@@ -87,7 +76,7 @@ if (isset($config["survey"])) {
 
     </div>
     <!-- /wp:columns -->
-<?php else: ?>
+<?php exit(0); else: ?>
     <!-- wp:paragraph -->
     <p></p>
     <!-- /wp:paragraph -->
@@ -195,4 +184,4 @@ if (isset($config["survey"])) {
 <!-- wp:paragraph -->
 <p><?php echo $config['footer']; ?></p>
 <!-- /wp:paragraph -->
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>

From cba26faf311f33388b994cf6a5fa4ab025d91691 Mon Sep 17 00:00:00 2001
From: Kim Taylor <kmtaylor@gmx.com>
Date: Sat, 21 Sep 2024 17:24:50 +1000
Subject: [PATCH 5/8] Show photographs.

---
 pledge-update/template.php | 53 +++++++++-----------------------------
 1 file changed, 12 insertions(+), 41 deletions(-)

diff --git a/pledge-update/template.php b/pledge-update/template.php
index fe326a3..047a745 100644
--- a/pledge-update/template.php
+++ b/pledge-update/template.php
@@ -76,38 +76,21 @@ $surveyLink = "<a href=\"https://forms.gle/gnDNyBiVC64tDo2Y7\">Streets People Lo
 
     </div>
     <!-- /wp:columns -->
-<?php exit(0); else: ?>
+<?php else: ?>
     <!-- wp:paragraph -->
     <p></p>
     <!-- /wp:paragraph -->
 <?php endif; ?>
 
-<?php 
-    if (isset($config['groupNames'])) {
-        $groupNames = $config['groupNames'];
-        $propertyOnCandidate = 'Group';
-    } else {
-        $groupNames = $config['wardNames'];
-        $propertyOnCandidate = 'Ward';
-    }
-?>
-
-<?php foreach ($groupNames as $index => $groupName): ?>
+<?php foreach ($councils as $key => $council): ?>
     <!-- wp:heading {"level":3,"className":"is-style-default"} -->
-    <?php $groupSlug = sluggify($groupName); ?>
-    <h3 class="wp-block-heading is-style-default" id="<?php echo $groupSlug; ?>"><a style="text-decoration: none;" href="#<?php echo $groupSlug; ?>"><?php echo htmlspecialchars($groupName); ?></a></h3>
+    <?php $groupSlug = sluggify($council); ?>
+    <h3 class="wp-block-heading is-style-default" id="<?php echo $groupSlug; ?>"><a style="text-decoration: none;" href="#<?php echo $groupSlug; ?>"><?php echo htmlspecialchars($council); ?></a></h3>
     <!-- /wp:heading -->
 
     <?php
-    $groupCandidates = array_filter($candidates, function ($candidate) use ($groupName, $propertyOnCandidate) {
-        return isset($candidate[$propertyOnCandidate]) && $candidate[$propertyOnCandidate] === $groupName;
-    });
-
-    usort($groupCandidates, function($a, $b) {
-        if ($a == $b) {
-            return 0;
-        }
-        return (((int) $a['Rating']) < ((int) $b['Rating'])) ? 1 : -1;
+    $groupCandidates = array_filter($candidates, function ($candidate) use ($council) {
+        return $candidate['Council'] === $council;
     });
 
     if (count($groupCandidates) > 0):
@@ -116,10 +99,10 @@ $surveyLink = "<a href=\"https://forms.gle/gnDNyBiVC64tDo2Y7\">Streets People Lo
         <?php
         $columnCount = 4;
 
-        $chunkedWardCandidates = array_chunk($groupCandidates, $columnCount);
+        $chunkedCouncilCandidates = array_chunk($groupCandidates, $columnCount);
         ?>
 
-        <?php foreach($chunkedWardCandidates as $chunk): ?>
+        <?php foreach($chunkedCouncilCandidates as $chunk): ?>
             <!-- wp:columns -->
             <div class="wp-block-columns">
                 
@@ -131,22 +114,13 @@ $surveyLink = "<a href=\"https://forms.gle/gnDNyBiVC64tDo2Y7\">Streets People Lo
                             <?php 
                                 $candidate = $chunk[$columnIdx];
 
-                                if (isset($candidate['Picture']) && isset($media[$candidate['Picture']])) {
-                                    $candidate_image = $media[$candidate['Picture']];
+                                if (isset($candidate['Picture']) && strlen($candidate['image_url'])) {
+                                    $candidate_image['url'] = $candidate['image_url'];
+                                    $candidate_image['id'] = $candidate['image_id'];
                                 } else {
-                                    $candidate_image = $media['default.png'];
+                                    continue;
                                 }
 
-                                $candidate_rating = str_repeat("✔️", max(0, min(5, $candidate['Rating'])));
-
-                                // If string is 5 ticks, insert a zero width space entity between the 3rd and 4th ticks so that it wraps nicer
-                                if ($candidate_rating == "✔️✔️✔️✔️✔️") {
-                                    $candidate_rating = "✔️✔️✔️&#8203;✔️✔️";
-                                }
-                                // If string is 4 ticks, insert a zero width space entity between the 2nd and 3rd ticks so that it wraps nicer
-                                if ($candidate_rating == "✔️✔️✔️✔️") {
-                                    $candidate_rating = "✔️✔️&#8203;✔️✔️";
-                                }
                             ?>
 
                             <!-- wp:image {"id":<?php echo $candidate_image['id']; ?>,"width":"200px","height":"200px","scale":"cover","align":"center","style":{"color":{}},"className":"is-resized"} -->
@@ -157,9 +131,6 @@ $surveyLink = "<a href=\"https://forms.gle/gnDNyBiVC64tDo2Y7\">Streets People Lo
                             <h2 class="wp-block-heading has-text-align-center has-medium-font-size" style="margin-top:1rem;margin-bottom:0.5rem"><strong><?php echo htmlspecialchars($candidate['Candidate Name']); ?></strong></h2>
                             <!-- /wp:heading -->
 
-                            <!-- wp:paragraph {"align":"center","style":{"layout":{"selfStretch":"fit","flexSize":null},"typography":{"lineHeight":"1"},"spacing":{"margin":{"top":"0.5rem","bottom":"1.5rem"}}},"fontSize":"large"} -->
-                            <p class="has-text-align-center has-large-font-size candidate-ticks"><?php echo $candidate_rating; ?></p>
-                            <!-- /wp:paragraph -->
                         <?php endif; ?>
 
                     </div>

From bbffeb89f1a2c4fd09bfd940fa508089fd8fadd1 Mon Sep 17 00:00:00 2001
From: Kim Taylor <kmtaylor@gmx.com>
Date: Sat, 21 Sep 2024 17:36:04 +1000
Subject: [PATCH 6/8] Update text.

---
 pledge-update/template.php | 109 ++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 67 deletions(-)

diff --git a/pledge-update/template.php b/pledge-update/template.php
index 047a745..5c2637d 100644
--- a/pledge-update/template.php
+++ b/pledge-update/template.php
@@ -1,41 +1,25 @@
 <?php 
-
 function sluggify($input) {
     return strtolower(str_replace(' ', '-', $input));
 }
-
-$surveyLink = "<a href=\"https://forms.gle/gnDNyBiVC64tDo2Y7\">Streets People Love Pledge and Survey</a>";
-
 ?>
 
 <!-- wp:paragraph -->
-<p>The Streets People Love campaign has created scorecards for candidates in the 2024 council elections. Scorecards have been generated based on a candidate's engagement with the Streets People Love campaign, their commitment to our pledge, their responses to a survey and input from campaign members located in the local government area in which they are running.</p>
+<p>The Streets People Love campaign offers council candidates the opportunity to take the following pledge:</p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph -->
-<p>Can't see a candidate you know is running? Candidates who don't take our survey won't appear on this page. Feel free to send your local candidates the <?php echo $surveyLink; ?> and let them know it's important to local residents that they do take part, so that we can vote for those who want to build the streets people love.</p>
+<p>If elected Councillor, I pledge to allocate budget and street space to build streets people love, and ensure that residents of all ages and abilities can safely move around our council area, irrespective of whether they choose to walk, cycle, wheel, use public transport or drive.</p>
 <!-- /wp:paragraph -->
 
-<?php if (isset($media["header.jpg"])): ?>
-<!-- wp:image {"id":<?php echo $media["header.jpg"]['id']; ?>,"aspectRatio":"16/9","scale":"cover","sizeSlug":"full","linkDestination":"none"} -->
-<figure class="wp-block-image size-full"><img src="<?php echo $media["header.jpg"]['url']; ?>" alt="" class="wp-image-<?php echo $media["header.jpg"]['id']; ?>" style="aspect-ratio:16/9;object-fit:cover"/></figure>
-<!-- /wp:image -->
- <?php endif ?>
-
- <?php 
- 
- $councilCount = count($councils);
-
- if ($councilCount > 1) {
-    $wardsDescription = "Candidates from " . $councilCount . " wards have taken the pledge:";
- }
-
- ?>
-
- <!-- wp:paragraph -->
-<p><?php echo $wardsDescription; ?></p>
+<!-- wp:paragraph -->
+<p>Candidates from these councils have taken the pledge:</p>
 <!-- /wp:paragraph -->
 
+<?php 
+$councilCount = count($councils);
+?>
+
 <?php if ($councilCount > 1): ?>
 
     <?php 
@@ -93,62 +77,53 @@ $surveyLink = "<a href=\"https://forms.gle/gnDNyBiVC64tDo2Y7\">Streets People Lo
         return $candidate['Council'] === $council;
     });
 
-    if (count($groupCandidates) > 0):
     ?>
 
-        <?php
-        $columnCount = 4;
+    <?php
+    $columnCount = 4;
 
-        $chunkedCouncilCandidates = array_chunk($groupCandidates, $columnCount);
-        ?>
+    $chunkedCouncilCandidates = array_chunk($groupCandidates, $columnCount);
+    ?>
 
-        <?php foreach($chunkedCouncilCandidates as $chunk): ?>
-            <!-- wp:columns -->
-            <div class="wp-block-columns">
-                
-                <?php for ($columnIdx = 0; $columnIdx < $columnCount; $columnIdx++): ?>
-                    <!-- wp:column -->
-                    <div class="wp-block-column">
+    <?php foreach($chunkedCouncilCandidates as $chunk): ?>
+        <!-- wp:columns -->
+        <div class="wp-block-columns">
+            
+            <?php for ($columnIdx = 0; $columnIdx < $columnCount; $columnIdx++): ?>
+                <!-- wp:column -->
+                <div class="wp-block-column">
 
-                        <?php if (array_key_exists($columnIdx, $chunk)): ?>
-                            <?php 
-                                $candidate = $chunk[$columnIdx];
+                    <?php if (array_key_exists($columnIdx, $chunk)): ?>
+                        <?php 
+                            $candidate = $chunk[$columnIdx];
 
-                                if (isset($candidate['Picture']) && strlen($candidate['image_url'])) {
-                                    $candidate_image['url'] = $candidate['image_url'];
-                                    $candidate_image['id'] = $candidate['image_id'];
-                                } else {
-                                    continue;
-                                }
+                            if (isset($candidate['Picture']) && strlen($candidate['image_url'])) {
+                                $candidate_image['url'] = $candidate['image_url'];
+                                $candidate_image['id'] = $candidate['image_id'];
+                            } else {
+                                continue;
+                            }
 
-                            ?>
+                        ?>
 
-                            <!-- wp:image {"id":<?php echo $candidate_image['id']; ?>,"width":"200px","height":"200px","scale":"cover","align":"center","style":{"color":{}},"className":"is-resized"} -->
-                            <figure class="wp-block-image aligncenter is-resized"><img src="<?php echo $candidate_image['url']; ?>" alt="" class="wp-image-<?php echo $candidate_image['id']; ?>" style="object-fit:cover;width:200px;height:200px"/></figure>
-                            <!-- /wp:image -->
+                        <!-- wp:image {"id":<?php echo $candidate_image['id']; ?>,"width":"200px","height":"200px","scale":"cover","align":"center","style":{"color":{}},"className":"is-resized"} -->
+                        <figure class="wp-block-image aligncenter is-resized"><img src="<?php echo $candidate_image['url']; ?>" alt="" class="wp-image-<?php echo $candidate_image['id']; ?>" style="object-fit:cover;width:200px;height:200px"/></figure>
+                        <!-- /wp:image -->
 
-                            <!-- wp:heading {"textAlign":"center","className":"wp-block-heading has-text-align-center has-medium-font-size","style":{"spacing":{"margin":{"top":"1rem","bottom":"0.5rem"}}}} -->
-                            <h2 class="wp-block-heading has-text-align-center has-medium-font-size" style="margin-top:1rem;margin-bottom:0.5rem"><strong><?php echo htmlspecialchars($candidate['Candidate Name']); ?></strong></h2>
-                            <!-- /wp:heading -->
+                        <!-- wp:heading {"textAlign":"center","className":"wp-block-heading has-text-align-center has-medium-font-size","style":{"spacing":{"margin":{"top":"1rem","bottom":"0.5rem"}}}} -->
+                        <h2 class="wp-block-heading has-text-align-center has-medium-font-size" style="margin-top:1rem;margin-bottom:0.5rem"><strong><?php echo htmlspecialchars($candidate['Candidate Name']); ?></strong></h2>
+                        <!-- /wp:heading -->
 
-                        <?php endif; ?>
+                    <?php endif; ?>
 
-                    </div>
-                    <!-- /wp:column -->
-                <?php endfor; ?>
+                </div>
+                <!-- /wp:column -->
+            <?php endfor; ?>
 
-            </div>
-            <!-- /wp:columns -->
-        <?php endforeach; ?>
+        </div>
+        <!-- /wp:columns -->
+    <?php endforeach; ?>
     
-    <?php else: ?>
-
-        <!-- wp:paragraph -->
-        <p>No candidates in this ward have completed the survey. Send your local candidates the <?php echo $surveyLink; ?> and ask them to take part so that local residents can vote for the candidates who want to build the streets people love.</p>
-        <!-- /wp:paragraph -->
-
-    <?php endif; ?>
-
 <?php endforeach; ?>
 
 <?php if (isset($config['footer'])): ?>

From 5e8170ecef96a77fd12362426d2c8e7c48b7442b Mon Sep 17 00:00:00 2001
From: Kim Taylor <kmtaylor@gmx.com>
Date: Sat, 21 Sep 2024 17:44:38 +1000
Subject: [PATCH 7/8] Highlight pledge text.

---
 pledge-update/template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pledge-update/template.php b/pledge-update/template.php
index 5c2637d..50eb782 100644
--- a/pledge-update/template.php
+++ b/pledge-update/template.php
@@ -8,8 +8,8 @@ function sluggify($input) {
 <p>The Streets People Love campaign offers council candidates the opportunity to take the following pledge:</p>
 <!-- /wp:paragraph -->
 
-<!-- wp:paragraph -->
-<p>If elected Councillor, I pledge to allocate budget and street space to build streets people love, and ensure that residents of all ages and abilities can safely move around our council area, irrespective of whether they choose to walk, cycle, wheel, use public transport or drive.</p>
+<!-- wp:paragraph {"backgroundColor":"nv-c-1"} -->
+<p class="has-nv-c-1-background-color has-background">If elected Councillor, I pledge to allocate budget and street space to build streets people love, and ensure that residents of all ages and abilities can safely move around our council area, irrespective of whether they choose to walk, cycle, wheel, use public transport or drive.</p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph -->

From efecbe1d765fe63aeca381138459d4471044fd4b Mon Sep 17 00:00:00 2001
From: Kim Taylor <kmtaylor@gmx.com>
Date: Sun, 22 Sep 2024 17:08:35 +1000
Subject: [PATCH 8/8] Change pledge text background colour.

---
 pledge-update/template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pledge-update/template.php b/pledge-update/template.php
index 50eb782..0e32c93 100644
--- a/pledge-update/template.php
+++ b/pledge-update/template.php
@@ -8,8 +8,8 @@ function sluggify($input) {
 <p>The Streets People Love campaign offers council candidates the opportunity to take the following pledge:</p>
 <!-- /wp:paragraph -->
 
-<!-- wp:paragraph {"backgroundColor":"nv-c-1"} -->
-<p class="has-nv-c-1-background-color has-background">If elected Councillor, I pledge to allocate budget and street space to build streets people love, and ensure that residents of all ages and abilities can safely move around our council area, irrespective of whether they choose to walk, cycle, wheel, use public transport or drive.</p>
+<!-- wp:paragraph {"style":{"color":{"background":"#10B5B0"}}} -->
+<p class="has-background" style="background-color:#10B5B0">If elected Councillor, I pledge to allocate budget and street space to build streets people love, and ensure that residents of all ages and abilities can safely move around our council area, irrespective of whether they choose to walk, cycle, wheel, use public transport or drive.</p>
 <!-- /wp:paragraph -->
 
 <!-- wp:paragraph -->