From 3bcbcc275a05742523b82b5d199dd0ddca6dd08e Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 20 Dec 2015 22:29:37 +0100 Subject: [PATCH] minor corrections --- src/main/webapp/bootstrap/carousel.xhtml | 2 +- src/main/webapp/forms/DataTable.xhtml | 49 ++++++++++++++++++----- src/main/webapp/forms/commandButton.xhtml | 24 +++++------ src/main/webapp/forms/selectOneMenu.xhtml | 4 +- src/main/webapp/layout/navLinks.xhtml | 11 ++--- src/main/webapp/layout/wells.xhtml | 15 +++---- 6 files changed, 64 insertions(+), 41 deletions(-) diff --git a/src/main/webapp/bootstrap/carousel.xhtml b/src/main/webapp/bootstrap/carousel.xhtml index 3469033a..2040ea20 100644 --- a/src/main/webapp/bootstrap/carousel.xhtml +++ b/src/main/webapp/bootstrap/carousel.xhtml @@ -372,7 +372,7 @@ see how the standard controls look in a wizard. Don't forget to switch off the a

- + Skinning diff --git a/src/main/webapp/forms/DataTable.xhtml b/src/main/webapp/forms/DataTable.xhtml index d0051da6..ba740772 100644 --- a/src/main/webapp/forms/DataTable.xhtml +++ b/src/main/webapp/forms/DataTable.xhtml @@ -13,27 +13,60 @@ td { padding: 8px; } -

DataTable (<b:dataTable />)

+

DataTable (<b:dataTable />)

+

Currently, the <b:dataTable > isn't much more than a proof of concept. We plan to + implement a full-blown datatable in the next version of BootsFaces (probably 0.9.0).

- Basic usage + + + + + + + + + + + + + + + + + + + + + + + +

Do it yourself

- +

This example shows how to convert the standard JSF datatable without support by BootsFaces. Until we've finished the + implementation of <b:dataTable >, this is the most flexible approach.

@@ -84,14 +117,10 @@ td {

Advanced usage

- -

Describe in a few words what <b:image> is about.

-

Basic usage

-

Put a short description in simple words here.

Reference section

- + Skinning diff --git a/src/main/webapp/forms/commandButton.xhtml b/src/main/webapp/forms/commandButton.xhtml index e4033669..32e63c0d 100644 --- a/src/main/webapp/forms/commandButton.xhtml +++ b/src/main/webapp/forms/commandButton.xhtml @@ -33,7 +33,7 @@

The Bootstrap look

By default, command buttons are gray (depending on your theme). You can configure them by using a different look:

- + @@ -181,51 +181,51 @@ - + - + - + - + - + - + - + - +

Partial processing:

 - + - + - + diff --git a/src/main/webapp/forms/selectOneMenu.xhtml b/src/main/webapp/forms/selectOneMenu.xhtml index 20ca7807..c351b79b 100644 --- a/src/main/webapp/forms/selectOneMenu.xhtml +++ b/src/main/webapp/forms/selectOneMenu.xhtml @@ -110,7 +110,7 @@ Current keeper: #{soccerTeamBean.goalkeeper.name} - + ]]> @@ -194,7 +194,7 @@ public class Player { Current keeper: #{soccerTeamBean.goalkeeper.name} - + diff --git a/src/main/webapp/layout/navLinks.xhtml b/src/main/webapp/layout/navLinks.xhtml index 56c9f57e..79dba2b0 100644 --- a/src/main/webapp/layout/navLinks.xhtml +++ b/src/main/webapp/layout/navLinks.xhtml @@ -48,13 +48,11 @@

Both icon and iconAwesome attributes, require the icon name as value the icon name without the trailing glyphicon- prefix and fa- prefix respectively.

Bootstrap 4 is going to drop support for the Glyphicon library. We recommend you to chose icons from the Font Awesome library to avoid future incompatibilities.

In the following example the b:listLinks tag is used as a container for the NavLinks, showing how to create a Sidebar with links.

- - EXAMPLE - + + - - Sidebar + - Sidebar + Use the well as a simple effect on an element to give it an inset effect.

- EXAMPLE - Well in a container - + EXAMPLE - Well - -

Well Header

- Well content. - + +

Well Header

+ Well, that's the content of the <b:well />. + - Markup:
@@ -30,9 +28,8 @@

Well Header

- Well content. + Well, that's the content of the . - ]]>