adjust color of get buttons; parallelize format

ICB-DCM · Dec 16, 2024 · c795a1c · c795a1c
1 parent 3a0169a
commit c795a1c
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 26 deletions.
diff --git a/program/shinyApp/R/data_selection/ui.R b/program/shinyApp/R/data_selection/ui.R
@@ -44,7 +44,7 @@ data_selection_sidebar_panel <- sidebarPanel(
           label = "Upload new data",
           width = "80%",
           icon = icon('paper-plane'),
-          style = "color: #fffff; background-color: #90DBF4; border-color: #000000"
+          style = "color: black; background-color: white; border-color: black;"
         ),
         hr(style = "border-top: 1px solid #858585;")
       ),
@@ -71,7 +71,7 @@ data_selection_sidebar_panel <- sidebarPanel(
           label = "Upload new data",
           width = "80%",
           icon = icon('paper-plane'),
-          style = "color: #fffff; background-color: #90DBF4; border-color: #000000",
+          style = "color: black; background-color: white; border-color: black;"
         ),
         hr(style = "border-top: 1px solid #858585;")
       ),
@@ -111,7 +111,7 @@ data_selection_sidebar_panel <- sidebarPanel(
           label = "Upload new data",
           width = "80%",
           icon = icon('paper-plane'),
-          style = "color: #fffff; background-color: #90DBF4; border-color: #000000",
+          style = "color: black; background-color: white; border-color: black;"
         ),
         hr(style = "border-top: 1px solid #858585;")
       ),
@@ -130,9 +130,8 @@ data_selection_sidebar_panel <- sidebarPanel(
         br(),
         actionButton(
           inputId = "EasyTestForUser",
-          label = "Start straight away with a test-dataset!",
-          icon = icon('paper-plane'),
-          style = "color: #fffff; background-color: #90DBF4; border-color: #000000"
+          label = "Upload test data",
+          style = "color: black; background-color: white; border-color: black;"
         ),
         hr(style = "border-top: 1px solid #858585;")
       )
