Fix string formatting and text output

diff --git a/R/server.R b/R/server.R
index ed5ecd7454b8ae73047cc6212ef38725afdd606d..a2ba674c0827f45203257976cb1e09555172f43e 100644 (file)
--- a/R/server.R
+++ b/R/server.R
@@ -142,7 +142,7 @@ server <- function(input, output) {
           output$gridShapeWarn <- shiny::renderText("")
 
         if (is.na(max_scale) || max_scale < 1 / grid_length) {
           output$gridShapeWarn <- shiny::renderText("")
 
         if (is.na(max_scale) || max_scale < 1 / grid_length) {

-          output$gridShapeWarn <- shiny::renderText("Error: The maximum scale
+          output$gridScaleWarn <- shiny::renderText("Error: The maximum scale

             must be at least the reciprocal of the grid length.")
           checks_passed <- FALSE
         }
             must be at least the reciprocal of the grid length.")
           checks_passed <- FALSE
         }

diff --git a/R/ui.R b/R/ui.R
index 5c6d420e833d290281ac257700eca17e8f7943ca..111b5f3d5c7f4e78d8e4ff90c06d58613762664a 100644 (file)
--- a/R/ui.R
+++ b/R/ui.R
@@ -23,9 +23,9 @@ ui <- function() { shiny::fluidPage(
               shiny::column(8,
                 shiny::textInput(inputId = "dataCounts", label = shiny::HTML(
                   paste0("Case counts", shiny::tags$sup("[?]",
               shiny::column(8,
                 shiny::textInput(inputId = "dataCounts", label = shiny::HTML(
                   paste0("Case counts", shiny::tags$sup("[?]",

-                    title = "Enter as a comma-separated list of positive
-                             integers, with at least two entries.
-                             Example: 1,1,2,3,5,8"))))),
+                    title = paste0("Enter as a comma-separated list of ",
+                                   "positive integers, with at least two ",
+                                   "entries. Example: 1,1,2,3,5,8")))))),

               shiny::column(4,
                 shiny::selectInput(inputId = "dataUnits",
                                    label = "Reporting frequency",
               shiny::column(4,
                 shiny::selectInput(inputId = "dataUnits",
                                    label = "Reporting frequency",


@@ -124,11 +124,12 @@ ui <- function() { shiny::fluidPage(
             ),
             shiny::span(shiny::textOutput(outputId = "serialseqBWarn"),
                         style = "color: red;"),
             ),
             shiny::span(shiny::textOutput(outputId = "serialseqBWarn"),
                         style = "color: red;"),

-            shiny::textInput(inputId = "kappaInput", label = shiny::HTML(
-              paste0("Maximum value", shiny::tags$sup("[?]",
-                title = "This describes the prior belief of R0, and should
-                         be set to a higher value if R0 is believed to be
-                         larger. (Default: 20)"))), value = "20"),
+            shiny::textInput(inputId = "kappaInput",
+              label = shiny::HTML(paste0("Maximum value", shiny::tags$sup("[?]",
+                title = paste0("This describes the prior belief of R0, and ",
+                               "should be set to a higher value if R0 is ",
+                               "believed to be larger. (Default: 20)")))),
+              value = "20"),

             shiny::span(shiny::textOutput(outputId = "kappaWarn"),
                         style = "color: red;"),
             shiny::actionButton(inputId = "addseqB", label = "Add")
             shiny::span(shiny::textOutput(outputId = "kappaWarn"),
                         style = "color: red;"),
             shiny::actionButton(inputId = "addseqB", label = "Add")