merge newest origin/shinyBS3 into Master

.Rbuildignore

@@ -1,4 +1,5 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
-README.html
+man-roxygen
+inst\tests
 README.md

.gitignore

@@ -1,4 +1,5 @@
 .Rproj.user
 .Rhistory
 .RData
-README.html
+README.html
+docs/Alerts2.html

DESCRIPTION

@@ -1,13 +1,14 @@
 Package: shinyBS
 Type: Package
-Title: Twitter Bootstrap Components for Shiny
-Version: 0.25
-Date: 2014-03-13
+Title: Extra Twitter Bootstrap Components for Shiny
+Version: 0.62
+Date: 2015-03-31
 Author: Eric Bailey
-Maintainer: Eric Bailey <ebailey@idem.in.gov>
-Description: Adds more Twitter Bootstrap components to the shiny interface
-Depends: methods
-Imports: shiny (>= 0.8.0)
-URL: https://github.com/ebailey78/shinyBS
+Maintainer: Eric Bailey <eb11307@gmail.com>
+Description: Adds easy access to additional Twitter Bootstrap components to Shiny. 
+Imports:
+    shiny (>= 0.13.2),
+    htmltools
+URL: https://ebailey78.github.io/shinyBS
 BugReports: https://github.com/ebailey78/shinyBS/issues
-License: GPL-3
+License: GPL-3

NAMESPACE

@@ -1,47 +1,23 @@
-export(bsAlert,
-createAlert,
-closeAlert,
-bsDemo,
-bsNavDemo,
-bsGlyph,
-bsNavBar,
-updateNavBar,
-bsNavLink,
-bsNavToggleLink,
-updateToggleLink,
-pageWithNavBar,
-bsNavDivider,
-bsNavButton,
-bsNavTextInput,
-bsNavDateInput,
-bsNavDateRangeInput,
-bsNavDropDown,
-updateDropDown,
-bsNavTextOutput,
-bsPopover,
-addPopover,
-bsProgressBar,
-updateProgressBar,
-bsTooltip,
-addTooltip,
-bsTypeAhead,
-bsNavTypeAhead,
-updateTypeAhead,
-removeTooltip,
-removePopover,
-bsCollapse,
-bsCollapsePanel,
-updateCollapse,
-bsButtonGroup,
-bsButton,
-bsActionButton,
-bsToggleButton,
-updateButtonGroup,
-updateButton,
-highlightCells,
-highlightRows,
-bsMedia,
-bsModal,
-toggleModal)
-import(shiny,
-       methods)
+# Generated by roxygen2 (4.1.0): do not edit by hand
+
+export(addPopover)
+export(addTooltip)
+export(bsAlert)
+export(bsButton)
+export(bsCollapse)
+export(bsCollapsePanel)
+export(bsExample)
+export(bsModal)
+export(bsPopover)
+export(bsTooltip)
+export(bsTypeahead)
+export(closeAlert)
+export(createAlert)
+export(popify)
+export(removePopover)
+export(removeTooltip)
+export(tipify)
+export(toggleModal)
+export(updateButton)
+export(updateCollapse)
+export(updateTypeahead)

R/Alerts.R

@@ -0,0 +1,82 @@
+#'Alerts
+#'
+#'Alerts allow you to communicate information to the user on the fly. Standard
+#'Bootstrap styling options give the user a hint at the type of information
+#'contained in the Alert.
+#'
+#'@section Components:
+#'There are three functions in the Alerts family: 
+#'  \describe{
+#'    \item{\code{\link{bsAlert}}}{Used in the UI to create an anchor where your
+#'      Alerts will be displayed.}
+#'    \item{\code{\link{createAlert}}}{Used in the Server logic to create
+#'      alerts. This would be used within a reactive context to display error 
+#'      or success messages to the user based on the status of that context.}
+#'    \item{\code{\link{closeAlert}}}{Used in the Server logic to close an alert
+#'      that is already open. By default, Alerts are dismissable by the user,
+#'      but this offers you a way to close them programmatically.}
+#'  }
+#'      
+#'@details
+#'To create alerts in your Shiny app you must place \code{bsAlert} in your ui.
+#'This serves as an anchor that tells shinyBS where to place the alerts created
+#'with \code{createAlert}. 
+#'
+#'Use \code{createAlert} in your server script to add alerts to the anchor 
+#'you created with \code{bsAlert} in your ui. You can place \code{createAlert}
+#'in observers, reactives, or outputs. A common usage may be to have logic that
+#'validates a user's inputs. If they are valid produce the requested output, if
+#'not use \code{createAlert} to give the user info about what they need to 
+#'change.
+#'
+#'@section Changes:
+#'\code{style} was called \code{type} in previous versions of shinyBS.
+#'
+#'\code{anchorId} was called \code{inputId} in previous versions of shinyBS.
+#'
+#'\code{content} was called \code{message} in previous versions of shinyBS.
+#' 
+#'@examples
+#'
+#'library(shiny)
+#'library(shinyBS)
+#'app = shinyApp(
+#'  ui = 
+#'    fluidPage(
+#'      sidebarLayout(
+#'        sidebarPanel(textInput("num1", NULL, value = 100), 
+#'          "divided by", textInput("num2", NULL, value = 20), 
+#'          "equals", textOutput("exampleOutput")),
+#'        mainPanel(
+#'          bsAlert("alert")
+#'        )
+#'      )
+#'  ),
+#'  server = 
+#'    function(input, output, session) {
+#'      output$exampleOutput <- renderText({
+#'        num1 <- as.numeric(input$num1)
+#'        num2 <- as.numeric(input$num2)
+#'      
+#'        if(is.na(num1) | is.na(num2)) {
+#'          createAlert(session, "alert", "exampleAlert", title = "Oops", 
+#'            content = "Both inputs should be numeric.", append = FALSE)
+#'        } else if(num2 == 0) {
+#'          createAlert(session, "alert", "exampleAlert", title = "Oops", 
+#'            content = "You cannot divide by 0.", append = FALSE)
+#'        } else {
+#'          closeAlert(session, "exampleAlert")
+#'          return(num1/num2)
+#'        }
+#'      
+#'      })    
+#'    }
+#')
+#'
+#'\dontrun{
+#'  runApp(app)
+#'}
+#'@templateVar item_name Alerts
+#'@templateVar family_name Alerts
+#'@template footer
+NULL

