JBoss Rich Faces SVN: r5765 - management/design/columnSortFilterFeatures.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-02-01 11:14:36 -0500 (Fri, 01 Feb 2008)
New Revision: 5765
Added:
management/design/columnSortFilterFeatures/FuncSpec - Filtering Feature.odt
Log:
Added: management/design/columnSortFilterFeatures/FuncSpec - Filtering Feature.odt
===================================================================
(Binary files differ)
Property changes on: management/design/columnSortFilterFeatures/FuncSpec - Filtering Feature.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 2 months
JBoss Rich Faces SVN: r5764 - in trunk/ui/dataTable/src/main/java/org/richfaces/renderkit: html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2008-02-01 09:06:31 -0500 (Fri, 01 Feb 2008)
New Revision: 5764
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-1940
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-01 13:53:30 UTC (rev 5763)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-01 14:06:31 UTC (rev 5764)
@@ -85,6 +85,8 @@
ResponseWriter writer = context.getResponseWriter();
UIComponent header = table.getHeader();
Iterator headers = columnFacets(table,"header");
+ Iterator<UIComponent> colums = table.columns();
+ int colCount = calculateRowColumns(table.columns());
if (header != null ||headers.hasNext()) {
@@ -104,9 +106,9 @@
encodeStyleClass(writer, null,
"dr-table-subheader rich-table-subheader", null,
headerClass);
- encodeHeaderFacets(context, writer, headers,
+ encodeHeaderFacets(context, writer, colums,
"dr-table-subheadercell rich-table-subheadercell",
- headerClass, "header", "th");
+ headerClass, "header", "th", colCount);
writer.endElement("tr");
}
@@ -132,10 +134,20 @@
protected void encodeHeaderFacets(FacesContext context,
ResponseWriter writer, Iterator headers, String skinCellClass,
- String headerClass, String facetName, String element)
+ String headerClass, String facetName, String element, int colCount)
throws IOException {
+ int t_colCount = 0;
while (headers.hasNext()) {
UIComponent column = (UIComponent) headers.next();
+ if((Integer)column.getAttributes().get("colspan")!=null){
+ t_colCount = t_colCount + ((Integer)column.getAttributes().get("colspan")).intValue();
+ }else{
+ t_colCount++;
+ }
+ if(t_colCount>colCount){
+ break;
+ }
+
String classAttribute = facetName + "Class";
String columnHeaderClass = (String) column.getAttributes().get(
classAttribute);
@@ -143,7 +155,7 @@
writer.startElement(element, column);
encodeStyleClass(writer, null, skinCellClass, headerClass,
columnHeaderClass);
- writer.writeAttribute("scope", "col", null);
+ writer.writeAttribute("scope", "col", null);
getUtils().encodeAttribute(context, column, "colspan");
if (column instanceof org.richfaces.component.UIColumn) {
@@ -183,8 +195,9 @@
renderChild(context, facet);
}
+ writer.endElement(element);
- writer.endElement(element);
+
}
}
@@ -193,6 +206,8 @@
ResponseWriter writer = context.getResponseWriter();
UIComponent footer = table.getFooter();
Iterator footers = columnFacets(table,"footer");
+ Iterator tableColumns = table.columns();//columnFacets(table,"footer");
+ int colCount = calculateRowColumns(table.columns());
if (footer != null || footers.hasNext()) {
writer.startElement("tfoot", table);
String footerClass = (String) table.getAttributes().get(
@@ -204,9 +219,9 @@
"dr-table-subfooter rich-table-subfooter", null,
footerClass);
- encodeHeaderFacets(context, writer, footers,
+ encodeHeaderFacets(context, writer, tableColumns,
"dr-table-subfootercell rich-table-subfootercell",
- footerClass, "footer", "td");
+ footerClass, "footer", "td",colCount);
writer.endElement("tr");
}
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2008-02-01 13:53:30 UTC (rev 5763)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/html/SubTableRenderer.java 2008-02-01 14:06:31 UTC (rev 5764)
@@ -60,14 +60,16 @@
*/
private void encodeHeaderRow(ResponseWriter writer, FacesContext context, UIComponent component,String facetName) throws IOException {
UIDataTable dataTable = (UIDataTable) component;
+ Iterator<UIComponent> columns = dataTable.columns();//columnFacets(dataTable,facetName);
Iterator headers = columnFacets(dataTable,facetName);
+ int colCount = calculateRowColumns(dataTable.columns());
String headerClass = (String) component.getAttributes().get(
facetName+"Class");
if (headers.hasNext()) {
writer.startElement(HTML.TR_ELEMENT, dataTable);
encodeStyleClass(writer, null, "dr-subtable-"+facetName+" rich-subtable-"+facetName, null, headerClass);
- encodeHeaderFacets(context, writer, headers, "dr-subtable-"+facetName+"cell rich-subtable-"+facetName+"cell", headerClass,
- facetName, "td");
+ encodeHeaderFacets(context, writer, columns, "dr-subtable-"+facetName+"cell rich-subtable-"+facetName+"cell", headerClass,
+ facetName, "td",colCount);
writer.endElement(HTML.TR_ELEMENT);
}
}
16 years, 2 months
JBoss Rich Faces SVN: r5763 - management/design/inplaceInput.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-02-01 08:53:30 -0500 (Fri, 01 Feb 2008)
New Revision: 5763
Modified:
management/design/inplaceInput/FuncSpec - InplaceInput.doc
Log:
Modified: management/design/inplaceInput/FuncSpec - InplaceInput.doc
===================================================================
(Binary files differ)
16 years, 2 months
JBoss Rich Faces SVN: r5762 - in management/design: standardComponent and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2008-02-01 08:03:20 -0500 (Fri, 01 Feb 2008)
New Revision: 5762
Added:
management/design/standardComponent/
management/design/standardComponent/btn_bg.gif
management/design/standardComponent/btn_press_bg.gif
management/design/standardComponent/customise_example.html
management/design/standardComponent/default_example.html
management/design/standardComponent/input_bg.gif
management/design/standardComponent/input_error.gif
Log:
http://jira.jboss.com/jira/browse/RF-2139
Added: management/design/standardComponent/btn_bg.gif
===================================================================
(Binary files differ)
Property changes on: management/design/standardComponent/btn_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design/standardComponent/btn_press_bg.gif
===================================================================
(Binary files differ)
Property changes on: management/design/standardComponent/btn_press_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design/standardComponent/customise_example.html
===================================================================
--- management/design/standardComponent/customise_example.html (rev 0)
+++ management/design/standardComponent/customise_example.html 2008-02-01 13:03:20 UTC (rev 5762)
@@ -0,0 +1,97 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+ <title>Untitled</title>
+</head>
+
+<body>
+
+<style>
+ .input_def{
+ border-width: 1px;
+ border-style : inset;
+ border-color : #BED6F8 /*panelBorderColor*/;
+ font-size: 11px /*generalSizeFont*/;
+ font-family: verdana /*generalFamilyFont*/;
+ color : #000000 /*controlTextColor*/;
+ background-color : #FFFFFF /*controlBackgroundColor*/;
+ background-image : url(input_bg.gif)/*from additionalBackgroundColor to controlBackgroundColor, width generalSizeFont*/;
+ background-repeat : no-repeat;
+ background-position : 1px 1px;
+ }
+ .input_sel{
+ border-width: 1px;
+ border-style : inset;
+ border-color : #BED6F8 /*panelBorderColor*/;
+ font-size: 11px /*generalSizeFont*/;
+ font-family: verdana /*generalFamilyFont*/;
+ color : #000000 /*controlTextColor*/;
+ background-color : #FFF2D0 /*NEW - inputLightColor*/;
+ }
+ .input_error{
+ border-width: 1px;
+ border-style : inset;
+ border-color : #BED6F8 /*panelBorderColor*/;
+ font-size: 11px /*generalSizeFont*/;
+ font-family: verdana /*generalFamilyFont*/;
+ color : #000000 /*controlTextColor*/;
+ background-color : #FFE6E6 /*NEW - errorBackgroundColor*/;
+ background-image : url(input_error.gif); /*NEW - errorColor*/
+ background-repeat : no-repeat;
+ background-position : center right;
+ }
+ .btn_def{
+ border-width: 1px;
+ border-style : outset;
+ border-color : #BED6F8 /*panelBorderColor*/;
+ font-size: 11px /*generalSizeFont*/;
+ font-family: verdana /*generalFamilyFont*/;
+ color : #000000 /*headerTextColor*/;
+ background-color : #BED6F8 /*headerBackgroundColor*/;
+ background-image : url(btn_bg.gif)/*from headerGradientColor to headerBackgroundColor, width generalSizeFont*/;
+ background-repeat : repeat-x;
+ background-position : top left;
+ }
+ .btn_press{
+ border-width: 1px;
+ border-style : inset;
+ border-color : #BED6F8 /*panelBorderColor*/;
+ font-size: 11px /*generalSizeFont*/;
+ font-family: verdana /*generalFamilyFont*/;
+ color : #000000 /*headerTextColor*/;
+ background-color : #BED6F8 /*headerBackgroundColor*/;
+ background-image : url(btn_press_bg.gif)/*from headerBackgroundColor to headerGradientColor, width generalSizeFont*/;
+ background-repeat : repeat-x;
+ background-position : bottom left;
+ }
+</style>
+<input type="Button" value="Test" class="btn_def">
+<input type="File" class="input_def">
+<input type="Text" value="Test" class="input_def">
+<select class="input_def">
+ <option>Test</option>
+ <option>Test</option>
+ <option>Test</option>
+</select><br><br>
+
+<input type="Button" value="Test" class="btn_press">
+<input type="File" class="input_sel">
+<input type="Text" value="Test" class="input_sel">
+<select class="input_sel">
+ <option>Test</option>
+ <option>Test</option>
+ <option>Test</option>
+</select><br><br>
+
+<input type="Button" value="Test" class="btn_def">
+<input type="File" class="input_def">
+<input type="Text" value="Test" class="input_error">
+<select class="input_def">
+ <option>Test</option>
+ <option>Test</option>
+ <option>Test</option>
+</select><br><br>
+
+</body>
+</html>
Added: management/design/standardComponent/default_example.html
===================================================================
--- management/design/standardComponent/default_example.html (rev 0)
+++ management/design/standardComponent/default_example.html 2008-02-01 13:03:20 UTC (rev 5762)
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+ <title>Untitled</title>
+</head>
+
+<body>
+
+<style>
+ input, select{
+ border-width: 1px;
+ border-color : #BED6F8 /*panelBorderColor*/;
+ font-size: 11px /*generalSizeFont*/;
+ font-family: verdana /*generalFamilyFont*/;
+ color : #000000 /*controlTextColor*/;
+ }
+</style>
+<input type="Button" value="Test">
+<input type="Checkbox">
+<input type="File">
+<input type="Radio">
+<input type="Text" value="Test">
+<select>
+ <option>Test</option>
+</select>
+</body>
+</html>
Added: management/design/standardComponent/input_bg.gif
===================================================================
(Binary files differ)
Property changes on: management/design/standardComponent/input_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: management/design/standardComponent/input_error.gif
===================================================================
(Binary files differ)
Property changes on: management/design/standardComponent/input_error.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 2 months
JBoss Rich Faces SVN: r5761 - trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-01 06:48:45 -0500 (Fri, 01 Feb 2008)
New Revision: 5761
Modified:
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
Log:
fix behavior for manual input
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-02-01 11:38:12 UTC (rev 5760)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-02-01 11:48:45 UTC (rev 5761)
@@ -232,6 +232,7 @@
if (this.isValueSet(event) && isSearchSuccessful) {
this.setValue();
}
+ this.comboValue.value = this.field.value;
}
},
16 years, 2 months
JBoss Rich Faces SVN: r5760 - trunk/sandbox/ui/combobox/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-01 06:38:12 -0500 (Fri, 01 Feb 2008)
New Revision: 5760
Modified:
trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml
Log:
enableManualInput = true
Modified: trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml
===================================================================
--- trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml 2008-02-01 11:37:24 UTC (rev 5759)
+++ trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml 2008-02-01 11:38:12 UTC (rev 5760)
@@ -36,7 +36,7 @@
<name>enableManualInput</name>
<classname>boolean</classname>
<description>enabled for keybord input</description>
- <defaultvalue>false</defaultvalue>
+ <defaultvalue>true</defaultvalue>
</property>
<property>
<name>filterNewValues</name>
16 years, 2 months
JBoss Rich Faces SVN: r5759 - trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-01 06:37:24 -0500 (Fri, 01 Feb 2008)
New Revision: 5759
Modified:
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
Log:
set another font size for inactive input
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-02-01 10:16:32 UTC (rev 5758)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-02-01 11:37:24 UTC (rev 5759)
@@ -314,7 +314,7 @@
<u:selector name=".rich-combobox-font-inactive">
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
- <u:style name="color" skin="tableBorderColor"/>
+ <u:style name="color" skin="generalTextColor"/>
</u:selector>
<u:selector name=".rich-combobox-input">
16 years, 2 months
JBoss Rich Faces SVN: r5758 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: cluts
Date: 2008-02-01 05:16:32 -0500 (Fri, 01 Feb 2008)
New Revision: 5758
Modified:
trunk/docs/userguide/en/src/main/docbook/included/calendar.xml
Log:
http://jira.jboss.org/jira/browse/RF-1943 - updated for calendar
Modified: trunk/docs/userguide/en/src/main/docbook/included/calendar.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2008-02-01 10:10:00 UTC (rev 5757)
+++ trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2008-02-01 10:16:32 UTC (rev 5758)
@@ -506,17 +506,19 @@
<entry>Returns additional data for the date</entry>
</row>
+ <!--
<row>
- <entry>enable()</entry>
-
- <entry>Enables calendar</entry>
+ <entry>enable()</entry>
+
+ <entry>Enables calendar</entry>
</row>
-
+
<row>
- <entry>disable()</entry>
-
- <entry>Disables calendar</entry>
+ <entry>disable()</entry>
+
+ <entry>Disables calendar</entry>
</row>
+ -->
<row>
<entry>getCurrentMonth()</entry>
@@ -531,16 +533,29 @@
</row>
<row>
- <entry>Collapse()</entry>
+ <entry>doCollapse()</entry>
<entry>Collapses calendar element</entry>
</row>
<row>
- <entry>Expand()</entry>
+ <entry>doExpand()</entry>
<entry>Expands calendar element</entry>
</row>
+
+ <row>
+ <entry>resetSelectedDate()</entry>
+
+ <entry>Clears a selected day value</entry>
+ </row>
+
+ <row>
+ <entry>doSwitch()</entry>
+
+ <entry>Inverts a state for the popup calendar</entry>
+ </row>
+
</tbody>
</tgroup>
</table>
16 years, 2 months
JBoss Rich Faces SVN: r5757 - trunk/sandbox/ui/combobox/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-02-01 05:10:00 -0500 (Fri, 01 Feb 2008)
New Revision: 5757
Modified:
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
add autocomplete="off" for input
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-31 18:53:21 UTC (rev 5756)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-02-01 10:10:00 UTC (rev 5757)
@@ -218,6 +218,7 @@
onselect="#{component.attributes['onselect']}"
onblur="#{component.attributes['onblur']}"
style="width:#{correction}; #{inputStyle}"
+ autocomplete="off"
/>
<input id="comboBoxButtonBG#{clientId}" readonly="true" type="text" value="" class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"/>
<input id="comboboxButton#{clientId}" readonly="true" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}; background-image: #{buttonIconNormal};"
16 years, 2 months