You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/12/09 17:56:20 UTC

svn commit: r1718906 - in /myfaces/tobago/branches/tobago-3.0.x: tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/ tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/ tobago-example/tobago-example-demo/src/main/webapp/ tobago-e...

Author: lofwyr
Date: Wed Dec  9 16:56:19 2015
New Revision: 1718906

URL: http://svn.apache.org/viewvc?rev=1718906&view=rev
Log:
TOBAGO-1516: Using Font Awesome as icon library
- replacing glyphicons with Font Awesome
- removing some old *.png icons

Added:
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/IconEncoder.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Icons.java
Removed:
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/calendarFastNext.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/calendarFastNextDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/calendarFastPrev.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/calendarFastPrevDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/calendarNext.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/calendarNextDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/calendarPrev.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/calendarPrevDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/fastNext.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/fastPrev.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/first.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/firstDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/last.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/lastDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/sheetFirst.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/sheetFirstDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/sheetLast.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/sheetLastDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/sheetNext.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/sheetNextDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/sheetPrev.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/sheetPrevDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/calendarFastNext.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/calendarFastNextDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/calendarFastPrev.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/calendarFastPrevDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/calendarNext.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/calendarNextDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/calendarPrev.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/calendarPrevDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/checked.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/checkedDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/fastNext.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/fastNextDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/fastPrev.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/fastPrevDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/first.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/firstDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/last.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/lastDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/selectManyShuttleAdd.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/selectManyShuttleAddAll.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/selectManyShuttleAddAllDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/selectManyShuttleAddDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/selectManyShuttleRemove.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/selectManyShuttleRemoveAll.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/selectManyShuttleRemoveAllDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/selectManyShuttleRemoveDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/sheetChecked.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/sheetFirst.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/sheetFirstDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/sheetLast.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/sheetLastDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/sheetNext.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/sheetNextDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/sheetPrev.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/sheetPrevDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/sheetSelectorMenu.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/sheetUnchecked.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/sheetUncheckedDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/singleChecked.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/image/singleUnchecked.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/calendarFastNext.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/calendarFastNextDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/calendarFastPrev.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/calendarFastPrevDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/calendarNext.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/calendarNextDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/calendarPrev.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/calendarPrevDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/checked.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/checkedDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/fastNext.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/fastNextDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/fastPrev.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/fastPrevDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/first.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/firstDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/last.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/lastDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/selectManyShuttleAdd.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/selectManyShuttleAddAll.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/selectManyShuttleAddAllDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/selectManyShuttleAddDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/selectManyShuttleRemove.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/selectManyShuttleRemoveAll.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/selectManyShuttleRemoveAllDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/selectManyShuttleRemoveDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/sheetChecked.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/sheetFirst.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/sheetFirstDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/sheetLast.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/sheetLastDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/sheetNext.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/sheetNextDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/sheetPrev.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/sheetPrevDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/sheetSelectorMenu.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/sheetUnchecked.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/sheetUncheckedDisabled.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/singleChecked.png
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/image/singleUnchecked.png
Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/16-layout/20/layout-example.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/section/section.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/buttons-with-image.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/DateRenderer.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIndentRenderer.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-overlay.js
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css

Added: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java?rev=1718906&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FontAwesomeIconEncoder.java Wed Dec  9 16:56:19 2015
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.tobago.renderkit.css;
+
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.EnumMap;
+import java.util.regex.Pattern;
+
+public class FontAwesomeIconEncoder implements IconEncoder {
+
+  private static final Logger LOG = LoggerFactory.getLogger(FontAwesomeIconEncoder.class);
+
+  private static final CssItem FA = new FontAwesomeCssItem("fa");
+
+  private static final Pattern PATTERN = Pattern.compile("^(fa(-[a-z]+)+)$");
+
+
+  private EnumMap<Icons, CssItem> icons;
+
+
+  public FontAwesomeIconEncoder() {
+    icons = new EnumMap<Icons, CssItem>(Icons.class);
+    for (Icons icon : Icons.values()) {
+      icons.put(icon, new FontAwesomeCssItem("fa-" + icon.name().toLowerCase().replaceAll("_", "-")));
+    }
+  }
+
+  @Override
+  public void encode(final TobagoResponseWriter writer, final Icons icon, final CssItem... cssItems)
+      throws IOException {
+    writer.startElement(HtmlElements.I);
+    writer.writeClassAttribute(FA, generateClass(icon), cssItems);
+    writer.endElement(HtmlElements.I);
+  }
+
+  private CssItem generateClass(final Icons icon) {
+    CssItem result = icons.get(icon);
+    if (result == null) {
+      LOG.warn("Missing icon: '" + icon + "'");
+    }
+    return result;
+  }
+
+  public static CssItem generateClass(final String name) {
+
+    return new CssItem() {
+
+      @Override
+      public String getName() {
+        // XXX cleanup, should be resolved with the ResourceManager... ? TBD
+        // todo: regexp check
+        if (PATTERN.matcher(name).matches()) {
+          return name;
+        } else {
+          LOG.warn("Unknown Icon: '" + name + "'");
+          return null;
+        }
+      }
+    };
+  }
+
+  private static final class FontAwesomeCssItem implements CssItem {
+
+    private String name;
+
+    public FontAwesomeCssItem(String name) {
+      this.name = name;
+    }
+
+    @Override
+    public String getName() {
+      return name;
+    }
+  }
+}