R/Buttons.R

@@ -0,0 +1,115 @@
+#'Buttons
+#'
+#'Twitter Bootstrap gives many options for styling buttons that aren't made 
+#'available by standard Shiny. Use shinyBS to create buttons of different sizes,
+#'shapes, and colors.
+#'
+#'@section Components:
+#'There are two functions in the Buttons family: 
+#'  \describe{
+#'    \item{\code{\link{bsButton}}}{Used in the UI to create a button. Buttons 
+#'    can be of the type \code{action} or \code{toggle}.}
+#'    \item{\code{\link{updateButton}}}{Used in the Server logic to modify the
+#'    state of a button created with \code{\link{bsButton}}}
+#'  }
+#'      
+#'@details
+#'Create a button in the UI with \code{\link{bsButton}}. If \code{type = "action"}
+#'the button will behave like the standard \code{\link{actionButton}} in shiny.
+#'If \code{type = "toggle"} the button will behave like a \code{\link{checkboxInput}}
+#'with an on and off state. It will return \code{TRUE} or \code{FALSE} to the Server
+#'depending on its state.
+#'
+#'You can update the style and state of a \code{\link{bsButton}} from the Server 
+#'logic with \code{\link{updateButton}}. For example, a button could be set to
+#'\code{disabled = TRUE} until the user has made some other selections, then once
+#'those selections have been made, an observer on the Server could use \code{\link{updateButton}}
+#'to enable the button allowing the user to proceed. Alternatively, you could set
+#'the button to \code{style = "success"} to let them know that the button is ready
+#'to be clicked.
+#'
+#'@section Changes:
+#'\code{bsActionButton} and \code{bsToggleButton} were replaced with just 
+#'\code{\link{bsButton}} with a \code{type} argument.
+#'
+#'\code{icon} was added to allow placing an icon in the button.
+#' 
+#'@examples
+#'library(shiny)
+#'library(shinyBS)
+#'app = shinyApp(
+#'  ui = 
+#'    fluidPage(
+#'      sidebarLayout(
+#'        sidebarPanel(
+#'          sliderInput("bins",
+#'                      "Move the slider to see its effect on the button below:",
+#'                      min = 1,
+#'                      max = 50,
+#'                      value = 1),
+#'          bsButton("actTwo", label = "Click me if you dare!", icon = icon("ban")),
+#'          tags$p("Clicking the first button below changes the disabled state of the second button."),
+#'          bsButton("togOne", label = "Toggle button disabled status", 
+#'                   block = TRUE, type = "toggle", value = TRUE),
+#'          bsButton("actOne", label = "Block Action Button", block = TRUE)
+#'        
+#'        ),
+#'        mainPanel(
+#'          textOutput("exampleText")
+#'        )
+#'      )  
+#'    ),
+#'  server = 
+#'    function(input, output, session) {
+#'      observeEvent(input$togOne, ({
+#'        updateButton(session, "actOne", disabled = !input$togOne)
+#'      }))
+#'      observeEvent(input$bins, ({
+#'        
+#'        b <- input$bins
+#'        disabled = NULL
+#'        style = "default"
+#'        icon = ""
+#'        
+#'        if(b < 5) {
+#'          disabled = TRUE
+#'          icon <- icon("ban")
+#'        } else {
+#'          disabled = FALSE
+#'        }
+#'        
+#'        if(b < 15 | b > 35) {
+#'          style = "danger"
+#'        } else if(b < 20 | b > 30) {
+#'          style = "warning"
+#'        } else {
+#'          style = "default"
+#'          icon = icon("check")
+#'        }
+#'      
+#'        updateButton(session, "actTwo", disabled = disabled, style = style, icon = icon)
+#'      
+#'      }))
+#'    
+#'      output$exampleText <- renderText({
+#'        input$actTwo
+#'        b <- isolate(input$bins)
+#'        txt = ""
+#'        if((b > 5 & b < 15) | b > 35) {
+#'          txt = "That was dangerous."
+#'        } else if((b > 5 & b < 20) | b > 30) {
+#'          txt = "I warned you about that."
+#'        } else if(b >= 20 &  b <= 30) {
+#'          txt = "You have chosen... wisely."
+#'        }
+#'        return(txt)
+#'      })
+#'    }
+#')
+#'\dontrun{
+#'  runApp(app)
+#'}
+#'@templateVar item_name Buttons
+#'@templateVar family_name Buttons
+#'@template footer
+NULL