remove widths parameter from columnLayout; add width parameter to sidebarPanel and mainPanel

This commit is contained in:
JJ Allaire
2013-12-14 17:26:08 -05:00
parent dbf684f385
commit 85baa596d0
5 changed files with 41 additions and 60 deletions

View File

@@ -2,17 +2,23 @@
\alias{mainPanel}
\title{Create a main panel}
\usage{
mainPanel(...)
mainPanel(..., width = 8)
}
\arguments{
\item{...}{Ouput elements to include in the main panel}
\item{...}{Output elements to include in the main panel}
\item{width}{The width of the main panel. For fluid
layouts this is out of 12 total units; for fixed layouts
it is out of whatever the width of the main panel's
parent column is.}
}
\value{
A main panel that can be passed to \link{pageWithSidebar}
A main panel that can be passed to
\code{\link{sidebarLayout}}.
}
\description{
Create a main panel containing output elements that can
in turn be passed to \link{pageWithSidebar}.
in turn be passed to \code{\link{sidebarLayout}}.
}
\examples{
# Show the caption and plot of the requested variable against mpg

View File

@@ -3,8 +3,7 @@
\title{Layout a sidebar and main area}
\usage{
sidebarLayout(sidebarPanel, mainPanel,
position = c("left", "right"), fluid = TRUE,
widths = c(4, 8))
position = c("left", "right"), fluid = TRUE)
}
\arguments{
\item{sidebarPanel}{The \link{sidebarPanel} containing
@@ -17,12 +16,6 @@
\item{fluid}{\code{TRUE} to use fluid layout;
\code{FALSE} to use fixed layout.}
\item{widths}{The columns widths of the sidebar and main
panel (the first value is for the sidebar; the second for
the main panel). Note that if you are using fixed layout
you may need to adjust these to accomodate the size of
the container if it's less than 12 units wide.}
}
\description{
Create a layout with a sidebar and main area. The sidebar

View File

@@ -2,17 +2,23 @@
\alias{sidebarPanel}
\title{Create a sidebar panel}
\usage{
sidebarPanel(...)
sidebarPanel(..., width = 4)
}
\arguments{
\item{...}{UI elements to include on the sidebar}
\item{width}{The width of the sidebar. For fluid layouts
this is out of 12 total units; for fixed layouts it is
out of whatever the width of the sidebar's parent column
is.}
}
\value{
A sidebar that can be passed to \link{pageWithSidebar}
A sidebar that can be passed to
\code{\link{sidebarLayout}}
}
\description{
Create a sidebar panel containing input controls that can
in turn be passed to \link{pageWithSidebar}.
in turn be passed to \code{\link{sidebarLayout}}.
}
\examples{
# Sidebar with controls to select a dataset and specify