Author: mvitenkov Date: 2008-09-29 13:04:45 -0400 (Mon, 29 Sep 2008) New Revision: 10605 Modified: trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp Log: Modified: trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp 2008-09-29 16:46:52 UTC (rev 10604) +++ trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTable.jsp 2008-09-29 17:04:45 UTC (rev 10605) @@ -70,30 +70,30 @@ rendered="#{extendedDataTableControlBean.rendered}" sortPriority="#{extendedDataTableControlBean.sortPriority}"> <rich:column id="firstName" headerClass="dataTableHeader" width="25%" - label="#{msg['patient.firstName']}" sortable="true" + label="First name" sortable="true" sortBy="#{patient.firstName}" filterBy="#{patient.firstName}" filterEvent="onkeyup"> <f:facet name="header"> - <h:outputText value="#{msg['patient.firstName']}" /> + <h:outputText value="First name" /> </f:facet> <h:outputText id="text" value="#{patient.firstName}"> <rich:toolTip value="sasasasasasa" /> </h:outputText> </rich:column> <rich:column id="lastName" headerClass="dataTableHeader" width="25%" - label="#{msg['patient.lastName']}" sortable="true" + label="Last name" sortable="true" sortBy="#{patient.lastName}" filterBy="#{patient.lastName}" filterEvent="onkeyup"> <f:facet name="header"> - <h:outputText value="#{msg['patient.lastName']}" /> + <h:outputText value="Last name" /> </f:facet> <h:outputText value="#{patient.lastName}" /> </rich:column> <rich:column id="admissionDate" headerClass="dataTableHeader" - width="50%" label="#{msg['patient.admissionDate']}" sortable="true" + width="50%" label="Admission name" sortable="true" sortBy="#{patient.admissionDate}"> <f:facet name="header"> - <h:outputText value="#{msg['patient.admissionDate']}" /> + <h:outputText value="Admission name" /> </f:facet> <h:outputText value="#{patient.admissionDate}" /> </rich:column> Modified: trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp 2008-09-29 16:46:52 UTC (rev 10604) +++ trunk/test-applications/jsp/src/main/webapp/ExtendedDataTable/ExtendedDataTableProperty.jsp 2008-09-29 17:04:45 UTC (rev 10605) @@ -6,26 +6,26 @@ <f:subview id="extendedDataTablePropertySubviewID"> <h:panelGrid columns="2"> - <h:outputLabel value="#{msg['table.width']}" for="tableWidthInput" /> + <h:outputLabel value="Width" for="tableWidthInput" /> <h:inputText id="tableWidthInput" value="#{extendedDataTableControlBean.width}"> <a4j:support event="onchange" reRender="demoTable"></a4j:support> </h:inputText> - <h:outputLabel value="#{msg['table.height']}" for="tableHeightInput" /> + <h:outputLabel value="Height" for="tableHeightInput" /> <h:inputText id="tableHeightInput" value="#{extendedDataTableControlBean.height}"> <a4j:support event="onchange" reRender="demoTable"></a4j:support> </h:inputText> - <h:outputLabel value="#{msg['table.patientsNumber']}" + <h:outputLabel value="Number of patients" for="tablePatientsNumberInput" /> <h:inputText id="tablePatientsNumberInput" value="#{extendedDataTableBean.patientsNumber}"> <a4j:support event="onchange" reRender="demoTable"></a4j:support> </h:inputText> - <h:outputLabel value="#{msg['table.sortMode']}" + <h:outputLabel value="Sort mode" for="tableSortModeSelect" /> <h:selectOneMenu id="tableSortModeSelect" value="#{extendedDataTableControlBean.sortMode}"> @@ -34,7 +34,7 @@ <a4j:support event="onchange" reRender="demoTable"></a4j:support> </h:selectOneMenu> - <h:outputLabel value="#{msg['table.selectionMode']}" + <h:outputLabel value="Selection mode" for="tableSelectionModeSelect" /> <h:selectOneMenu id="tableSelectionModeSelect" value="#{extendedDataTableControlBean.selectionMode}"> @@ -43,11 +43,11 @@ <a4j:support event="onchange" reRender="demoTable"></a4j:support> </h:selectOneMenu> - <h:outputText value="#{msg['table.paginated']}" /> + <h:outputText value="paginated" /> <h:selectBooleanCheckbox id="paginatedCheckbox" value="#{extendedDataTableControlBean.paginated}" onclick="submit()" /> - <h:outputLabel value="#{msg['table.rowsNumber']}" + <h:outputLabel value="Number of rows" for="tableRowsNumberInput" /> <h:inputText id="tableRowsNumberInput" value="#{extendedDataTableControlBean.rowsNumber}"> @@ -114,7 +114,7 @@ <br /> <h:commandButton value="add test" action="#{extendedDataTableControlBean.addExtDTable}"></h:commandButton> - <a4j:commandButton value="#{msg['table.update']}" reRender="mainPanel"> + <a4j:commandButton value="Update values" reRender="mainPanel"> </a4j:commandButton> <br /> @@ -123,19 +123,19 @@ <rich:dataTable id="selectedPatients" value="#{extendedDataTableBean.selectedItems}" var="selectedPatient"> <f:facet name="header"> - <h:outputText value="#{msg['table.selectedPatients']}" /> + <h:outputText value="Selected patient" /> </f:facet> <rich:column id="selectedFirstName" headerClass="dataTableHeader" - label="#{msg['patient.firstName']}"> + label="First name"> <f:facet name="header"> - <h:outputText value="#{msg['patient.firstName']}" /> + <h:outputText value="First name" /> </f:facet> <h:outputText value="#{selectedPatient.firstName}" /> </rich:column> <rich:column id="selectedLastName" headerClass="dataTableHeader" - label="#{msg['patient.lastName']}"> + label="Last name"> <f:facet name="header"> - <h:outputText value="#{msg['patient.lastName']}" /> + <h:outputText value="Last name" /> </f:facet> <h:outputText value="#{selectedPatient.lastName}" /> </rich:column>