@@ -11,7 +11,7 @@ Imports: methods, stats, utils, graphics, S4Vectors, IRanges,

          BiocParallel, SingleCellExperiment, sparseMatrixStats, DelayedArray,

          DelayedMatrixStats, HDF5Array, BiocSingular

 Suggests: BiocGenerics, RUnit, BiocStyle, knitr, rmarkdown, limma, RColorBrewer,

-          org.Hs.eg.db, genefilter, edgeR, GSVAdata, shiny, shinythemes, ggplot2,

+          org.Hs.eg.db, genefilter, edgeR, GSVAdata, shiny, shinydashboard, ggplot2,

           data.table, plotly, future, promises, shinybusy, shinyjs

 Description: Gene Set Variation Analysis (GSVA) is a non-parametric, unsupervised method for estimating variation of gene set enrichment through the samples of a expression data set. GSVA performs a change in coordinate systems, transforming the data from a gene by sample matrix to a gene-set by sample matrix, thereby allowing the evaluation of pathway enrichment for each sample. This new matrix of GSVA enrichment scores facilitates applying standard analytical methods like functional enrichment, survival analysis, clustering, CNV-pathway analysis or cross-tissue pathway analysis, in a pathway-centric manner.

 License: GPL (>= 2)

@@ -1,48 +1,53 @@

 igsva <- function() {

-  shinydeps <- c("shiny", "shinythemes", "ggplot2",

+  shinydeps <- c("shiny", "shinydashboard", "ggplot2",

                  "data.table", "plotly", "future",

-                 "shinyjs", "shinybusy", "limma")

+                 "shinyjs", "shinybusy", "limma", "magrittr")

   maskshinydeps <- shinydeps %in% installed.packages()

   if (any(!maskshinydeps))

     stop(sprintf("Please install the following packages to use the GSVA WebApp:\n\n  %s\n",

                  paste(shinydeps[!maskshinydeps], collapse=", ")))

-  

-  # namespaceImportFrom(self=getNamespace("base"),

-  #                     ns=getNamespace("shiny"))

-  # 

-  # namespaceImportFrom(self=getNamespace("base"),

-  #                     ns=getNamespace("shinythemes"),

-  #                     vars="shinytheme")

-  # 

-  # namespaceImportFrom(self=getNamespace("base"),

-  #                     ns=getNamespace("ggplot2"),

-  #                     vars="ggplot")

-  # 

-  # namespaceImportFrom(self=getNamespace("base"),

-  #                     ns=getNamespace("data.table"))

-  # 

-  # namespaceImportFrom(self=getNamespace("base"),

-  #                     ns=getNamespace("plotly"),

-  #                     vars=c("ggplotly", "event_data", "style"))

-  # 

-  # namespaceImportFrom(self=getNamespace("base"),

-  #                     ns=getNamespace("future"))

-  # 

-  # namespaceImportFrom(self=getNamespace("base"),

-  #                     ns=getNamespace("shinyjs"))

-  # 

-  # namespaceImportFrom(self=getNamespace("base"),

-  #                     ns=getNamespace("shinybusy"))

-  # 

-  # namespaceImportFrom(self=getNamespace("base"),

-  #                     ns=getNamespace("limma"))

   appDir <- system.file("shinyApp", package="GSVA")

   if (appDir == "")

     stop("The GSVA Shiny app cannot be found within the package.")

-  # runWebApp <- get("runApp", mode="function")

-  # runWebApp(appDir)

+

   shiny::runApp(appDir)

 }

+

+## legacy code

+

+# runWebApp <- get("runApp", mode="function")

+# runWebApp(appDir)

+

+

+# namespaceImportFrom(self=getNamespace("base"),

+#                     ns=getNamespace("shiny"))

+# 

+# namespaceImportFrom(self=getNamespace("base"),

+#                     ns=getNamespace("shinythemes"),

+#                     vars="shinytheme")

+# 

+# namespaceImportFrom(self=getNamespace("base"),

+#                     ns=getNamespace("ggplot2"),

+#                     vars="ggplot")

+# 

+# namespaceImportFrom(self=getNamespace("base"),

+#                     ns=getNamespace("data.table"))

+# 

+# namespaceImportFrom(self=getNamespace("base"),

+#                     ns=getNamespace("plotly"),

+#                     vars=c("ggplotly", "event_data", "style"))

+# 

+# namespaceImportFrom(self=getNamespace("base"),

+#                     ns=getNamespace("future"))

+# 

+# namespaceImportFrom(self=getNamespace("base"),

+#                     ns=getNamespace("shinyjs"))

+# 

+# namespaceImportFrom(self=getNamespace("base"),

+#                     ns=getNamespace("shinybusy"))

+# 

+# namespaceImportFrom(self=getNamespace("base"),

+#                     ns=getNamespace("limma"))

\ No newline at end of file

@@ -1,12 +1,11 @@

 closeBtnUI <- function(id){

   ns <- NS(id)

-  hidden(actionButton(ns("closeSave"), "Save & Close", style = "color: #fff;

-  font-weight: bold;

-  background-color: red;

-  border-color: #fff;

-  width:130;

-  padding: 5px 5px 5px 5px;

-  margin: 5px 5px 5px 5px; "))

+  hidden(actionButton(ns("closeSave"), "Save & Close", 

+                      icon = icon("window-close"),

+                      style = "color: #fff;

+                      font-weight: bold;

+                      background-color: red;

+                      border-color: #fff;"))

 }

 closeBtnServer <- function(id, gs){

@@ -3,9 +3,7 @@ downloadUI <- function(id) {

   hidden(downloadButton(ns('downloadData'), 'Download', style = "color: #fff;

   font-weight: bold;

   background-color: #27ae60;

-  border-color: #fff;

-  padding: 5px 14px 5px 14px;

-  margin: 5px 5px 5px 5px;" ))

+  border-color: #fff;" ))

 }

 downloadServer <- function(id, gs){

@@ -29,9 +29,12 @@ dashboardPage(

                    "Yes" = "yes")),

     br(),

     fluidRow(

-      actionButton("button", "Run"),

-      downloadUI("download"),

-      closeBtnUI("close"),

+      column(

+        width = 12, align = "left",

+        actionButton("button", "Run"),

+        downloadUI("download"),

+        closeBtnUI("close")

+      )

     )

   ),

@@ -11,6 +11,8 @@ font-weight: bold;

   color: white;

   font-weight: bold;

   font-size: 30px;

+  padding: 5px 5px 5px 5px;

+  margin: 5px 5px 5px 5px;

 }

 .left-side, .main-sidebar {