Added dfeshiny a11y_panel and header functions

dfe-analytical-services · Jan 2, 2025 · f85e7d5 · f85e7d5
1 parent 7b9eaf8
commit f85e7d5
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 86 deletions.
diff --git a/renv.lock b/renv.lock
@@ -35,9 +35,9 @@
     },
     "MASS": {
       "Package": "MASS",
-      "Version": "7.3-61",
+      "Version": "7.3-63",
       "Source": "Repository",
-      "Repository": "RSPM",
+      "Repository": "CRAN",
       "Requirements": [
         "R",
         "grDevices",
@@ -46,7 +46,7 @@
         "stats",
         "utils"
       ],
-      "Hash": "0cafd6f0500e5deba33be22c46bf6055"
+      "Hash": "192afb459696dc96ccb5adb5bef047de"
     },
     "Matrix": {
       "Package": "Matrix",
@@ -139,18 +139,6 @@
       ],
       "Hash": "45f0398006e83a5b10b72a90663d8d8c"
     },
-    "RCurl": {
-      "Package": "RCurl",
-      "Version": "1.98-1.16",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Requirements": [
-        "R",
-        "bitops",
-        "methods"
-      ],
-      "Hash": "ddbdf53d15b47be4407ede6914f56fbb"
-    },
     "Rcpp": {
       "Package": "Rcpp",
       "Version": "1.0.13-1",
@@ -204,13 +192,6 @@
       ],
       "Hash": "543776ae6848fde2f48ff3816d0628bc"
     },
-    "bitops": {
-      "Package": "bitops",
-      "Version": "1.0-9",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "d972ef991d58c19e6efa71b21f5e144b"
-    },
     "brio": {
       "Package": "brio",
       "Version": "1.1.5",
@@ -452,28 +433,28 @@
     },
     "dfeshiny": {
       "Package": "dfeshiny",
-      "Version": "0.5.2",
+      "Version": "0.5.3.9000",
       "Source": "GitHub",
       "RemoteType": "github",
       "RemoteHost": "api.github.com",
       "RemoteUsername": "dfe-analytical-services",
       "RemoteRepo": "dfeshiny",
-      "RemoteRef": "91f1eb3cbac6e1d2ba64300e22a36c95a73dda25",
-      "RemoteSha": "91f1eb3cbac6e1d2ba64300e22a36c95a73dda25",
+      "RemoteRef": "main",
+      "RemoteSha": "10839ea6942570856e726072b50c188ef5de684e",
       "Requirements": [
         "R",
-        "RCurl",
         "checkmate",
         "glue",
         "htmltools",
+        "lubridate",
         "magrittr",
         "shiny",
         "shinyGovstyle",
         "shinyjs",
         "stringr",
         "styler"
       ],
-      "Hash": "2fcdaff1ae69716fc711621d785828a0"
+      "Hash": "0343ae081c14d14deabefb8402405d86"
     },
     "diffobj": {
       "Package": "diffobj",
@@ -941,6 +922,19 @@
       ],
       "Hash": "b8552d117e1b808b09a832f589b79035"
     },
+    "lubridate": {
+      "Package": "lubridate",
+      "Version": "1.9.4",
+      "Source": "Repository",
+      "Repository": "CRAN",
+      "Requirements": [
+        "R",
+        "generics",
+        "methods",
+        "timechange"
+      ],
+      "Hash": "be38bc740fc51783a78edb5a157e4104"
+    },
     "magrittr": {
       "Package": "magrittr",
       "Version": "2.0.3",
@@ -1029,42 +1023,41 @@
     },
     "openssl": {
       "Package": "openssl",
-      "Version": "2.2.2",
+      "Version": "2.3.0",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
         "askpass"
       ],
-      "Hash": "d413e0fef796c9401a4419485f709ca1"
+      "Hash": "5bfe2927efa9f87766ca9605301ea48f"
     },
     "pillar": {
       "Package": "pillar",
-      "Version": "1.9.0",
+      "Version": "1.10.0",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
         "cli",
-        "fansi",
         "glue",
         "lifecycle",
         "rlang",
         "utf8",
         "utils",
         "vctrs"
       ],