Added: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/IconEncoder.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/IconEncoder.java?rev=1718906&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/IconEncoder.java (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/IconEncoder.java Wed Dec  9 16:56:19 2015
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.tobago.renderkit.css;
+
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
+
+import java.io.IOException;
+
+public interface IconEncoder {
+
+  void encode(TobagoResponseWriter writer, Icons icon, final CssItem... cssItems) throws IOException;
+
+}

Added: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Icons.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Icons.java?rev=1718906&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Icons.java (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Icons.java Wed Dec  9 16:56:19 2015
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.tobago.renderkit.css;
+
+public enum Icons {
+
+  ANGLE_DOUBLE_LEFT,
+  ANGLE_DOUBLE_RIGHT,
+  ANGLE_DOWN,
+  ANGLE_LEFT,
+  ANGLE_RIGHT,
+  ANGLE_UP,
+  BACKWARD,
+  CALENDAR,
+  CLOCK_O,
+  FORWARD,
+  MINUS_SQUARE_O,
+  PLUS_SQUARE_O,
+  SQUARE_O,
+  STEP_BACKWARD,
+  STEP_FORWARD;
+}

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java Wed Dec  9 16:56:19 2015
@@ -23,6 +23,9 @@ import org.apache.myfaces.tobago.ajax.Aj
 import org.apache.myfaces.tobago.internal.util.StringUtils;
 import org.apache.myfaces.tobago.renderkit.css.Classes;
 import org.apache.myfaces.tobago.renderkit.css.CssItem;
+import org.apache.myfaces.tobago.renderkit.css.FontAwesomeIconEncoder;
+import org.apache.myfaces.tobago.renderkit.css.IconEncoder;
+import org.apache.myfaces.tobago.renderkit.css.Icons;
 import org.apache.myfaces.tobago.renderkit.css.Style;
 import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -43,6 +46,10 @@ import java.io.Writer;
  */
 public abstract class TobagoResponseWriter extends ResponseWriter {
 
+  private static final CssItem[] NO_CSS_ITEMS = new CssItem[0];
+
+  protected IconEncoder iconEncoder = new FontAwesomeIconEncoder();
+
   // same as in ResponseWriter
 
   /**
@@ -148,12 +155,24 @@ public abstract class TobagoResponseWrit
     }
   }
 
-  public void writeClassAttribute(final CssItem first, final CssItem... others) throws IOException {
+  public void writeClassAttribute(final CssItem first) throws IOException {
+    writeClassAttribute(first, null, NO_CSS_ITEMS);
+  }
+
+  public void writeClassAttribute(final CssItem first, final CssItem second) throws IOException {
+    writeClassAttribute(first, second, NO_CSS_ITEMS);
+  }
+
+  public void writeClassAttribute(final CssItem first, final CssItem second, final CssItem... others) throws IOException {
     StringBuilder builder = new StringBuilder();
     if (first != null) {
       builder.append(first.getName());
       builder.append(' ');
     }
+    if (second != null) {
+      builder.append(second.getName());
+      builder.append(' ');
+    }
     for (CssItem other : others) {
       if (other != null) {
         builder.append(other.getName());
@@ -202,6 +221,13 @@ public abstract class TobagoResponseWrit
   }
 
   /**
+   * Writes an supported icon.
+   */
+  public void writeIcon(final Icons icon, final CssItem... cssItems) throws IOException {
+    iconEncoder.encode(this, icon, cssItems);
+  }
+
+  /**
    * @deprecated Should not be used, because it conflicts with CSP.
    */
   @Deprecated

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/16-layout/20/layout-example.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/16-layout/20/layout-example.xhtml?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/16-layout/20/layout-example.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/16-layout/20/layout-example.xhtml Wed Dec  9 16:56:19 2015
@@ -28,7 +28,7 @@
     <tc:in label="Second Name"/>
     <tc:flexLayout columns="*;auto">
       <tc:in label="ID"/>
-      <tc:link image="glyphicon-search" />
+      <tc:link image="fa-search" />
     </tc:flexLayout>
     <tc:date label="Birthday"/>
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml Wed Dec  9 16:56:19 2015
@@ -140,15 +140,10 @@
       <tc:selectItem itemValue="stars" itemLabel="Stars"/>
     </tc:selectManyShuttle>
 
-    <tc:panel/>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <tc:gridLayout columns="*;auto"/>
-      </f:facet>
-      <tc:panel/>
-      <tc:button action="/content/25-select/select.xhtml" label="Submit"/>
-    </tc:panel>
+    <tc:flowLayout>
+      <tc:style textAlign="right"/>
+      <tc:button action="/content/25-select/select.xhtml" label="Submit" defaultCommand="true"/>
+    </tc:flowLayout>
 
   </tc:panel>
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml Wed Dec  9 16:56:19 2015
@@ -105,17 +105,17 @@
       </tc:form>
       <tc:form>
         <tc:button immediate="true" id="previous"
-                   image="glyphicon-chevron-left"
+                   image="fa-chevron-left"
                    action="#{navigationState.gotoPrevious}"
                    disabled="#{navigationState.first}"
                    tip="#{overviewBundle.footer_previous}"/>
         <tc:button immediate="true" id="next"
-                   image="glyphicon-chevron-right"
+                   image="fa-chevron-right"
                    action="#{navigationState.gotoNext}"
                    disabled="#{navigationState.last}"
                    tip="#{overviewBundle.footer_next}"/>
         <tc:button action="#{navigationState.toggleViewSource}"
-                   image="glyphicon-eye-open"
+                   image="fa-eye"
                    immediate="true" tip="#{overviewBundle.footer_viewSource}"/>
       </tc:form>
     </tc:flowLayout>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/section/section.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/section/section.xhtml?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/section/section.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/section/section.xhtml Wed Dec  9 16:56:19 2015
@@ -23,22 +23,22 @@
   <tc:page id="page">
     <tc:flowLayout>
 
-      <tc:section label="Main Section" image="glyphicon-heart">
+      <tc:section label="Main Section" image="fa-heart">
         <tc:section label="1st Sub-Section">
           1st content
         </tc:section>
         <tc:section>
           2nd content (title has no label nor image)
         </tc:section>
-        <tc:section label="3rd Sub-Section with image" image="glyphicon-star">
+        <tc:section label="3rd Sub-Section with image" image="fa-star">
           3rd content
         </tc:section>
-        <tc:section image="glyphicon-star-empty">
+        <tc:section image="fa-star-o">
           4th content (title has only an image)
-          <tc:section label="Sub-Sub-Section" image="glyphicon-star-empty">
-            <tc:section label="Sub-Sub-Sub-Section" image="glyphicon-star-empty">
-              <tc:section label="Sub-Sub-Sub-Sub-Section" image="glyphicon-star-empty">
-                <tc:section label="Sub-Sub-Sub-Sub-Sub-Section" image="glyphicon-star-empty">
+          <tc:section label="Sub-Sub-Section" image="fa-star-o">
+            <tc:section label="Sub-Sub-Sub-Section" image="fa-star-o">
+              <tc:section label="Sub-Sub-Sub-Sub-Section" image="fa-star-o">
+                <tc:section label="Sub-Sub-Sub-Sub-Sub-Section" image="fa-star-o">
                   Level 6
                 </tc:section>
               </tc:section>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/buttons-with-image.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/buttons-with-image.xhtml?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/buttons-with-image.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/segmentLayout/buttons-with-image.xhtml Wed Dec  9 16:56:19 2015
@@ -25,10 +25,10 @@
 
     <tc:segmentLayout large="1;1;1;1;1;1;1;1;1;1;1;1" medium="3;3;3;3">
 
-      <tc:button image="glyphicon-remove" label="1a Abbrechen" />
-      <tc:button image="glyphicon-refresh" label="1b Aktualisieren" />
-      <tc:button image="glyphicon-paperclip" label="1c Anhang" />
-      <tc:button image="glyphicon-log-in" label="1d Anmelden" />
+      <tc:button image="fa-remove" label="1a Abbrechen" />
+      <tc:button image="fa-refresh" label="1b Aktualisieren" />
+      <tc:button image="fa-paperclip" label="1c Anhang" />
+      <tc:button image="fa-sign-in" label="1d Anmelden" />
 
       <!-- XXX here is a problem in Firefox 40 and IE 11 when rendering.
       XXX In Chrome and Safari the page is okay.
@@ -39,59 +39,59 @@
       The reason is, that the image is slightly higher than the glyphicon
       -->
       <tc:button image="image/feather-leaf" label="2a Ansicht öffnen" />
-      <tc:button image="glyphicon-eye-close" label="2b Ansicht schließen" />
-      <tc:button image="glyphicon-tasks" label="2c Aufgabe" />
-      <tc:button image="glyphicon-scissors" label="2d Ausschneiden" />
-
-      <tc:button image="glyphicon-pencil" label="3a Bearbeiten" />
-      <tc:button image="glyphicon-log-out" label="3b Beenden" />
-      <tc:button image="glyphicon-bookmark" label="3c Bookmark" />
-      <tc:button image="glyphicon-asterisk" label="3d Clear" />
-
-      <tc:button image="glyphicon-export" label="4a Dateiexport" />
-      <tc:button image="glyphicon-th-list" label="4b Detail" />
-      <tc:button image="glyphicon-stats" label="4c Diagramm" />
-      <tc:button image="glyphicon-modal-window" label="4d Display" />
-
-      <tc:button image="glyphicon-file" label="5a Dokument" />
-      <tc:button image="glyphicon-envelope" label="5b Email" />
-      <tc:button image="glyphicon-minus" label="5c Entfernen" />
-      <tc:button image="glyphicon-ok" label="5d Fertig" />
+      <tc:button image="fa-eye-close" label="2b Ansicht schließen" />
+      <tc:button image="fa-tasks" label="2c Aufgabe" />
+      <tc:button image="fa-scissors" label="2d Ausschneiden" />
+
+      <tc:button image="fa-pencil" label="3a Bearbeiten" />
+      <tc:button image="fa-sign-out" label="3b Beenden" />
+      <tc:button image="fa-bookmark" label="3c Bookmark" />
+      <tc:button image="fa-asterisk" label="3d Clear" />
+
+      <tc:button image="fa-export" label="4a Dateiexport" />
+      <tc:button image="fa-th-list" label="4b Detail" />
+      <tc:button image="fa-stats" label="4c Diagramm" />
+      <tc:button image="fa-modal-window" label="4d Display" />
+
+      <tc:button image="fa-file" label="5a Dokument" />
+      <tc:button image="fa-envelope" label="5b Email" />
+      <tc:button image="fa-minus" label="5c Entfernen" />
+      <tc:button image="fa-ok" label="5d Fertig" />
 
-      <tc:button image="glyphicon-filter" label="6a Filtern" />
+      <tc:button image="fa-filter" label="6a Filtern" />
       <tc:button image="image/feather-leaf" label="6b Gruppe" />
-      <tc:button image="glyphicon-question-sign" label="6c Hilfe" />
-      <tc:button image="glyphicon-plus" label="6d Hinzufügen" />
+      <tc:button image="fa-question-circle" label="6c Hilfe" />
+      <tc:button image="fa-plus" label="6d Hinzufügen" />
 
-      <tc:button image="glyphicon-home" label="7a Home" />
-      <tc:button image="glyphicon-calendar" label="7b Kalender" />
-      <tc:button image="glyphicon-duplicate" label="7c Kopieren" />
-      <tc:button image="glyphicon-trash" label="7d Löschen" />
-
-      <tc:button image="glyphicon-resize-full" label="8a Maximieren" />
-      <tc:button image="glyphicon-resize-small" label="8b Minimieren" />
-      <tc:button image="glyphicon-file" label="8c Neu" />
-      <tc:button image="glyphicon-folder-open" label="8d Öffnen" />
-
-      <tc:button image="glyphicon-step-backward" label="9a Rückgängig" />
-      <tc:button image="glyphicon-lock" label="9b Sicherheit" />
-      <tc:button image="glyphicon-save-file" label="9c Sichern" />
-      <tc:button image="glyphicon-search" label="9d Suchen" />
-
-      <tc:button image="glyphicon-time" label="10a Uhrzeit" />
-      <tc:button image="glyphicon-forward" label="10b Weiter" />
-      <tc:button image="glyphicon-repeat" label="10c Erneut" />
-      <tc:button image="glyphicon-backward" label="10d Zurück" />
-
-      <tc:button image="glyphicon-import" label="11a Dateiimport" />
-      <tc:button image="glyphicon-link" label="11b Link" />
-      <tc:button image="glyphicon-folder-close" label="11c Ordner schließen" />
-      <tc:button image="glyphicon-folder-open" label="11d Ordner öffnen" />
-
-      <tc:button image="glyphicon-print" label="12a Drucken" />
-      <tc:button image="glyphicon-th" label="12b Berechnen" />
-      <tc:button image="glyphicon-eur" label="12c Umrechnungskurs" />
-      <tc:button image="glyphicon-check" label="12d Prüfen" />
+      <tc:button image="fa-home" label="7a Home" />
+      <tc:button image="fa-calendar" label="7b Kalender" />
+      <tc:button image="fa-copy" label="7c Kopieren" />
+      <tc:button image="fa-trash" label="7d Löschen" />
+
+      <tc:button image="fa-resize-full" label="8a Maximieren" />
+      <tc:button image="fa-resize-small" label="8b Minimieren" />
+      <tc:button image="fa-file" label="8c Neu" />
+      <tc:button image="fa-folder-open" label="8d Öffnen" />
+
+      <tc:button image="fa-undo" label="9a Rückgängig" />
+      <tc:button image="fa-lock" label="9b Sicherheit" />
+      <tc:button image="fa-save" label="9c Sichern" />
+      <tc:button image="fa-search" label="9d Suchen" />
+
+      <tc:button image="fa-clock-o" label="10a Uhrzeit" />
+      <tc:button image="fa-forward" label="10b Weiter" />
+      <tc:button image="fa-repeat" label="10c Erneut" />
+      <tc:button image="fa-backward" label="10d Zurück" />
+
+      <tc:button image="fa-import" label="11a Dateiimport" />
+      <tc:button image="fa-link" label="11b Link" />
+      <tc:button image="fa-folder-close" label="11c Ordner schließen" />
+      <tc:button image="fa-folder-open" label="11d Ordner öffnen" />
+
+      <tc:button image="fa-print" label="12a Drucken" />
+      <tc:button image="fa-th" label="12b Berechnen" />
+      <tc:button image="fa-eur" label="12c Umrechnungskurs" />
+      <tc:button image="fa-check" label="12d Prüfen" />
     </tc:segmentLayout>
 
   </tc:page>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java Wed Dec  9 16:56:19 2015
@@ -104,13 +104,7 @@ public enum BootstrapClass implements Cs
   FORM_CONTROL_STATIC("form-control-static"),
   FORM_GROUP("form-group"),
   FORM_HORIZONTAL("form-horizontal"),
-  GLYPHICON("glyphicon"),
-  GLYPHICON_CALENDAR("glyphicon-calendar"),
-  GLYPHICON_CHEVRON_DOWN("glyphicon-chevron-down"),
-  GLYPHICON_CHEVRON_LEFT("glyphicon-chevron-left"),
-  GLYPHICON_CHEVRON_RIGHT("glyphicon-chevron-right"),
-  GLYPHICON_CHEVRON_UP("glyphicon-chevron-up"),
-  GLYPHICON_TIME("glyphicon-time"),
+  GLYPHICON("glyphicon"), // FIXME
   HAS_ERROR("has-error"),
   HAS_SUCCESS("has-success"),
   HAS_WARNING("has-warning"),
@@ -118,6 +112,7 @@ public enum BootstrapClass implements Cs
   INFO("info"),
   INPUT_GROUP("input-group"),
   INPUT_GROUP_BTN("input-group-btn"),
+  INVISIBLE("invisible"),
   MODAL("modal"),
   MODAL_DIALOG("modal-dialog"),
   MODAL_CONTENT("modal-content"),

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/DateRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/DateRenderer.java?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/DateRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/DateRenderer.java Wed Dec  9 16:56:19 2015
@@ -23,6 +23,7 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.component.AbstractUIInput;
 import org.apache.myfaces.tobago.internal.context.DateTimeI18n;
 import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
+import org.apache.myfaces.tobago.renderkit.css.Icons;
 import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
 import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -81,21 +82,13 @@ public class DateRenderer extends InRend
     writer.writeAttribute(HtmlAttributes.DISABLED, date.isDisabled() || date.isReadonly());
     if (pattern.contains("m")) { // simple guessing
       if (pattern.contains("d")) {
-        writer.startElement(HtmlElements.SPAN);
-        writer.writeClassAttribute(BootstrapClass.GLYPHICON, BootstrapClass.GLYPHICON_CALENDAR);
-        writer.endElement(HtmlElements.SPAN);
-        writer.startElement(HtmlElements.SPAN);
-        writer.writeClassAttribute(BootstrapClass.GLYPHICON, BootstrapClass.GLYPHICON_TIME);
-        writer.endElement(HtmlElements.SPAN);
+        writer.writeIcon(Icons.CALENDAR);
+        writer.writeIcon(Icons.CLOCK_O);
       } else {
-        writer.startElement(HtmlElements.SPAN);
-        writer.writeClassAttribute(BootstrapClass.GLYPHICON, BootstrapClass.GLYPHICON_TIME);
-        writer.endElement(HtmlElements.SPAN);
+        writer.writeIcon(Icons.CLOCK_O);
       }
     } else {
-      writer.startElement(HtmlElements.SPAN);
-      writer.writeClassAttribute(BootstrapClass.GLYPHICON, BootstrapClass.GLYPHICON_CALENDAR);
-      writer.endElement(HtmlElements.SPAN);
+      writer.writeIcon(Icons.CALENDAR);
     }
     writer.endElement(HtmlElements.BUTTON);
     writer.endElement(HtmlElements.SPAN);

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java Wed Dec  9 16:56:19 2015
@@ -28,7 +28,6 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
 import org.apache.myfaces.tobago.renderkit.css.BootstrapClassGenerator;
 import org.apache.myfaces.tobago.renderkit.css.Classes;
-import org.apache.myfaces.tobago.renderkit.css.CssItem;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
 import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
@@ -120,7 +119,7 @@ public class SegmentLayoutRenderer exten
       FacesContext facesContext, TobagoResponseWriter writer, BootstrapClassGenerator generator, UIComponent child)
       throws IOException {
     writer.startElement(HtmlElements.DIV);
-    writer.writeClassAttribute((CssItem) null, generator.generate());
+    writer.writeClassAttribute(null, null, generator.generate());
     RenderUtils.encode(facesContext, child);
     writer.endElement(HtmlElements.DIV);
   }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java Wed Dec  9 16:56:19 2015
@@ -23,6 +23,7 @@ import org.apache.myfaces.tobago.compone
 import org.apache.myfaces.tobago.renderkit.SelectManyRendererBase;
 import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
 import org.apache.myfaces.tobago.renderkit.css.Classes;
+import org.apache.myfaces.tobago.renderkit.css.Icons;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlButtonTypes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
@@ -85,10 +86,10 @@ public class SelectManyShuttleRenderer e
     writer.endElement(HtmlElements.SELECT);
     writer.startElement(HtmlElements.DIV);
     writer.writeClassAttribute(Classes.create(select, "toolBar"));
-    createButton(facesContext, component, writer, disabled, BootstrapClass.GLYPHICON_CHEVRON_RIGHT, 2, "addAll");
-    createButton(facesContext, component, writer, disabled, BootstrapClass.GLYPHICON_CHEVRON_RIGHT, 1, "add");
-    createButton(facesContext, component, writer, disabled, BootstrapClass.GLYPHICON_CHEVRON_LEFT, 1, "remove");
-    createButton(facesContext, component, writer, disabled, BootstrapClass.GLYPHICON_CHEVRON_LEFT, 2, "removeAll");
+    createButton(facesContext, component, writer, disabled, Icons.ANGLE_DOUBLE_RIGHT, "addAll");
+    createButton(facesContext, component, writer, disabled, Icons.ANGLE_RIGHT, "add");
+    createButton(facesContext, component, writer, disabled, Icons.ANGLE_LEFT, "remove");
+    createButton(facesContext, component, writer, disabled, Icons.ANGLE_DOUBLE_LEFT, "removeAll");
     writer.endElement(HtmlElements.DIV);
     final String selectedLabel = select.getSelectedLabel();
     if (selectedLabel != null) {
@@ -135,17 +136,13 @@ public class SelectManyShuttleRenderer e
 
   private void createButton(
       final FacesContext context, final UIComponent component, final TobagoResponseWriter writer,
-      final boolean disabled, final BootstrapClass icon, final int iconCount, final String sub) throws IOException {
+      final boolean disabled, final Icons icon, final String sub) throws IOException {
     writer.startElement(HtmlElements.BUTTON);
     writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
     writer.writeClassAttribute(Classes.create(component, sub), BootstrapClass.BTN, BootstrapClass.BTN_DEFAULT);
     writer.writeIdAttribute(component.getClientId(context) + ComponentUtils.SUB_SEPARATOR + sub);
     writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
-    for (int i = 0; i < iconCount; i++) {
-      writer.startElement(HtmlElements.SPAN);
-      writer.writeClassAttribute(BootstrapClass.GLYPHICON, icon);
-      writer.endElement(HtmlElements.SPAN);
-    }
+    writer.writeIcon(icon);
     writer.endElement(HtmlElements.BUTTON);
   }
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java Wed Dec  9 16:56:19 2015
@@ -57,6 +57,7 @@ import org.apache.myfaces.tobago.model.T
 import org.apache.myfaces.tobago.renderkit.RendererBase;
 import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
 import org.apache.myfaces.tobago.renderkit.css.Classes;
+import org.apache.myfaces.tobago.renderkit.css.Icons;
 import org.apache.myfaces.tobago.renderkit.css.Style;
 import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
 import org.apache.myfaces.tobago.renderkit.html.Command;
@@ -341,11 +342,15 @@ public class SheetRenderer extends Rende
         writer.writeClassAttribute(Classes.create(sheet, "cell", markup));
 
         if (column instanceof UIColumnSelector) {
-          final boolean disabled = ComponentUtils.getBooleanAttribute(column, Attributes.DISABLED);
+          UIColumnSelector selector = (UIColumnSelector) column;
           writer.startElement(HtmlElements.INPUT);
-          writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.CHECKBOX);
+          if (sheet.getSelectable().isSingle()) {
+            writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.RADIO);
+          } else {
+            writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.CHECKBOX);
+          }
           writer.writeAttribute(HtmlAttributes.CHECKED, selected);
-          writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
+          writer.writeAttribute(HtmlAttributes.DISABLED, selector.isDisabled());
           writer.writeIdAttribute(sheetId + "_data_row_selector_" + rowIndex);
           writer.writeClassAttribute(Classes.create(sheet, "columnSelector"));
           writer.endElement(HtmlElements.INPUT);
@@ -478,9 +483,10 @@ public class SheetRenderer extends Rende
         }
         final String pagerCommandId = pagerCommand.getClientId(facesContext);
 