@@ -164,7 +163,7 @@ data_selection_main_panel <- mainPanel(
   fluidRow(
     column(5,
            actionButton(
-            "select_data", "Select Data",
+            "select_data", "[optional] Select Data",
             width = "100%",
             icon = icon('filter'),
             style = "color: #fffff; background-color: white; border-color: #000000"
@@ -175,10 +174,18 @@ data_selection_main_panel <- mainPanel(
     condition = "input.select_data % 2 == 0",
     fluidRow(column(5,
         actionButton(
-          "use_full_data", "Use Full Dataset",
+          "use_full_data", "Go to Preprocessing",
           width = "100%",
-          icon = icon('rocket'),
-          style = "color: #fffff; background-color: #70BF4F47; border-color: #000000"
+          icon = icon("fas fa-mouse-pointer"),
+          style = "
+          background-color: white;
+          color: black;
+          border: 2px solid darkgrey;
+          font-size: 15px;
+          font-weight: bold;
+          box-shadow: 3px 3px 5px rgba(255, 0, 0, 0.8);
+          padding: 5px 5px;
+          border-radius: 10px;"
         )
     ))
   ),

diff --git a/program/shinyApp/R/enrichment_analysis/ui.R b/program/shinyApp/R/enrichment_analysis/ui.R
@@ -105,7 +105,8 @@ ea_sidebar <- function(ns){
     uiOutput(outputId = ns("UniverseOfGene_ui")),
     actionButton(
       inputId = ns("enrichmentGO"),
-      label = "Get Enrichment Analysis"
+      label = "Get Enrichment Analysis",
+      icon = icon("fas fa-mouse-pointer")
     ),
     hr(style = "border-top: 1px solid #000000;"),
     uiOutput(outputId = ns("KeggPathwayID_ui")),

diff --git a/program/shinyApp/R/heatmap/ui.R b/program/shinyApp/R/heatmap/ui.R
@@ -56,7 +56,7 @@ heatmap_sidebar<- function(ns){
     actionButton(
       inputId = ns("Do_Heatmap"),
       label = "Get Heatmap",
-      icon(name = "fas fa-laptop-code")
+      icon(name = "fas fa-mouse-pointer")
     ),
     hr(style = "border-top: 1px solid #000000;"),
     h5("Aesthetics") %>% helper(type = "markdown", content = "Heatmap_Aesthetics"),

diff --git a/program/shinyApp/R/help_tab/ui.R b/program/shinyApp/R/help_tab/ui.R
@@ -17,7 +17,7 @@ help_tab_sidebar_panel <- sidebarPanel(
      inputId = "get_help",
      label = "GO!",
      icon = icon('paper-plane'),
-     style = "color: #fffff; background-color: #90DBF4; border-color: #000000"
+     style = "color: black; background-color: white; border-color: black;"
    ),
   div(
     id = "horizontalLine",

diff --git a/program/shinyApp/R/pca/ui.R b/program/shinyApp/R/pca/ui.R
@@ -17,41 +17,41 @@ pca_sidebar_panel <- function(ns){
     uiOutput(outputId = ns("SampleAnnotationTypes_pca_ui")),
     uiOutput(outputId = ns("sample_selection_pca_ui")),
     # Scale data to unit variance y/n
-    radioGroupButtons(
+    radioButtons(
       inputId = ns("scale_data"),
       label = "Scale data to unit variance?",
       choices = c("Yes","No"),
-      direction = "horizontal",
+      # direction = "horizontal",
       selected = "No"
     ),
     ### start pca ---
     actionButton(
       inputId = ns("Do_PCA"),
       label = "Get PCA",
-      icon("fas fa-laptop-code")
+      icon("fas fa-mouse-pointer")
     ),
     ### further visualizations
     hr(style = "border-top: 1px solid #000000;"),
     uiOutput(outputId = ns("coloring_options_ui")),
-    radioGroupButtons(
+    radioButtons(
       inputId = ns("x_axis_selection"),
       label = "PC for x-Axis",
       choices = c("PC1","PC2", "PC3", "PC4"),
-      direction = "vertical",
+      # direction = "horizontal",
       selected = "PC1"
     ),
-    radioGroupButtons(
+    radioButtons(
       inputId = ns("y_axis_selection"),
       label = "PC for y-Axis",
       choices = c("PC1","PC2", "PC3", "PC4"),
-      direction = "vertical",
+      # direction = "horizontal",
       selected = "PC2"
     ),
-    radioGroupButtons(
+    radioButtons(
       inputId = ns("Show_loadings"),
       label = "Plot Loadings on top? (currently top 5)",
       choices = c("Yes","No"),
-      direction = "horizontal",
+      # direction = "horizontal",
       selected = "No"
     ),
     helpText("Note: if you would like to change the annotation of the indicated loading vectors please select an option the the tab Loadings"),

diff --git a/program/shinyApp/R/pre_processing/ui.R b/program/shinyApp/R/pre_processing/ui.R
@@ -25,7 +25,7 @@ pre_processing_sidebar_panel <- sidebarPanel(
   actionButton(
     inputId = "Do_preprocessing",
     label = "Get Pre-Processing",
-    icon(name = "fas fa-laptop-code")
+    icon(name = "fas fa-mouse-pointer")
   ),
   hr(style = "border-top: 1px solid #000000;"),
   uiOutput("violin_plot_color_ui")

diff --git a/program/shinyApp/R/sample_correlation/ui.R b/program/shinyApp/R/sample_correlation/ui.R
@@ -12,7 +12,7 @@ sampleCorrelation_sidebar_panel <- function(ns){
     actionButton(
       inputId = ns("Do_SampleCorrelation"),
       label = "Get Sample Correlation",
-      icon("fas fa-laptop-code")
+      icon("fas fa-mouse-pointer")
     ),
     hr(style = "border-top: 1px solid #000000;"),
     uiOutput(outputId = ns("SampleAnnotationChoice_ui")) %>% helper(type = "markdown", content = "SampleCorr_Color"),

diff --git a/program/shinyApp/R/significance_analysis/ui.R b/program/shinyApp/R/significance_analysis/ui.R
@@ -27,7 +27,8 @@ significance_analysis_sidebar_ui<- function(ns){
     # Button to start analysis
     actionButton(
       inputId = ns("significanceGo"),
-      label = "Get Significance Analysis"
+      label = "Get Significance Analysis",
+      icon = icon("fas fa-mouse-pointer")
     ),
     hidden(actionButton(
       inputId = ns("refreshUI"),

diff --git a/program/shinyApp/R/single_gene_visualisation/ui.R b/program/shinyApp/R/single_gene_visualisation/ui.R
@@ -8,7 +8,8 @@ single_gene_visualisation_sidebar_ui<- function(ns){
 
     actionButton(
       inputId = ns("singleGeneGo"), 
-      label = "Get Single Gene Visualisation"
+      label = "Get Single Gene Visualisation",
+      icon = icon("fas fa-mouse-pointer")
       ),
     # hidden Button to refresh the UI
     hidden(actionButton(

diff --git a/program/shinyApp/ui.R b/program/shinyApp/ui.R
@@ -100,6 +100,17 @@ ui <- shiny::fluidPage(
         font-size: 24px;
         color: darkred !important;
       }
+      .well button {
+      background-color: white;
+      color: black;
+      border: 2px solid darkgrey;
+      font-size: 15px;
+      font-weight: bold;
+      box-shadow: 3px 3px 5px rgba(255, 0, 0, 0.9);
+      padding: 5px 5px;
+      border-radius: 10px;
+      }
+
       #shiny-disconnected-overlay {
         background-color: grey;
         opacity: 1;