From da36f845b12eaa6624c202de9b2b536ea80a58d7 Mon Sep 17 00:00:00 2001
From: Lionqueen94 <lionqueen94@gmail.com>
Date: Fri, 7 Feb 2025 18:16:19 +0100
Subject: [PATCH 01/13] Add missing footer to Election Report Page

---
 frontend/app/module/election/page/ElectionReportPage.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/app/module/election/page/ElectionReportPage.tsx b/frontend/app/module/election/page/ElectionReportPage.tsx
index 48f818cfc..54853e07b 100644
--- a/frontend/app/module/election/page/ElectionReportPage.tsx
+++ b/frontend/app/module/election/page/ElectionReportPage.tsx
@@ -1,3 +1,5 @@
+import { Footer } from "app/component/footer/Footer";
+
 import { useElection, useElectionStatus } from "@kiesraad/api";
 import { t, tx } from "@kiesraad/i18n";
 import { Button, FormLayout, PageTitle } from "@kiesraad/ui";
@@ -82,6 +84,7 @@ export function ElectionReportPage() {
           </FormLayout.Controls>
         </article>
       </main>
+      <Footer />
     </>
   );
 }

From 79a57cb101e18db32f73c38cbd7df913dff12883 Mon Sep 17 00:00:00 2001
From: Lionqueen94 <lionqueen94@gmail.com>
Date: Fri, 7 Feb 2025 18:22:09 +0100
Subject: [PATCH 02/13] Make sure table linkrow has separate column for the
 chevron with a set width

---
 .../PollingStationsList.tsx                   |  2 ++
 .../app/module/election/page/OverviewPage.tsx |  2 ++
 .../page/PollingStationListPage.test.tsx      | 10 +++----
 .../page/PollingStationListPage.tsx           |  2 ++
 .../app/module/users/UserListPage.test.tsx    | 12 ++++----
 frontend/lib/icon/generated.tsx               |  1 +
 frontend/lib/icon/svg/chevronRight.svg        |  2 +-
 frontend/lib/ui/Table/Table.module.css        |  2 ++
 frontend/lib/ui/Table/Table.stories.tsx       |  6 +++-
 frontend/lib/ui/Table/Table.tsx               | 29 ++++++++++++++-----
 10 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/frontend/app/component/form/data_entry/polling_station_choice/PollingStationsList.tsx b/frontend/app/component/form/data_entry/polling_station_choice/PollingStationsList.tsx
index 15776957e..7ccbd8d93 100644
--- a/frontend/app/component/form/data_entry/polling_station_choice/PollingStationsList.tsx
+++ b/frontend/app/component/form/data_entry/polling_station_choice/PollingStationsList.tsx
@@ -15,6 +15,7 @@ export function PollingStationsList({ pollingStations }: PollingStationsListProp
       <Table.Header>
         <Table.Column>{t("number")}</Table.Column>
         <Table.Column>{t("polling_station.title.singular")}</Table.Column>
+        <Table.Column />
       </Table.Header>
       <Table.Body>
         {pollingStations.map((pollingStation: PollingStation) => {
@@ -35,6 +36,7 @@ export function PollingStationsList({ pollingStations }: PollingStationsListProp
                 <span>{pollingStation.name}</span>
                 {status && <Badge type={status} showIcon />}
               </Table.Cell>
+              <Table.Cell />
             </Table.LinkRow>
           );
         })}
diff --git a/frontend/app/module/election/page/OverviewPage.tsx b/frontend/app/module/election/page/OverviewPage.tsx
index 1ce1b422c..a2882ef93 100644
--- a/frontend/app/module/election/page/OverviewPage.tsx
+++ b/frontend/app/module/election/page/OverviewPage.tsx
@@ -57,6 +57,7 @@ export function OverviewPage() {
                 {!isAdminOrCoordinator ? t("election.location") : t("election.level_polling_station")}
               </Table.Column>
               <Table.Column>{t("election_status.label")}</Table.Column>
+              <Table.Column />
             </Table.Header>
             <Table.Body className="fs-md">
               {electionList.map((election) => (
@@ -69,6 +70,7 @@ export function OverviewPage() {
                       userRole={isAdminOrCoordinator ? "coordinator" : "typist"}
                     />
                   </Table.Cell>
+                  <Table.Cell />
                 </Table.LinkRow>
               ))}
             </Table.Body>
diff --git a/frontend/app/module/polling_stations/page/PollingStationListPage.test.tsx b/frontend/app/module/polling_stations/page/PollingStationListPage.test.tsx
index 09f6b439a..3b7eb5e31 100644
--- a/frontend/app/module/polling_stations/page/PollingStationListPage.test.tsx
+++ b/frontend/app/module/polling_stations/page/PollingStationListPage.test.tsx
@@ -22,11 +22,11 @@ describe("PollingStationListPage", () => {
     const table = await screen.findByRole("table");
     expect(table).toBeVisible();
     expect(table).toHaveTableContent([
-      ["Nummer", "Naam", "Soort"],
-      ["33", "Op Rolletjes", "Mobiel"],
-      ["34", "Testplek", "Bijzonder"],
-      ["35", "Testschool", "Vaste locatie"],
-      ["36", "Testbuurthuis", "Vaste locatie"],
+      ["Nummer", "Naam", "Soort", ""],
+      ["33", "Op Rolletjes", "Mobiel", ""],
+      ["34", "Testplek", "Bijzonder", ""],
+      ["35", "Testschool", "Vaste locatie", ""],
+      ["36", "Testbuurthuis", "Vaste locatie", ""],
     ]);
   });
 
diff --git a/frontend/app/module/polling_stations/page/PollingStationListPage.tsx b/frontend/app/module/polling_stations/page/PollingStationListPage.tsx
index 6bd8b72f5..a2d309941 100644
--- a/frontend/app/module/polling_stations/page/PollingStationListPage.tsx
+++ b/frontend/app/module/polling_stations/page/PollingStationListPage.tsx
@@ -105,6 +105,7 @@ export function PollingStationListPage() {
                 <Table.Column>{t("number")}</Table.Column>
                 <Table.Column>{t("name")}</Table.Column>
                 <Table.Column>{t("type")}</Table.Column>
+                <Table.Column />
               </Table.Header>
               <Table.Body className="fs-md">
                 {data.polling_stations.map((station) => (
@@ -114,6 +115,7 @@ export function PollingStationListPage() {
                     <Table.Cell>
                       {station.polling_station_type && labelForPollingStationType[station.polling_station_type]}
                     </Table.Cell>
+                    <Table.Cell />
                   </Table.LinkRow>
                 ))}
               </Table.Body>
diff --git a/frontend/app/module/users/UserListPage.test.tsx b/frontend/app/module/users/UserListPage.test.tsx
index 13f7a7c06..d16be50c5 100644
--- a/frontend/app/module/users/UserListPage.test.tsx
+++ b/frontend/app/module/users/UserListPage.test.tsx
@@ -17,12 +17,12 @@ describe("PollingStationListPage", () => {
     const table = await screen.findByRole("table");
     expect(table).toBeVisible();
     expect(table).toHaveTableContent([
-      ["Gebruikersnaam", "Rol", "Volledige naam", "Laatste activiteit"],
-      ["Sanne", "Beheerder", "Sanne Molenaar", "vandaag 10:20"],
-      ["Jayden", "Coördinator", "Jayden Ahmen", "vandaag 13:37"],
-      ["Gebruiker01", "Invoerder", "Nog niet gebruikt", "–"],
-      ["Gebruiker02", "Invoerder", "Nog niet gebruikt", "–"],
-      ["Gebruiker03", "Invoerder", "Nog niet gebruikt", "–"],
+      ["Gebruikersnaam", "Rol", "Volledige naam", "Laatste activiteit", ""],
+      ["Sanne", "Beheerder", "Sanne Molenaar", "vandaag 10:20", ""],
+      ["Jayden", "Coördinator", "Jayden Ahmen", "vandaag 13:37", ""],
+      ["Gebruiker01", "Invoerder", "Nog niet gebruikt", "–", ""],
+      ["Gebruiker02", "Invoerder", "Nog niet gebruikt", "–", ""],
+      ["Gebruiker03", "Invoerder", "Nog niet gebruikt", "–", ""],
     ]);
   });
 });
diff --git a/frontend/lib/icon/generated.tsx b/frontend/lib/icon/generated.tsx
index afd2258a3..4c6a25d34 100644
--- a/frontend/lib/icon/generated.tsx
+++ b/frontend/lib/icon/generated.tsx
@@ -143,6 +143,7 @@ export const IconChevronRight = (props: React.SVGAttributes<SVGElement>) => (
     version="1.1"
     viewBox="0 0 20 20"
     role="img"
+    fill="#475467"
   >
     <path d="M7.5,15.8c-.2,0-.4,0-.6-.2-.3-.3-.3-.9,0-1.2l4.4-4.4-4.4-4.4c-.3-.3-.3-.9,0-1.2.3-.3.9-.3,1.2,0l5,5c.3.3.3.9,0,1.2l-5,5c-.2.2-.4.2-.6.2Z" />
   </svg>
diff --git a/frontend/lib/icon/svg/chevronRight.svg b/frontend/lib/icon/svg/chevronRight.svg
index 5d35e382f..5d7a7c2ae 100644
--- a/frontend/lib/icon/svg/chevronRight.svg
+++ b/frontend/lib/icon/svg/chevronRight.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 20 20" role="img">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 20 20" role="img" fill="#475467">
   <path d="M7.5,15.8c-.2,0-.4,0-.6-.2-.3-.3-.3-.9,0-1.2l4.4-4.4-4.4-4.4c-.3-.3-.3-.9,0-1.2.3-.3.9-.3,1.2,0l5,5c.3.3.3.9,0,1.2l-5,5c-.2.2-.4.2-.6.2Z"/>
 </svg>
\ No newline at end of file
diff --git a/frontend/lib/ui/Table/Table.module.css b/frontend/lib/ui/Table/Table.module.css
index 1d4b0634a..5c915907d 100644
--- a/frontend/lib/ui/Table/Table.module.css
+++ b/frontend/lib/ui/Table/Table.module.css
@@ -52,7 +52,9 @@
       background: var(--color-hover);
     }
 
+    /* Chevron icon cell */
     td:last-of-type {
+      width: 5rem;
       padding-right: 2.75rem;
       background-image: url("../../icon/svg/chevronRight.svg");
       background-size: 1.25rem;
diff --git a/frontend/lib/ui/Table/Table.stories.tsx b/frontend/lib/ui/Table/Table.stories.tsx
index 0481eb0ee..6ee640747 100644
--- a/frontend/lib/ui/Table/Table.stories.tsx
+++ b/frontend/lib/ui/Table/Table.stories.tsx
@@ -65,7 +65,8 @@ export const LinkTable: Story = () => {
       <Table.Header>
         <Table.Column>Number</Table.Column>
         <Table.Column>Click me</Table.Column>
-        <Table.Column>Look a chevron</Table.Column>
+        <Table.Column>Look a chevron right of here</Table.Column>
+        <Table.Column />
       </Table.Header>
       <Table.Body className="fs-md">
         {data.map((row) => (
@@ -73,6 +74,7 @@ export const LinkTable: Story = () => {
             <Table.NumberCell>{row[0]}</Table.NumberCell>
             <Table.Cell>{row[1]}</Table.Cell>
             <Table.Cell>{row[2]}</Table.Cell>
+            <Table.Cell />
           </Table.LinkRow>
         ))}
       </Table.Body>
@@ -86,6 +88,7 @@ export const IconBadgeTable: Story = () => (
       <Table.Column>Number</Table.Column>
       <Table.Column>With icon</Table.Column>
       <Table.Column>With badge</Table.Column>
+      <Table.Column />
     </Table.Header>
     <Table.Body>
       {data.map((row) => (
@@ -99,6 +102,7 @@ export const IconBadgeTable: Story = () => (
             <span>{row[2]}</span>
             <Badge type="first_entry_in_progress" showIcon />
           </Table.Cell>
+          <Table.Cell />
         </Table.LinkRow>
       ))}
     </Table.Body>
diff --git a/frontend/lib/ui/Table/Table.tsx b/frontend/lib/ui/Table/Table.tsx
index 1cb4f1833..caa018261 100644
--- a/frontend/lib/ui/Table/Table.tsx
+++ b/frontend/lib/ui/Table/Table.tsx
@@ -8,11 +8,12 @@ import cls from "./Table.module.css";
 export interface TableProps {
   id?: string;
   children?: React.ReactNode;
+  className?: string;
 }
 
-export function Table({ id, children }: TableProps) {
+export function Table({ id, children, className }: TableProps) {
   return (
-    <table id={id} className={cls.table}>
+    <table id={id} className={cn(cls.table, className)}>
       {children}
     </table>
   );
@@ -34,19 +35,31 @@ function Header({ children, className }: { children: React.ReactNode[]; classNam
   );
 }
 
-function Column({ children, className }: { children: React.ReactNode; className?: string }) {
-  return <th className={className}>{children}</th>;
+function Column({
+  children,
+  scope,
+  className,
+}: {
+  children?: React.ReactNode;
+  scope?: "col" | "row";
+  className?: string;
+}) {
+  return (
+    <th scope={scope || "col"} className={className}>
+      {children}
+    </th>
+  );
 }
 
 function Body({ children, className }: { children: React.ReactNode[]; className?: string }) {
   return <tbody className={className}>{children}</tbody>;
 }
 
-function Row({ children }: { children: React.ReactNode[] }) {
-  return <tr>{children}</tr>;
+function Row({ children, className }: { children: React.ReactNode[]; className?: string }) {
+  return <tr className={className}>{children}</tr>;
 }
 
-function LinkRow({ children, to }: { children: React.ReactNode[]; to: To }) {
+function LinkRow({ children, to, className }: { children: React.ReactNode[]; to: To; className?: string }) {
   const navigate = useNavigate();
 
   function handleClick() {
@@ -54,7 +67,7 @@ function LinkRow({ children, to }: { children: React.ReactNode[]; to: To }) {
   }
 
   return (
-    <tr className={cls.rowLink} onClick={handleClick}>
+    <tr className={cn(cls.rowLink, className)} onClick={handleClick}>
       {children}
     </tr>
   );

From a6990f05884ba09f9c5e952b213176beeae23954 Mon Sep 17 00:00:00 2001
From: Lionqueen94 <lionqueen94@gmail.com>
Date: Fri, 7 Feb 2025 18:24:19 +0100
Subject: [PATCH 03/13] Show a message that no elections exist on overview page
 instead of a harsh error and added tests

---
 .../election/page/OverviewPage.test.tsx       | 44 ++++++++++++++
 .../app/module/election/page/OverviewPage.tsx | 58 ++++++++++---------
 .../lib/api/election/ElectionListProvider.tsx |  2 -
 frontend/lib/i18n/locales/nl/election.json    |  1 +
 4 files changed, 76 insertions(+), 29 deletions(-)
 create mode 100644 frontend/app/module/election/page/OverviewPage.test.tsx

diff --git a/frontend/app/module/election/page/OverviewPage.test.tsx b/frontend/app/module/election/page/OverviewPage.test.tsx
new file mode 100644
index 000000000..7ea8c5e8a
--- /dev/null
+++ b/frontend/app/module/election/page/OverviewPage.test.tsx
@@ -0,0 +1,44 @@
+import { screen } from "@testing-library/react";
+import { beforeEach, describe, expect, test } from "vitest";
+
+import { ElectionListProvider, ElectionListResponse } from "@kiesraad/api";
+import { ElectionListRequestHandler } from "@kiesraad/api-mocks";
+import { overrideOnce, render, server } from "@kiesraad/test";
+
+import { OverviewPage } from "./OverviewPage";
+
+describe("OverviewPage", () => {
+  beforeEach(() => {
+    server.use(ElectionListRequestHandler);
+  });
+
+  test("Show elections", async () => {
+    render(
+      <ElectionListProvider>
+        <OverviewPage />
+      </ElectionListProvider>,
+    );
+
+    const table = await screen.findByRole("table");
+    expect(table).toBeVisible();
+    expect(table).toHaveTableContent([
+      ["Verkiezing", "Gebied", "Status", ""],
+      ["Gemeenteraadsverkiezingen 2026", "Heemdamseburg", "Steminvoer bezig", ""],
+    ]);
+  });
+
+  test("Show no elections message", async () => {
+    overrideOnce("get", "/api/elections", 200, {
+      elections: [],
+    } satisfies ElectionListResponse);
+
+    render(
+      <ElectionListProvider>
+        <OverviewPage />
+      </ElectionListProvider>,
+    );
+
+    expect(await screen.findByText(/Er zijn nog geen verkiezingen/)).toBeVisible();
+    expect(screen.queryByRole("table")).toBeNull();
+  });
+});
diff --git a/frontend/app/module/election/page/OverviewPage.tsx b/frontend/app/module/election/page/OverviewPage.tsx
index a2882ef93..1d811af19 100644
--- a/frontend/app/module/election/page/OverviewPage.tsx
+++ b/frontend/app/module/election/page/OverviewPage.tsx
@@ -49,33 +49,37 @@ export function OverviewPage() {
         </Alert>
       )}
       <main>
-        <article>
-          <Table id="overview">
-            <Table.Header>
-              <Table.Column>{t("election.title.singular")}</Table.Column>
-              <Table.Column>
-                {!isAdminOrCoordinator ? t("election.location") : t("election.level_polling_station")}
-              </Table.Column>
-              <Table.Column>{t("election_status.label")}</Table.Column>
-              <Table.Column />
-            </Table.Header>
-            <Table.Body className="fs-md">
-              {electionList.map((election) => (
-                <Table.LinkRow key={election.id} to={electionLink(election)}>
-                  <Table.Cell className="fs-body">{election.name}</Table.Cell>
-                  <Table.Cell>{!isAdminOrCoordinator ? election.location : ""}</Table.Cell>
-                  <Table.Cell>
-                    <ElectionStatusWithIcon
-                      status={election.status}
-                      userRole={isAdminOrCoordinator ? "coordinator" : "typist"}
-                    />
-                  </Table.Cell>
-                  <Table.Cell />
-                </Table.LinkRow>
-              ))}
-            </Table.Body>
-          </Table>
-        </article>
+        {!electionList.length ? (
+          <p className="mb-lg">{t("election.no_elections")}</p>
+        ) : (
+          <article>
+            <Table id="overview">
+              <Table.Header>
+                <Table.Column>{t("election.title.singular")}</Table.Column>
+                <Table.Column>
+                  {!isAdminOrCoordinator ? t("election.location") : t("election.level_polling_station")}
+                </Table.Column>
+                <Table.Column>{t("election_status.label")}</Table.Column>
+                <Table.Column />
+              </Table.Header>
+              <Table.Body className="fs-md">
+                {electionList.map((election) => (
+                  <Table.LinkRow key={election.id} to={electionLink(election)}>
+                    <Table.Cell className="fs-body">{election.name}</Table.Cell>
+                    <Table.Cell>{!isAdminOrCoordinator ? election.location : ""}</Table.Cell>
+                    <Table.Cell>
+                      <ElectionStatusWithIcon
+                        status={election.status}
+                        userRole={isAdminOrCoordinator ? "coordinator" : "typist"}
+                      />
+                    </Table.Cell>
+                    <Table.Cell />
+                  </Table.LinkRow>
+                ))}
+              </Table.Body>
+            </Table>
+          </article>
+        )}
       </main>
       <Footer />
     </>
diff --git a/frontend/lib/api/election/ElectionListProvider.tsx b/frontend/lib/api/election/ElectionListProvider.tsx
index 4fcf3b7fe..cd4b9045b 100644
--- a/frontend/lib/api/election/ElectionListProvider.tsx
+++ b/frontend/lib/api/election/ElectionListProvider.tsx
@@ -15,8 +15,6 @@ export function ElectionListProvider({ children }: ElectionListProviderProps) {
   return (
     <RequestStateHandler
       requestState={requestState}
-      notFoundMessage="error.elections_not_found"
-      isFoundCheck={(data) => data.elections.length > 0}
       renderOnSuccess={(data) => (
         <ElectionListProviderContext.Provider value={{ electionList: data.elections }}>
           {children}
diff --git a/frontend/lib/i18n/locales/nl/election.json b/frontend/lib/i18n/locales/nl/election.json
index 1c3c5d9cc..defee05fa 100644
--- a/frontend/lib/i18n/locales/nl/election.json
+++ b/frontend/lib/i18n/locales/nl/election.json
@@ -9,6 +9,7 @@
   },
   "level_polling_station": "Niveau stembureau",
   "location": "Gebied",
+  "no_elections": "Er zijn nog geen verkiezingen.",
   "status": "Status",
   "start_when_count_list_received": "Zodra je een tellijst van een stembureau hebt gekregen kan je beginnen met invoeren."
 }

From 41ece77269c886028766ffcb7be6d5cef516e6a3 Mon Sep 17 00:00:00 2001
From: Lionqueen94 <lionqueen94@gmail.com>
Date: Fri, 7 Feb 2025 18:36:35 +0100
Subject: [PATCH 04/13] Forgot UserListPage LinkRow change

---
 frontend/app/module/users/UserListPage.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/app/module/users/UserListPage.tsx b/frontend/app/module/users/UserListPage.tsx
index 99cf9423e..133cb168e 100644
--- a/frontend/app/module/users/UserListPage.tsx
+++ b/frontend/app/module/users/UserListPage.tsx
@@ -33,6 +33,7 @@ export function UserListPage() {
               <Table.Column>{t("role")}</Table.Column>
               <Table.Column>{t("user.fullname")}</Table.Column>
               <Table.Column>{t("user.last_activity")}</Table.Column>
+              <Table.Column />
             </Table.Header>
             <Table.Body className="fs-md">
               {users.map((user) => (
@@ -43,6 +44,7 @@ export function UserListPage() {
                   <Table.Cell>
                     {user.last_activity_at ? formatDateTime(new Date(user.last_activity_at)) : "–"}
                   </Table.Cell>
+                  <Table.Cell />
                 </Table.LinkRow>
               ))}
             </Table.Body>

From f58f1629f14e2c15721058a12cad24664bb4f9cf Mon Sep 17 00:00:00 2001
From: Lionqueen94 <lionqueen94@gmail.com>
Date: Fri, 7 Feb 2025 23:23:01 +0100
Subject: [PATCH 05/13] Corrected error logo color in Alert, ProgressList and
 StatusList and small alert text color

---
 frontend/lib/ui/Alert/Alert.module.css               | 6 +++---
 frontend/lib/ui/ProgressList/ProgressList.module.css | 2 +-
 frontend/lib/ui/StatusList/StatusList.module.css     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/lib/ui/Alert/Alert.module.css b/frontend/lib/ui/Alert/Alert.module.css
index de6b7bd9f..039bfd493 100644
--- a/frontend/lib/ui/Alert/Alert.module.css
+++ b/frontend/lib/ui/Alert/Alert.module.css
@@ -45,7 +45,7 @@
   }
 
   &.error {
-    border-color: var(--color-error-darkest);
+    border-color: var(--color-error-darker);
     background-color: var(--color-error-bg);
     > button:focus,
     > button:focus-visible {
@@ -56,7 +56,7 @@
       background: var(--color-error-hover);
     }
     svg {
-      fill: var(--color-error-darkest);
+      fill: var(--color-error-darker);
     }
   }
   &.warning {
@@ -115,7 +115,7 @@
       padding: 0;
     }
     p {
-      color: var(--color-error-darkest);
+      color: var(--base-black);
       font-size: var(--font-size-md);
     }
   }
diff --git a/frontend/lib/ui/ProgressList/ProgressList.module.css b/frontend/lib/ui/ProgressList/ProgressList.module.css
index b2fa10692..7da07e44c 100644
--- a/frontend/lib/ui/ProgressList/ProgressList.module.css
+++ b/frontend/lib/ui/ProgressList/ProgressList.module.css
@@ -136,7 +136,7 @@
     &:global(.error) {
       aside {
         svg {
-          fill: var(--color-error-darkest);
+          fill: var(--color-error-darker);
         }
       }
     }
diff --git a/frontend/lib/ui/StatusList/StatusList.module.css b/frontend/lib/ui/StatusList/StatusList.module.css
index 3853c6f47..cb9ca51ee 100644
--- a/frontend/lib/ui/StatusList/StatusList.module.css
+++ b/frontend/lib/ui/StatusList/StatusList.module.css
@@ -51,7 +51,7 @@
 
     &:global(.error) {
       svg {
-        fill: var(--color-error-darkest);
+        fill: var(--color-error-darker);
       }
     }
   }

From 2d268416246646c5d009c47477fecbd2039805bd Mon Sep 17 00:00:00 2001
From: Lionqueen94 <lionqueen94@gmail.com>
Date: Sat, 8 Feb 2025 02:10:56 +0100
Subject: [PATCH 06/13] Make sure there is no empty table when there are no
 polling stations to input on polling station choice page

---
 .../polling_station_choice/PollingStationChoiceForm.tsx  | 9 +++++++--
 .../polling_station_choice/PollingStationsList.tsx       | 3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm.tsx b/frontend/app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm.tsx
index acb43ae41..9508c43b8 100644
--- a/frontend/app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm.tsx
+++ b/frontend/app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm.tsx
@@ -77,6 +77,11 @@ export function PollingStationChoiceForm({ anotherEntry }: PollingStationChoiceF
       status: status.status,
     }));
 
+  const pollingStationsForDataEntry = pollingStations.filter((pollingStation: PollingStation) => {
+    const status = electionStatus.statuses.find((status) => status.polling_station_id === pollingStation.id)?.status;
+    return status !== "definitive" && status !== "entries_different";
+  });
+
   return (
     <form
       onSubmit={(e) => {
@@ -145,12 +150,12 @@ export function PollingStationChoiceForm({ anotherEntry }: PollingStationChoiceF
             </span>
           </summary>
           <h2 className={cls.formTitle}>{t("polling_station_choice.choose_polling_station")}</h2>
-          {pollingStations.length === 0 ? (
+          {!pollingStationsForDataEntry.length ? (
             <Alert type="error" variant="small">
               <p>{t("polling_station_choice.no_polling_stations_found")}</p>
             </Alert>
           ) : (
-            <PollingStationsList pollingStations={pollingStations} />
+            <PollingStationsList pollingStations={pollingStationsForDataEntry} />
           )}
         </details>
       </div>
diff --git a/frontend/app/component/form/data_entry/polling_station_choice/PollingStationsList.tsx b/frontend/app/component/form/data_entry/polling_station_choice/PollingStationsList.tsx
index 7ccbd8d93..5e3979dfa 100644
--- a/frontend/app/component/form/data_entry/polling_station_choice/PollingStationsList.tsx
+++ b/frontend/app/component/form/data_entry/polling_station_choice/PollingStationsList.tsx
@@ -22,9 +22,6 @@ export function PollingStationsList({ pollingStations }: PollingStationsListProp
           const status = electionStatus.statuses.find(
             (status) => status.polling_station_id === pollingStation.id,
           )?.status;
-          if (status === "definitive" || status === "entries_different") {
-            return null;
-          }
 
           return (
             <Table.LinkRow

From ffba221b643ed3e83d97e3dd2a91f342f2209265 Mon Sep 17 00:00:00 2001
From: Lionqueen94 <lionqueen94@gmail.com>
Date: Sun, 9 Feb 2025 00:32:39 +0100
Subject: [PATCH 07/13] Adjusted no elections text, to be expanded in other
 epic

---
 frontend/app/module/election/page/OverviewPage.tsx | 2 +-
 frontend/lib/i18n/locales/nl/election.json         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/app/module/election/page/OverviewPage.tsx b/frontend/app/module/election/page/OverviewPage.tsx
index 1d811af19..dfe8a009e 100644
--- a/frontend/app/module/election/page/OverviewPage.tsx
+++ b/frontend/app/module/election/page/OverviewPage.tsx
@@ -50,7 +50,7 @@ export function OverviewPage() {
       )}
       <main>
         {!electionList.length ? (
-          <p className="mb-lg">{t("election.no_elections")}</p>
+          <h2>{t("election.no_elections_added")}</h2>
         ) : (
           <article>
             <Table id="overview">
diff --git a/frontend/lib/i18n/locales/nl/election.json b/frontend/lib/i18n/locales/nl/election.json
index defee05fa..ca7cd9323 100644
--- a/frontend/lib/i18n/locales/nl/election.json
+++ b/frontend/lib/i18n/locales/nl/election.json
@@ -9,7 +9,7 @@
   },
   "level_polling_station": "Niveau stembureau",
   "location": "Gebied",
-  "no_elections": "Er zijn nog geen verkiezingen.",
+  "no_elections_added": "Nog geen verkiezingen ingesteld",
   "status": "Status",
   "start_when_count_list_received": "Zodra je een tellijst van een stembureau hebt gekregen kan je beginnen met invoeren."
 }

From ce7cbca2d06186cfa8d92668410a486ff39d7673 Mon Sep 17 00:00:00 2001
From: Lionqueen94 <lionqueen94@gmail.com>
Date: Sun, 9 Feb 2025 11:53:14 +0100
Subject: [PATCH 08/13] Fix test

---
 frontend/app/module/election/page/OverviewPage.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/app/module/election/page/OverviewPage.test.tsx b/frontend/app/module/election/page/OverviewPage.test.tsx
index 7ea8c5e8a..8282fc309 100644
--- a/frontend/app/module/election/page/OverviewPage.test.tsx
+++ b/frontend/app/module/election/page/OverviewPage.test.tsx
@@ -38,7 +38,7 @@ describe("OverviewPage", () => {
       </ElectionListProvider>,
     );
 
-    expect(await screen.findByText(/Er zijn nog geen verkiezingen/)).toBeVisible();
+    expect(await screen.findByText(/Nog geen verkiezingen ingesteld/)).toBeVisible();
     expect(screen.queryByRole("table")).toBeNull();
   });
 });

From 9f9e9eadb7a215ee3cbb60c75fc7ff933c0cebf7 Mon Sep 17 00:00:00 2001
From: Lionqueen94 <lionqueen94@gmail.com>
Date: Mon, 10 Feb 2025 14:07:50 +0100
Subject: [PATCH 09/13] Rename Table.Column to Table.HeaderCell and undid empty
 cell for chevron in LinkRow, increased padding instead to adhere to design

---
 .../election/status/ElectionStatus.tsx        | 10 +++----
 .../PollingStationsList.tsx                   |  6 ++---
 .../election/page/OverviewPage.test.tsx       |  4 +--
 .../app/module/election/page/OverviewPage.tsx | 10 +++----
 .../page/PollingStationListPage.test.tsx      | 10 +++----
 .../page/PollingStationListPage.tsx           |  8 +++---
 .../app/module/users/UserListPage.test.tsx    | 12 ++++-----
 frontend/app/module/users/UserListPage.tsx    | 10 +++----
 frontend/lib/ui/Table/Table.module.css        |  3 +--
 frontend/lib/ui/Table/Table.stories.tsx       | 26 ++++++++-----------
 frontend/lib/ui/Table/Table.tsx               |  4 +--
 11 files changed, 45 insertions(+), 58 deletions(-)

diff --git a/frontend/app/component/election/status/ElectionStatus.tsx b/frontend/app/component/election/status/ElectionStatus.tsx
index 001c8c0af..59be5c43c 100644
--- a/frontend/app/component/election/status/ElectionStatus.tsx
+++ b/frontend/app/component/election/status/ElectionStatus.tsx
@@ -159,18 +159,18 @@ function getTableHeaderForCategory(category: StatusCategory): React.ReactNode {
   function CategoryHeader({ children }: { children?: React.ReactNode[] }) {
     return (
       <Table.Header key={category} className="bg-gray">
-        <Table.Column key={`${category}-number`}>{t("number")}</Table.Column>
-        <Table.Column key={`${category}-name`}>{t("polling_station.title.singular")}</Table.Column>
+        <Table.HeaderCell key={`${category}-number`}>{t("number")}</Table.HeaderCell>
+        <Table.HeaderCell key={`${category}-name`}>{t("polling_station.title.singular")}</Table.HeaderCell>
         {children}
       </Table.Header>
     );
   }
 
-  const finishedAtColumn = <Table.Column key={`${category}-time`}>{t("finished_at")}</Table.Column>;
+  const finishedAtColumn = <Table.HeaderCell key={`${category}-time`}>{t("finished_at")}</Table.HeaderCell>;
   const progressColumn = (
-    <Table.Column key={`${category}-progress`} className="w-13">
+    <Table.HeaderCell key={`${category}-progress`} className="w-13">
       {t("progress")}
-    </Table.Column>
+    </Table.HeaderCell>
   );
 
   switch (category) {
diff --git a/frontend/app/component/form/data_entry/polling_station_choice/PollingStationsList.tsx b/frontend/app/component/form/data_entry/polling_station_choice/PollingStationsList.tsx
index 5e3979dfa..98a83d1e4 100644
--- a/frontend/app/component/form/data_entry/polling_station_choice/PollingStationsList.tsx
+++ b/frontend/app/component/form/data_entry/polling_station_choice/PollingStationsList.tsx
@@ -13,9 +13,8 @@ export function PollingStationsList({ pollingStations }: PollingStationsListProp
   return (
     <Table id="polling_station_list">
       <Table.Header>
-        <Table.Column>{t("number")}</Table.Column>
-        <Table.Column>{t("polling_station.title.singular")}</Table.Column>
-        <Table.Column />
+        <Table.HeaderCell>{t("number")}</Table.HeaderCell>
+        <Table.HeaderCell>{t("polling_station.title.singular")}</Table.HeaderCell>
       </Table.Header>
       <Table.Body>
         {pollingStations.map((pollingStation: PollingStation) => {
@@ -33,7 +32,6 @@ export function PollingStationsList({ pollingStations }: PollingStationsListProp
                 <span>{pollingStation.name}</span>
                 {status && <Badge type={status} showIcon />}
               </Table.Cell>
-              <Table.Cell />
             </Table.LinkRow>
           );
         })}
diff --git a/frontend/app/module/election/page/OverviewPage.test.tsx b/frontend/app/module/election/page/OverviewPage.test.tsx
index 8282fc309..346f6ba99 100644
--- a/frontend/app/module/election/page/OverviewPage.test.tsx
+++ b/frontend/app/module/election/page/OverviewPage.test.tsx
@@ -22,8 +22,8 @@ describe("OverviewPage", () => {
     const table = await screen.findByRole("table");
     expect(table).toBeVisible();
     expect(table).toHaveTableContent([
-      ["Verkiezing", "Gebied", "Status", ""],
-      ["Gemeenteraadsverkiezingen 2026", "Heemdamseburg", "Steminvoer bezig", ""],
+      ["Verkiezing", "Gebied", "Status"],
+      ["Gemeenteraadsverkiezingen 2026", "Heemdamseburg", "Steminvoer bezig"],
     ]);
   });
 
diff --git a/frontend/app/module/election/page/OverviewPage.tsx b/frontend/app/module/election/page/OverviewPage.tsx
index dfe8a009e..aad8af877 100644
--- a/frontend/app/module/election/page/OverviewPage.tsx
+++ b/frontend/app/module/election/page/OverviewPage.tsx
@@ -55,12 +55,11 @@ export function OverviewPage() {
           <article>
             <Table id="overview">
               <Table.Header>
-                <Table.Column>{t("election.title.singular")}</Table.Column>
-                <Table.Column>
+                <Table.HeaderCell>{t("election.title.singular")}</Table.HeaderCell>
+                <Table.HeaderCell>
                   {!isAdminOrCoordinator ? t("election.location") : t("election.level_polling_station")}
-                </Table.Column>
-                <Table.Column>{t("election_status.label")}</Table.Column>
-                <Table.Column />
+                </Table.HeaderCell>
+                <Table.HeaderCell>{t("election_status.label")}</Table.HeaderCell>
               </Table.Header>
               <Table.Body className="fs-md">
                 {electionList.map((election) => (
@@ -73,7 +72,6 @@ export function OverviewPage() {
                         userRole={isAdminOrCoordinator ? "coordinator" : "typist"}
                       />
                     </Table.Cell>
-                    <Table.Cell />
                   </Table.LinkRow>
                 ))}
               </Table.Body>
diff --git a/frontend/app/module/polling_stations/page/PollingStationListPage.test.tsx b/frontend/app/module/polling_stations/page/PollingStationListPage.test.tsx
index 3b7eb5e31..09f6b439a 100644
--- a/frontend/app/module/polling_stations/page/PollingStationListPage.test.tsx
+++ b/frontend/app/module/polling_stations/page/PollingStationListPage.test.tsx
@@ -22,11 +22,11 @@ describe("PollingStationListPage", () => {
     const table = await screen.findByRole("table");
     expect(table).toBeVisible();
     expect(table).toHaveTableContent([
-      ["Nummer", "Naam", "Soort", ""],
-      ["33", "Op Rolletjes", "Mobiel", ""],
-      ["34", "Testplek", "Bijzonder", ""],
-      ["35", "Testschool", "Vaste locatie", ""],
-      ["36", "Testbuurthuis", "Vaste locatie", ""],
+      ["Nummer", "Naam", "Soort"],
+      ["33", "Op Rolletjes", "Mobiel"],
+      ["34", "Testplek", "Bijzonder"],
+      ["35", "Testschool", "Vaste locatie"],
+      ["36", "Testbuurthuis", "Vaste locatie"],
     ]);
   });
 
diff --git a/frontend/app/module/polling_stations/page/PollingStationListPage.tsx b/frontend/app/module/polling_stations/page/PollingStationListPage.tsx
index a2d309941..79e3541d8 100644
--- a/frontend/app/module/polling_stations/page/PollingStationListPage.tsx
+++ b/frontend/app/module/polling_stations/page/PollingStationListPage.tsx
@@ -102,10 +102,9 @@ export function PollingStationListPage() {
 
             <Table id="polling_stations">
               <Table.Header>
-                <Table.Column>{t("number")}</Table.Column>
-                <Table.Column>{t("name")}</Table.Column>
-                <Table.Column>{t("type")}</Table.Column>
-                <Table.Column />
+                <Table.HeaderCell>{t("number")}</Table.HeaderCell>
+                <Table.HeaderCell>{t("name")}</Table.HeaderCell>
+                <Table.HeaderCell>{t("type")}</Table.HeaderCell>
               </Table.Header>
               <Table.Body className="fs-md">
                 {data.polling_stations.map((station) => (
@@ -115,7 +114,6 @@ export function PollingStationListPage() {
                     <Table.Cell>
                       {station.polling_station_type && labelForPollingStationType[station.polling_station_type]}
                     </Table.Cell>
-                    <Table.Cell />
                   </Table.LinkRow>
                 ))}
               </Table.Body>
diff --git a/frontend/app/module/users/UserListPage.test.tsx b/frontend/app/module/users/UserListPage.test.tsx
index d16be50c5..13f7a7c06 100644
--- a/frontend/app/module/users/UserListPage.test.tsx
+++ b/frontend/app/module/users/UserListPage.test.tsx
@@ -17,12 +17,12 @@ describe("PollingStationListPage", () => {
     const table = await screen.findByRole("table");
     expect(table).toBeVisible();
     expect(table).toHaveTableContent([
-      ["Gebruikersnaam", "Rol", "Volledige naam", "Laatste activiteit", ""],
-      ["Sanne", "Beheerder", "Sanne Molenaar", "vandaag 10:20", ""],
-      ["Jayden", "Coördinator", "Jayden Ahmen", "vandaag 13:37", ""],
-      ["Gebruiker01", "Invoerder", "Nog niet gebruikt", "–", ""],
-      ["Gebruiker02", "Invoerder", "Nog niet gebruikt", "–", ""],
-      ["Gebruiker03", "Invoerder", "Nog niet gebruikt", "–", ""],
+      ["Gebruikersnaam", "Rol", "Volledige naam", "Laatste activiteit"],
+      ["Sanne", "Beheerder", "Sanne Molenaar", "vandaag 10:20"],
+      ["Jayden", "Coördinator", "Jayden Ahmen", "vandaag 13:37"],
+      ["Gebruiker01", "Invoerder", "Nog niet gebruikt", "–"],
+      ["Gebruiker02", "Invoerder", "Nog niet gebruikt", "–"],
+      ["Gebruiker03", "Invoerder", "Nog niet gebruikt", "–"],
     ]);
   });
 });
diff --git a/frontend/app/module/users/UserListPage.tsx b/frontend/app/module/users/UserListPage.tsx
index 133cb168e..5c194d47b 100644
--- a/frontend/app/module/users/UserListPage.tsx
+++ b/frontend/app/module/users/UserListPage.tsx
@@ -29,11 +29,10 @@ export function UserListPage() {
         <article>
           <Table id="users">
             <Table.Header>
-              <Table.Column>{t("user.username")}</Table.Column>
-              <Table.Column>{t("role")}</Table.Column>
-              <Table.Column>{t("user.fullname")}</Table.Column>
-              <Table.Column>{t("user.last_activity")}</Table.Column>
-              <Table.Column />
+              <Table.HeaderCell>{t("user.username")}</Table.HeaderCell>
+              <Table.HeaderCell>{t("role")}</Table.HeaderCell>
+              <Table.HeaderCell>{t("user.fullname")}</Table.HeaderCell>
+              <Table.HeaderCell>{t("user.last_activity")}</Table.HeaderCell>
             </Table.Header>
             <Table.Body className="fs-md">
               {users.map((user) => (
@@ -44,7 +43,6 @@ export function UserListPage() {
                   <Table.Cell>
                     {user.last_activity_at ? formatDateTime(new Date(user.last_activity_at)) : "–"}
                   </Table.Cell>
-                  <Table.Cell />
                 </Table.LinkRow>
               ))}
             </Table.Body>
diff --git a/frontend/lib/ui/Table/Table.module.css b/frontend/lib/ui/Table/Table.module.css
index 5c915907d..4bc95033f 100644
--- a/frontend/lib/ui/Table/Table.module.css
+++ b/frontend/lib/ui/Table/Table.module.css
@@ -54,8 +54,7 @@
 
     /* Chevron icon cell */
     td:last-of-type {
-      width: 5rem;
-      padding-right: 2.75rem;
+      padding-right: 4.5rem;
       background-image: url("../../icon/svg/chevronRight.svg");
       background-size: 1.25rem;
       background-position: center right 1.5rem;
diff --git a/frontend/lib/ui/Table/Table.stories.tsx b/frontend/lib/ui/Table/Table.stories.tsx
index 6ee640747..c0353d8bf 100644
--- a/frontend/lib/ui/Table/Table.stories.tsx
+++ b/frontend/lib/ui/Table/Table.stories.tsx
@@ -16,9 +16,9 @@ export const BasicTable: Story = () => (
     <div className="mb-lg">
       <Table id="basic_table">
         <Table.Header>
-          <Table.Column>Number</Table.Column>
-          <Table.Column className="w-13">Fixed width</Table.Column>
-          <Table.Column>Some value</Table.Column>
+          <Table.HeaderCell>Number</Table.HeaderCell>
+          <Table.HeaderCell className="w-13">Fixed width</Table.HeaderCell>
+          <Table.HeaderCell>Some value</Table.HeaderCell>
         </Table.Header>
         <Table.Body>
           {data.map((row) => (
@@ -35,8 +35,8 @@ export const BasicTable: Story = () => (
     <div className="mb-lg">
       <Table id="styled_table">
         <Table.Header className="bg-gray">
-          <Table.Column>Nummer</Table.Column>
-          <Table.Column>Stembureau</Table.Column>
+          <Table.HeaderCell>Nummer</Table.HeaderCell>
+          <Table.HeaderCell>Stembureau</Table.HeaderCell>
         </Table.Header>
         <Table.Body className="fs-sm">
           <Table.Row>
@@ -63,10 +63,9 @@ export const LinkTable: Story = () => {
   return (
     <Table id="link_table">
       <Table.Header>
-        <Table.Column>Number</Table.Column>
-        <Table.Column>Click me</Table.Column>
-        <Table.Column>Look a chevron right of here</Table.Column>
-        <Table.Column />
+        <Table.HeaderCell>Number</Table.HeaderCell>
+        <Table.HeaderCell>Click me</Table.HeaderCell>
+        <Table.HeaderCell>Look a chevron right of here</Table.HeaderCell>
       </Table.Header>
       <Table.Body className="fs-md">
         {data.map((row) => (
@@ -74,7 +73,6 @@ export const LinkTable: Story = () => {
             <Table.NumberCell>{row[0]}</Table.NumberCell>
             <Table.Cell>{row[1]}</Table.Cell>
             <Table.Cell>{row[2]}</Table.Cell>
-            <Table.Cell />
           </Table.LinkRow>
         ))}
       </Table.Body>
@@ -85,10 +83,9 @@ export const LinkTable: Story = () => {
 export const IconBadgeTable: Story = () => (
   <Table id="icon_badge_table">
     <Table.Header>
-      <Table.Column>Number</Table.Column>
-      <Table.Column>With icon</Table.Column>
-      <Table.Column>With badge</Table.Column>
-      <Table.Column />
+      <Table.HeaderCell>Number</Table.HeaderCell>
+      <Table.HeaderCell>With icon</Table.HeaderCell>
+      <Table.HeaderCell>With badge</Table.HeaderCell>
     </Table.Header>
     <Table.Body>
       {data.map((row) => (
@@ -102,7 +99,6 @@ export const IconBadgeTable: Story = () => (
             <span>{row[2]}</span>
             <Badge type="first_entry_in_progress" showIcon />
           </Table.Cell>
-          <Table.Cell />
         </Table.LinkRow>
       ))}
     </Table.Body>
diff --git a/frontend/lib/ui/Table/Table.tsx b/frontend/lib/ui/Table/Table.tsx
index caa018261..7525411c4 100644
--- a/frontend/lib/ui/Table/Table.tsx
+++ b/frontend/lib/ui/Table/Table.tsx
@@ -20,7 +20,7 @@ export function Table({ id, children, className }: TableProps) {
 }
 
 Table.Header = Header;
-Table.Column = Column;
+Table.HeaderCell = HeaderCell;
 Table.Body = Body;
 Table.Row = Row;
 Table.LinkRow = LinkRow;
@@ -35,7 +35,7 @@ function Header({ children, className }: { children: React.ReactNode[]; classNam
   );
 }
 
-function Column({
+function HeaderCell({
   children,
   scope,
   className,

From 558485a170835814db0acb739f7b1c37abc419b7 Mon Sep 17 00:00:00 2001
From: Lionqueen94 <lionqueen94@gmail.com>
Date: Mon, 10 Feb 2025 15:09:10 +0100
Subject: [PATCH 10/13] Added Footer to OverviewLayout and removed from all
 child routes and added no elections text for non admins on OverviewPage

---
 .../data_entry/page/DataEntryHomePage.tsx     |  2 --
 .../app/module/election/OverviewLayout.tsx    |  3 +++
 .../module/election/page/ElectionHomePage.tsx |  3 ---
 .../election/page/ElectionReportPage.tsx      |  3 ---
 .../election/page/ElectionStatusPage.tsx      |  2 --
 .../election/page/OverviewPage.test.tsx       |  7 +++++-
 .../app/module/election/page/OverviewPage.tsx | 22 ++++++++++++-------
 .../PollingStationsLayout.tsx                 | 14 ------------
 frontend/app/module/polling_stations/index.ts |  1 -
 frontend/app/routes.tsx                       |  4 ++--
 frontend/lib/i18n/locales/nl/election.json    |  2 ++
 11 files changed, 27 insertions(+), 36 deletions(-)
 delete mode 100644 frontend/app/module/polling_stations/PollingStationsLayout.tsx

diff --git a/frontend/app/module/data_entry/page/DataEntryHomePage.tsx b/frontend/app/module/data_entry/page/DataEntryHomePage.tsx
index 233a0a7d7..d6634d7bf 100644
--- a/frontend/app/module/data_entry/page/DataEntryHomePage.tsx
+++ b/frontend/app/module/data_entry/page/DataEntryHomePage.tsx
@@ -2,7 +2,6 @@ import { useEffect } from "react";
 import { useLocation, useNavigate } from "react-router";
 
 import { ElectionProgress } from "app/component/election/ElectionProgress";
-import { Footer } from "app/component/footer/Footer";
 import { PollingStationChoiceForm } from "app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm";
 
 import { DEFAULT_CANCEL_REASON, useElection, useElectionStatus } from "@kiesraad/api";
@@ -73,7 +72,6 @@ export function DataEntryHomePage() {
         </article>
         <ElectionProgress />
       </main>
-      <Footer />
     </>
   );
 }
diff --git a/frontend/app/module/election/OverviewLayout.tsx b/frontend/app/module/election/OverviewLayout.tsx
index b0d5b9314..8c0c02ac9 100644
--- a/frontend/app/module/election/OverviewLayout.tsx
+++ b/frontend/app/module/election/OverviewLayout.tsx
@@ -1,5 +1,7 @@
 import { Outlet } from "react-router";
 
+import { Footer } from "app/component/footer/Footer";
+
 import { ElectionListProvider } from "@kiesraad/api";
 import { AppLayout } from "@kiesraad/ui";
 
@@ -8,6 +10,7 @@ export function OverviewLayout() {
     <ElectionListProvider>
       <AppLayout>
         <Outlet />
+        <Footer />
       </AppLayout>
     </ElectionListProvider>
   );
diff --git a/frontend/app/module/election/page/ElectionHomePage.tsx b/frontend/app/module/election/page/ElectionHomePage.tsx
index 1ec1afeb3..b586405ab 100644
--- a/frontend/app/module/election/page/ElectionHomePage.tsx
+++ b/frontend/app/module/election/page/ElectionHomePage.tsx
@@ -1,7 +1,5 @@
 import { Link } from "react-router";
 
-import { Footer } from "app/component/footer/Footer";
-
 import { useElection } from "@kiesraad/api";
 import { t } from "@kiesraad/i18n";
 import { PageTitle } from "@kiesraad/ui";
@@ -42,7 +40,6 @@ export function ElectionHomePage() {
           </ul>
         </article>
       </main>
-      <Footer />
     </>
   );
 }
diff --git a/frontend/app/module/election/page/ElectionReportPage.tsx b/frontend/app/module/election/page/ElectionReportPage.tsx
index 54853e07b..48f818cfc 100644
--- a/frontend/app/module/election/page/ElectionReportPage.tsx
+++ b/frontend/app/module/election/page/ElectionReportPage.tsx
@@ -1,5 +1,3 @@
-import { Footer } from "app/component/footer/Footer";
-
 import { useElection, useElectionStatus } from "@kiesraad/api";
 import { t, tx } from "@kiesraad/i18n";
 import { Button, FormLayout, PageTitle } from "@kiesraad/ui";
@@ -84,7 +82,6 @@ export function ElectionReportPage() {
           </FormLayout.Controls>
         </article>
       </main>
-      <Footer />
     </>
   );
 }
diff --git a/frontend/app/module/election/page/ElectionStatusPage.tsx b/frontend/app/module/election/page/ElectionStatusPage.tsx
index 36daf1a19..041ddb4dc 100644
--- a/frontend/app/module/election/page/ElectionStatusPage.tsx
+++ b/frontend/app/module/election/page/ElectionStatusPage.tsx
@@ -2,7 +2,6 @@ import { useNavigate } from "react-router";
 
 import { HeaderElectionStatusWithIcon } from "app/component/election/ElectionStatusWithIcon";
 import { ElectionStatus } from "app/component/election/status/ElectionStatus";
-import { Footer } from "app/component/footer/Footer";
 
 import { useElection, useElectionStatus } from "@kiesraad/api";
 import { t } from "@kiesraad/i18n";
@@ -49,7 +48,6 @@ export function ElectionStatusPage() {
           navigate={(path) => void navigate(path)}
         />
       </main>
-      <Footer />
     </>
   );
 }
diff --git a/frontend/app/module/election/page/OverviewPage.test.tsx b/frontend/app/module/election/page/OverviewPage.test.tsx
index 346f6ba99..3fe79d41a 100644
--- a/frontend/app/module/election/page/OverviewPage.test.tsx
+++ b/frontend/app/module/election/page/OverviewPage.test.tsx
@@ -38,7 +38,12 @@ describe("OverviewPage", () => {
       </ElectionListProvider>,
     );
 
-    expect(await screen.findByText(/Nog geen verkiezingen ingesteld/)).toBeVisible();
+    expect(await screen.findByText(/Abacus is nog niet klaar voor gebruik/)).toBeVisible();
+    expect(
+      await screen.findByText(
+        /Je kan als invoerder nog niks doen. Wacht tot de coördinator het systeem openstelt voor het invoeren van telresultaten./,
+      ),
+    ).toBeVisible();
     expect(screen.queryByRole("table")).toBeNull();
   });
 });
diff --git a/frontend/app/module/election/page/OverviewPage.tsx b/frontend/app/module/election/page/OverviewPage.tsx
index aad8af877..5c5c45d77 100644
--- a/frontend/app/module/election/page/OverviewPage.tsx
+++ b/frontend/app/module/election/page/OverviewPage.tsx
@@ -1,7 +1,6 @@
 import { To, useLocation, useNavigate } from "react-router";
 
 import { ElectionStatusWithIcon } from "app/component/election/ElectionStatusWithIcon";
-import { Footer } from "app/component/footer/Footer";
 import { NavBar } from "app/component/navbar/NavBar";
 
 import { Election, useElectionList } from "@kiesraad/api";
@@ -49,10 +48,18 @@ export function OverviewPage() {
         </Alert>
       )}
       <main>
-        {!electionList.length ? (
-          <h2>{t("election.no_elections_added")}</h2>
-        ) : (
-          <article>
+        <article>
+          {!electionList.length ? (
+            !isAdminOrCoordinator ? (
+              <>
+                <h2 className="mb-lg">{t("election.not_ready_for_use")}</h2>
+                <p className="md form-paragraph">{t("election.please_wait_for_coordinator")}</p>
+              </>
+            ) : (
+              <h2>{t("election.no_elections_added")}</h2>
+              // TODO: To be expanded in issue #888
+            )
+          ) : (
             <Table id="overview">
               <Table.Header>
                 <Table.HeaderCell>{t("election.title.singular")}</Table.HeaderCell>
@@ -76,10 +83,9 @@ export function OverviewPage() {
                 ))}
               </Table.Body>
             </Table>
-          </article>
-        )}
+          )}
+        </article>
       </main>
-      <Footer />
     </>
   );
 }
diff --git a/frontend/app/module/polling_stations/PollingStationsLayout.tsx b/frontend/app/module/polling_stations/PollingStationsLayout.tsx
deleted file mode 100644
index 0fd00e1b7..000000000
--- a/frontend/app/module/polling_stations/PollingStationsLayout.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Outlet } from "react-router";
-
-import { Footer } from "app/component/footer/Footer";
-
-import { AppLayout } from "@kiesraad/ui";
-
-export function PollingStationsLayout() {
-  return (
-    <AppLayout>
-      <Outlet />
-      <Footer />
-    </AppLayout>
-  );
-}
diff --git a/frontend/app/module/polling_stations/index.ts b/frontend/app/module/polling_stations/index.ts
index 3773f2482..4962a1f6f 100644
--- a/frontend/app/module/polling_stations/index.ts
+++ b/frontend/app/module/polling_stations/index.ts
@@ -1,2 +1 @@
-export * from "./PollingStationsLayout";
 export * from "./page";
diff --git a/frontend/app/routes.tsx b/frontend/app/routes.tsx
index 7d218cafc..3c7eda946 100644
--- a/frontend/app/routes.tsx
+++ b/frontend/app/routes.tsx
@@ -12,7 +12,7 @@ import {
 } from "app/module/election";
 import { LogsHomePage } from "app/module/logs";
 import { NotAvailableInMock } from "app/module/NotAvailableInMock";
-import { PollingStationListPage, PollingStationsLayout } from "app/module/polling_stations";
+import { PollingStationListPage } from "app/module/polling_stations";
 import { UserListPage } from "app/module/users";
 import { WorkstationsHomePage } from "app/module/workstations";
 
@@ -60,7 +60,7 @@ export const routes = createRoutesFromElements(
           }
         />
         <Route path="status" element={<ElectionStatusPage />} />
-        <Route path="polling-stations" element={<PollingStationsLayout />}>
+        <Route path="polling-stations" element={null}>
           <Route index element={<PollingStationListPage />} />
           <Route path="create" element={<PollingStationCreatePage />} />
           <Route path=":pollingStationId/update" element={<PollingStationUpdatePage />} />
diff --git a/frontend/lib/i18n/locales/nl/election.json b/frontend/lib/i18n/locales/nl/election.json
index ca7cd9323..c034066a6 100644
--- a/frontend/lib/i18n/locales/nl/election.json
+++ b/frontend/lib/i18n/locales/nl/election.json
@@ -10,6 +10,8 @@
   "level_polling_station": "Niveau stembureau",
   "location": "Gebied",
   "no_elections_added": "Nog geen verkiezingen ingesteld",
+  "not_ready_for_use": "Abacus is nog niet klaar voor gebruik",
+  "please_wait_for_coordinator": "Je kan als invoerder nog niks doen. Wacht tot de coördinator het systeem openstelt voor het invoeren van telresultaten.",
   "status": "Status",
   "start_when_count_list_received": "Zodra je een tellijst van een stembureau hebt gekregen kan je beginnen met invoeren."
 }

From e72177b7bcf409239a7507cdf3a46b55c572d892 Mon Sep 17 00:00:00 2001
From: Lionqueen94 <lionqueen94@gmail.com>
Date: Tue, 11 Feb 2025 16:57:02 +0100
Subject: [PATCH 11/13] Added separate alert when all polling stations data
 entries have been finished

---
 .../PollingStationChoiceForm.test.tsx         | 34 +++++++++++++++++++
 .../PollingStationChoiceForm.tsx              |  6 +++-
 .../locales/nl/polling_station_choice.json    | 19 ++++++-----
 3 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/frontend/app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm.test.tsx b/frontend/app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm.test.tsx
index 5e4678123..33d00268a 100644
--- a/frontend/app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm.test.tsx
+++ b/frontend/app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm.test.tsx
@@ -281,6 +281,40 @@ describe("Test PollingStationChoiceForm", () => {
       expect(screen.getByText("Geen stembureaus gevonden")).toBeVisible();
     });
 
+    test("All data entries of polling stations are finished, polling station list shows message", async () => {
+      overrideOnce("get", "/api/elections/1", 200, electionDetailsMockResponse);
+      overrideOnce("get", "/api/elections/1/status", 200, {
+        statuses: [
+          {
+            polling_station_id: 1,
+            status: "definitive",
+          },
+          {
+            polling_station_id: 2,
+            status: "definitive",
+          },
+          {
+            polling_station_id: 3,
+            status: "definitive",
+          },
+          {
+            polling_station_id: 4,
+            status: "entries_different",
+          },
+        ],
+      } satisfies ElectionStatusResponse);
+
+      const user = userEvent.setup();
+      renderPollingStationChoicePage();
+
+      const openPollingStationList = await screen.findByTestId("openPollingStationList");
+      await user.click(openPollingStationList);
+      expect(screen.getByText("Kies het stembureau")).toBeVisible();
+
+      // Check if the error message is visible
+      expect(screen.getByText("Alle stembureaus zijn twee keer ingevoerd")).toBeVisible();
+    });
+
     test("Second data entry has correct link", async () => {
       overrideOnce("get", "/api/elections/1", 200, electionDetailsMockResponse);
       overrideOnce("get", "/api/elections/1/status", 200, {
diff --git a/frontend/app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm.tsx b/frontend/app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm.tsx
index 9508c43b8..07532364b 100644
--- a/frontend/app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm.tsx
+++ b/frontend/app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm.tsx
@@ -150,10 +150,14 @@ export function PollingStationChoiceForm({ anotherEntry }: PollingStationChoiceF
             </span>
           </summary>
           <h2 className={cls.formTitle}>{t("polling_station_choice.choose_polling_station")}</h2>
-          {!pollingStationsForDataEntry.length ? (
+          {!pollingStations.length ? (
             <Alert type="error" variant="small">
               <p>{t("polling_station_choice.no_polling_stations_found")}</p>
             </Alert>
+          ) : !pollingStationsForDataEntry.length ? (
+            <Alert type="notify" variant="small">
+              <p>{t("polling_station_choice.all_polling_stations_filled_in_twice")}</p>
+            </Alert>
           ) : (
             <PollingStationsList pollingStations={pollingStationsForDataEntry} />
           )}
diff --git a/frontend/lib/i18n/locales/nl/polling_station_choice.json b/frontend/lib/i18n/locales/nl/polling_station_choice.json
index 5a495238c..26f80ba95 100644
--- a/frontend/lib/i18n/locales/nl/polling_station_choice.json
+++ b/frontend/lib/i18n/locales/nl/polling_station_choice.json
@@ -1,17 +1,18 @@
 {
+  "all_polling_stations_filled_in_twice": "Alle stembureaus zijn twee keer ingevoerd",
+  "choose_polling_station": "Kies het stembureau",
   "enter_a_valid_number_to_start": "Voer een geldig nummer van een stembureau in om te beginnen",
-  "polling_station_entry_not_possible": "Het stembureau dat je geselecteerd hebt kan niet meer ingevoerd worden",
   "has_already_been_filled_twice": "Stembureau {nr} <strong>({name})</strong> is al twee keer ingevoerd",
-  "unfinished_input_title": "Je hebt nog een openstaande invoer",
-  "unfinished_input_content": "Je bent begonnen met het invoeren van onderstaande stembureaus, maar hebt deze nog niet helemaal afgerond:",
-  "insert_title": "Welk stembureau ga je invoeren?",
   "insert_another": "Verder met een volgend stembureau?",
+  "insert_number": "Voer het nummer in:",
+  "insert_title": "Welk stembureau ga je invoeren?",
   "name_correct_warning": "Klopt de naam van het stembureau met de naam op je papieren proces-verbaal?\nDan kan je beginnen. Klopt de naam niet? Overleg met de coördinator.",
-  "unknown_number": "Weet je het nummer niet?",
-  "view_list": "Bekijk de lijst met alle stembureaus",
-  "choose_polling_station": "Kies het stembureau",
+  "no_polling_station_found_with_number": "Geen stembureau gevonden met nummer {nr}",
   "no_polling_stations_found": "Geen stembureaus gevonden",
-  "insert_number": "Voer het nummer in:",
+  "polling_station_entry_not_possible": "Het stembureau dat je geselecteerd hebt kan niet meer ingevoerd worden",
   "searching": "aan het zoeken",
-  "no_polling_station_found_with_number": "Geen stembureau gevonden met nummer {nr}"
+  "unfinished_input_title": "Je hebt nog een openstaande invoer",
+  "unfinished_input_content": "Je bent begonnen met het invoeren van onderstaande stembureaus, maar hebt deze nog niet helemaal afgerond:",
+  "unknown_number": "Weet je het nummer niet?",
+  "view_list": "Bekijk de lijst met alle stembureaus"
 }

From a06a9ac4d70e5a68c5f8d03bc088213934ce91e8 Mon Sep 17 00:00:00 2001
From: Lionqueen94 <lionqueen94@gmail.com>
Date: Wed, 12 Feb 2025 17:44:33 +0100
Subject: [PATCH 12/13] Re-added the Footer back to the pages instead of in the
 Layout, we should not have a footer in the data entry flow due to political
 groups navigation scrolling issues

---
 .../module/data_entry/page/DataEntryHomePage.tsx   |  2 ++
 .../app/module/election/page/ElectionHomePage.tsx  |  3 +++
 .../module/election/page/ElectionReportPage.tsx    |  3 +++
 .../module/election/page/ElectionStatusPage.tsx    |  2 ++
 .../polling_stations/PollingStationsLayout.tsx     | 14 ++++++++++++++
 frontend/app/module/polling_stations/index.ts      |  1 +
 frontend/app/routes.tsx                            |  4 ++--
 7 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 frontend/app/module/polling_stations/PollingStationsLayout.tsx

diff --git a/frontend/app/module/data_entry/page/DataEntryHomePage.tsx b/frontend/app/module/data_entry/page/DataEntryHomePage.tsx
index fc631adcf..0b52deb47 100644
--- a/frontend/app/module/data_entry/page/DataEntryHomePage.tsx
+++ b/frontend/app/module/data_entry/page/DataEntryHomePage.tsx
@@ -2,6 +2,7 @@ import { useEffect } from "react";
 import { useLocation, useNavigate } from "react-router";
 
 import { ElectionProgress } from "app/component/election/ElectionProgress";
+import { Footer } from "app/component/footer/Footer";
 import { PollingStationChoiceForm } from "app/component/form/data_entry/polling_station_choice/PollingStationChoiceForm";
 
 import { DEFAULT_CANCEL_REASON, useElection, useElectionStatus } from "@kiesraad/api";
@@ -69,6 +70,7 @@ export function DataEntryHomePage() {
         </article>
         <ElectionProgress />
       </main>
+      <Footer />
     </>
   );
 }
diff --git a/frontend/app/module/election/page/ElectionHomePage.tsx b/frontend/app/module/election/page/ElectionHomePage.tsx
index b586405ab..1ec1afeb3 100644
--- a/frontend/app/module/election/page/ElectionHomePage.tsx
+++ b/frontend/app/module/election/page/ElectionHomePage.tsx
@@ -1,5 +1,7 @@
 import { Link } from "react-router";
 
+import { Footer } from "app/component/footer/Footer";
+
 import { useElection } from "@kiesraad/api";
 import { t } from "@kiesraad/i18n";
 import { PageTitle } from "@kiesraad/ui";
@@ -40,6 +42,7 @@ export function ElectionHomePage() {
           </ul>
         </article>
       </main>
+      <Footer />
     </>
   );
 }
diff --git a/frontend/app/module/election/page/ElectionReportPage.tsx b/frontend/app/module/election/page/ElectionReportPage.tsx
index 48f818cfc..54853e07b 100644
--- a/frontend/app/module/election/page/ElectionReportPage.tsx
+++ b/frontend/app/module/election/page/ElectionReportPage.tsx
@@ -1,3 +1,5 @@
+import { Footer } from "app/component/footer/Footer";
+
 import { useElection, useElectionStatus } from "@kiesraad/api";
 import { t, tx } from "@kiesraad/i18n";
 import { Button, FormLayout, PageTitle } from "@kiesraad/ui";
@@ -82,6 +84,7 @@ export function ElectionReportPage() {
           </FormLayout.Controls>
         </article>
       </main>
+      <Footer />
     </>
   );
 }
diff --git a/frontend/app/module/election/page/ElectionStatusPage.tsx b/frontend/app/module/election/page/ElectionStatusPage.tsx
index 041ddb4dc..36daf1a19 100644
--- a/frontend/app/module/election/page/ElectionStatusPage.tsx
+++ b/frontend/app/module/election/page/ElectionStatusPage.tsx
@@ -2,6 +2,7 @@ import { useNavigate } from "react-router";
 
 import { HeaderElectionStatusWithIcon } from "app/component/election/ElectionStatusWithIcon";
 import { ElectionStatus } from "app/component/election/status/ElectionStatus";
+import { Footer } from "app/component/footer/Footer";
 
 import { useElection, useElectionStatus } from "@kiesraad/api";
 import { t } from "@kiesraad/i18n";
@@ -48,6 +49,7 @@ export function ElectionStatusPage() {
           navigate={(path) => void navigate(path)}
         />
       </main>
+      <Footer />
     </>
   );
 }
diff --git a/frontend/app/module/polling_stations/PollingStationsLayout.tsx b/frontend/app/module/polling_stations/PollingStationsLayout.tsx
new file mode 100644
index 000000000..0fd00e1b7
--- /dev/null
+++ b/frontend/app/module/polling_stations/PollingStationsLayout.tsx
@@ -0,0 +1,14 @@
+import { Outlet } from "react-router";
+
+import { Footer } from "app/component/footer/Footer";
+
+import { AppLayout } from "@kiesraad/ui";
+
+export function PollingStationsLayout() {
+  return (
+    <AppLayout>
+      <Outlet />
+      <Footer />
+    </AppLayout>
+  );
+}
diff --git a/frontend/app/module/polling_stations/index.ts b/frontend/app/module/polling_stations/index.ts
index 4962a1f6f..3773f2482 100644
--- a/frontend/app/module/polling_stations/index.ts
+++ b/frontend/app/module/polling_stations/index.ts
@@ -1 +1,2 @@
+export * from "./PollingStationsLayout";
 export * from "./page";
diff --git a/frontend/app/routes.tsx b/frontend/app/routes.tsx
index bb6014a07..2cf28aec6 100644
--- a/frontend/app/routes.tsx
+++ b/frontend/app/routes.tsx
@@ -12,7 +12,7 @@ import {
 } from "app/module/election";
 import { LogsHomePage } from "app/module/logs";
 import { NotAvailableInMock } from "app/module/NotAvailableInMock";
-import { PollingStationListPage } from "app/module/polling_stations";
+import { PollingStationListPage, PollingStationsLayout } from "app/module/polling_stations";
 import {
   UserCreateDetailsPage,
   UserCreateLayout,
@@ -66,7 +66,7 @@ export const routes = createRoutesFromElements(
           }
         />
         <Route path="status" element={<ElectionStatusPage />} />
-        <Route path="polling-stations" element={null}>
+        <Route path="polling-stations" element={<PollingStationsLayout />}>
           <Route index element={<PollingStationListPage />} />
           <Route path="create" element={<PollingStationCreatePage />} />
           <Route path=":pollingStationId/update" element={<PollingStationUpdatePage />} />

From 20d7838019c608248fda6fc87dbf7e803b940c22 Mon Sep 17 00:00:00 2001
From: Lionqueen94 <lionqueen94@gmail.com>
Date: Wed, 12 Feb 2025 17:48:52 +0100
Subject: [PATCH 13/13] Moved footer to OverviewPage instead of OverviewLayout
 to be more consistent with the footer location in sibling pages

---
 frontend/app/module/election/OverviewLayout.tsx    | 3 ---
 frontend/app/module/election/page/OverviewPage.tsx | 2 ++
 frontend/lib/ui/Table/Table.module.css             | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/app/module/election/OverviewLayout.tsx b/frontend/app/module/election/OverviewLayout.tsx
index 8c0c02ac9..b0d5b9314 100644
--- a/frontend/app/module/election/OverviewLayout.tsx
+++ b/frontend/app/module/election/OverviewLayout.tsx
@@ -1,7 +1,5 @@
 import { Outlet } from "react-router";
 
-import { Footer } from "app/component/footer/Footer";
-
 import { ElectionListProvider } from "@kiesraad/api";
 import { AppLayout } from "@kiesraad/ui";
 
@@ -10,7 +8,6 @@ export function OverviewLayout() {
     <ElectionListProvider>
       <AppLayout>
         <Outlet />
-        <Footer />
       </AppLayout>
     </ElectionListProvider>
   );
diff --git a/frontend/app/module/election/page/OverviewPage.tsx b/frontend/app/module/election/page/OverviewPage.tsx
index c500d6627..87a54f691 100644
--- a/frontend/app/module/election/page/OverviewPage.tsx
+++ b/frontend/app/module/election/page/OverviewPage.tsx
@@ -1,6 +1,7 @@
 import { To, useLocation, useNavigate } from "react-router";
 
 import { ElectionStatusWithIcon } from "app/component/election/ElectionStatusWithIcon";
+import { Footer } from "app/component/footer/Footer";
 import { NavBar } from "app/component/navbar/NavBar";
 
 import { Election, useElectionList } from "@kiesraad/api";
@@ -81,6 +82,7 @@ export function OverviewPage() {
           )}
         </article>
       </main>
+      <Footer />
     </>
   );
 }
diff --git a/frontend/lib/ui/Table/Table.module.css b/frontend/lib/ui/Table/Table.module.css
index 4bc95033f..efe21bd8f 100644
--- a/frontend/lib/ui/Table/Table.module.css
+++ b/frontend/lib/ui/Table/Table.module.css
@@ -52,7 +52,7 @@
       background: var(--color-hover);
     }
 
-    /* Chevron icon cell */
+    /* Cell with the chevron icon */
     td:last-of-type {
       padding-right: 4.5rem;
       background-image: url("../../icon/svg/chevronRight.svg");