Covid19Mirai 3.1.0 (#266)

* Covid19Mirai 3.1.0 (#264) (#265) Added actionButtons Fixed bug map Added data to rds * prep for new release 3.1.0 - closes (#263) * small refinements style
miraisolutions · Oct 15, 2023 · 1af4422 · 1af4422
1 parent 0d0f6c7
commit 1af4422
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/R/mod_continent.R b/R/mod_continent.R
@@ -79,13 +79,13 @@ mod_continent_ui <- function(id, uicont, nn = 1000){
     ),
    hr(),
    hr(),
-   actionButton(ns("button_country_plot"), "Click to open Country Level report on main variables.", class = "button-style"),
+   actionButton(ns("button_country_plot"), p("Click to open:",br(), "Country Level report on main variables."), class = "button-style"),
    div(h4("Country Plots within Continent"), align = "center", style = "margin-top:20px; margin-bottom:20px;"),
    uiOutput(ns("country_plots_ui")),
 
    hr(),
-   actionButton(ns("button_cont_maps"), "Click to open Country Heat Maps on main variables.", class = "button-style"),
-   div("Country Heat Maps within Continent", align = "center", class = "sectiontitle"),
+   actionButton(ns("button_cont_maps"),  p("Click to open:",br(),"Country Heat Maps on main variables."), class = "button-style"),
+   div(h4("Country Heat Maps within Continent"), align = "center", class = "sectiontitle"),
    uiOutput(ns("continent_maps")),
    hr(),
    mod_add_table_ui(ns(paste("add_table_cont", uicont , sep = "_"))),

diff --git a/R/mod_country.R b/R/mod_country.R
@@ -114,7 +114,7 @@ areaUI <- function(id, tab = TRUE, hospflag = TRUE, stringency = TRUE, vaxflag =
    tg <- tagList(
       div(id = id,
            hr(),
-           div("Country Report at 2nd administrative level", align = "center", class = "sectiontitle"),
+           div(h4("Country Report at 2nd administrative level"), align = "center", class = "sectiontitle"),
            hr(),
            div(
              HTML(from_nth_case_area2_msg(n2)), class = "bodytext"

diff --git a/R/mod_global.R b/R/mod_global.R
@@ -38,17 +38,17 @@ mod_global_ui <- function(id){
       )
     ),
     hr(),
-    actionButton(ns("button_global"), "Click to open graphs about Top Countries on main variables.", class = "button-style"),
+    actionButton(ns("button_global"),  p("Click to open report:",br(), "Top Countries - main variables."), class = "button-style"),
     uiOutput(ns("top_countries_ui")),
 
     hr(),
-    actionButton(ns("button_global_hosp"), "Click to open graphs about Top Countries on Hospitalizations and Intensive Cares", class = "button-style"),
+    actionButton(ns("button_global_hosp"), p("Click to open report:",br(), "Top Countries - Hospitalizations"), class = "button-style"),
     uiOutput(ns("top_countries_hosp_ui")),
     hr(),
-    actionButton(ns("button_global_str"), "Click to open graphs about Top Countries on Stringency Index", class = "button-style"),
+    actionButton(ns("button_global_str"), p("Click to open report:",br(), "Top Countries - Stringency Index"), class = "button-style"),
     uiOutput(ns("top_countries_str_ui")),
     hr(),
-    actionButton(ns("button_global_vax"), "Click to open graphs about Top Countries on Vaccination", class = "button-style"),
+    actionButton(ns("button_global_vax"), p("Click to open report:",br(), "Top Countries - Vaccination"), class = "button-style"),
     uiOutput(ns("top_countries_vax_ui")),
     hr(),
     mod_add_table_ui(ns("add_table_world"))

diff --git a/R/mod_individual_country.R b/R/mod_individual_country.R
@@ -62,11 +62,11 @@ mod_ind_country_ui <- function(id){
     mod_add_table_ui(ns("ind_add_table_country")), # table at country level
 
     hr(),
-    actionButton(ns("button_2nd_level"), "Click to open graphs at Cantonal Level.", class = "button-style"),
-    div("Country Report at Cantonal level", align = "center", class = "sectiontitle"),
+    actionButton(ns("button_2nd_level"), p("Click to open report:",br(), "Cantonal Level."), class = "button-style"),
+    div(h4("Country Report at Cantonal level"), align = "center", class = "sectiontitle"),
     uiOutput(ns("ch_2nd_level_ui")),
     hr(),
-    actionButton(ns("button_2nd_level_maps"), "Click to open Heat Maps of Switzerland at Cantonal Level.", class = "button-style"),
+    actionButton(ns("button_2nd_level_maps"), p("Click to open Heat Mapsreport:",br(), "Switzerland at Cantonal Level."), class = "button-style"),
     uiOutput(ns("ch_2nd_level_maps_ui")),
 
     hr()
@@ -88,7 +88,7 @@ areamapUI <- function(id, country){
   tagList(
     div(id = id,
         hr(),
-        div(paste("Country Heat Maps within", country), align = "center", style = "sectiontitle"),
+        div(h4(paste("Country Heat Maps within", country)), align = "center", style = "sectiontitle"),
         hr(),
         fluidRow(
           column(6,

diff --git a/inst/app/www/style.css b/inst/app/www/style.css
@@ -349,5 +349,5 @@ Count Boxes
 .button-style {
   background-color: #008cc3;
   font-size: 14px;
-  display: inline-block;
+  display: flex;
 }