-      "Hash": "15da5a8412f317beeee6175fbc76f4bb"
+      "Hash": "101ca350beea21261a15ba169d7a8513"
     },
     "pingr": {
       "Package": "pingr",
-      "Version": "2.0.4",
+      "Version": "2.0.5",
       "Source": "Repository",
       "Repository": "CRAN",
       "Requirements": [
         "R",
         "processx",
         "utils"
       ],
-      "Hash": "a68ecec33211e55f957631b6163a4898"
+      "Hash": "63d34946057b145d9e812ccbf3b36ea1"
     },
     "pkgbuild": {
       "Package": "pkgbuild",
@@ -1507,9 +1500,9 @@
     },
     "testthat": {
       "Package": "testthat",
-      "Version": "3.2.1.1",
+      "Version": "3.2.2",
       "Source": "Repository",
-      "Repository": "RSPM",
+      "Repository": "CRAN",
       "Requirements": [
         "R",
         "R6",
@@ -1532,7 +1525,7 @@
         "waldo",
         "withr"
       ],
-      "Hash": "3f6e7e5e2220856ff865e4834766bf2b"
+      "Hash": "6773967afbe2f74c87021e72c1bb05c0"
     },
     "tibble": {
       "Package": "tibble",
@@ -1569,6 +1562,17 @@
       ],
       "Hash": "829f27b9c4919c16b593794a6344d6c0"
     },
+    "timechange": {
+      "Package": "timechange",
+      "Version": "0.3.0",
+      "Source": "Repository",
+      "Repository": "RSPM",
+      "Requirements": [
+        "R",
+        "cpp11"
+      ],
+      "Hash": "c5f3c201b931cd6474d17d8700ccb1c8"
+    },
     "tinytex": {
       "Package": "tinytex",
       "Version": "0.54",

diff --git a/shiny-template.Rproj b/shiny-template.Rproj
@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 3ff89608-36fb-45c8-ba4e-d5904f05c408
 
 RestoreWorkspace: Default
 SaveWorkspace: Default

diff --git a/ui.R b/ui.R
@@ -72,13 +72,8 @@ ui <- function(input, output, session) {
     ),
 
     # Header ------------------------------------------------------------------
-    shinyGovstyle::header(
-      main_text = "",
-      main_link = "https://www.gov.uk/government/organisations/department-for-education",
-      secondary_text = "Department for Education (DfE) Shiny Template",
-      logo = "images/DfE_logo_landscape.png",
-      logo_width = 150,
-      logo_height = 32
+    dfeshiny::header(
+      header = "Department for Education (DfE) Shiny Template"
     ),
 
     # Beta banner -------------------------------------------------------------
@@ -105,7 +100,20 @@ ui <- function(input, output, session) {
       # Content for these panels is defined in the R/ui_panels/ folder
       example_tab_1_panel(),
       user_guide_panel(),
-      a11y_panel(),
+      shiny::tabPanel(
+        value = "a11y_panel",
+        "Accessibility",
+        dfeshiny::a11y_panel(
+          dashboard_title = site_title,
+          dashboard_url = site_primary,
+          date_tested = "12th March 2024",
+          date_prepared = "1st July 2024",
+          date_reviewed = "1st July 2024",
+          issues_contact = "[email protected]",
+          non_accessible_components = c("List non-accessible components here"),
+          specific_issues = c("List specific issues here")
+        )
+      ),
       shiny::tabPanel(
         value = "cookies_panel_ui",
         "Cookies",

diff --git a/www/dfe_shiny_gov_style.css b/www/dfe_shiny_gov_style.css
@@ -296,47 +296,6 @@ html {
   color: #fff;
 }
 
-/* Custom disconnect CSS --------------------------------------------------- */
-#ss-connect-dialog {
-  display: none !important;
-}
-
-#shiny-disconnected-overlay {
-  display: none !important;
-}
-
-#ss-overlay {
-  background-color: #000000 !important;
-  opacity: 0.6 !important;
-  position: fixed !important;
-  top: 0 !important;
-  left: 0 !important;
-  bottom: 0 !important;
-  right: 0 !important;
-  z-index: 99998 !important;
-  overflow: hidden !important;
-  cursor: not-allowed !important;
-}
-
-#custom-disconnect-dialog {
-  background: #000000 !important;
-  color: #FFFFFF !important;
-  width: full !important;
-  transform: translateX(-50%) translateY(-50%) !important;
-  font-size: 16px !important;
-  top: 50% !important;
-  position: fixed !important;
-  bottom: auto !important;
-  left: 50% !important;
-  padding: 0.8em 1.5em !important;
-  text-align: center !important;
-  height: auto !important;
-  opacity: 1 !important;
-  z-index: 99999 !important;
-  border-radius: 3px !important;
-  box-shadow: rgba(0, 0, 0, 0.3) 3px 3px 10px !important;
-}
-
 /* Custom value boxes CSS -------------------------------------------------- */
 /* Set the font sizes */
 #vboxhead-small {