Author: ppitonak(a)redhat.com Date: 2010-10-08 08:42:30 -0400 (Fri, 08 Oct 2010) New Revision: 19500 Removed: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richExtendedDataTable.css Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting.xhtml Log: * added a4j:ajax to dataTable's slider * all extended data tables styled Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2010-10-08 09:38:48 UTC (rev 19499) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2010-10-08 12:42:30 UTC (rev 19500) @@ -166,7 +166,9 @@ <h:outputText id="columnHeaderNumberOfKidsComponent" value="rich:inputNumberSlider" /> </f:facet> - <rich:inputNumberSlider id="numOfKidsSlider" value="#{record.numberOfKids}" maxValue="5"/> + <rich:inputNumberSlider id="numOfKidsSlider" value="#{record.numberOfKids}" maxValue="5"> + <a4j:ajax/> + </rich:inputNumberSlider> <f:facet name="footer"> <h:outputText id="columnFooterNumberOfKids" value="Number of Kids" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-10-08 09:38:48 UTC (rev 19499) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components1.xhtml 2010-10-08 12:42:30 UTC (rev 19500) @@ -34,7 +34,43 @@ <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="richExtendedDataTable.css"/> + <style type="text/css"> + .rf-edt-c { + height: 30px !important; + vertical-align: middle; + } + + .rf-edt { + width: 720px !important; + height: 400px !important; + } + + .rf-edt-hdr-c { + height: 2.5em !important; + } + + .rf-edt-c-columnSex { + width: 100px !important; + text-align: center; + } + + .rf-edt-c-columnName { + width: 150px !important; + } + + .rf-edt-c-columnSmoker { + text-align: center; + width: 150px !important; + } + + .rf-edt-c-columnFavoriteColor { + width: 150px !important; + } + + .rf-edt-c-columnNumberOfKids { + width: 150px !important; + } + </style> </ui:define> <ui:define name="outOfTemplateBefore"> @@ -50,9 +86,13 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" + beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" + clientFirst="#{richExtendedDataTableBean.attributes['clientFirst'].value}" + clientRows="#{richExtendedDataTableBean.attributes['clientRows'].value}" filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" @@ -66,9 +106,13 @@ rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" + selection="#{richExtendedDataTableBean.attributes['selection'].value}" + selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" + style="#{richExtendedDataTableBean.attributes['style'].value}" + styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" value="#{richExtendedDataTableBean.state ? model.employees : null}" var="record" @@ -112,19 +156,6 @@ </f:facet> </rich:column> - <rich:column id="columnTitle" sortBy="#{record.title}"> - <f:facet name="header"> - <h:outputText id="columnHeaderTitle" value="Title" /> - <br/> - <h:outputText id="columnHeaderTitleComponent" value="rich:inplaceSelect" /> - </f:facet> - - <h:outputText value="#{record.title}" /> - <f:facet name="footer"> - <h:outputText id="columnFooterTitle" value="Title" /> - </f:facet> - </rich:column> - <rich:column id="columnSmoker" sortBy="#{record.smoker}"> <f:facet name="header"> <h:outputText id="columnHeaderSmoker" value="Smoker" /> @@ -132,7 +163,9 @@ <h:outputText id="columnHeaderSmokerComponent" value="h:selectBooleanCheckbox" /> </f:facet> - <h:selectBooleanCheckbox value="#{record.smoker}"/> + <h:selectBooleanCheckbox value="#{record.smoker}"> + <a4j:ajax/> + </h:selectBooleanCheckbox> <f:facet name="footer"> <h:outputText id="columnFooterSmoker" value="Smoker" /> @@ -162,7 +195,7 @@ <rich:inputNumberSpinner id="spinner" value="#{record.numberOfKids}" maxValue="5"> <a4j:ajax/> </rich:inputNumberSpinner> - + <f:facet name="footer"> <h:outputText id="columnFooterNumberOfKids" value="Number of Kids" /> </f:facet> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-10-08 09:38:48 UTC (rev 19499) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-10-08 12:42:30 UTC (rev 19500) @@ -34,7 +34,47 @@ <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="richDataTable.css"/> + <style type="text/css"> + .rf-edt-c { + height: 70px !important; + vertical-align: middle; + } + + .rf-edt { + width: 970px !important; + height: 400px !important; + } + + .rf-edt-hdr-c { + height: 2.5em !important; + } + + .rf-edt-c-columnSex { + width: 100px !important; + text-align: center; + } + + .rf-edt-c-columnName { + width: 150px !important; + } + + .rf-edt-c-columnTitle { + width: 150px !important; + } + + .rf-edt-c-columnBirthdate { + text-align: center; + width: 150px !important; + } + + .rf-edt-c-columnCompanies { + width: 150px !important; + } + + .rf-edt-c-columnNumberOfKids { + width: 250px !important; + } + </style> </ui:define> <ui:define name="outOfTemplateBefore"> @@ -50,9 +90,13 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" + beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" + clientFirst="#{richExtendedDataTableBean.attributes['clientFirst'].value}" + clientRows="#{richExtendedDataTableBean.attributes['clientRows'].value}" filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" @@ -66,9 +110,13 @@ rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" + selection="#{richExtendedDataTableBean.attributes['selection'].value}" + selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" + style="#{richExtendedDataTableBean.attributes['style'].value}" + styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" value="#{richExtendedDataTableBean.state ? model.employees : null}" var="record" @@ -118,7 +166,7 @@ <f:facet name="header"> <h:outputText id="columnHeaderTitle" value="Title" /> <br/> - <h:outputText id="columnHeaderTitleComponent" value="rich:comboBox" /> + <h:outputText id="columnHeaderTitleComponent" value="rich:inplaceSelect" /> </f:facet> <h:outputText value="#{record.title}" /> @@ -166,7 +214,9 @@ <h:outputText id="columnHeaderNumberOfKidsComponent" value="rich:inputNumberSlider" /> </f:facet> - <rich:inputNumberSlider id="numOfKidsSlider" value="#{record.numberOfKids}" maxValue="5"/> + <rich:inputNumberSlider id="numOfKidsSlider" value="#{record.numberOfKids}" maxValue="5"> + <a4j:ajax/> + </rich:inputNumberSlider> <f:facet name="footer"> <h:outputText id="columnFooterNumberOfKids" value="Number of Kids" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2010-10-08 09:38:48 UTC (rev 19499) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/filtering.xhtml 2010-10-08 12:42:30 UTC (rev 19500) @@ -35,7 +35,44 @@ <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="richDataTable.css"/> + <style type="text/css"> + .rf-edt-c { + height: 30px !important; + vertical-align: middle; + } + + .rf-edt { + width: 820px !important; + height: 400px !important; + } + + .rf-edt-hdr-c { + height: 4.2em !important; + } + + .rf-edt-c-columnSex { + width: 100px !important; + text-align: center; + } + + .rf-edt-c-columnName { + width: 150px !important; + } + + .rf-edt-c-columnTitle { + width: 150px !important; + } + + .rf-edt-c-columnNumberOfKids { + text-align: center; + width: 150px !important; + } + + .rf-edt-c-columnNumberOfKids2 { + text-align: center; + width: 250px !important; + } + </style> </ui:define> <ui:define name="outOfTemplateBefore"> @@ -50,9 +87,13 @@ <ui:define name="component"> <rich:extendedDataTable id="richDataTable" + beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" + clientFirst="#{richExtendedDataTableBean.attributes['clientFirst'].value}" + clientRows="#{richExtendedDataTableBean.attributes['clientRows'].value}" filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" @@ -66,9 +107,13 @@ rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" + selection="#{richExtendedDataTableBean.attributes['selection'].value}" + selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" + style="#{richExtendedDataTableBean.attributes['style'].value}" + styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" value="#{richExtendedDataTableBean.state ? model.employees : null}" var="record" @@ -88,7 +133,7 @@ <f:selectItem itemValue="ALL" itemLabel="all"/> <f:selectItem itemValue="FEMALE" itemLabel="female"/> <f:selectItem itemValue="MALE" itemLabel="male"/> - <a4j:ajax id="columnHeaderSexAjax" render="commonGrid" execute="@this" event="change"/> + <a4j:ajax render="commonGrid" execute="@this" event="change"/> </h:selectOneMenu> </h:panelGroup> </f:facet> @@ -108,7 +153,7 @@ <h:outputText id="columnHeaderNameType" value="(expression contains ignore case)" /> <br/> <h:inputText id="columnHeaderNameInput" value="#{richExtendedDataTableBean.nameFilter}"> - <a4j:ajax id="columnHeaderNameAjax" render="commonGrid" execute="@this" event="change"/> + <a4j:ajax render="commonGrid" execute="@this" event="change"/> </h:inputText> </f:facet> @@ -125,7 +170,7 @@ <h:outputText id="columnHeaderTitleType" value="(expression equals)" /> <br/> <h:inputText id="columnHeaderTitleInput" value="#{richExtendedDataTableBean.titleFilter}"> - <a4j:ajax id="columnHeaderTitleAjax" render="commonGrid" execute="@this" event="change"/> + <a4j:ajax render="commonGrid" execute="@this" event="change"/> </h:inputText> </f:facet> @@ -141,7 +186,7 @@ <br/> <h:outputText id="columnHeaderNumberOfKidsType" value="(expression &gt;=)" /> <br/> - <h:inputText id="columnHeaderNumberOfKidsInput" value="TODO inputNumberSpinner"/> + <rich:inputNumberSpinner id="spinnerFilter" minValue="0" maxValue="6" value="0" cycled="true"/> </f:facet> <h:outputText value="#{record.numberOfKids}" /> @@ -156,7 +201,7 @@ <br/> <h:outputText id="columnHeaderNumberOfKids2Type" value="(expression &lt;)" /> <br/> - <h:inputText id="columnHeaderNumberOfKids2Input" value="TODO inputNumberSlider"/> + <rich:inputNumberSlider id="sliderFilter" minValue="0" maxValue="6" value="6"/> </f:facet> <h:outputText value="#{record.numberOfKids}" /> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2010-10-08 09:38:48 UTC (rev 19499) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/scroller.xhtml 2010-10-08 12:42:30 UTC (rev 19500) @@ -34,7 +34,12 @@ <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="richExtendedDataTable.css"/> + <style type="text/css"> + .rf-edt { + width: 300px !important; + height: 300px !important; + } + </style> </ui:define> <ui:define name="outOfTemplateBefore"> @@ -50,9 +55,13 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" + beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" + clientFirst="#{richExtendedDataTableBean.attributes['clientFirst'].value}" + clientRows="#{richExtendedDataTableBean.attributes['clientRows'].value}" filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" @@ -66,9 +75,13 @@ rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" + selection="#{richExtendedDataTableBean.attributes['selection'].value}" + selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" + style="#{richExtendedDataTableBean.attributes['style'].value}" + styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" value="#{richExtendedDataTableBean.state ? model.capitals : null}" var="record" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2010-10-08 09:38:48 UTC (rev 19499) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/simple.xhtml 2010-10-08 12:42:30 UTC (rev 19500) @@ -34,7 +34,12 @@ <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="richExtendedDataTable.css"/> + <style type="text/css"> + .rf-edt { + width: 215px !important; + height: 300px !important; + } + </style> </ui:define> <ui:define name="outOfTemplateBefore"> @@ -49,11 +54,13 @@ <ui:define name="component"> <rich:extendedDataTable id="richEDT" + beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" clientFirst="#{richExtendedDataTableBean.attributes['clientFirst'].value}" clientRows="#{richExtendedDataTableBean.attributes['clientRows'].value}" filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" @@ -67,6 +74,8 @@ rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" + selection="#{richExtendedDataTableBean.attributes['selection'].value}" + selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting.xhtml 2010-10-08 09:38:48 UTC (rev 19499) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/sorting.xhtml 2010-10-08 12:42:30 UTC (rev 19500) @@ -34,7 +34,12 @@ <f:converter converterId="templatesListConverter" /> </f:viewParam> </f:metadata> - <h:outputStylesheet library="css" name="richDataTable.css"/> + <style type="text/css"> + .rf-edt { + width: 300px !important; + height: 300px !important; + } + </style> </ui:define> <ui:define name="outOfTemplateBefore"> @@ -50,9 +55,13 @@ <ui:define name="component"> <rich:extendedDataTable id="table" + beforeselectionchange="#{richExtendedDataTableBean.attributes['beforeselectionchange'].value}" + clientFirst="#{richExtendedDataTableBean.attributes['clientFirst'].value}" + clientRows="#{richExtendedDataTableBean.attributes['clientRows'].value}" filterVar="#{richExtendedDataTableBean.attributes['filterVar'].value}" filteringListeners="#{richExtendedDataTableBean.attributes['filteringListeners'].value}" first="#{richExtendedDataTableBean.attributes['first'].value}" + frozenColumns="#{richExtendedDataTableBean.attributes['frozenColumns'].value}" iterationState="#{richExtendedDataTableBean.attributes['iterationState'].value}" iterationStatusVar="#{richExtendedDataTableBean.attributes['iterationStatusVar'].value}" keepSaved="#{richExtendedDataTableBean.attributes['keepSaved'].value}" @@ -66,9 +75,13 @@ rowKey="#{richExtendedDataTableBean.attributes['rowKey'].value}" rowKeyConverter="#{richExtendedDataTableBean.attributes['rowKeyConverter'].value}" rows="#{richExtendedDataTableBean.attributes['rows'].value}" + selection="#{richExtendedDataTableBean.attributes['selection'].value}" + selectionchange="#{richExtendedDataTableBean.attributes['selectionchange'].value}" sortMode="#{richExtendedDataTableBean.attributes['sortMode'].value}" sortPriority="#{richExtendedDataTableBean.attributes['sortPriority'].value}" sortingListeners="#{richExtendedDataTableBean.attributes['sortingListeners'].value}" + style="#{richExtendedDataTableBean.attributes['style'].value}" + styleClass="#{richExtendedDataTableBean.attributes['styleClass'].value}" value="#{richExtendedDataTableBean.state ? model.capitals : null}" var="record" Deleted: modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richExtendedDataTable.css =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richExtendedDataTable.css 2010-10-08 09:38:48 UTC (rev 19499) +++ modules/tests/metamer/trunk/application/src/main/webapp/resources/css/richExtendedDataTable.css 2010-10-08 12:42:30 UTC (rev 19500) @@ -1,16 +0,0 @@ -.align-center { - text-align: center; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.extended-data-table { - width: 300; - height: 400px; -} \ No newline at end of file