-        writer.startElement(HtmlElements.SPAN);
+        writer.startElement(HtmlElements.UL);
         writer.writeClassAttribute(
-            Classes.create(sheet, "pagingOuter", showPageRange), TobagoClass.SHEET__PAGING_PAGES);
+            Classes.create(sheet, "pagingOuter", showPageRange),
+            TobagoClass.SHEET__PAGING_PAGES, BootstrapClass.PAGINATION);
         String areaId = "pagingPages";
         writer.writeIdAttribute(sheetId + ComponentUtils.SUB_SEPARATOR + "pagingPages");
         writer.writeText("");
@@ -490,6 +496,7 @@ public class SheetRenderer extends Rende
           link(facesContext, application, areaId, atBeginning, PageAction.FIRST, sheet);
           link(facesContext, application, areaId, atBeginning, PageAction.PREV, sheet);
         }
+        writer.startElement(HtmlElements.LI);
         writer.startElement(HtmlElements.SPAN);
         writer.writeClassAttribute(Classes.create(sheet, "pagingText"));
         writer.writeAttribute(HtmlAttributes.TITLE,
@@ -541,12 +548,13 @@ public class SheetRenderer extends Rende
           writer.write(ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "sheetPagingInfoEmptyPage"));
         }
         writer.endElement(HtmlElements.SPAN);
+        writer.endElement(HtmlElements.LI);
         if (sheet.isShowPageRangeArrows()) {
           final boolean atEnd = sheet.isAtEnd();
           link(facesContext, application, areaId, atEnd, PageAction.NEXT, sheet);
           link(facesContext, application, areaId, atEnd || !sheet.hasRowCount(), PageAction.LAST, sheet);
         }
-        writer.endElement(HtmlElements.SPAN);
+        writer.endElement(HtmlElements.UL);
       }
 
       writer.endElement(HtmlElements.FOOTER);
@@ -737,23 +745,39 @@ public class SheetRenderer extends Rende
         "image/sheet" + command.getToken() + (disabled ? "Disabled" : ""));
 
     final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
-    writer.startElement(HtmlElements.IMG);
+    writer.startElement(HtmlElements.LI);
+    writer.startElement(HtmlElements.A);
     writer.writeIdAttribute(data.getClientId(facesContext)
         + ComponentUtils.SUB_SEPARATOR + areaId + ComponentUtils.SUB_SEPARATOR + "pagingArrows"
         + ComponentUtils.SUB_SEPARATOR + command.getToken());
     final Classes pagerClasses = Classes.create(data, "footerPagerButton", disabled ? Markup.DISABLED : null);
     writer.writeClassAttribute(pagerClasses);
-    writer.writeAttribute(HtmlAttributes.SRC, image, false);
     writer.writeAttribute(HtmlAttributes.TITLE, tip, true);
-    writer.writeAttribute(HtmlAttributes.ALT, "", false);
-    writer.writeAttribute(DataAttributes.DISABLED, disabled);
-    writer.endElement(HtmlElements.IMG);
+    writer.writeIcon(getIcon(command));
+//    writer.writeAttribute(DataAttributes.DISABLED, disabled);
+    writer.endElement(HtmlElements.A);
+    writer.endElement(HtmlElements.LI);
   }
 
   // TODO sheet.getColumnLayout() may return the wrong number of column...
   // TODO
   // TODO
 
+  private Icons getIcon(PageAction pageAction) {
+    switch (pageAction) {
+      case FIRST:
+        return Icons.STEP_BACKWARD;
+      case LAST:
+        return Icons.STEP_FORWARD;
+      case PREV:
+        return Icons.BACKWARD;
+      case NEXT:
+        return Icons.FORWARD;
+      default:
+        return null;
+    }
+  }
+
   private void renderColumnHeaders(
       final FacesContext facesContext, final UISheet sheet, final TobagoResponseWriter writer,
       final List<AbstractUIColumn> renderedColumnList)
@@ -807,7 +831,7 @@ public class SheetRenderer extends Rende
           writer.writeClassAttribute(Classes.create(sheet, "headerCell"));
           writer.startElement(HtmlElements.SPAN);
           final AbstractUIColumn column = renderedColumnList.get(j);
