Commit bc3873ae authored by mahendra-mariadassou's avatar mahendra-mariadassou
Browse files

Merge branch 'dev'

parents bfe44243 084d98a9
...@@ -20,11 +20,12 @@ app_server <- function(input, output, session) { ...@@ -20,11 +20,12 @@ app_server <- function(input, output, session) {
shinyjs::hide("skip") shinyjs::hide("skip")
shinyjs::hide("download") 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/>")) 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("clean")
shinyjs::show("skip") shinyjs::show("skip")
shinyjs::show("download") shinyjs::show("download")
......
...@@ -28,7 +28,8 @@ app_ui <- function() { ...@@ -28,7 +28,8 @@ app_ui <- function() {
accept = c("text/tab-separated-values", ".tsv", ".tabular") accept = c("text/tab-separated-values", ".tsv", ".tabular")
), ),
HTML("<br/>"), 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; }")) tags$head(tags$style(".butt{color: black !important; margin-left: 16px; }"))
) )
), ),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment