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/05/21 15:52:28 UTC
svn commit: r1680876 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-example/tobago-example-test/src/main/webapp/test/sheet/
tobago-theme/tobago-theme-richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/image/
toba...
Author: lofwyr
Date: Thu May 21 13:52:27 2015
New Revision: 1680876
URL: http://svn.apache.org/r1680876
Log:
TOBAGO-1368: Create a new theme which uses Bootstrap
- sorting
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/ascending.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/descending.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/ascending.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/descending.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/ascending.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/descending.png
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-types.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.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
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-types.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-types.xhtml?rev=1680876&r1=1680875&r2=1680876&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-types.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-types.xhtml Thu May 21 13:52:27 2015
@@ -42,8 +42,8 @@
<tc:column label="<tc:in>" id="c_in">
<tc:in value="#{luminary.name}" id="in"/>
</tc:column>
- <tc:column label="<tx:date>" id="c_date">
- <tx:date label="Label" labelWidth="100px"/>
+ <tc:column label="<tc:date>" id="c_date">
+ <tc:date />
</tc:column>
<tc:column label="<tc:button>" id="c_button">
<tc:button label="#{luminary.name}"/>
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/SectionRenderer.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/SectionRenderer.java?rev=1680876&r1=1680875&r2=1680876&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/SectionRenderer.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/SectionRenderer.java Thu May 21 13:52:27 2015
@@ -77,7 +77,7 @@ public class SectionRenderer extends Lay
if (image != null && image.startsWith("glyphicon-")) { // XXX hack: should be integrated in the resource manager
writer.startElement(HtmlElements.SPAN, null);
writer.writeClassAttribute(BootstrapClass.GLYPHICON, BootstrapClass.glyphicon(image));
- writer.endElement(HtmlElements.SPAN);
+ writer.endElement(HtmlElements.SPAN);
}
if (image != null && label != null) {
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=1680876&r1=1680875&r2=1680876&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 Thu May 21 13:52:27 2015
@@ -843,11 +843,11 @@ public class SheetRenderer extends Layou
if (column.getId().equals(sheetState.getSortedColumnId())) {
final String sortTitle;
if (sheetState.isAscending()) {
- sorterImage = ResourceManagerUtils.getImage(facesContext, "image/ascending");
+ sorterImage = "glyphicon-chevron-up";
sortTitle = ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "sheetAscending");
markup = markup.add(Markup.ASCENDING);
} else {
- sorterImage = ResourceManagerUtils.getImage(facesContext, "image/descending");
+ sorterImage = "glyphicon-chevron-down";
sortTitle = ResourceManagerUtils.getPropertyNotNull(facesContext, "tobago", "sheetDescending");
markup = markup.add(Markup.DESCENDING);
}
@@ -893,10 +893,9 @@ public class SheetRenderer extends Layou
}
if (sorterImage != null) {
- writer.startElement(HtmlElements.IMG, null);
- writer.writeAttribute(HtmlAttributes.SRC, sorterImage, false);
- writer.writeAttribute(HtmlAttributes.ALT, "", false);
- writer.endElement(HtmlElements.IMG);
+ writer.startElement(HtmlElements.SPAN, null);
+ writer.writeClassAttribute(BootstrapClass.GLYPHICON, BootstrapClass.glyphicon(sorterImage));
+ writer.endElement(HtmlElements.SPAN);
}
writer.endElement(HtmlElements.SPAN);