-          BootstrapClass sorterGlyphicon = null;
+          Icons sorterIcon = null;
           Markup markup = Markup.NULL;
           String tip = (String) column.getAttributes().get(Attributes.TIP);
           // sorter icons should only displayed when there is only 1 column and not input
@@ -845,11 +869,11 @@ public class SheetRenderer extends Rende
               if (column.getId().equals(sheetState.getSortedColumnId())) {
                 final String sortTitle;
                 if (sheetState.isAscending()) {
-                  sorterGlyphicon = BootstrapClass.GLYPHICON_CHEVRON_UP;
+                  sorterIcon = Icons.ANGLE_UP;
                   sortTitle = ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "sheetAscending");
                   markup = markup.add(Markup.ASCENDING);
                 } else {
-                  sorterGlyphicon = BootstrapClass.GLYPHICON_CHEVRON_DOWN;
+                  sorterIcon = Icons.ANGLE_DOWN;
                   sortTitle = ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "sheetDescending");
                   markup = markup.add(Markup.DESCENDING);
                 }
@@ -894,11 +918,7 @@ public class SheetRenderer extends Rende
 
           }
 
-          if (sorterGlyphicon != null) {
-            writer.startElement(HtmlElements.SPAN);
-            writer.writeClassAttribute(BootstrapClass.GLYPHICON, sorterGlyphicon);
-            writer.endElement(HtmlElements.SPAN);
-          }
+          writer.writeIcon(sorterIcon);
 
           writer.endElement(HtmlElements.SPAN);
           if (renderedColumnList.get(j).isResizable()) {

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIndentRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIndentRenderer.java?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIndentRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeIndentRenderer.java Wed Dec  9 16:56:19 2015
@@ -26,7 +26,9 @@ import org.apache.myfaces.tobago.context
 import org.apache.myfaces.tobago.internal.component.AbstractUIData;
 import org.apache.myfaces.tobago.internal.component.AbstractUITreeNode;
 import org.apache.myfaces.tobago.renderkit.RendererBase;
+import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
 import org.apache.myfaces.tobago.renderkit.css.Classes;
+import org.apache.myfaces.tobago.renderkit.css.Icons;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
 import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -100,8 +102,7 @@ public class TreeIndentRenderer extends
       }
       writer.endElement(HtmlElements.IMG);
 */
