diff --git a/.Rbuildignore b/.Rbuildignore
index dcbeefa2..05da44fc 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -18,5 +18,5 @@
^srcjs$
^.*\.icloud$
^netlify\.toml$
-^inst/examples/vignettes-demos$
+^inst/examples/vignettes-demos/.*./rsconnect$
diff --git a/DESCRIPTION b/DESCRIPTION
index b379e6ca..753648ad 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: bs4Dash
Type: Package
Title: A 'Bootstrap 4' Version of 'shinydashboard'
-Version: 2.0.1.9000
+Version: 2.0.1
Authors@R: c(
person("David", "Granjon", email = "dgranjon@ymail.com", role = c("aut", "cre")),
person(family = "RinteRface", role = "cph"),
@@ -50,6 +50,7 @@ Collate:
'dashboardPage.R'
'aliases.R'
'auto-color.R'
+ 'bs4Dash-package.r'
'bs4DashGallery.R'
'deps.R'
'grid.R'
diff --git a/NAMESPACE b/NAMESPACE
index 2ff00204..c2dc4bb0 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -179,3 +179,4 @@ export(userPostTagItems)
export(valueBox)
export(valueBoxOutput)
importFrom(jsonlite,toJSON)
+importFrom(lifecycle,deprecated)
diff --git a/NEWS.md b/NEWS.md
index 4d28fd69..89b5fad4 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,8 @@
-# bs4Dash 2.0.1.9000
+# bs4Dash 2.0.1
+
+## Minor changes
+- Simple patch to fix wrong .Rbuildignore [rule](https://github.com/DivadNojnarg/outstanding-shiny-ui/issues/52).
+- Update internal file structure.
## Bug Fix
- Fix #220: Disable badgeLabel in SidebarMenuItem when collapsed. Wrong tag structure fixed.
diff --git a/R/bs4Dash-package.r b/R/bs4Dash-package.r
new file mode 100644
index 00000000..20b8c951
--- /dev/null
+++ b/R/bs4Dash-package.r
@@ -0,0 +1,6 @@
+#' bs4Dash
+#'
+#' @name bs4Dash
+#' @docType package
+#' @importFrom lifecycle deprecated
+"_PACKAGE"
\ No newline at end of file
diff --git a/R/deps.R b/R/deps.R
index ad9d8d3f..74cb0426 100644
--- a/R/deps.R
+++ b/R/deps.R
@@ -13,6 +13,8 @@ add_bs4Dash_deps <- function(tag, options) {
ionicons_css <- "https://unpkg.com/ionicons@4.4.2/dist/css/"
google_fonts <- "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700"
+ bs4Dash_version <- as.character(utils::packageVersion("bs4Dash"))
+
bs4Dash_deps <- list(
# jquery UI deps for sortable elements
htmltools::htmlDependency(
@@ -43,8 +45,8 @@ add_bs4Dash_deps <- function(tag, options) {
# additional options (this needs to be loaded before shinydashboardPlus deps)
htmltools::htmlDependency(
"options",
- as.character(utils::packageVersion("bs4Dash")),
- src = c(file = "bs4Dash-2.0.0"),
+ bs4Dash_version,
+ src = c(file = sprintf("bs4Dash-%s", bs4Dash_version)),
head = paste0(
"
@@ -47,7 +47,7 @@
-
+
@@ -90,7 +90,7 @@
-
+
@@ -104,13 +104,13 @@
-
+
@@ -47,7 +47,7 @@
-
+
@@ -90,7 +90,7 @@
-
+
@@ -104,13 +104,13 @@
-
+
@@ -47,7 +47,7 @@
-
+
@@ -90,7 +90,7 @@
-
+
@@ -104,13 +104,13 @@
-
+
@@ -89,7 +89,7 @@
-
+
@@ -132,7 +132,7 @@
-
+
diff --git a/docs/articles/more-skins.html b/docs/articles/more-skins.html
index af93d7d8..92a0e712 100644
--- a/docs/articles/more-skins.html
+++ b/docs/articles/more-skins.html
@@ -39,7 +39,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -47,7 +47,7 @@
-
+
@@ -90,7 +90,7 @@
-
+
@@ -104,13 +104,13 @@
-
+
@@ -110,7 +110,7 @@
How to start?
David Granjon
-
2021-04-26
+
2021-07-16
Source: vignettes/step-by-step.Rmd
step-by-step.Rmd
@@ -163,7 +163,7 @@
)
has mandatory slots for the navbar (dashboardHeader()
), sidebar (dashboardSidebar()
) and (dashboardBody()
). Note the dashboardControlbar()
and dashboardFooter()
are optional. The title parameter gives its name to the web browser tab. freshTheme , when provided, expects a fresh powered theme created with fresh::create_theme()
. It allows deeper customization of colors to fit very specific needs like industry brand colors. preloader expects a loader tag built with waiter
, see more here , for instance:
+
preloader <- list ( html = tagList ( spin_1 ( ) , "Loading ..." ) , color = "#343a40" )
At the moment, options are not available, but the idea is to provide deeper customization of the AdminLTE3 template like changing the sidebars and cards animation speed, …
When fullscreen is TRUE, an icon is displayed in the navbar to switch to full screen mode. help automatically enable/disable all tooltips and popover that are present in the shiny app: this is an easier approach than using the server methods addPopover()
, addTooltip()
, … but less specific. dark allows to toggle the dark mode: if FALSE, the theme switch is hidden and the dashboard takes the light design. scrollToTop allows to toggle the scroll to top button shown in the bottom right corner.
Now, it is time to fill this template!
@@ -427,7 +427,7 @@
sidebarIcon = icon ( "bars" ) ,
controlbarIcon = icon ( "th" ) ,
fixed = FALSE ,
- leftUi = tagList (
+ leftUi = tagList (
dropdownMenu (
badgeStatus = "info" ,
type = "notifications" ,
diff --git a/docs/authors.html b/docs/authors.html
index ca795ad1..ecc1d5e1 100644
--- a/docs/authors.html
+++ b/docs/authors.html
@@ -81,7 +81,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -89,7 +89,7 @@
-
+
@@ -132,7 +132,7 @@
-
+
diff --git a/docs/index.html b/docs/index.html
index e8b7079a..5a4f798f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -41,7 +41,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -49,7 +49,7 @@
-
+
@@ -92,7 +92,7 @@
-
+
diff --git a/docs/news/index.html b/docs/news/index.html
index ef6b1bbc..91f58e84 100644
--- a/docs/news/index.html
+++ b/docs/news/index.html
@@ -81,7 +81,7 @@
bs4Dash
- 2.0.0.9000
+ 2.0.1
@@ -89,7 +89,7 @@
-
+
@@ -132,7 +132,7 @@
-
+
@@ -153,9 +153,30 @@ Changelog
Source: NEWS.md
-
-
@@ -92,7 +92,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/docs/reference/boxProfile.html b/docs/reference/boxProfile.html
index b67db00c..298557c2 100644
--- a/docs/reference/boxProfile.html
+++ b/docs/reference/boxProfile.html
@@ -84,7 +84,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -92,7 +92,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/docs/reference/boxSidebar.html b/docs/reference/boxSidebar.html
index a1ea4ee7..8e257c74 100644
--- a/docs/reference/boxSidebar.html
+++ b/docs/reference/boxSidebar.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/bs4Dash.html b/docs/reference/bs4Dash.html
new file mode 100644
index 00000000..650b4c9a
--- /dev/null
+++ b/docs/reference/bs4Dash.html
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+
+
+bs4Dash — bs4Dash • bs4Dash
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Make 'Bootstrap 4' Shiny dashboards. Use the full power
+ of 'AdminLTE3', a dashboard template built on top of 'Bootstrap 4'
+ <https://github.com/ColorlibHQ/AdminLTE>.
+
+
+
+
+
See also
+
+
+
Author
+
+
Maintainer : David Granjon dgranjon@ymail.com
+
Other contributors:
+RinteRface [copyright holder]
+Almasaeed Studio (AdminLTE3 theme for Bootstrap 4) [contributor, copyright holder]
+Winston Chang (Utils functions from shinydashboard) [contributor, copyright holder]
+Thomas Park (Bootswatch Sketchy theme CSS) [contributor, copyright holder]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/reference/bs4DashGallery.html b/docs/reference/bs4DashGallery.html
index c037faf2..926647a3 100644
--- a/docs/reference/bs4DashGallery.html
+++ b/docs/reference/bs4DashGallery.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/callout.html b/docs/reference/callout.html
index 1cd738c7..be6e944a 100644
--- a/docs/reference/callout.html
+++ b/docs/reference/callout.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/carousel.html b/docs/reference/carousel.html
index 6a01dcdb..cad10d87 100644
--- a/docs/reference/carousel.html
+++ b/docs/reference/carousel.html
@@ -83,7 +83,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -91,7 +91,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
diff --git a/docs/reference/column.html b/docs/reference/column.html
index c4ec8aca..40a4a11f 100644
--- a/docs/reference/column.html
+++ b/docs/reference/column.html
@@ -83,7 +83,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -91,7 +91,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
diff --git a/docs/reference/dashboardBody.html b/docs/reference/dashboardBody.html
index 71daee80..cef2a0c4 100644
--- a/docs/reference/dashboardBody.html
+++ b/docs/reference/dashboardBody.html
@@ -84,7 +84,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -92,7 +92,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/docs/reference/dashboardBrand.html b/docs/reference/dashboardBrand.html
index 48bea97a..3adb37a2 100644
--- a/docs/reference/dashboardBrand.html
+++ b/docs/reference/dashboardBrand.html
@@ -84,7 +84,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -92,7 +92,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/docs/reference/dashboardControlbar.html b/docs/reference/dashboardControlbar.html
index bcb57be7..1f77152d 100644
--- a/docs/reference/dashboardControlbar.html
+++ b/docs/reference/dashboardControlbar.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/dashboardFooter.html b/docs/reference/dashboardFooter.html
index 189bbe21..8157f643 100644
--- a/docs/reference/dashboardFooter.html
+++ b/docs/reference/dashboardFooter.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/dashboardHeader.html b/docs/reference/dashboardHeader.html
index 5f6f62f1..376d1d19 100644
--- a/docs/reference/dashboardHeader.html
+++ b/docs/reference/dashboardHeader.html
@@ -83,7 +83,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -91,7 +91,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
diff --git a/docs/reference/dashboardPage.html b/docs/reference/dashboardPage.html
index 0950e113..e42fce32 100644
--- a/docs/reference/dashboardPage.html
+++ b/docs/reference/dashboardPage.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/dashboardSidebar.html b/docs/reference/dashboardSidebar.html
index 64c2fa4f..1f8afe03 100644
--- a/docs/reference/dashboardSidebar.html
+++ b/docs/reference/dashboardSidebar.html
@@ -91,7 +91,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -99,7 +99,7 @@
-
+
@@ -142,7 +142,7 @@
-
+
diff --git a/docs/reference/dashboardUser.html b/docs/reference/dashboardUser.html
index 258a1247..f8e27872 100644
--- a/docs/reference/dashboardUser.html
+++ b/docs/reference/dashboardUser.html
@@ -85,7 +85,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -93,7 +93,7 @@
-
+
@@ -136,7 +136,7 @@
-
+
diff --git a/docs/reference/dropdownDivider.html b/docs/reference/dropdownDivider.html
index e4de893c..b5480fea 100644
--- a/docs/reference/dropdownDivider.html
+++ b/docs/reference/dropdownDivider.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/dropdownMenu.html b/docs/reference/dropdownMenu.html
index 3cf15ecd..bf3d0c75 100644
--- a/docs/reference/dropdownMenu.html
+++ b/docs/reference/dropdownMenu.html
@@ -86,7 +86,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -94,7 +94,7 @@
-
+
@@ -137,7 +137,7 @@
-
+
@@ -416,7 +416,7 @@ Examp
color = "lime"
)
) ,
- leftUi = tagList (
+ leftUi = tagList (
dropdownMenu (
badgeStatus = "info" ,
type = "notifications" ,
diff --git a/docs/reference/dropdownMenuOutput.html b/docs/reference/dropdownMenuOutput.html
index a96d9390..7864a51b 100644
--- a/docs/reference/dropdownMenuOutput.html
+++ b/docs/reference/dropdownMenuOutput.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/findSidebarItem.html b/docs/reference/findSidebarItem.html
index 2ccbf944..a46f22b5 100644
--- a/docs/reference/findSidebarItem.html
+++ b/docs/reference/findSidebarItem.html
@@ -85,7 +85,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -93,7 +93,7 @@
-
+
@@ -136,7 +136,7 @@
-
+
diff --git a/docs/reference/getAdminLTEColors.html b/docs/reference/getAdminLTEColors.html
index 6255aefd..457fa005 100644
--- a/docs/reference/getAdminLTEColors.html
+++ b/docs/reference/getAdminLTEColors.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/index.html b/docs/reference/index.html
index 5e041495..87e5226b 100644
--- a/docs/reference/index.html
+++ b/docs/reference/index.html
@@ -81,7 +81,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -89,7 +89,7 @@
-
+
@@ -132,7 +132,7 @@
-
+
diff --git a/docs/reference/infoBox.html b/docs/reference/infoBox.html
index 63a88fad..7e3a9e5f 100644
--- a/docs/reference/infoBox.html
+++ b/docs/reference/infoBox.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/insertTab.html b/docs/reference/insertTab.html
index a2a8dd12..638b9719 100644
--- a/docs/reference/insertTab.html
+++ b/docs/reference/insertTab.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/ionicon.html b/docs/reference/ionicon.html
index 67b38d83..395120fe 100644
--- a/docs/reference/ionicon.html
+++ b/docs/reference/ionicon.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/jumbotron.html b/docs/reference/jumbotron.html
index f516eeaa..2cd39c96 100644
--- a/docs/reference/jumbotron.html
+++ b/docs/reference/jumbotron.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/listgroup.html b/docs/reference/listgroup.html
index 46b9fe5d..4ec4cfa4 100644
--- a/docs/reference/listgroup.html
+++ b/docs/reference/listgroup.html
@@ -83,7 +83,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -91,7 +91,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
diff --git a/docs/reference/loading.html b/docs/reference/loading.html
index e2e9b65f..cce65bc4 100644
--- a/docs/reference/loading.html
+++ b/docs/reference/loading.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/menuItemOutput.html b/docs/reference/menuItemOutput.html
index 2ba54b86..d941b586 100644
--- a/docs/reference/menuItemOutput.html
+++ b/docs/reference/menuItemOutput.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/menuOutput.html b/docs/reference/menuOutput.html
index 9fd755a0..0d3fa6cb 100644
--- a/docs/reference/menuOutput.html
+++ b/docs/reference/menuOutput.html
@@ -88,7 +88,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -96,7 +96,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
diff --git a/docs/reference/popover.html b/docs/reference/popover.html
index ae275baa..e44692e6 100644
--- a/docs/reference/popover.html
+++ b/docs/reference/popover.html
@@ -85,7 +85,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -93,7 +93,7 @@
-
+
@@ -136,7 +136,7 @@
-
+
diff --git a/docs/reference/productList.html b/docs/reference/productList.html
index 4ad6e8bf..15e8908d 100644
--- a/docs/reference/productList.html
+++ b/docs/reference/productList.html
@@ -84,7 +84,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -92,7 +92,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/docs/reference/progress.html b/docs/reference/progress.html
index 05f2a3b1..3bfaa681 100644
--- a/docs/reference/progress.html
+++ b/docs/reference/progress.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/quote.html b/docs/reference/quote.html
index 30d1048b..a8037908 100644
--- a/docs/reference/quote.html
+++ b/docs/reference/quote.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/renderMenu.html b/docs/reference/renderMenu.html
index 2193d6c1..aca0efe7 100644
--- a/docs/reference/renderMenu.html
+++ b/docs/reference/renderMenu.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/ribbon.html b/docs/reference/ribbon.html
index 398a23ee..b648e4b0 100644
--- a/docs/reference/ribbon.html
+++ b/docs/reference/ribbon.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/sidebarMenuOutput.html b/docs/reference/sidebarMenuOutput.html
index 583e6950..c3b0f091 100644
--- a/docs/reference/sidebarMenuOutput.html
+++ b/docs/reference/sidebarMenuOutput.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/skinSelector.html b/docs/reference/skinSelector.html
index 5d119864..a890d656 100644
--- a/docs/reference/skinSelector.html
+++ b/docs/reference/skinSelector.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/socialBox.html b/docs/reference/socialBox.html
index 4e017b8a..c1680180 100644
--- a/docs/reference/socialBox.html
+++ b/docs/reference/socialBox.html
@@ -84,7 +84,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -92,7 +92,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/docs/reference/sortable.html b/docs/reference/sortable.html
index 59eefb28..de87aece 100644
--- a/docs/reference/sortable.html
+++ b/docs/reference/sortable.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/stars.html b/docs/reference/stars.html
index 2ed7d533..62756289 100644
--- a/docs/reference/stars.html
+++ b/docs/reference/stars.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/tabBox.html b/docs/reference/tabBox.html
index 850efed8..6450aa13 100644
--- a/docs/reference/tabBox.html
+++ b/docs/reference/tabBox.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/table.html b/docs/reference/table.html
index 51bc7402..2097ef5b 100644
--- a/docs/reference/table.html
+++ b/docs/reference/table.html
@@ -84,7 +84,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -92,7 +92,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/docs/reference/tabsetPanel.html b/docs/reference/tabsetPanel.html
index ce22245f..51c2e5e6 100644
--- a/docs/reference/tabsetPanel.html
+++ b/docs/reference/tabsetPanel.html
@@ -84,7 +84,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -92,7 +92,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/docs/reference/tagAssert.html b/docs/reference/tagAssert.html
index b846df7e..d30d87fc 100644
--- a/docs/reference/tagAssert.html
+++ b/docs/reference/tagAssert.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/timeline.html b/docs/reference/timeline.html
index f2ad15ea..1240d037 100644
--- a/docs/reference/timeline.html
+++ b/docs/reference/timeline.html
@@ -88,7 +88,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -96,7 +96,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
diff --git a/docs/reference/toast.html b/docs/reference/toast.html
index de09c339..a492cf76 100644
--- a/docs/reference/toast.html
+++ b/docs/reference/toast.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/tooltip.html b/docs/reference/tooltip.html
index 5b862ae1..b6a20b7d 100644
--- a/docs/reference/tooltip.html
+++ b/docs/reference/tooltip.html
@@ -85,7 +85,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -93,7 +93,7 @@
-
+
@@ -136,7 +136,7 @@
-
+
diff --git a/docs/reference/useAutoColor.html b/docs/reference/useAutoColor.html
index 4307c01e..8cc5037b 100644
--- a/docs/reference/useAutoColor.html
+++ b/docs/reference/useAutoColor.html
@@ -84,7 +84,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -92,7 +92,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/docs/reference/userBox.html b/docs/reference/userBox.html
index 09471a24..660350ed 100644
--- a/docs/reference/userBox.html
+++ b/docs/reference/userBox.html
@@ -83,7 +83,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -91,7 +91,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
diff --git a/docs/reference/userList.html b/docs/reference/userList.html
index ebabbee7..e39c260a 100644
--- a/docs/reference/userList.html
+++ b/docs/reference/userList.html
@@ -83,7 +83,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -91,7 +91,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
diff --git a/docs/reference/userMessage.html b/docs/reference/userMessage.html
index ef34e9a5..42e6854a 100644
--- a/docs/reference/userMessage.html
+++ b/docs/reference/userMessage.html
@@ -85,7 +85,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -93,7 +93,7 @@
-
+
@@ -136,7 +136,7 @@
-
+
@@ -395,7 +395,7 @@ Examp
date = "Now" ,
image = "https://i.pinimg.com/originals/f1/15/df/f115dfc9cab063597b1221d015996b39.jpg" ,
type = "received" ,
- text = tagList (
+ text = tagList (
sliderInput (
"obs" ,
"Number of observations:" ,
@@ -419,7 +419,7 @@ Examp
action = "update" ,
index = input $ index ,
content = list (
- text = tagList (
+ text = tagList (
appButton (
inputId = "reload" ,
label = "Click me!" ,
diff --git a/docs/reference/userPost.html b/docs/reference/userPost.html
index faf6afde..9997f9f9 100644
--- a/docs/reference/userPost.html
+++ b/docs/reference/userPost.html
@@ -84,7 +84,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -92,7 +92,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/docs/reference/userPostMedia.html b/docs/reference/userPostMedia.html
index 8c02a2b4..40cc6de3 100644
--- a/docs/reference/userPostMedia.html
+++ b/docs/reference/userPostMedia.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/validColors.html b/docs/reference/validColors.html
index 8da61273..b8d335ba 100644
--- a/docs/reference/validColors.html
+++ b/docs/reference/validColors.html
@@ -83,7 +83,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -91,7 +91,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
diff --git a/docs/reference/validNuances.html b/docs/reference/validNuances.html
index ebb39a01..e90296fb 100644
--- a/docs/reference/validNuances.html
+++ b/docs/reference/validNuances.html
@@ -84,7 +84,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -92,7 +92,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/docs/reference/validStatuses.html b/docs/reference/validStatuses.html
index 677c9123..6d65919b 100644
--- a/docs/reference/validStatuses.html
+++ b/docs/reference/validStatuses.html
@@ -84,7 +84,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -92,7 +92,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
diff --git a/docs/reference/validStatusesPlus.html b/docs/reference/validStatusesPlus.html
index 906a318f..9f9fdfe3 100644
--- a/docs/reference/validStatusesPlus.html
+++ b/docs/reference/validStatusesPlus.html
@@ -82,7 +82,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -90,7 +90,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
diff --git a/docs/reference/valueBox.html b/docs/reference/valueBox.html
index eceaf118..c9a8f943 100644
--- a/docs/reference/valueBox.html
+++ b/docs/reference/valueBox.html
@@ -85,7 +85,7 @@
bs4Dash
- 2.0.0
+ 2.0.1
@@ -93,7 +93,7 @@
-
+
@@ -136,7 +136,7 @@
-
+
diff --git a/inst/bs4Dash-2.0.0/bs4Dash.css b/inst/bs4Dash-2.0.1/bs4Dash.css
similarity index 100%
rename from inst/bs4Dash-2.0.0/bs4Dash.css
rename to inst/bs4Dash-2.0.1/bs4Dash.css
diff --git a/inst/bs4Dash-2.0.0/bs4Dash.js b/inst/bs4Dash-2.0.1/bs4Dash.js
similarity index 100%
rename from inst/bs4Dash-2.0.0/bs4Dash.js
rename to inst/bs4Dash-2.0.1/bs4Dash.js
diff --git a/inst/bs4Dash-2.0.0/bs4Dash.min.js b/inst/bs4Dash-2.0.1/bs4Dash.min.js
similarity index 100%
rename from inst/bs4Dash-2.0.0/bs4Dash.min.js
rename to inst/bs4Dash-2.0.1/bs4Dash.min.js
diff --git a/inst/bs4Dash-2.0.0/bs4Dash.min.js.map b/inst/bs4Dash-2.0.1/bs4Dash.min.js.map
similarity index 100%
rename from inst/bs4Dash-2.0.0/bs4Dash.min.js.map
rename to inst/bs4Dash-2.0.1/bs4Dash.min.js.map
diff --git a/man/bs4Dash.Rd b/man/bs4Dash.Rd
new file mode 100644
index 00000000..22f4fc8c
--- /dev/null
+++ b/man/bs4Dash.Rd
@@ -0,0 +1,33 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/bs4Dash-package.r
+\docType{package}
+\name{bs4Dash}
+\alias{bs4Dash}
+\alias{bs4Dash-package}
+\title{bs4Dash}
+\description{
+Make 'Bootstrap 4' Shiny dashboards. Use the full power
+ of 'AdminLTE3', a dashboard template built on top of 'Bootstrap 4'
+ .
+}
+\seealso{
+Useful links:
+\itemize{
+ \item \url{https://rinterface.github.io/bs4Dash/index.html}
+ \item \url{https://github.com/RinteRface/bs4Dash}
+ \item Report bugs at \url{https://github.com/RinteRface/bs4Dash/issues}
+}
+
+}
+\author{
+\strong{Maintainer}: David Granjon \email{dgranjon@ymail.com}
+
+Other contributors:
+\itemize{
+ \item RinteRface [copyright holder]
+ \item Almasaeed Studio (AdminLTE3 theme for Bootstrap 4) [contributor, copyright holder]
+ \item Winston Chang (Utils functions from shinydashboard) [contributor, copyright holder]
+ \item Thomas Park (Bootswatch Sketchy theme CSS) [contributor, copyright holder]
+}
+
+}
diff --git a/srcjs/bs4Dash-2.0.0/accordions-binding.js b/srcjs/bs4Dash-2.0.1/accordions-binding.js
similarity index 100%
rename from srcjs/bs4Dash-2.0.0/accordions-binding.js
rename to srcjs/bs4Dash-2.0.1/accordions-binding.js
diff --git a/srcjs/bs4Dash-2.0.0/cards.js b/srcjs/bs4Dash-2.0.1/cards.js
similarity index 100%
rename from srcjs/bs4Dash-2.0.0/cards.js
rename to srcjs/bs4Dash-2.0.1/cards.js
diff --git a/srcjs/bs4Dash-2.0.0/controlbar.js b/srcjs/bs4Dash-2.0.1/controlbar.js
similarity index 100%
rename from srcjs/bs4Dash-2.0.0/controlbar.js
rename to srcjs/bs4Dash-2.0.1/controlbar.js
diff --git a/srcjs/bs4Dash-2.0.0/feedbacks.js b/srcjs/bs4Dash-2.0.1/feedbacks.js
similarity index 100%
rename from srcjs/bs4Dash-2.0.0/feedbacks.js
rename to srcjs/bs4Dash-2.0.1/feedbacks.js
diff --git a/srcjs/bs4Dash-2.0.0/leftSidebar.js b/srcjs/bs4Dash-2.0.1/leftSidebar.js
similarity index 100%
rename from srcjs/bs4Dash-2.0.0/leftSidebar.js
rename to srcjs/bs4Dash-2.0.1/leftSidebar.js
diff --git a/srcjs/bs4Dash-2.0.0/miscellaneous.js b/srcjs/bs4Dash-2.0.1/miscellaneous.js
similarity index 100%
rename from srcjs/bs4Dash-2.0.0/miscellaneous.js
rename to srcjs/bs4Dash-2.0.1/miscellaneous.js
diff --git a/srcjs/bs4Dash-2.0.0/navbar.js b/srcjs/bs4Dash-2.0.1/navbar.js
similarity index 100%
rename from srcjs/bs4Dash-2.0.0/navbar.js
rename to srcjs/bs4Dash-2.0.1/navbar.js
diff --git a/srcjs/bs4Dash-2.0.0/output-bindings.js b/srcjs/bs4Dash-2.0.1/output-bindings.js
similarity index 100%
rename from srcjs/bs4Dash-2.0.0/output-bindings.js
rename to srcjs/bs4Dash-2.0.1/output-bindings.js
diff --git a/srcjs/bs4Dash-2.0.0/tabs.js b/srcjs/bs4Dash-2.0.1/tabs.js
similarity index 100%
rename from srcjs/bs4Dash-2.0.0/tabs.js
rename to srcjs/bs4Dash-2.0.1/tabs.js
diff --git a/srcjs/bs4Dash-2.0.0/userMessages.js b/srcjs/bs4Dash-2.0.1/userMessages.js
similarity index 100%
rename from srcjs/bs4Dash-2.0.0/userMessages.js
rename to srcjs/bs4Dash-2.0.1/userMessages.js
diff --git a/tests/testthat/test-bs4Cards.R b/tests/testthat/test-bs4Cards.R
index b7930cc4..e9fe9a11 100644
--- a/tests/testthat/test-bs4Cards.R
+++ b/tests/testthat/test-bs4Cards.R
@@ -40,7 +40,7 @@ getCardBodyStyle <- function(card) {
getCardTools <- function(card) {
header <- getCardHeader(card)
- bs4Dash:::dropNulls(header$children[[3]]$children)
+ bs4Dash:::dropNulls(header$children[[2]]$children[[2]])
}
test_that("is shiny tag?", {
@@ -58,7 +58,7 @@ test_that("card structure", {
# if collapsible is FALSE, there is still header with title "\u200C"
cardChildren <- getCardChildren(bs4Card(collapsible = FALSE))
expect_length(cardChildren, 2)
- expect_equal(getCardChildren(bs4Card(collapsible = FALSE))[[1]]$children[[2]]$attribs$class, "card-title")
+ expect_equal(getCardChildren(bs4Card(collapsible = FALSE))[[1]]$children[[1]]$attribs$class, "card-title")
# if collapsible is FALSE but title is not NULL, the header is included
cardChildren <- getCardChildren(bs4Card(collapsible = FALSE, title = "card title"))
@@ -72,17 +72,17 @@ test_that("card tools", {
parms$collapsible <- TRUE
cardTag <- do.call(bs4Card, parms)
toolsTag <- getCardTools(cardTag)
- expect_length(toolsTag[[1]], 1)
+ expect_length(toolsTag, 1)
parms$closable <- TRUE
cardTag <- do.call(bs4Card, parms)
toolsTag <- getCardTools(cardTag)
- expect_length(toolsTag[[1]], 2)
+ expect_length(toolsTag, 2)
parms$maximizable <- TRUE
cardTag <- do.call(bs4Card, parms)
toolsTag <- getCardTools(cardTag)
- expect_length(toolsTag[[1]], 3)
+ expect_length(toolsTag, 3)
parms$dropdownMenu <- boxDropdown(
boxDropdownItem("plop"),
@@ -90,18 +90,18 @@ test_that("card tools", {
)
cardTag <- do.call(bs4Card, parms)
toolsTag <- getCardTools(cardTag)
- expect_length(toolsTag[[1]], 4)
+ expect_length(toolsTag, 4)
parms$sidebar <- boxSidebar()
cardTag <- do.call(bs4Card, parms)
toolsTag <- getCardTools(cardTag)
- expect_length(toolsTag[[1]], 5)
+ expect_length(toolsTag, 5)
# label does not belong to the toolsTag list
parms$label <- boxLabel(text = "label", status = "danger")
cardTag <- do.call(bs4Card, parms)
toolsTag <- getCardTools(cardTag)
- expect_length(toolsTag, 2)
+ expect_length(toolsTag, 5)
})
test_that("default", {
diff --git a/tools/jstools.R b/tools/jstools.R
index 1d3e834f..e6ab084c 100644
--- a/tools/jstools.R
+++ b/tools/jstools.R
@@ -1,18 +1,19 @@
# Packages ----------------------------------------------------------------
library(jstools)
+bs4Dash_version <- as.character(utils::packageVersion("bs4Dash"))
# Validate ----------------------------------------------------------------
bs4DashJS <- list.files(
- path = "srcjs/bs4Dash-2.0.0",
+ path = sprintf("srcjs/bs4Dash-%s", bs4Dash_version),
recursive = TRUE,
full.names = TRUE
)
# jshint_file(input = bs4DashJS, options = jshint_options(jquery = TRUE, globals = list("Shiny", "app")))
-outputDir <- "inst/bs4Dash-2.0.0"
+outputDir <- sprintf("inst/bs4Dash-%s", bs4Dash_version)
# Concat -----------------------------------------------------------------