Merge branch 'dev'

R/app_server.R

@@ -20,11 +20,12 @@ app_server <- function(input, output, session) {
   shinyjs::hide("skip")
   shinyjs::hide("download")
   
-  output$tmptxt <- renderUI(HTML("<p>Please upload your data (Biom file and MultiHits TSV file).</p>"))
+  output$tmptxt <- renderUI(HTML("<p>Please upload your data (Biom file, MultiHits TSV file and optional fasta file).</p>"))
   output$tmptxt2 <- renderUI(HTML("<p>Please upload your data (Biom file and MultiHits TSV file).</p><br/><br/>"))
   
-  observeEvent(input$tsv, {
+  observeEvent(input$upload, {
     
+    shinyjs::hide("upload")
     shinyjs::show("clean")
     shinyjs::show("skip")
     shinyjs::show("download")

R/app_ui.R

@@ -28,7 +28,8 @@ app_ui <- function() {
                     accept = c("text/tab-separated-values", ".tsv", ".tabular")
                    ),
           HTML("<br/>"),
-          downloadButton("download", "Download", class="butt"),
+          actionButton("upload", "Submit data", class = "butt", icon = icon("cloud-upload")),
+          downloadButton("download", "Download data", class="butt"),
           tags$head(tags$style(".butt{color: black !important; margin-left: 16px; }"))
         )
       ),