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/02/11 19:24:54 UTC
svn commit: r1659036 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/
tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/
tobago-exa...
Author: lofwyr
Date: Wed Feb 11 18:24:54 2015
New Revision: 1659036
URL: http://svn.apache.org/r1659036
Log:
Merged from trunk
doc [from revision 1659031]
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml (contents, props changed)
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java?rev=1659036&r1=1659035&r2=1659036&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java Wed Feb 11 18:24:54 2015
@@ -235,6 +235,7 @@ public interface SheetTagDeclaration
/**
* Flag indicating if paging arrows are shown near page range
+ * @since 2.0.0
*/
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "true")
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java?rev=1659036&r1=1659035&r2=1659036&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java Wed Feb 11 18:24:54 2015
@@ -49,6 +49,8 @@ public class SheetConfig {
private SelectItem[] sheetPagingPositionItems;
private SelectItem[] sheetSelectableItems;
private String selectable;
+ private boolean showDirectLinksArrows;
+ private boolean showPageRangeArrows;
private boolean sheetConfigPopup;
public SheetConfig() {
@@ -64,6 +66,8 @@ public class SheetConfig {
sheetPagingPositionItems = createSheetItems(SHEET_PAGER_POSITION_KEYS);
sheetSelectableItems = createSheetItems(SHEET_SELECTABLE_KEYS);
selectable = SHEET_SELECTABLE_KEYS[2];
+ showDirectLinksArrows = false;
+ showPageRangeArrows = true;
}
public String configSheet() {
@@ -181,4 +185,20 @@ public class SheetConfig {
public void setSelectable(final String selectable) {
this.selectable = selectable;
}
+
+ public boolean isShowDirectLinksArrows() {
+ return showDirectLinksArrows;
+ }
+
+ public void setShowDirectLinksArrows(boolean showDirectLinksArrows) {
+ this.showDirectLinksArrows = showDirectLinksArrows;
+ }
+
+ public boolean isShowPageRangeArrows() {
+ return showPageRangeArrows;
+ }
+
+ public void setShowPageRangeArrows(boolean showPageRangeArrows) {
+ this.showPageRangeArrows = showPageRangeArrows;
+ }
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml?rev=1659036&r1=1659035&r2=1659036&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml Wed Feb 11 18:24:54 2015
@@ -32,10 +32,10 @@
actionListener="#{overviewController.resetColumnWidths}" />
<tc:toolBarCommand label="#" tip="#{overviewBundle.sheet_configTip}" renderedPartially="sheetConfigPopup" >
<f:facet name="popup">
- <tc:popup width="300px" height="275px" id="sheetConfigPopup">
+ <tc:popup width="300px" height="325px" id="sheetConfigPopup">
<tc:box label="#{overviewBundle.sheet_configTitle}">
<f:facet name="layout">
- <tc:gridLayout rows="auto;auto;auto;auto;auto;auto;auto;auto;auto;1*;auto"/>
+ <tc:gridLayout rows="auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;auto;1*;auto"/>
</f:facet>
<tx:selectOneChoice label="showHeader"
value="#{overviewController.sheetConfig.sheetShowHeader}"
@@ -67,12 +67,18 @@
tip="TODO: paging DirectLinkCount Text">
<f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
</tx:selectOneChoice>
+ <tx:selectBooleanCheckbox label="with arrows"
+ value="#{overviewController.sheetConfig.showPageRangeArrows}"
+ tip="TODO: showPageRangeArrows Text"/>
<tx:selectOneChoice label="showDirectLinks"
value="#{overviewController.sheetConfig.sheetDirectPagingPosition}"
tip="TODO: paging DirectLinkCount Text">
<f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
</tx:selectOneChoice>
+ <tx:selectBooleanCheckbox label="with arrows"
+ value="#{overviewController.sheetConfig.showDirectLinksArrows}"
+ tip="TODO: showDirectLinksArrows Text"/>
<tx:selectOneChoice label="directLinkCount"
value="#{overviewController.sheetConfig.sheetDirectLinkCount}"
@@ -140,6 +146,8 @@
stateChangeListener="#{demo.stateChangeListener}"
sortActionListener="#{overviewController.sheetSorter}"
selectable="#{overviewController.sheetConfig.selectable}"
+ showDirectLinksArrows="#{overviewController.sheetConfig.showDirectLinksArrows}"
+ showPageRangeArrows="#{overviewController.sheetConfig.showPageRangeArrows}"
renderedPartially="@this :page:header:headerInfo">
<!--
<f:facet name="reload">
Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 11 18:24:54 2015
@@ -1 +1 @@
-/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml:1621332,1622508
+/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml:1621332,1622508,1659031