Merge branch 'main' into bugfix/new-script

Public-Health-Scotland · Nov 15, 2024 · daf7c96 · daf7c96
2 parents 36d2cec + d684a07
commit daf7c96
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/R/phsshinyapp.R b/R/phsshinyapp.R
@@ -79,7 +79,7 @@ phsshinyapp <- function(path, author = Sys.info()[["user"]], app_name = "WRITE A
 
   # Getting app preamble
   app_preamble <- shiny_app_template(app_name = app_name, author = author)
-  app_code <- paste(app_preamble, app_code, collapse = "\n")
+  app_code <- paste0(app_preamble, app_code, collapse = "\n")
 
 
   # Write to index file

diff --git a/R/shiny_app_template.R b/R/shiny_app_template.R
@@ -19,8 +19,9 @@ shiny_app_template <- function(app_name = "WRITE APP NAME HERE",
     "# UI",
     "ui <- fluidPage(",
     "tagList(",
+    'tags$html(lang = "en"), # Set the language of the page - important for accessibility',
     "# Specify most recent fontawesome library - change version as needed",
-    'tags$style("@import url(https://use.fontawesome.com/releases/v6.1.2/css/all.css);"),',
+    'tags$style("@import url(https://use.fontawesome.com/releases/v6.6.0/css/all.css);"),',
     "navbarPage(",
     '    id = "intabset", # id used for jumping between tabs',
     "    title = div(",
@@ -31,7 +32,7 @@ shiny_app_template <- function(app_name = "WRITE APP NAME HERE",
     paste0("    windowTitle = ", '"', app_name, '"', ",", "# Title for browser tab"),
     '    header = tags$head(includeCSS("www/styles.css"),  # CSS stylesheet',
     '    tags$link(rel = "shortcut icon", href = "favicon_phs.ico") # Icon for browser tab',
-    "),"
+    "),\n"
   )
 
   r_code <- paste(r_code, collapse = "\n")

diff --git a/inst/text/shiny/app.R b/inst/text/shiny/app.R
@@ -49,6 +49,6 @@ server <- function(input, output, session) {
 }
 
 # Run the application
-shinyApp(ui=ui, server=server)
+shinyApp(ui = ui, server = server)
 
 ### END OF SCRIPT ###