-      final String icon = junction && showLines ? "glyphicon-option-vertical" : "glyphicon-cog";
-      HtmlRendererUtils.encodeIconWithLabel(writer, icon, null);
+      writer.writeIcon(Icons.SQUARE_O, BootstrapClass.INVISIBLE); // FIXME TOBAGO-1495
     }
   }
 
@@ -115,8 +116,8 @@ public class TreeIndentRenderer extends
     }
     final boolean hasNextSibling = junctions.get(junctions.size() - 1); // last element
 
-    final String icon = folder ? expanded ? "glyphicon-minus" : "glyphicon-plus" : "glyphicon-option-vertical";
-    HtmlRendererUtils.encodeIconWithLabel(writer, icon, null);
+    writer.writeIcon(
+        (Icons) (folder ? expanded ? Icons.MINUS_SQUARE_O : Icons.PLUS_SQUARE_O : Icons.SQUARE_O));
 
 /*
     writer.startElement(HtmlElements.IMG, null);

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java Wed Dec  9 16:56:19 2015
@@ -31,8 +31,8 @@ import org.apache.myfaces.tobago.interna
 import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
 import org.apache.myfaces.tobago.internal.webapp.TobagoResponseWriterWrapper;
 import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
-import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
 import org.apache.myfaces.tobago.renderkit.css.Classes;
+import org.apache.myfaces.tobago.renderkit.css.FontAwesomeIconEncoder;
 import org.apache.myfaces.tobago.renderkit.css.Style;
 import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
 import org.apache.myfaces.tobago.renderkit.html.Command;
@@ -106,10 +106,8 @@ public final class HtmlRendererUtils {
   }
 
   public static void encodeIconWithLabel(TobagoResponseWriter writer, String image, String label) throws IOException {
-    if (image != null && image.startsWith("glyphicon-")) { // XXX hack: should be integrated in the resource manager
-      writer.startElement(HtmlElements.SPAN);
-      writer.writeClassAttribute(BootstrapClass.GLYPHICON, BootstrapClass.glyphicon(image));
-      writer.endElement(HtmlElements.SPAN);
+    if (image != null && image.startsWith("fa-")) { // XXX hack: should be integrated in the resource manager
+      writer.writeIcon(null, FontAwesomeIconEncoder.generateClass(image)); // todo: should not be static
     }
     if (label != null) {
       writer.startElement(HtmlElements.SPAN);
@@ -122,10 +120,8 @@ public final class HtmlRendererUtils {
        TobagoResponseWriter writer, FacesContext facesContext, String image, LabelWithAccessKey label, boolean disabled)
       throws IOException {
     if (image != null) {
-      if (image.startsWith("glyphicon-")) {
-        writer.startElement(HtmlElements.SPAN);
-        writer.writeClassAttribute(BootstrapClass.GLYPHICON, BootstrapClass.glyphicon(image));
-        writer.endElement(HtmlElements.SPAN);
+      if (image.startsWith("fa-")) {
+        writer.writeIcon(null, FontAwesomeIconEncoder.generateClass(image)); // todo: should not be static
       } else {
         if (ResourceManagerUtils.isAbsoluteResource(image)) {
           // absolute Path to image: nothing to do

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml Wed Dec  9 16:56:19 2015
@@ -402,6 +402,7 @@
         <style name="style/contrib/jquery-ui-timepicker-addon-1.4.5.css"/>
         <style name="bootstrap/3.3.5/css/bootstrap.css"/>
         <style name="bootstrap/3.3.5/css/bootstrap-theme.css"/>
+        <style name="font-awesome/4.5.0/css/font-awesome.css"/>
         <style name="style/tobago.css"/>
       </resources>
       <resources production="false">
@@ -428,6 +429,7 @@
         <style name="style/contrib/jquery-ui-timepicker-addon-1.4.5.css"/>
         <style name="bootstrap/3.3.5/css/bootstrap.css"/>
         <style name="bootstrap/3.3.5/css/bootstrap-theme.css"/>
+        <style name="font-awesome/4.5.0/css/font-awesome.css"/>
         <style name="style/tobago.css"/>
       </resources>
     </theme-definition>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-overlay.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-overlay.js?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-overlay.js (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-overlay.js Wed Dec  9 16:56:19 2015
@@ -75,11 +75,12 @@ Tobago.Config.set("Ajax", "waitOverlayDe
       var wait = jQuery("<div>").addClass("tobago-page-overlayCenter");
       this.overlay.append(wait);
 
-      var image = jQuery("<span>").css({fontSize: "xx-large"});
+      var image = jQuery("<i>");
       if (this.options.error) {
-        image.addClass("glyphicon glyphicon-flash").css({color: "#ff0000"});
+        image.addClass("fa fa-flash fa-3x");
+        wait.addClass("alert-danger");
       } else {
-        image.addClass("glyphicon glyphicon-refresh tobago-x-spinning").css({opacity: 0.4});
+        image.addClass("fa fa-refresh fa-3x fa-spin").css({opacity: 0.4});
       }
       wait.append(image);
       wait.show();

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-tree.js Wed Dec  9 16:56:19 2015
@@ -203,12 +203,6 @@ Tobago.Tree.init = function(elements) {
     });
   });
 
-  // XXX hack: if solved TOBAGO-1495 can be closed
-  Tobago.Utils.selectWithJQuery(elements, ".tobago-treeNode")
-      .find(".glyphicon-cog").css({
-    color: "transparent"
-  });
-
 };
 
 Tobago.Tree.isExpanded = function(node, expanded) {

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js Wed Dec  9 16:56:19 2015
@@ -980,10 +980,11 @@ var Tobago = {
         var page = jQuery(".tobago-page");
         page.attr("title", "This application can't be used embedded inside an other site " +
         "(configuration: prevent-frame-attacks=true)!");
-        jQuery("<span>")
-            .addClass("glyphicon glyphicon-flash")
-            .css({color: "#ff0000", fontSize: "xx-large", margin: "20px"})
+        jQuery("<i>")
+            .addClass("fa fa-flash")
+            .css({fontSize: "xx-large", margin: "20px"})
             .appendTo(page);
+        page.addClass("alert-danger");
       }
     }
   },

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css?rev=1718906&r1=1718905&r2=1718906&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css Wed Dec  9 16:56:19 2015
@@ -355,6 +355,8 @@ h6 > .glyphicon:first-child {
 .tobago-sheet-pagingInput {
   text-align: center;
   display: none;
+  margin: -4px 0;
+  width: 3em;
 }
 
 .tobago-sheet-pagingOuter {
@@ -523,19 +525,3 @@ fixme: there is a problem with the selec
 .tobago-tabGroup-toolBar {
   display: none;
 }
-
-
-.glyphicon.tobago-x-spinning {
-  animation: tobago-x-spinning 1s infinite linear;
-  -webkit-animation: tobago-x-spinning_webkit 1s infinite linear;
-}
-
-@keyframes tobago-x-spinning {
-  from { transform: rotate(0deg);}
-  to { transform: rotate(360deg);}
-}
-
-@-webkit-keyframes tobago-x-spinning_webkit {
-  from { -webkit-transform: rotate(0deg);}
-  to { -webkit-transform: rotate(360deg);}
-}