From 2ece1a143c97f551a9724ec0169f7dba59ef836b Mon Sep 17 00:00:00 2001 From: LCHansson Date: Fri, 14 Mar 2014 23:27:31 +0100 Subject: [PATCH 1/3] Add actionButton2 --- NAMESPACE | 1 + R/actionButton2.R | 13 +++++++++++++ man/actionButton2.Rd | 21 +++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 R/actionButton2.R create mode 100644 man/actionButton2.Rd diff --git a/NAMESPACE b/NAMESPACE index 35940cb..7396862 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -1,3 +1,4 @@ +export(actionButton2) export(bootstrapCheckbox) export(bootstrapSelectInput) export(bootstrapSwitch) diff --git a/R/actionButton2.R b/R/actionButton2.R new file mode 100644 index 0000000..bd41c0e --- /dev/null +++ b/R/actionButton2.R @@ -0,0 +1,13 @@ +#' actionButton2 +#' +#' an extension of actionButton +#' +#' @param inputId Specifies the input slot that will be used to access the value. +#' @param label The contents of the button–usually a text label, but you could also use any other HTML, like an image. +#' @param class the class parameters of the \code{actionButton} +#' @export + +actionButton2 <- function(inputId, label, class="btn action-button") { + tags$button(id = inputId, type = "button", class = class, + label) +} diff --git a/man/actionButton2.Rd b/man/actionButton2.Rd new file mode 100644 index 0000000..a9854f0 --- /dev/null +++ b/man/actionButton2.Rd @@ -0,0 +1,21 @@ +\name{actionButton2} +\alias{actionButton2} +\title{actionButton2} +\usage{ +actionButton2(inputId, label, class = "btn action-button") +} +\arguments{ + \item{inputId}{Specifies the input slot that will be used + to access the value.} + + \item{label}{The contents of the button–usually a text + label, but you could also use any other HTML, like an + image.} + + \item{class}{the class parameters of the + \code{actionButton}} +} +\description{ +an extension of actionButton +} + From ae3e634b5210b34bb937a36082e57ff6852f06cd Mon Sep 17 00:00:00 2001 From: LCHansson Date: Fri, 14 Mar 2014 23:31:05 +0100 Subject: [PATCH 2/3] Remove Collate field from DESCRIPTION --- DESCRIPTION | 8 -------- 1 file changed, 8 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d48989d..ab89a3c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -10,11 +10,3 @@ License: What license is it under? Depends: shiny, RJSONIO -Collate: - 'bootstrap.R' - 'bootstrap-select.R' - 'select2.R' - 'bootstrap-multiselect.R' - 'json.R' - 'bootstrap-checkbox.R' - 'bootstrap-switch.R' From 11b41737f5f1f3f9cce92280b9b88a8b536d185b Mon Sep 17 00:00:00 2001 From: LCHansson Date: Fri, 14 Mar 2014 23:31:21 +0100 Subject: [PATCH 3/3] Add manpages for installation purposes --- man/bootstrapCheckbox.Rd | 4 ++-- man/bootstrapSelectInput.Rd | 11 +++++------ man/bootstrapSwitch.Rd | 7 +++---- man/bootswatchTheme.Rd | 5 ++--- man/followButtons.Rd | 13 ++++++------- man/githubButton.Rd | 6 +++--- man/multiselectInput.Rd | 4 ++-- man/select2Input.Rd | 5 ++--- man/shareButtons.Rd | 4 ++-- 9 files changed, 27 insertions(+), 32 deletions(-) diff --git a/man/bootstrapCheckbox.Rd b/man/bootstrapCheckbox.Rd index b1753be..e61c482 100644 --- a/man/bootstrapCheckbox.Rd +++ b/man/bootstrapCheckbox.Rd @@ -2,7 +2,7 @@ \alias{bootstrapCheckbox} \title{Bootstrap checkbox} \usage{ - bootstrapCheckbox(inputId, ..., options = NULL) +bootstrapCheckbox(inputId, ..., options = NULL) } \arguments{ \item{inputId}{input id} @@ -12,6 +12,6 @@ \item{options}{select 2 options} } \description{ - ... +... } diff --git a/man/bootstrapSelectInput.Rd b/man/bootstrapSelectInput.Rd index aef7da0..e0ce673 100644 --- a/man/bootstrapSelectInput.Rd +++ b/man/bootstrapSelectInput.Rd @@ -2,11 +2,10 @@ \alias{bootstrapSelectInput} \title{bootstrap-select Input} \usage{ - bootstrapSelectInput(inputId, label, choices, - selected = NULL, multiple = FALSE, style = NULL, - title = NULL, selectedTextFormat = NULL, header = NULL, - icon = NULL, subtext = NULL, content = NULL, - liveSearch = NULL, size = NULL, options = NULL) +bootstrapSelectInput(inputId, label, choices, selected = NULL, + multiple = FALSE, style = NULL, title = NULL, + selectedTextFormat = NULL, header = NULL, icon = NULL, subtext = NULL, + content = NULL, liveSearch = NULL, size = NULL, options = NULL) } \arguments{ \item{inputId}{input id} @@ -17,6 +16,6 @@ it works yet)} } \description{ - ... +... } diff --git a/man/bootstrapSwitch.Rd b/man/bootstrapSwitch.Rd index 37cf8ae..955a7ef 100644 --- a/man/bootstrapSwitch.Rd +++ b/man/bootstrapSwitch.Rd @@ -2,9 +2,8 @@ \alias{bootstrapSwitch} \title{Bootstrap switch} \usage{ - bootstrapSwitch(inputId, dataLabelIcon = "", - dataOnLabel = "On", dataOffLabel = "Off", - type = "make-switch", size = "switch-mini") +bootstrapSwitch(inputId, dataLabelIcon = "", dataOnLabel = "On", + dataOffLabel = "Off", type = "make-switch", size = "switch-mini") } \arguments{ \item{inputId}{input id} @@ -14,6 +13,6 @@ \item{size}{size (e.g. 'switch-mini')} } \description{ - ... +... } diff --git a/man/bootswatchTheme.Rd b/man/bootswatchTheme.Rd index 50e5efa..5fa722b 100644 --- a/man/bootswatchTheme.Rd +++ b/man/bootswatchTheme.Rd @@ -2,8 +2,7 @@ \alias{bootswatchTheme} \title{Bootswatch theme} \usage{ - bootswatchTheme(theme = "amelia", list, - version = "2.3.1") +bootswatchTheme(theme = "amelia", list, version = "2.3.1") } \arguments{ \item{theme}{bootstrap theme} @@ -11,6 +10,6 @@ \item{list}{tagList (e.g. pageWithSidebar())} } \description{ - ... +... } diff --git a/man/followButtons.Rd b/man/followButtons.Rd index b5f2fa5..a8ba499 100644 --- a/man/followButtons.Rd +++ b/man/followButtons.Rd @@ -2,12 +2,11 @@ \alias{followButtons} \title{Follow buttons} \usage{ - followButtons(small = TRUE, vertical = FALSE, - facebook = NULL, twitter = NULL, linkedin = NULL, - linkedin_company = NULL, google = NULL, youtube = NULL, - flickr = NULL, vimeo = NULL, pinterest = NULL, - instagram = NULL, foursquare = NULL, tumblr = NULL, - rss = NULL) +followButtons(small = TRUE, vertical = FALSE, facebook = NULL, + twitter = NULL, linkedin = NULL, linkedin_company = NULL, + google = NULL, youtube = NULL, flickr = NULL, vimeo = NULL, + pinterest = NULL, instagram = NULL, foursquare = NULL, tumblr = NULL, + rss = NULL) } \arguments{ \item{small}{small size; TRUE or FALSE} @@ -41,6 +40,6 @@ \item{rss}{rss feed} } \description{ - ... +... } diff --git a/man/githubButton.Rd b/man/githubButton.Rd index 8e1dfdd..dcb352f 100644 --- a/man/githubButton.Rd +++ b/man/githubButton.Rd @@ -2,8 +2,8 @@ \alias{githubButton} \title{Github button} \usage{ - githubButton(user = "metagraf", repo = "sparkle", - type = "watch", count = TRUE, small = TRUE) +githubButton(user = "metagraf", repo = "sparkle", type = "watch", + count = TRUE, small = TRUE) } \arguments{ \item{user}{github user} @@ -17,6 +17,6 @@ \item{small}{small size (TRUE/FALSE)} } \description{ - ... +... } diff --git a/man/multiselectInput.Rd b/man/multiselectInput.Rd index bdd120a..0f9f821 100644 --- a/man/multiselectInput.Rd +++ b/man/multiselectInput.Rd @@ -2,7 +2,7 @@ \alias{multiselectInput} \title{Bootstrap multiselect} \usage{ - multiselectInput(inputId, ..., options = NULL) +multiselectInput(inputId, ..., options = NULL) } \arguments{ \item{inputId}{input id} @@ -12,6 +12,6 @@ \item{options}{select 2 options} } \description{ - ... +... } diff --git a/man/select2Input.Rd b/man/select2Input.Rd index 551ff8f..69dc31d 100644 --- a/man/select2Input.Rd +++ b/man/select2Input.Rd @@ -2,8 +2,7 @@ \alias{select2Input} \title{Select2 Input} \usage{ - select2Input(inputId, ..., - options = list(width = "200px")) +select2Input(inputId, ..., options = list(width = "200px")) } \arguments{ \item{inputId}{input id} @@ -13,6 +12,6 @@ \item{options}{select 2 options} } \description{ - ... +... } diff --git a/man/shareButtons.Rd b/man/shareButtons.Rd index 1165429..29b977c 100644 --- a/man/shareButtons.Rd +++ b/man/shareButtons.Rd @@ -2,12 +2,12 @@ \alias{shareButtons} \title{Share buttons} \usage{ - shareButtons(style = 1) +shareButtons(style = 1) } \arguments{ \item{style}{style type (1-7)} } \description{ - ... +... }