squash several last commits into one - second one

Author: dmpe

NEWS

@@ -2,6 +2,8 @@ shinydashboard 0.5.1.9000
 --------------------------------------------------------------------------------
 * Updated to AdminLTE 2.3.2 (1ee281b).
 
+* Add wrench icon to the box-header (now can use dropdown menu)
+
 shinydashboard 0.5.1
 --------------------------------------------------------------------------------
 

R/boxes.R

@@ -251,7 +251,7 @@ infoBox <- function(title, value = NULL, subtitle = NULL,
 #' @export
 box <- function(..., title = NULL, footer = NULL, status = NULL,
                 solidHeader = FALSE, background = NULL, width = 6,
-                height = NULL, collapsible = FALSE, collapsed = FALSE, wrench = FALSE) {
+                height = NULL, collapsible = FALSE, collapsed = FALSE, wrench = FALSE, wrenchOptions = NULL) {
 
   boxClass <- "box"
   if (solidHeader || !is.null(background)) {
@@ -299,11 +299,12 @@ box <- function(..., title = NULL, footer = NULL, status = NULL,
       collapseTag <- tags$button(class = paste0("btn btn-box-tool"), `data-widget` = "collapse", shiny::icon(collapseIcon))
     }
 
-    if(wrench == TRUE) {
+    if (wrench == TRUE) {
       wrenchTag <- div(class = paste0("btn-group"),
-                       tags$button(class = "btn btn-box-tool dropdown-toggle", `type` = "button", `data-toggle` = "dropdown", shiny::icon("wrench")),
-                       tags$ul(class = "dropdown-menu", `role` = "menu")
-                       ## todo vymyslet jak zaridit abych to pouzivatelne z UI
+                       tags$button(class = "btn btn-box-tool dropdown-toggle", `type` = "button",
+                                   `data-toggle` = "dropdown", shiny::icon("wrench")),
+                       tags$ul(class = "dropdown-menu", `role` = "menu", wrenchOptions)
+                       ## TODO: how to display them ?
       )
     }
 
@@ -314,7 +315,7 @@ box <- function(..., title = NULL, footer = NULL, status = NULL,
   }
 
   headerTag <- NULL
-  if (!is.null(titleTag) ||  !is.null(boxToolsTag) ) {
+  if (!is.null(titleTag) || !is.null(boxToolsTag)) {
     headerTag <- div(class = "box-header",
       titleTag,
       boxToolsTag

R/deps.R

@@ -20,7 +20,7 @@ addDeps <- function(x) {
   }
 
   dashboardDeps <- list(
-    htmlDependency("AdminLTE", "2.0.6",
+    htmlDependency("AdminLTE", "2.3.2",
       c(file = system.file("AdminLTE", package = "shinydashboard")),
       script = adminLTE_js,
       stylesheet = adminLTE_css

man/box.Rd

@@ -42,7 +42,7 @@ body <- dashboardBody(
         )
     ),
     box(title = "Histogram box title",
-        status = "warning", solidHeader = TRUE, collapsible = F, wrench = T,
+        status = "warning", solidHeader = TRUE, collapsible = F, wrench = T, wrenchOptions = tags$li(a(href="https://google.cz", "Click here!")),
         plotOutput("plot", height = 250)
     )
   ),