diff --git a/README.md b/README.md index cf42ce2..2dbc8ee 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,6 @@ Requirements for running 'ScarFace' and a manual can be found in 'MANUAL.md'.

If you use 'ScarFace' for your published research, please cite:

-Raitzsch, M. and Gattuso, J.-P., 2020. ScarFace - seacarb calculations with a Shiny user interface. Available from: https://github.com/martens73/ScarFace. +Raitzsch, M. and Gattuso, J.-P., 2020. ScarFace - seacarb calculations with R Shiny user interface. https://github.com/martens73/ScarFace.
as well as
-Gattuso J.-P., Epitalon J.-M., Lavigne H. & Orr J., 2019. seacarb: seawater carbonate chemistry. R package version 3.2.12. http://CRAN.R-project.org/package=seacarb. +Gattuso J.-P., Epitalon J.-M., Lavigne H. and Orr J., 2019. seacarb: seawater carbonate chemistry. R package version 3.2.12. http://CRAN.R-project.org/package=seacarb. diff --git a/app.R b/app.R index 9ea69c5..f9b5893 100644 --- a/app.R +++ b/app.R @@ -7,7 +7,6 @@ library(dplyr) ##### UI ##### ui <- dashboardPage( - # dashboardHeader(title = img(src="logo.png", height = 25)), dashboardHeader(title = "ScarFace"), dashboardSidebar( sidebarMenu(id = "tabs", @@ -31,11 +30,10 @@ ui <- dashboardPage( br(), br(), br(), - # div(img(src = "logo.png", width = 200), style="text-align: center;"), p("ScarFace", align = "center", style="color: #7da2d1; font-size: 48px"), - p(em("version 1.0"), align="center"), + p(em("version 1.0.0"), align="center"), p("This application is designed to calculate the carbonate system chemistry of seawater based on the 'seacarb' package using a graphical user interface", align="center"), - p("Its name stands for ",tags$b("s"),"ea",tags$b("car"),"b calculations with a Shiny user inter",tags$b("face"),".",align="center"), + p("Its name stands for ",tags$b("s"),"ea",tags$b("car"),"b calculations with R Shiny user inter",tags$b("face"),".",align="center"), p("'ScarFace' was written in 'R' and embedded in an interactive web app using the 'Shiny' package. Shiny combines the computational power of R with the interactivity of the modern web.", align="center"), p("Shiny uses reactive elements, i.e. the user interacts via the 'ui' (user interface) with the actual R code running in the background called 'server'. Whenever the user make input changes, this will automatically affect all dependent elements (e.g. plots or data tables).", align="center"), p("Even though the code can be accessed and modified, there is no need for the user to dig into R programming. So 'ScarFace' is extremely user-friendly and makes the usage of 'seacarb' work like a charm.", align="center"), @@ -361,16 +359,12 @@ ui <- dashboardPage( br(), br(), br(), - # div(img(src = "logo.png", width = 200), style="text-align: center;"), p("ScarFace", align = "center", style="color: #7da2d1; font-size: 48px"), - p(em("version 1.0"), align="center"), - p("When you use ScarFace for your published research, please cite it as follows:", align="center"), + p(em("version 1.0.0"), align="center"), + p("When you use 'ScarFace' for your published research, please cite the following two references:", align="center"), br(), - p("Raitzsch, M. and Gattuso, J.-P. (2020): ScarFace - seacarb calculations with a Shiny user interface. Available from: https://github.com/martens73/ScarFace.", align="center"), - br(), - p("but also please give due credit to the creators of the package 'seacarb':", align="center"), - br(), - p("Gattuso J.-P., Epitalon J.-M., Lavigne H. & Orr J., 2019. seacarb: seawater carbonate chemistry. R package version 3.2.12. http://CRAN.R-project.org/package=seacarb.", align="center") + p("Raitzsch, M. and Gattuso, J.-P., 2020. ScarFace - seacarb calculations with R Shiny user interface. https://github.com/martens73/ScarFace.", align="center"), + p("Gattuso J.-P., Epitalon J.-M., Lavigne H. and Orr J., 2019. seacarb: seawater carbonate chemistry. R package version 3.2.12. http://CRAN.R-project.org/package=seacarb.", align="center") ) ) )