From 7336d5a033800d3282995d6a18b6912f37496feb Mon Sep 17 00:00:00 2001 From: Erik Leppo Date: Wed, 31 Jan 2024 16:56:15 -0500 Subject: [PATCH] v2.0.7.9027 * refactor: Apply revised USEPA template (2023-12-15), Issue #155 --- DESCRIPTION | 2 +- NEWS | 8 +- NEWS.md | 8 +- NEWS.rmd | 5 + inst/shiny-examples/ContDataQC/global.R | 2 +- inst/shiny-examples/ContDataQC/ui.R | 1025 +++++++++++------------ 6 files changed, 522 insertions(+), 528 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 88ed4bc..59ffae4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: ContDataQC Title: Quality Control (QC) of Continous Monitoring Data -Version: 2.0.7.9026 +Version: 2.0.7.9027 Authors@R: c( person("Erik W", "Leppo", email="Erik.Leppo@tetratech.com",role=c("aut","cre")), person("Ann","Roseberry Lincoln", role="ctb"), diff --git a/NEWS b/NEWS index 7a0f380..2cbbe52 100644 --- a/NEWS +++ b/NEWS @@ -3,10 +3,16 @@ NEWS-ContDataQC - #> Last Update: 2024-01-31 14:12:04.111378 + #> Last Update: 2024-01-31 16:53:57.644938 # Version History +## v2.0.7.9027 + +2024-01-31 + +- refactor: Apply revised USEPA template (2023-12-15), Issue \#155 + ## v2.0.7.9026 2024-01-31 diff --git a/NEWS.md b/NEWS.md index 7a0f380..2cbbe52 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,10 +3,16 @@ NEWS-ContDataQC - #> Last Update: 2024-01-31 14:12:04.111378 + #> Last Update: 2024-01-31 16:53:57.644938 # Version History +## v2.0.7.9027 + +2024-01-31 + +- refactor: Apply revised USEPA template (2023-12-15), Issue \#155 + ## v2.0.7.9026 2024-01-31 diff --git a/NEWS.rmd b/NEWS.rmd index eedd9cc..29908c2 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -21,6 +21,11 @@ cat(paste0("Last Update: ",Sys.time())) # Version History +## v2.0.7.9027 +2024-01-31 + +* refactor: Apply revised USEPA template (2023-12-15), Issue #155 + ## v2.0.7.9026 2024-01-31 diff --git a/inst/shiny-examples/ContDataQC/global.R b/inst/shiny-examples/ContDataQC/global.R index 12038d6..4b37049 100644 --- a/inst/shiny-examples/ContDataQC/global.R +++ b/inst/shiny-examples/ContDataQC/global.R @@ -22,7 +22,7 @@ library(shinyjs) # Sys.setenv(PATH = paste(Sys.getenv("PATH"), "C:\\Rtools\\bin", sep = ";")) # Version Number -version <- "2.0.7.9026" +version <- "2.0.7.9027" #Maximum individual file size that can be uploaded is 70 MB options(shiny.maxRequestSize = 70 * 1024^2) diff --git a/inst/shiny-examples/ContDataQC/ui.R b/inst/shiny-examples/ContDataQC/ui.R index 55229c3..cb5fa98 100644 --- a/inst/shiny-examples/ContDataQC/ui.R +++ b/inst/shiny-examples/ContDataQC/ui.R @@ -23,537 +23,514 @@ tab_5b_Console <- source("external/tab_5b_Console.R", local = TRUE)$value #tab_9_Status <- source("external/tab_9_Status.R", local = TRUE)$value -shinyUI( - # VERSION, 1, current [non-EPA] ---- - navbarPage("Continuous data QC, summary, and statistics", - theme = shinytheme("spacelab") - ,tab_1_About() - #,tab_1a_Overview() - #,tab_1c_FAQ() +# shinyUI( +# # VERSION, 1, current [non-EPA] ---- +# navbarPage("Continuous Data QC, Summary, and Statistics" +# , theme = shinytheme("spacelab") +# , tab_1_About() +# #, tab_1a_Overview() +# #, tab_1c_FAQ() +# , tab_2_DataPrep() +# , tab_3_MainFunc() +# #,tab_3c_QCThresh() +# , tab_4_USGSgage() +# , tab_5_Troubleshooting() +# #, tab_5b_Console() +# #, tab_x_TestData() +# #, tab_9_Status() +# )## navbarPage ~ END +# )## shinyUI ~ END + +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# VERSION, EPA Template ---- +# OneEPA_template_for_ShinyApps_(update_title_on_line_28___UI_code_on_215___dateUpdated_on_441___server_code_on_457)_.R +# 2023-12-15 +#~~~~~~~~~~~ +# Using separate UI and Server files so commented out server code at bottom +# commented out require(shiny) +# Changed ui <- foo to shinyUI(foo) then added closing parenthesis at end +# 3 places to edit: title, UI code, date (~500) +#~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# require(shiny) + +# ui <- fluidPage( +shinyUI(fluidPage( + tags$html(class = "no-js", lang="en"), + tags$head( + HTML( + " + + + " + ), + tags$meta(charset="utf-8"), + tags$meta(property="og:site_name", content="US EPA"), + #tags$link(rel = "stylesheet", type = "text/css", href = "css/uswds.css"), + tags$link(rel = "stylesheet", type = "text/css", href = "https://cdnjs.cloudflare.com/ajax/libs/uswds/3.0.0-beta.3/css/uswds.min.css", integrity="sha512-ZKvR1/R8Sgyx96aq5htbFKX84hN+zNXN73sG1dEHQTASpNA8Pc53vTbPsEKTXTZn9J4G7R5Il012VNsDEReqCA==", crossorigin="anonymous", referrerpolicy="no-referrer"), + tags$meta(property="og:url", content="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"), + tags$link(rel="canonical", href="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"), + tags$link(rel="shortlink", href="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"), + tags$meta(property="og:url", content="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"), + tags$meta(property="og:image", content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-og.jpg"), + tags$meta(property="og:image:width", content="1200"), + tags$meta(property="og:image:height", content="630"), + tags$meta(property="og:image:alt", content="U.S. Environmental Protection Agency"), + tags$meta(name="twitter:card", content="summary_large_image"), + tags$meta(name="twitter:image:alt", content="U.S. Environmental Protection Agency"), + tags$meta(name="twitter:image:height", content="600"), + tags$meta(name="twitter:image:width", content="1200"), + tags$meta(name="twitter:image", content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-twitter.jpg"), + tags$meta(name="MobileOptimized", content="width"), + tags$meta(name="HandheldFriendly", content="true"), + tags$meta(name="viewport", content="width=device-width, initial-scale=1.0"), + tags$meta(`http-equiv`="x-ua-compatible", content="ie=edge"), + tags$script(src = "js/pattern-lab-head-script.js"), + ## update this line with your title:---- + tags$title('Continuous Data QC, Summary, and Statistics | US EPA'), + tags$link(rel="icon", type="image/x-icon", href="https://www.epa.gov/themes/epa_theme/images/favicon.ico"), + tags$meta(name="msapplication-TileColor", content="#FFFFFF"), + tags$meta(name="msapplication-TileImage", content="https://www.epa.gov/themes/epa_theme/images/favicon-144.png"), + tags$meta(name="application-name", content=""), + tags$meta(name="msapplication-config", content="https://www.epa.gov/themes/epa_theme/images/ieconfig.xml"), + tags$link(rel="apple-touch-icon-precomposed", sizes="196x196", href="https://www.epa.gov/themes/epa_theme/images/favicon-196.png"), + tags$link(rel="apple-touch-icon-precomposed", sizes="152x152", href="https://www.epa.gov/themes/epa_theme/images/favicon-152.png"), + tags$link(rel="apple-touch-icon-precomposed", sizes="144x144", href="https://www.epa.gov/themes/epa_theme/images/favicon-144.png"), + tags$link(rel="apple-touch-icon-precomposed", sizes="120x120", href="https://www.epa.gov/themes/epa_theme/images/favicon-120.png"), + tags$link(rel="apple-touch-icon-precomposed", sizes="114x114", href="https://www.epa.gov/themes/epa_theme/images/favicon-114.png"), + tags$link(rel="apple-touch-icon-precomposed", sizes="72x72", href="https://www.epa.gov/themes/epa_theme/images/favicon-72.png"), + tags$link(rel="apple-touch-icon-precomposed", href="https://www.epa.gov/themes/epa_theme/images/favicon-180.png"), + tags$link(rel="icon", href="https://www.epa.gov/themes/epa_theme/images/favicon-32.png", sizes="32x32"), + tags$link(rel="preload", href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2", as="font", crossorigin="anonymous"), + tags$link(rel="preload", href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2", as="font", crossorigin="anonymous"), + tags$link(rel="preload", href="https://www.epa.gov/themes/epa_theme/fonts/merriweather/Latin-Merriweather-Bold.woff2", as="font", crossorigin="anonymous"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/ajax-progress.module.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/autocomplete-loading.module.css?r6lsex" ), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/js.module.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/sticky-header.module.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-counter.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-counters.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-general-info.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/tabledrag.module.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/tablesort.module.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/tree-child.module.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/themes/epa_theme/css/styles.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/themes/epa_theme/css-lib/colorbox.min.css?r6lsex"), + + tags$script(src = 'https://cdnjs.cloudflare.com/ajax/libs/uswds/3.0.0-beta.3/js/uswds-init.min.js'), + #fix container-fluid that boostrap RShiny uses + tags$style(HTML( + '.container-fluid { + padding-right: 0; + padding-left: 0; + margin-right: 0; + margin-left: 0; + } + .tab-content { + margin-right: 30px; + margin-left: 30px; + }' + )) + ), + tags$body( + class="path-themes not-front has-wide-template", id="top", + tags$script( + src = 'https://cdnjs.cloudflare.com/ajax/libs/uswds/3.0.0-beta.3/js/uswds.min.js' + ) + ), + + # Site Header + HTML( + ' + + + + + +
+
+
+
+
+
+ U.S. flag +
+
+

An official website of the United States government

+ +
+ +
+
+
+
+
+ Dot gov +
+

+ Official websites use .gov +
A .gov website belongs to an official government organization in the United States. +

+
+
+
+ HTTPS +
+

+ Secure .gov websites use HTTPS +
A lock () or https:// means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites. +

+
+
+
+
+
+
+
+
+ +
+
+ +
' + ), + + # Individual Page Header + HTML( + '' + ), + + # Site Footer + HTML( + '
+ + + + + + + + ' + ) +) # END fluidPage +) # END shinyUI + +# # Insert your server code here +# ## Begin example server code +# server <- function(input, output) +# { +# output$distPlot <- renderPlot({ +# hist(rnorm(input$obs)) +# }) +# } +# ## End example server code # -# # Site Footer -# HTML( -# ' -# -# -# -# -# -# -# -# ' -# ) -# ) # END fluidPage -# )## shinyUI +# shinyApp(ui = ui, server = server)