September 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r3055 - in branches/3.1.x/ui/scrollableDataTable/src/main: templates/org/richfaces and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2007-09-21 11:55:29 -0400 (Fri, 21 Sep 2007) New Revision: 3055 Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js branches/3.1.x/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx Log: RF-973 Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js =================================================================== --- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-09-21 15:37:11 UTC (rev 3054) +++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-09-21 15:55:29 UTC (rev 3055) @@ -411,7 +411,7 @@ } if(el) { - var index = parseInt(el.getAttribute("columnIndex")); + var index = parseInt(el.getAttribute("columnindex")); if(index>=0) { /* var dir = this.getColumns()[index].sorted; Modified: branches/3.1.x/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx =================================================================== --- branches/3.1.x/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2007-09-21 15:37:11 UTC (rev 3054) +++ branches/3.1.x/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2007-09-21 15:55:29 UTC (rev 3055) @@ -12,7 +12,7 @@ component="javax.faces.component.UIComponent" > - <th class="dr-sdt-hc rich-sdt-header-cell #{headerColumnClass} #{headerColumnSortClass}" id="#{client_id}:hc_#{cell_index}" columnIndex="#{cell_index}" sortable="#{component.attributes['sortable']}"> + <th class="dr-sdt-hc rich-sdt-header-cell #{headerColumnClass} #{headerColumnSortClass}" id="#{client_id}:hc_#{cell_index}" columnindex="#{cell_index}" sortable="#{component.attributes['sortable']}"> <jsp:scriptlet>

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r3054 - in trunk/test-applications/facelets/src/main: java/rich and 7 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ayanul Date: 2007-09-21 11:37:11 -0400 (Fri, 21 Sep 2007) New Revision: 3054 Added: trunk/test-applications/facelets/src/main/webapp/pages/Div/ trunk/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Rich/ trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/ trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Select/ trunk/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Select/SelectOneMenuPage.xhtml Removed: trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml trunk/test-applications/facelets/src/main/webapp/pages/SelectOneMenuPage.xhtml trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java trunk/test-applications/facelets/src/main/java/rich/RichBean.java trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml Log: Modified: trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-09-21 15:37:01 UTC (rev 3053) +++ trunk/test-applications/facelets/src/main/java/calendar/CalendarBean.java 2007-09-21 15:37:11 UTC (rev 3054) @@ -39,7 +39,7 @@ "Tuesday +", "Wednesday +", "Thursday +", "Friday +", "Saturday +", "Sunday +"}; private static final String [] MOUNT_LABELS = new String[] { "January +", "February +", "March +", "April +", "May +", "June +", "July +", "August +", - "September", "October", "November", "December" }; + "September +", "October +", "November +", "December +" }; private static final String [] MOUNT_LABELS_SHORT = new String[] { "Jan +", "Feb +", "Mar +", "Apr +", "May +", "Jun +", "Jul +", "Aug +", "Sep +", "Oct +", "Nov +", "Dec +" }; Modified: trunk/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2007-09-21 15:37:01 UTC (rev 3053) +++ trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2007-09-21 15:37:11 UTC (rev 3054) @@ -4,7 +4,7 @@ private String src; public RichBean() { - src = "/DataFilterSlider/DataFilterSlider.xhtml"; + src = "/Calendar/Calendar.xhtml"; } public String getSrc() { Modified: trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-21 15:37:01 UTC (rev 3053) +++ trunk/test-applications/facelets/src/main/webapp/Calendar/Calendar.xhtml 2007-09-21 15:37:11 UTC (rev 3054) @@ -29,7 +29,6 @@ preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" weekDayLabels="#{calendarBean.weekDayLabels}" - weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" monthLabels="#{calendarBean.monthLabels}" monthLabelsShort="#{calendarBean.monthLabelsShort}" value="#{calendarBean.selectedDate}" Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-09-21 15:37:01 UTC (rev 3053) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-09-21 15:37:11 UTC (rev 3054) @@ -6,7 +6,7 @@ <from-view-id>/pages/main.xhtml</from-view-id> <navigation-case> <from-outcome>TestDiv</from-outcome> - <to-view-id>/pages/Div.xhtml</to-view-id> + <to-view-id>/pages/Div/Div.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>Spinner</from-outcome> @@ -118,11 +118,11 @@ </navigation-case> <navigation-case> <from-outcome>Test</from-outcome> - <to-view-id>/pages/Test.xhtml</to-view-id> + <to-view-id>/pages/Rich/Rich.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>Map</from-outcome> - <to-view-id>/pages/Map.xhtml</to-view-id> + <to-view-id>/pages/Select/Map.xhtml</to-view-id> </navigation-case> <navigation-case> <from-outcome>RichTest</from-outcome> Added: trunk/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/pages/Div/Div.xhtml 2007-09-21 15:37:11 UTC (rev 3054) @@ -0,0 +1,27 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:ui="http://java.sun.com/jsf/facelets"> +<f:view> + <head> + <title></title> + <link rel="stylesheet" + href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" + type="text/css" /> + </head> + <body> + <div id="divOpthID" align="right" style="z-index: 200"> + <ui:include src="/pages/RichMenu/RichMenu.xhtml"/> + </div> + + <div id="div_1_ID" style="position: relative; left:600px; top:500px; z-index:1;"> + <div id="div_2_ID" style="position: absolute; left:-580px; top:-450px;"> + <ui:include src="${richBean.src}" /> + </div> + </div> + </body> +</f:view> +</html> Deleted: trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml 2007-09-21 15:37:01 UTC (rev 3053) +++ trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml 2007-09-21 15:37:11 UTC (rev 3054) @@ -1,65 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> -<f:view> - <head> - <title></title> - <link rel="stylesheet" - href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" - type="text/css" /> - </head> - <body> - <div id="div_1_ID" style="position: relative; left:600px; top:500px; z-index:1;"> - <div id="div_2_ID" style="position: absolute; left:-580px; top:-450px;"> - <ui:include src="${divBean.src}" /> - </div> - </div> - - <div id="divOpthID" align="right"> - <h:form id="forvDivOpthID"> - <h:panelGrid columns="2"> - <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> - <h:commandLink action="#{skinBean.change}" value="set skin" /> - - <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> - <f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" /> - <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.xhtml" itemLabel="Data Filter Slider" /> - <f:selectItem itemValue="/DataScroller/DS.xhtml" itemLabel="Date Scroller" /> - <f:selectItem itemValue="/DataTable/DT.xhtml" itemLabel="Date Table" /> - <f:selectItem itemValue="/DradAndDrop/DragAndDrop.xhtml" itemLabel="Drag And Drop" /> - <f:selectItem itemValue="/DropDownMenu/DDMenu.xhtml" itemLabel="Drop Down Menu" /> - <f:selectItem itemValue="/Effect/Effect.xhtml" itemLabel="Effect" /> - <f:selectItem itemValue="/Gmap/Gmap.xhtml" itemLabel="Gmap" /> - <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.xhtml" itemLabel="Input Number Slider" /> - <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.xhtml" itemLabel="Input Number Spinner" /> - <f:selectItem itemValue="/Insert/Insert.xhtml" itemLabel="Insert" /> - <f:selectItem itemValue="/Message/Message.xhtml" itemLabel="Message" /> - <f:selectItem itemValue="/ModalPanel/ModalPanel.xhtml" itemLabel="Modal Panel" /> - <f:selectItem itemValue="/Paint2D/Paint2D.xhtml" itemLabel="Paint2D" /> - <f:selectItem itemValue="/Panel/Panel.xhtml" itemLabel="Panel" /> - <f:selectItem itemValue="/Panel/panel2.xhtml" itemLabel="Panel2" /> - <f:selectItem itemValue="/PanelBar/PanelBar.xhtml" itemLabel="Panel Bar" /> - <f:selectItem itemValue="/PanelMenu/PanelMenu.xhtml" itemLabel="Panel Menu" /> - <f:selectItem itemValue="/Separator/Separator.xhtml" itemLabel="Separator" /> - <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.xhtml" itemLabel="Simple Toggle Panel" /> - <f:selectItem itemValue="/Spacer/Spacer.xhtml" itemLabel="Spacer" /> - <f:selectItem itemValue="/SuggestionBox/SuggestionBox.xhtml" itemLabel="Suggestion Box" /> - <f:selectItem itemValue="/TabPanel/TabPanel.xhtml" itemLabel="Tab Panel" /> - <f:selectItem itemValue="/TogglePanel/TogglePanel.xhtml" itemLabel="Toggle Panel" /> - <f:selectItem itemValue="/ToolBar/ToolBar.xhtml" itemLabel="Tool Bar" /> - <f:selectItem itemValue="/Tooltip/Tooltip.xhtml" itemLabel="Tooltip" /> - <f:selectItem itemValue="/Tree/Tree.xhtml" itemLabel="Tree" /> - <f:selectItem itemValue="/VirtualEarth/VirtualEarth.xhtml" itemLabel="Virtual Earth" /> - </h:selectOneMenu> - </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> - </div> - </body> -</f:view> -</html> Deleted: trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml 2007-09-21 15:37:01 UTC (rev 3053) +++ trunk/test-applications/facelets/src/main/webapp/pages/Map.xhtml 2007-09-21 15:37:11 UTC (rev 3054) @@ -1,63 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> -<f:view> - <head> - <title></title> - <link rel="stylesheet" - href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" - type="text/css" /> - </head> - <body> - <div id="divOpthID" align="right" style="z-index: 2"> - <h:form id="forvDivOpthID"> - <h:panelGrid columns="2"> - <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> - <h:commandLink action="#{skinBean.change}" value="set skin" /> - - <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> - <f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" /> - <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.xhtml" itemLabel="Data Filter Slider" /> - <f:selectItem itemValue="/DataScroller/DS.xhtml" itemLabel="Date Scroller" /> - <f:selectItem itemValue="/DataTable/DT.xhtml" itemLabel="Date Table" /> - <f:selectItem itemValue="/DradAndDrop/DragAndDrop.xhtml" itemLabel="Drag And Drop" /> - <f:selectItem itemValue="/DropDownMenu/DDMenu.xhtml" itemLabel="Drop Down Menu" /> - <f:selectItem itemValue="/Effect/Effect.xhtml" itemLabel="Effect" /> - <f:selectItem itemValue="/Gmap/Gmap.xhtml" itemLabel="Gmap" /> - <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.xhtml" itemLabel="Input Number Slider" /> - <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.xhtml" itemLabel="Input Number Spinner" /> - <f:selectItem itemValue="/Insert/Insert.xhtml" itemLabel="Insert" /> - <f:selectItem itemValue="/Message/Message.xhtml" itemLabel="Message" /> - <f:selectItem itemValue="/ModalPanel/ModalPanel.xhtml" itemLabel="Modal Panel" /> - <f:selectItem itemValue="/Paint2D/Paint2D.xhtml" itemLabel="Paint2D" /> - <f:selectItem itemValue="/Panel/Panel.xhtml" itemLabel="Panel" /> - <f:selectItem itemValue="/Panel/panel2.xhtml" itemLabel="Panel2" /> - <f:selectItem itemValue="/PanelBar/PanelBar.xhtml" itemLabel="Panel Bar" /> - <f:selectItem itemValue="/PanelMenu/PanelMenu.xhtml" itemLabel="Panel Menu" /> - <f:selectItem itemValue="/Separator/Separator.xhtml" itemLabel="Separator" /> - <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.xhtml" itemLabel="Simple Toggle Panel" /> - <f:selectItem itemValue="/Spacer/Spacer.xhtml" itemLabel="Spacer" /> - <f:selectItem itemValue="/SuggestionBox/SuggestionBox.xhtml" itemLabel="Suggestion Box" /> - <f:selectItem itemValue="/TabPanel/TabPanel.xhtml" itemLabel="Tab Panel" /> - <f:selectItem itemValue="/TogglePanel/TogglePanel.xhtml" itemLabel="Toggle Panel" /> - <f:selectItem itemValue="/ToolBar/ToolBar.xhtml" itemLabel="Tool Bar" /> - <f:selectItem itemValue="/Tooltip/Tooltip.xhtml" itemLabel="Tooltip" /> - <f:selectItem itemValue="/Tree/Tree.xhtml" itemLabel="Tree" /> - <f:selectItem itemValue="/VirtualEarth/VirtualEarth.xhtml" itemLabel="Virtual Earth" /> - </h:selectOneMenu> - </h:panelGrid> - </h:form> - </div> - <div id="divID" style="position: absolute; top:15px; left: 10px; z-index: 1"> - <ui:include src="/pages/SelectOneMenuPage.xhtml" /> - </div> - <ui:include src="${richBean.src}" /> - - </body> -</f:view> -</html> Added: trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/pages/Rich/Rich.xhtml 2007-09-21 15:37:11 UTC (rev 3054) @@ -0,0 +1,23 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:ui="http://java.sun.com/jsf/facelets"> +<f:view> + <head> + <title></title> + <link rel="stylesheet" + href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" + type="text/css" /> + </head> + <body> + <div id="divOpthID" align="right" style="z-index: 200"> + <ui:include src="/pages/RichMenu/RichMenu.xhtml"/> + </div> + + <ui:include src="${richBean.src}" /> + </body> +</f:view> +</html> Added: trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/pages/RichMenu/RichMenu.xhtml 2007-09-21 15:37:11 UTC (rev 3054) @@ -0,0 +1,46 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich"> + + <h:form id="forvDivOpthID"> + <h:panelGrid columns="2"> + <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> + <h:commandLink action="#{skinBean.change}" value="set skin" /> + + <h:outputText value="Select component:" /> + <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> + <f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" /> + <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.xhtml" itemLabel="Data Filter Slider" /> + <f:selectItem itemValue="/DataScroller/DS.xhtml" itemLabel="Date Scroller" /> + <f:selectItem itemValue="/DataTable/DT.xhtml" itemLabel="Date Table" /> + <f:selectItem itemValue="/DradAndDrop/DragAndDrop.xhtml" itemLabel="Drag And Drop" /> + <f:selectItem itemValue="/DropDownMenu/DDMenu.xhtml" itemLabel="Drop Down Menu" /> + <f:selectItem itemValue="/Effect/Effect.xhtml" itemLabel="Effect" /> + <f:selectItem itemValue="/Gmap/Gmap.xhtml" itemLabel="Gmap" /> + <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.xhtml" itemLabel="Input Number Slider" /> + <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.xhtml" itemLabel="Input Number Spinner" /> + <f:selectItem itemValue="/Insert/Insert.xhtml" itemLabel="Insert" /> + <f:selectItem itemValue="/Message/Message.xhtml" itemLabel="Message" /> + <f:selectItem itemValue="/ModalPanel/ModalPanel.xhtml" itemLabel="Modal Panel" /> + <f:selectItem itemValue="/Paint2D/Paint2D.xhtml" itemLabel="Paint2D" /> + <f:selectItem itemValue="/Panel/Panel.xhtml" itemLabel="Panel" /> + <f:selectItem itemValue="/Panel/panel2.xhtml" itemLabel="Panel2" /> + <f:selectItem itemValue="/PanelBar/PanelBar.xhtml" itemLabel="Panel Bar" /> + <f:selectItem itemValue="/PanelMenu/PanelMenu.xhtml" itemLabel="Panel Menu" /> + <f:selectItem itemValue="/Separator/Separator.xhtml" itemLabel="Separator" /> + <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.xhtml" itemLabel="Simple Toggle Panel" /> + <f:selectItem itemValue="/Spacer/Spacer.xhtml" itemLabel="Spacer" /> + <f:selectItem itemValue="/SuggestionBox/SuggestionBox.xhtml" itemLabel="Suggestion Box" /> + <f:selectItem itemValue="/TabPanel/TabPanel.xhtml" itemLabel="Tab Panel" /> + <f:selectItem itemValue="/TogglePanel/TogglePanel.xhtml" itemLabel="Toggle Panel" /> + <f:selectItem itemValue="/ToolBar/ToolBar.xhtml" itemLabel="Tool Bar" /> + <f:selectItem itemValue="/Tooltip/Tooltip.xhtml" itemLabel="Tooltip" /> + <f:selectItem itemValue="/Tree/Tree.xhtml" itemLabel="Tree" /> + <f:selectItem itemValue="/VirtualEarth/VirtualEarth.xhtml" itemLabel="Virtual Earth" /> + </h:selectOneMenu> + </h:panelGrid> + <h:commandLink value="Back" action="main"></h:commandLink> + </h:form> +</html> \ No newline at end of file Added: trunk/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/pages/Select/Map.xhtml 2007-09-21 15:37:11 UTC (rev 3054) @@ -0,0 +1,29 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:ui="http://java.sun.com/jsf/facelets"> +<f:view> + <head> + <title></title> + <link rel="stylesheet" + href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" + type="text/css" /> + </head> + <body> + <div id="divOpthID" align="right" style="z-index: 200"> + <ui:include src="/pages/RichMenu/RichMenu.xhtml"/> + </div> + + <div id="divID" style="position: absolute; top:60px; left: 10px; z-index: 1"> + <ui:include src="/pages/Select/SelectOneMenuPage.xhtml" /> + </div> + + <div id="divPageID" style="position: absolute; top:90px;"> + <ui:include src="${richBean.src}" /> + </div> + </body> +</f:view> +</html> Added: trunk/test-applications/facelets/src/main/webapp/pages/Select/SelectOneMenuPage.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Select/SelectOneMenuPage.xhtml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/pages/Select/SelectOneMenuPage.xhtml 2007-09-21 15:37:11 UTC (rev 3054) @@ -0,0 +1,175 @@ +<h:form id="formSOMID" xmlns:a4j="http://richfaces.org/a4j" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich"> + + <h:panelGrid columns="7" cellpadding="20px" cellspacing="30px"> + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + </h:panelGrid> +</h:form> Deleted: trunk/test-applications/facelets/src/main/webapp/pages/SelectOneMenuPage.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/SelectOneMenuPage.xhtml 2007-09-21 15:37:01 UTC (rev 3053) +++ trunk/test-applications/facelets/src/main/webapp/pages/SelectOneMenuPage.xhtml 2007-09-21 15:37:11 UTC (rev 3054) @@ -1,175 +0,0 @@ -<h:form id="formSOMID" xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich"> - - <h:panelGrid columns="7" cellpadding="20px" cellspacing="30px"> - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - </h:panelGrid> -</h:form> Deleted: trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml 2007-09-21 15:37:01 UTC (rev 3053) +++ trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml 2007-09-21 15:37:11 UTC (rev 3054) @@ -1,60 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:ui="http://java.sun.com/jsf/facelets"> -<f:view> - <head> - <title></title> - <link rel="stylesheet" - href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" - type="text/css" /> - </head> - <body> - <div id="divOpthID" align="right"> - <h:form id="forvDivOpthID"> - <h:panelGrid columns="2"> - <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> - <h:commandLink action="#{skinBean.change}" value="set skin" /> - - <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> - <f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" /> - <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.xhtml" itemLabel="Data Filter Slider" /> - <f:selectItem itemValue="/DataScroller/DS.xhtml" itemLabel="Date Scroller" /> - <f:selectItem itemValue="/DataTable/DT.xhtml" itemLabel="Date Table" /> - <f:selectItem itemValue="/DradAndDrop/DragAndDrop.xhtml" itemLabel="Drag And Drop" /> - <f:selectItem itemValue="/DropDownMenu/DDMenu.xhtml" itemLabel="Drop Down Menu" /> - <f:selectItem itemValue="/Effect/Effect.xhtml" itemLabel="Effect" /> - <f:selectItem itemValue="/Gmap/Gmap.xhtml" itemLabel="Gmap" /> - <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.xhtml" itemLabel="Input Number Slider" /> - <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.xhtml" itemLabel="Input Number Spinner" /> - <f:selectItem itemValue="/Insert/Insert.xhtml" itemLabel="Insert" /> - <f:selectItem itemValue="/Message/Message.xhtml" itemLabel="Message" /> - <f:selectItem itemValue="/ModalPanel/ModalPanel.xhtml" itemLabel="Modal Panel" /> - <f:selectItem itemValue="/Paint2D/Paint2D.xhtml" itemLabel="Paint2D" /> - <f:selectItem itemValue="/Panel/Panel.xhtml" itemLabel="Panel" /> - <f:selectItem itemValue="/Panel/panel2.xhtml" itemLabel="Panel2" /> - <f:selectItem itemValue="/PanelBar/PanelBar.xhtml" itemLabel="Panel Bar" /> - <f:selectItem itemValue="/PanelMenu/PanelMenu.xhtml" itemLabel="Panel Menu" /> - <f:selectItem itemValue="/Separator/Separator.xhtml" itemLabel="Separator" /> - <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.xhtml" itemLabel="Simple Toggle Panel" /> - <f:selectItem itemValue="/Spacer/Spacer.xhtml" itemLabel="Spacer" /> - <f:selectItem itemValue="/SuggestionBox/SuggestionBox.xhtml" itemLabel="Suggestion Box" /> - <f:selectItem itemValue="/TabPanel/TabPanel.xhtml" itemLabel="Tab Panel" /> - <f:selectItem itemValue="/TogglePanel/TogglePanel.xhtml" itemLabel="Toggle Panel" /> - <f:selectItem itemValue="/ToolBar/ToolBar.xhtml" itemLabel="Tool Bar" /> - <f:selectItem itemValue="/Tooltip/Tooltip.xhtml" itemLabel="Tooltip" /> - <f:selectItem itemValue="/Tree/Tree.xhtml" itemLabel="Tree" /> - <f:selectItem itemValue="/VirtualEarth/VirtualEarth.xhtml" itemLabel="Virtual Earth" /> - </h:selectOneMenu> - </h:panelGrid> - </h:form> - </div> - <ui:include src="${richBean.src}" /> - - </body> -</f:view> -</html> Modified: trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-09-21 15:37:01 UTC (rev 3053) +++ trunk/test-applications/facelets/src/main/webapp/pages/main.xhtml 2007-09-21 15:37:11 UTC (rev 3054) @@ -19,7 +19,7 @@ <h:commandLink value="Div" action="TestDiv"></h:commandLink> <h:commandLink value="Select" action="Map"></h:commandLink> <h:commandLink value="temp" action="RichTest"></h:commandLink> - <h:commandLink value="Empty page" action="EmptyPage"></h:commandLink> + <h:commandLink value="Customize page" action="EmptyPage"></h:commandLink> </h:panelGrid> </rich:panel> </h:form>

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r3053 - in trunk/test-applications/jsp/src/main/webapp: Div and 5 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ayanul Date: 2007-09-21 11:37:01 -0400 (Fri, 21 Sep 2007) New Revision: 3053 Added: trunk/test-applications/jsp/src/main/webapp/Div/ trunk/test-applications/jsp/src/main/webapp/Div/Div.jsp trunk/test-applications/jsp/src/main/webapp/RichTest/ trunk/test-applications/jsp/src/main/webapp/RichTest/Rich.jsp trunk/test-applications/jsp/src/main/webapp/Select/ trunk/test-applications/jsp/src/main/webapp/Select/Map.jsp trunk/test-applications/jsp/src/main/webapp/Select/SelectOneMenuPage.jsp trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/ trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp Removed: trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp trunk/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml Log: Copied: trunk/test-applications/jsp/src/main/webapp/Div/Div.jsp (from rev 3036, trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp) =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Div/Div.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/Div/Div.jsp 2007-09-21 15:37:01 UTC (rev 3053) @@ -0,0 +1,21 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + + <div id="div_1_ID" style="position: relative; left:400px; top:400px; border-color: red, 2px;"> + <div id="div_2_ID" style="position: absolute; left:-380px; top:-380px; color: blue, 2px;"> + <jsp:include page="${richBean.src}" /> + </div> + </div> +</body> +</html> +</f:view> \ No newline at end of file Added: trunk/test-applications/jsp/src/main/webapp/RichTest/Rich.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/RichTest/Rich.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/RichTest/Rich.jsp 2007-09-21 15:37:01 UTC (rev 3053) @@ -0,0 +1,16 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + <jsp:include page="${richBean.src}" /> +</body> +</html> +</f:view> \ No newline at end of file Copied: trunk/test-applications/jsp/src/main/webapp/Select/Map.jsp (from rev 3036, trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp) =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Select/Map.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/Select/Map.jsp 2007-09-21 15:37:01 UTC (rev 3053) @@ -0,0 +1,22 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<f:view> +<html> +<head> +<title></title> +<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +</head> +<body> + <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> + + <div id="divID" style="position: absolute; top:60px; left: 10px; z-index: 1"> + <jsp:include page="SelectOneMenuPage.jsp" /> + </div> + <div id="divPageID" style="position: absolute; top:110px; left: 10px;"> + <jsp:include page="${richBean.src}" /> + </div> +</body> +</html> +</f:view> \ No newline at end of file Copied: trunk/test-applications/jsp/src/main/webapp/Select/SelectOneMenuPage.jsp (from rev 2983, trunk/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp) =================================================================== --- trunk/test-applications/jsp/src/main/webapp/Select/SelectOneMenuPage.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/Select/SelectOneMenuPage.jsp 2007-09-21 15:37:01 UTC (rev 3053) @@ -0,0 +1,176 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> + +<f:subview id="selectOneMenuPage"> + <h:panelGrid columns="7" cellpadding="20px" cellspacing="30px"> + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + + <h:selectOneMenu value="selectItem" > + <f:selectItem itemLabel="selectItem" itemValue="test" /> + </h:selectOneMenu> + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-09-21 14:44:05 UTC (rev 3052) +++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-09-21 15:37:01 UTC (rev 3053) @@ -114,15 +114,15 @@ </navigation-case> <navigation-case> <from-outcome>TestDiv</from-outcome> - <to-view-id>/pages/Div.jsp</to-view-id> + <to-view-id>/pages/Div/Div.jsp</to-view-id> </navigation-case> <navigation-case> <from-outcome>RichTest</from-outcome> - <to-view-id>/pages/RichTest.jsp</to-view-id> + <to-view-id>/pages/Rich/Rich.jsp</to-view-id> </navigation-case> <navigation-case> <from-outcome>Map</from-outcome> - <to-view-id>/pages/Map.jsp</to-view-id> + <to-view-id>/pages/Select/Map.jsp</to-view-id> </navigation-case> <navigation-case> <from-outcome>EmptyPage</from-outcome> Deleted: trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp 2007-09-21 14:44:05 UTC (rev 3052) +++ trunk/test-applications/jsp/src/main/webapp/pages/Div.jsp 2007-09-21 15:37:01 UTC (rev 3053) @@ -1,58 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:view> -<html> -<head> -<title></title> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> -<body> - <h:form> - <h:panelGrid columns="2"> - <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> - <h:commandLink action="#{skinBean.change}" value="set skin" /> - - <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> - <f:selectItem itemValue="" itemLabel="none" /> - <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" /> - <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> - <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> - <f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" /> - <f:selectItem itemValue="/DradAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" /> - <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" /> - <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" /> - <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" /> - <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.jsp" itemLabel="Input Number Slider" /> - <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.jsp" itemLabel="Input Number Spinner" /> - <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" /> - <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" /> - <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" /> - <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" /> - <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" /> - <f:selectItem itemValue="/Panel/panel2.jsp" itemLabel="Panel2" /> - <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" /> - <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" /> - <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" /> - <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" /> - <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" /> - <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" /> - <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" /> - <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" /> - <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" /> - <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" /> - <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" /> - <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" /> - </h:selectOneMenu> - </h:panelGrid> - </h:form> - <div id="div_1_ID" style="position: relative; left:400px; top:400px; border-color: red, 2px;"> - <div id="div_2_ID" style="position: absolute; left:-380px; top:-380px; color: blue, 2px;"> - <jsp:include page="${richBean.src}" /> - </div> - </div> -</body> -</html> -</f:view> \ No newline at end of file Deleted: trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp 2007-09-21 14:44:05 UTC (rev 3052) +++ trunk/test-applications/jsp/src/main/webapp/pages/Map.jsp 2007-09-21 15:37:01 UTC (rev 3053) @@ -1,58 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:view> -<html> -<head> -<title></title> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> -<body> -<div id="divOptionID" align="right" style="position: static; z-index: 200"> - <h:form> - <h:panelGrid columns="2"> - <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> - <h:commandLink action="#{skinBean.change}" value="set skin" /> - <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> - <f:selectItem itemValue="" itemLabel="none" /> - <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" /> - <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> - <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> - <f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" /> - <f:selectItem itemValue="/DradAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" /> - <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" /> - <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" /> - <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" /> - <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.jsp" itemLabel="Input Number Slider" /> - <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.jsp" itemLabel="Input Number Spinner" /> - <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" /> - <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" /> - <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" /> - <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" /> - <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" /> - <f:selectItem itemValue="/Panel/panel2.jsp" itemLabel="Panel2" /> - <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" /> - <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" /> - <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" /> - <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" /> - <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" /> - <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" /> - <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" /> - <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" /> - <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" /> - <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" /> - <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" /> - <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" /> - </h:selectOneMenu> - </h:panelGrid> - </h:form> - </div> - <div id="divID" style="position: absolute; top:15px; left: 10px; z-index: 1"> - <jsp:include page="SelectOneMenuPage.jsp" /> - </div> - <jsp:include page="${richBean.src}" /> -</body> -</html> -</f:view> \ No newline at end of file Added: trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp (rev 0) +++ trunk/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2007-09-21 15:37:01 UTC (rev 3053) @@ -0,0 +1,47 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> +<f:subview id="richMenuID"> + <h:form> + <h:panelGrid columns="3"> + <rich:spacer width="750px"></rich:spacer> + <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> + <h:commandLink action="#{skinBean.change}" value="set skin" /> + + <rich:spacer width="750px"></rich:spacer> + <h:outputText value="Select component:" /> + <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> + <f:selectItem itemValue="" itemLabel="none" /> + <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" /> + <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> + <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> + <f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" /> + <f:selectItem itemValue="/DradAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" /> + <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" /> + <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" /> + <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" /> + <f:selectItem itemValue="/InputNumberSlider/InputNumberSlider.jsp" itemLabel="Input Number Slider" /> + <f:selectItem itemValue="/InputNumberSpinner/InputNumberSpinner.jsp" itemLabel="Input Number Spinner" /> + <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" /> + <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" /> + <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" /> + <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" /> + <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" /> + <f:selectItem itemValue="/Panel/panel2.jsp" itemLabel="Panel2" /> + <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" /> + <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" /> + <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" /> + <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" /> + <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" /> + <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" /> + <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" /> + <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" /> + <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" /> + <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" /> + <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" /> + <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" /> + </h:selectOneMenu> + + </h:panelGrid> + </h:form> +</f:subview> \ No newline at end of file Deleted: trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp 2007-09-21 14:44:05 UTC (rev 3052) +++ trunk/test-applications/jsp/src/main/webapp/pages/RichTest.jsp 2007-09-21 15:37:01 UTC (rev 3053) @@ -1,54 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:view> -<html> -<head> -<title></title> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> -<body> - <h:form> - <h:panelGrid columns="2"> - <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> - <h:commandLink action="#{skinBean.change}" value="set skin" /> - - <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> - <f:selectItem itemValue="" itemLabel="none" /> - <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" /> - <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> - <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> - <f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" /> - <f:selectItem itemValue="/DradAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" /> - <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" /> - <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" /> - <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" /> - <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.jsp" itemLabel="Input Number Slider" /> - <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.jsp" itemLabel="Input Number Spinner" /> - <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" /> - <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" /> - <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" /> - <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" /> - <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" /> - <f:selectItem itemValue="/Panel/panel2.jsp" itemLabel="Panel2" /> - <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" /> - <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" /> - <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" /> - <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" /> - <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" /> - <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" /> - <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" /> - <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" /> - <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" /> - <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" /> - <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" /> - <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" /> - </h:selectOneMenu> - </h:panelGrid> - </h:form> - <jsp:include page="${richBean.src}" /> -</body> -</html> -</f:view> \ No newline at end of file Deleted: trunk/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp =================================================================== --- trunk/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp 2007-09-21 14:44:05 UTC (rev 3052) +++ trunk/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp 2007-09-21 15:37:01 UTC (rev 3053) @@ -1,176 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> - -<f:subview id="selectOneMenuPage"> - <h:panelGrid columns="7" cellpadding="20px" cellspacing="30px"> - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - </h:panelGrid> -</f:subview> \ No newline at end of file

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r3052 - branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2007-09-21 10:44:05 -0400 (Fri, 21 Sep 2007) New Revision: 3052 Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java Log: RF-946 Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java =================================================================== --- branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-09-21 14:24:04 UTC (rev 3051) +++ branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-09-21 14:44:05 UTC (rev 3052) @@ -64,6 +64,10 @@ private static final String COMPONENT_FAMILY = "org.richfaces.Calendar"; + public static final String AJAX_MODE = "ajax"; + + public static final String CLIENT_MODE = "client"; + private final static Log log = LogFactory.getLog(UICalendar.class); public abstract Locale getLocale(); @@ -142,6 +146,10 @@ public abstract void setCurrentDateChangeListener(MethodBinding scrollerListener); + public abstract String getMode(); + + public abstract void setMode(String mode); + //TODO onclick add users onclick @@ -288,7 +296,7 @@ AjaxContext ajaxContext = AjaxContext .getCurrentInstance(facesContext); ajaxContext.addRegionsFromComponent(this); - ajaxContext.setResponseData(getPreload()); + if(getPreload()!=null){ajaxContext.setResponseData(getPreload());} } else { if (event instanceof CurrentDateChangeEvent) { FacesContext facesContext = FacesContext.getCurrentInstance(); @@ -384,9 +392,17 @@ public Date[] getPreloadDateRange() { Date dateRangeBegin = this.getPreloadDateRangeBegin(); Date dateRangeEnd = this.getPreloadDateRangeEnd(); - + + if(dateRangeBegin==null&&dateRangeEnd==null){ + return null; + } + else{ if (dateRangeBegin.after(dateRangeEnd)) { - // TODO add message + // XXX add message + FacesMessage message = new FacesMessage("preloadDateRangeBegin is greater than preloadDateRangeEnd"); + message.setSeverity(FacesMessage.SEVERITY_ERROR); + FacesContext context = FacesContext.getCurrentInstance(); + context.addMessage(getClientId(context), message); throw new IllegalArgumentException(); } @@ -405,6 +421,7 @@ return (Date[]) dates.toArray(new Date[dates.size()]); } + } public void addCurrentDateChangeListener(CurrentDateChangeListener listener) { addFacesListener(listener);

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r3051 - in branches/3.1.x: ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: pyaschenko Date: 2007-09-21 10:24:04 -0400 (Fri, 21 Sep 2007) New Revision: 3051 Modified: branches/3.1.x/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js branches/3.1.x/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js branches/3.1.x/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss Log: merged with trunk revision 3050 Modified: branches/3.1.x/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp =================================================================== --- branches/3.1.x/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-09-21 14:16:45 UTC (rev 3050) +++ branches/3.1.x/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-09-21 14:24:04 UTC (rev 3051) @@ -64,6 +64,7 @@ <f:facet name="optionalFooter"> <h:outputText value="optionalFooter Facet" /> </f:facet> + <f:validator validatorId="org.richfaces.CalendarValidator" /> <h:panelGrid columns="2"> Modified: branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js =================================================================== --- branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-09-21 14:16:45 UTC (rev 3050) +++ branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-09-21 14:24:04 UTC (rev 3051) @@ -378,9 +378,14 @@ initialize: function(id,parameters) { // dayListTableId, weekNumberBarId, weekDayBarId - 3 tables ids', + // dayListMarkup - day cell markup + // context: {day, date, weekNumber, weekDayNumber, isWeekend, isCurrentMonth, elementId, component} // weekNumberMarkup - week number cell markup + // context: {weekNumber, elementId, component} // weekDayMarkup - week day cell markup + // context: {weekDayLabel, weekDayLabelShort, weekDayNumber, isWeekend, elementId, component} + // headerMarkup // footerMarkup // headerOptionalMarkup - user defined header (optional) @@ -389,6 +394,7 @@ // currentDate - date to show month (day not used) (mm/yyyy) // selectedDate - selected date (mm/dd/yyyy) // weekDayLabels - collection of week day labels keyed by week day numbers + // weekDayLabelsShort - collection of week day short labels keyed by week day numbers // minDaysInFirstWeek - locale-specific constant defining number of days in the first week // firstWeekDay - (0..6) locale-specific constant defining number of the first week day // showWeekDaysBar - show WeekDays Bar [default value is true] @@ -410,7 +416,7 @@ this.params = parameters; if (!this.params.showWeekDaysBar) this.params.showWeekDaysBar = true; if (!this.params.showWeeksBar) this.params.showWeeksBar = true; - if (!this.params.datePattern) this.params.datePattern = "MMM d, y"; + if (!this.params.datePattern) thisparams.datePattern = "MMM d, y"; // markups initialization if (!this.params.dayListMarkup) this.params.dayListMarkup = CalendarView.dayList; @@ -435,6 +441,8 @@ this.calendarContext = new CalendarContext(this); this.DATE_ELEMENT_ID = this.params.dayListTableId+'Cell'; + this.WEEKNUMBER_ELEMENT_ID = this.params.weekNumberBarId+'Cell'; + this.WEEKDAY_ELEMENT_ID = this.params.weekDayBarId+'Cell'; this.POPUP_ID = this.id+'Popup'; this.POPUP_BUTTON_ID = this.id+'PopupButton'; this.INPUT_DATE_ID = this.id+'InputDate'; @@ -484,6 +492,7 @@ var styleClass; var bottomStyleClass; var htmlTextWeekDayBar=''; + var context; if (this.params.showWeekDaysBar) { var htmlTextWeekDayBar = '<tr id="'+this.params.weekDayBarId+'">'; @@ -491,14 +500,17 @@ var weekDayCounter = this.params.firstWeekDay; for (var i=0;i<7;i++) { - var weekDayHtml = this.evaluateMarkup(this.params.weekDayMarkup, {weekDayLabel: this.params.weekDayLabelsShort[weekDayCounter], weekDayNumber:weekDayCounter, componentId:this.getWeekDayComponentId(i)} ); + context = {weekDayLabel: this.params.weekDayLabels[weekDayCounter], weekDayLabelShort: this.params.weekDayLabelsShort[weekDayCounter], weekDayNumber:weekDayCounter, isWeekend:this.isWeekend(i), elementId:this.WEEKDAY_ELEMENT_ID+i, component:this}; + var weekDayHtml = this.evaluateMarkup(this.params.weekDayMarkup, context ); if (weekDayCounter==6) weekDayCounter=0; else weekDayCounter++; - + styleClass = "rich-calendar-days"; - if (i==this.firstWeekendDayNumber || i==this.secondWeekendDayNumber) styleClass += " rich-calendar-weekends"; - + if (context.isWeekend) + { + styleClass += " rich-calendar-weekends"; + } if (i==6) styleClass += " rich-right-cell"; - htmlTextWeekDayBar+='<td class="'+styleClass+'">'+weekDayHtml+'</td>'; + htmlTextWeekDayBar+='<td class="'+styleClass+'" id="'+context.elementId+'">'+weekDayHtml+'</td>'; } htmlTextWeekDayBar+='</tr>\n'; } @@ -513,8 +525,9 @@ htmlTextWeek+='<tr id="'+this.params.weekNumberBarId+k+'">'; if (this.params.showWeeksBar) { - var weekNumberHtml = this.evaluateMarkup(this.params.weekNumberMarkup, {weekNumber: k, componentId:this.getWeekNumberComponentId(k-1)} ); - htmlTextWeek+='<td class="rich-calendar-week '+bottomStyleClass+'">'+weekNumberHtml+'</td>'; + context = {weekNumber: k, elementId:this.WEEKNUMBER_ELEMENT_ID+k, component:this}; + var weekNumberHtml = this.evaluateMarkup(this.params.weekNumberMarkup, context ); + htmlTextWeek+='<td class="rich-calendar-week '+bottomStyleClass+'" id="'+context.elementId+'">'+weekNumberHtml+'</td>'; } // day cells creation @@ -535,7 +548,7 @@ obj.richfacesComponent="richfaces:calendar"; obj.innerHTML = htmlTextIFrame+htmlTextHeader+htmlHeaderOptional+htmlControlsHeader+htmlTextWeekDayBar+htmlTextWeek+htmlControlsFooter+htmlFooterOptional+htmlTextFooter; - this.submitFunction = this.params.submitFunction.bind(this); + if(this.params.submitFunction) this.submitFunction = this.params.submitFunction.bind(this); this.prepareEvents(); }, @@ -639,18 +652,6 @@ return true; }, - getWeekDayComponentId: function (v) { - return this.id+"WeekDay"+v; - }, - - getWeekNumberComponentId: function (v) { - return this.id+"WeekNumber"+v; - }, - - getDateComponentId: function (v) { - return this.id+"Date"+v; - }, - getCurrentDate: function() { return this.currentDate; }, @@ -807,8 +808,8 @@ if (daydata._month==-1) this.prevMonth(); else this.nextMonth(); else if (this.params.boundaryDatesMode == "select") { - var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day); - if (this.selectDate(date)) + //var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day); + if (this.selectDate(daydata.date)) { this.doCollapse(); } @@ -822,8 +823,8 @@ if (obj) { var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)]; - var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day); - if (this.invokeEvent("datemouseover", obj, e, date)) + //var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day); + if (this.invokeEvent("datemouseover", obj, e, daydata.date)) { if (daydata._month==0) Element.addClassName(obj,'rich-calendar-hover'); } @@ -835,8 +836,8 @@ if (obj) { var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)]; - var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day); - if (this.invokeEvent("datemouseout", obj, e, date)) + //var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day); + if (this.invokeEvent("datemouseout", obj, e, daydata.date)) { if (daydata._month==0) Element.removeClassName(obj,'rich-calendar-hover'); } @@ -913,7 +914,11 @@ var dayCounter = previousMonthDays - wd + 1; // previuos month days - if (wd>0) while (dayCounter<=previousMonthDays) {this.days.push({day:dayCounter, _isWeekend: this.isWeekend(p), _month:month}); dayCounter++; p++; } + if (wd>0) while (dayCounter<=previousMonthDays) + { + this.days.push({day:dayCounter, isWeekend: this.isWeekend(p), _month:month}); dayCounter++; p++; + } + dayCounter = 1; month=0; @@ -926,7 +931,7 @@ var firstDay = this.daysData.days[idx].day; while (dayCounter<firstDay) { - this.days.push({day:dayCounter, _isWeekend:this.isWeekend(p%7), _month:month}); + this.days.push({day:dayCounter, isWeekend:this.isWeekend(p%7), _month:month}); dayCounter++; p++; @@ -940,7 +945,7 @@ flag = this.isWeekend(p%7); obj = this.daysData.days[idx]; obj.day = dayCounter; - obj._isWeekend = flag; + obj.isWeekend = flag; obj._month = month; this.days.push(obj); idx++; @@ -951,7 +956,7 @@ while (p<42) { if (dayCounter>currentMonthDays) {dayCounter=1; month=1;} - this.days.push({day:dayCounter, _isWeekend: this.isWeekend(p%7), _month:month}); + this.days.push({day:dayCounter, isWeekend: this.isWeekend(p%7), _month:month}); dayCounter++; p++; } @@ -1000,6 +1005,7 @@ var obj = $(this.params.weekNumberBarId+k); element = obj.firstChild; + var weeknumber; // week number update if (this.params.showWeeksBar) @@ -1011,10 +1017,13 @@ wn=1; weekflag=false; } - element.innerHTML = this.evaluateMarkup(this.params.weekNumberMarkup, {weekNumber: wn++, componentId:this.getWeekNumberComponentId(k-1)} ); + weeknumber = wn; + element.innerHTML = this.evaluateMarkup(this.params.weekNumberMarkup, {weekNumber: wn++, elementId:element.id, component:this} ); if (k==1&&wn>52) wn=1; element = element.nextSibling; } + + var weekdaycounter = this.params.firstWeekDay; while (element) { @@ -1022,7 +1031,13 @@ // TODO fix start/stop event's calls this.stopCellEvents(element); - dataobj.componentId=this.getDateComponentId(p); + dataobj.elementId=element.id; + dataobj.date=new Date(currentYear, currentMonth+dataobj._month, dataobj.day); + dataobj.weekNumber = weeknumber; + dataobj.component = this; + dataobj.isCurrentMonth = (dataobj._month==0); + dataobj.weekDayNumber = weekdaycounter; + if (weekdaycounter==6) weekdaycounter=0; else weekdaycounter++; element.innerHTML = this.evaluateMarkup(this.params.dayListMarkup, dataobj ); // class styles @@ -1392,7 +1407,7 @@ CalendarView.dayList = [new ET(function (context) { return context.day})]; CalendarView.weekNumber = [new ET(function (context) { return context.weekNumber})]; -CalendarView.weekDay = [new ET(function (context) { return context.weekDayLabel})]; +CalendarView.weekDay = [new ET(function (context) { return context.weekDayLabelShort})]; CalendarContext = Class.create(); Object.extend(CalendarContext.prototype, { @@ -1400,6 +1415,8 @@ this.calendar=calendar; this.monthLabels=calendar.params.monthLabels; this.monthLabelsShort=calendar.params.monthLabelsShort; + this.weekDayLabels=calendar.params.weekDayLabels; + this.weekDayLabelsShort=calendar.params.weekDayLabelsShort; }, nextYearControl: CalendarView.nextYearControl, Modified: branches/3.1.x/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js =================================================================== --- branches/3.1.x/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-09-21 14:16:45 UTC (rev 3050) +++ branches/3.1.x/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-09-21 14:24:04 UTC (rev 3051) @@ -601,15 +601,8 @@ } if (this.options.autosized) { - var cWidth = eContentDiv.clientWidth; - var cHeight = eContentDiv.clientHeight; - - eShadowDiv.style.width = cWidth+"px"; - eShadowDiv.style.height = cHeight+"px"; - if (eIframe) { - eIframe.style.width = cWidth+"px"; - eIframe.style.height = cHeight+"px"; - } + this.observerSize = + window.setInterval(this.correctShadowSize.bindAsEventListener(this), 500); } this.doResizeOrMove(ModalPanel.Sizer.Diff.EMPTY); @@ -632,7 +625,7 @@ this.shown = true; }, - + startDrag: function(border) { for (var k = 0; k < this.borders.length; k++ ) { //this.borders[k].hide(); @@ -694,6 +687,10 @@ } this.shown = false; + + if (this.options.autosized) { + window.clearInterval(this.observerSize); + } }, doResizeOrMove: function(diff) { @@ -861,6 +858,22 @@ return true; } + }, + + correctShadowSize: function(event) { + var eContentDiv = $(this.contentDiv); + var eShadowDiv = $(this.shadowDiv); + var eIframe = $(this.iframe); + + var cWidth = eContentDiv.clientWidth; + var cHeight = eContentDiv.clientHeight; + + eShadowDiv.style.width = cWidth+"px"; + eShadowDiv.style.height = cHeight+"px"; + if (eIframe) { + eIframe.style.width = cWidth+"px"; + eIframe.style.height = cHeight+"px"; + } } } Modified: branches/3.1.x/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss =================================================================== --- branches/3.1.x/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-09-21 14:16:45 UTC (rev 3050) +++ branches/3.1.x/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss 2007-09-21 14:24:04 UTC (rev 3051) @@ -121,7 +121,7 @@ <f:resource f:key="org.richfaces.renderkit.html.images.TreeLineLastImage"/> </u:style> </u:selector> -<u:selector name="p.dr-tree-last-node-marker+* .rich-tree-node-handleicon"> +<u:selector name="p.dr-tree-last-node-marker+*.rich-tree-node-handleicon"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.html.images.TreeLineLastImage"/> </u:style>

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r3050 - in branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html: templates and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: sergeyhalipov Date: 2007-09-21 10:16:45 -0400 (Fri, 21 Sep 2007) New Revision: 3050 Modified: branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/css/suggestionbox.xcss branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/popup.jspx branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/table.jspx Log: Add fix for RF-833 to branch 3.1.1 Modified: branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/css/suggestionbox.xcss =================================================================== --- branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/css/suggestionbox.xcss 2007-09-21 14:13:39 UTC (rev 3049) +++ branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/css/suggestionbox.xcss 2007-09-21 14:16:45 UTC (rev 3050) @@ -32,6 +32,7 @@ .dr-sb-overflow { overflow : auto; + overflow-x : hidden; } .dr-sb-int-decor-table { Modified: branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/popup.jspx =================================================================== --- branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/popup.jspx 2007-09-21 14:13:39 UTC (rev 3049) +++ branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/popup.jspx 2007-09-21 14:16:45 UTC (rev 3050) @@ -21,7 +21,7 @@ <f:call name="overflowSize"/> </f:attribute> - <table> + <table width="100%" > <f:attribute name="id"> <f:call name="getContentId"/> </f:attribute> Modified: branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/table.jspx =================================================================== --- branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/table.jspx 2007-09-21 14:13:39 UTC (rev 3049) +++ branches/3.1.x/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/templates/table.jspx 2007-09-21 14:16:45 UTC (rev 3050) @@ -3,7 +3,7 @@ xmlns:u='http:/jsf.exadel.com/template/util' xmlns="http://www.w3.org/1999/xhtml"> - <table border="0" cellpadding="0" cellspacing="0" class="dr-sb-int-decor-table rich-sb-int-decor-table"> + <table border="0" cellpadding="0" cellspacing="0" class="dr-sb-int-decor-table rich-sb-int-decor-table" width="100%" > <f:attribute name="id"> <f:call name="getContentId"/> </f:attribute>

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r3049 - branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2007-09-21 10:13:39 -0400 (Fri, 21 Sep 2007) New Revision: 3049 Modified: branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java Log: RF-957 Modified: branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java =================================================================== --- branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-09-21 14:09:05 UTC (rev 3048) +++ branches/3.1.x/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-09-21 14:13:39 UTC (rev 3049) @@ -5,6 +5,7 @@ import java.util.Iterator; import java.util.Map; +import javax.faces.FacesException; import javax.faces.component.UIComponent; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; @@ -51,6 +52,8 @@ private final String COLUMN_NORMAL_TYPE = "normal"; + private final String PERSENTAGE_SUPPORT_ERROR_MSG = "columnsWidth property: Percentage values are not supported"; + private RendererBase cellTemplate = null; private RendererBase headerCellTemplate = null; @@ -108,9 +111,14 @@ ComponentVariables variables = ComponentsVariableResolver.getVariables(headerCellTemplate, column); String widthPx = (String)column.getAttributes().get("width"); + + // temporary solution RF-957 + if(widthPx.contains("%")){ + throw new FacesException(PERSENTAGE_SUPPORT_ERROR_MSG); + } + int width = Integer.parseInt(widthPx.substring(0, widthPx.indexOf("px"))); - - + int sepOffset = 0; if(state.isFrozenColumn()){

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r3048 - branches/3.1.x/ui/tree/src/main/java/org/richfaces/component.

by richfaces-svn-commits＠lists.jboss.org

Author: sergeyhalipov Date: 2007-09-21 10:09:05 -0400 (Fri, 21 Sep 2007) New Revision: 3048 Modified: branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java Log: Add fix for RF-765 to branch 3.1.1 Modified: branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java =================================================================== --- branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-09-21 14:00:06 UTC (rev 3047) +++ branches/3.1.x/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-09-21 14:09:05 UTC (rev 3048) @@ -36,6 +36,26 @@ private Object acceptedTypes; private String dragIndicator; + private boolean ajaxSingle = false; + private boolean bypassUpdates = false; + private boolean limitToList = false; + private Object reRender = null; + private String status = null; + private String eventsQueue = null; + private int requestDelay = Integer.MIN_VALUE; + private String oncomplete = null; + private String focus = null; + private Object data = null; + private boolean ignoreDupResponses = false; + private int timeout = Integer.MIN_VALUE; + + private boolean ajaxSingleSet = false; + private boolean bypassUpdatesSet = false; + private boolean limitToListSet = false; + private boolean requestDelaySet = false; + private boolean ignoreDupResponsesSet = false; + private boolean timeoutSet = false; + public static final String COMPONENT_TYPE = "org.richfaces.TreeNode"; public static final String COMPONENT_FAMILY = "org.richfaces.TreeNode"; @@ -401,4 +421,424 @@ } return tree.getOndropend(); } + + /** + * if "true", submits ONLY one field/link, instead of all form controls + * Setter for ajaxSingle + * @param ajaxSingle - new value + */ + public void setAjaxSingle( boolean __ajaxSingle ){ + this.ajaxSingle = __ajaxSingle; + this.ajaxSingleSet = true; + } + + /** + * if "true", submits ONLY one field/link, instead of all form controls + * Getter for ajaxSingle + * @return ajaxSingle value from local variable or value bindings + */ + public boolean isAjaxSingle( ){ + if(this.ajaxSingleSet){ + return this.ajaxSingle; + } + ValueBinding vb = getValueBinding("ajaxSingle"); + if (vb != null) { + Boolean value = (Boolean) vb.getValue(getFacesContext()); + if (null == value) { + UITree tree = getUITree(); + if (tree != null) { + return tree.isAjaxSingle(); + } + return this.ajaxSingle; + } + return (value.booleanValue()); + } else { + UITree tree = getUITree(); + if (tree != null) { + return tree.isAjaxSingle(); + } + return this.ajaxSingle; + } + } + + /** + * If "true", after process validations phase it skips updates of model beans on a force render response. It can be used for validating components input + * Setter for bypassUpdates + * @param bypassUpdates - new value + */ + public void setBypassUpdates( boolean __bypassUpdates ){ + this.bypassUpdates = __bypassUpdates; + this.bypassUpdatesSet = true; + } + + /** + * If "true", after process validations phase it skips updates of model beans on a force render response. It can be used for validating components input + * Getter for bypassUpdates + * @return bypassUpdates value from local variable or value bindings + */ + public boolean isBypassUpdates() { + if (this.bypassUpdatesSet) { + return this.bypassUpdates; + } + ValueBinding vb = getValueBinding("bypassUpdates"); + if (vb != null) { + Boolean value = (Boolean) vb.getValue(getFacesContext()); + if (null == value) { + UITree tree = getUITree(); + if (tree != null) { + return tree.isBypassUpdates(); + } + return this.bypassUpdates; + } + return (value.booleanValue()); + } else { + UITree tree = getUITree(); + if (tree != null) { + return tree.isBypassUpdates(); + } + return this.bypassUpdates; + } + } + + /** + * If "true", updates on client side ONLY elements from this 'reRender' property. If "false" (default) updates all rendered by ajax region components + * Setter for limitToList + * @param limitToList - new value + */ + public void setLimitToList(boolean __limitToList) { + this.limitToList = __limitToList; + this.limitToListSet = true; + } + + /** + * If "true", updates on client side ONLY elements from this 'reRender' property. If "false" (default) updates all rendered by ajax region components + * Getter for limitToList + * @return limitToList value from local variable or value bindings + */ + public boolean isLimitToList() { + if (this.limitToListSet) { + return this.limitToList; + } + ValueBinding vb = getValueBinding("limitToList"); + if (vb != null) { + Boolean value = (Boolean) vb.getValue(getFacesContext()); + if (null == value) { + UITree tree = getUITree(); + if (tree != null) { + return tree.isLimitToList(); + } + return this.limitToList; + } + return (value.booleanValue()); + } else { + UITree tree = getUITree(); + if (tree != null) { + return tree.isLimitToList(); + } + return (this.limitToList); + } + } + + /** + * Id['s] (in format of call UIComponent.findComponent()) of components, rendered in case of AjaxRequest caused by this component. Can be single id, comma-separated list of Id's, or EL Expression with array or Collection + * Setter for reRender + * @param reRender - new value + */ + public void setReRender(Object __reRender) { + this.reRender = __reRender; + } + + /** + * Id['s] (in format of call UIComponent.findComponent()) of components, rendered in case of AjaxRequest caused by this component. Can be single id, comma-separated list of Id's, or EL Expression with array or Collection + * Getter for reRender + * @return reRender value from local variable or value bindings + */ + public Object getReRender() { + if (null != this.reRender) { + return this.reRender; + } + ValueBinding vb = getValueBinding("reRender"); + if (null != vb) { + return (Object) vb.getValue(getFacesContext()); + } else { + UITree tree = getUITree(); + if (tree != null) { + return tree.getReRender(); + } + return null; + } + } + + /** + * ID (in format of call UIComponent.findComponent()) of Request status component + * Setter for status + * @param status - new value + */ + public void setStatus(String __status) { + this.status = __status; + } + + /** + * ID (in format of call UIComponent.findComponent()) of Request status component + * Getter for status + * @return status value from local variable or value bindings + */ + public String getStatus() { + if (null != this.status) { + return this.status; + } + ValueBinding vb = getValueBinding("status"); + if (null != vb) { + return (String) vb.getValue(getFacesContext()); + } else { + UITree tree = getUITree(); + if (tree != null) { + return tree.getStatus(); + } + return null; + } + } + + /** + * Name of requests queue to avoid send next request before complete other from same event. Can be used to reduce number of requests of frequently events (key press, mouse move etc.) + * Setter for eventsQueue + * @param eventsQueue - new value + */ + public void setEventsQueue(String __eventsQueue) { + this.eventsQueue = __eventsQueue; + } + + /** + * Name of requests queue to avoid send next request before complete other from same event. Can be used to reduce number of requests of frequently events (key press, mouse move etc.) + * Getter for eventsQueue + * @return eventsQueue value from local variable or value bindings + */ + public String getEventsQueue() { + if (null != this.eventsQueue) { + return this.eventsQueue; + } + ValueBinding vb = getValueBinding("eventsQueue"); + if (null != vb) { + return (String) vb.getValue(getFacesContext()); + } else { + UITree tree = getUITree(); + if (tree != null) { + return tree.getEventsQueue(); + } + return null; + } + } + + /** + * Attribute defines the time (in ms.) that the request will be wait in the queue before it is ready to send. + When the delay time is over, the request will be sent to the server or removed if the newest 'similar' request is in a queue already + * Setter for requestDelay + * @param requestDelay - new value + */ + public void setRequestDelay(int __requestDelay) { + this.requestDelay = __requestDelay; + this.requestDelaySet = true; + } + + /** + * Attribute defines the time (in ms.) that the request will be wait in the queue before it is ready to send. + When the delay time is over, the request will be sent to the server or removed if the newest 'similar' request is in a queue already + * Getter for requestDelay + * @return requestDelay value from local variable or value bindings + */ + public int getRequestDelay() { + if (this.requestDelaySet) { + return this.requestDelay; + } + ValueBinding vb = getValueBinding("requestDelay"); + if (vb != null) { + Integer value = (Integer) vb.getValue(getFacesContext()); + if (null == value) { + UITree tree = getUITree(); + if (tree != null) { + return tree.getRequestDelay(); + } + return this.requestDelay; + } + return (value.intValue()); + } else { + UITree tree = getUITree(); + if (tree != null) { + return tree.getRequestDelay(); + } + return (this.requestDelay); + } + } + + /** + * JavaScript code for call after request completed on client side + * Setter for oncomplete + * @param oncomplete - new value + */ + public void setOncomplete(String __oncomplete) { + this.oncomplete = __oncomplete; + } + + /** + * JavaScript code for call after request completed on client side + * Getter for oncomplete + * @return oncomplete value from local variable or value bindings + */ + public String getOncomplete() { + if (null != this.oncomplete) { + return this.oncomplete; + } + ValueBinding vb = getValueBinding("oncomplete"); + if (null != vb) { + return (String) vb.getValue(getFacesContext()); + } else { + UITree tree = getUITree(); + if (tree != null) { + return tree.getOncomplete(); + } + return null; + } + } + + /** + * id of element to set focus after request completed on client side + * Setter for focus + * @param focus - new value + */ + public void setFocus(String __focus) { + this.focus = __focus; + } + + /** + * id of element to set focus after request completed on client side + * Getter for focus + * @return focus value from local variable or value bindings + */ + public String getFocus() { + if (null != this.focus) { + return this.focus; + } + ValueBinding vb = getValueBinding("focus"); + if (null != vb) { + return (String) vb.getValue(getFacesContext()); + } else { + UITree tree = getUITree(); + if (tree != null) { + return tree.getFocus(); + } + return null; + } + } + + /** + * Serialized (on default with JSON) data passed on the client by a developer on AJAX request. It's accessible via "data.foo" syntax + * Setter for data + * @param data - new value + */ + public void setData(Object __data) { + this.data = __data; + } + + /** + * Serialized (on default with JSON) data passed on the client by a developer on AJAX request. It's accessible via "data.foo" syntax + * Getter for data + * @return data value from local variable or value bindings + */ + public Object getData() { + if (null != this.data) { + return this.data; + } + ValueBinding vb = getValueBinding("data"); + if (null != vb) { + return (Object) vb.getValue(getFacesContext()); + } else { + UITree tree = getUITree(); + if (tree != null) { + return tree.getData(); + } + return null; + } + } + + /** + * Attribute allows to ignore an Ajax Response produced by a request if the newest 'similar' request is + in a queue already. ignoreDupResponses="true" does not cancel the request while it is processed on the server, + but just allows to avoid unnecessary updates on the client side if the response isn't actual now + * Setter for ignoreDupResponses + * @param ignoreDupResponses - new value + */ + public void setIgnoreDupResponses(boolean __ignoreDupResponses) { + this.ignoreDupResponses = __ignoreDupResponses; + this.ignoreDupResponsesSet = true; + } + + /** + * Attribute allows to ignore an Ajax Response produced by a request if the newest 'similar' request is + in a queue already. ignoreDupResponses="true" does not cancel the request while it is processed on the server, + but just allows to avoid unnecessary updates on the client side if the response isn't actual now + * Getter for ignoreDupResponses + * @return ignoreDupResponses value from local variable or value bindings + */ + public boolean isIgnoreDupResponses() { + if (this.ignoreDupResponsesSet) { + return this.ignoreDupResponses; + } + ValueBinding vb = getValueBinding("ignoreDupResponses"); + if (vb != null) { + Boolean value = (Boolean) vb.getValue(getFacesContext()); + if (null == value) { + UITree tree = getUITree(); + if (tree != null) { + return tree.isIgnoreDupResponses(); + } + return this.ignoreDupResponses; + } + return (value.booleanValue()); + } else { + UITree tree = getUITree(); + if (tree != null) { + return tree.isIgnoreDupResponses(); + } + return (this.ignoreDupResponses); + } + } + + /** + * Response waiting time on a particular request. If a response is not received during this time, the request is aborted + * Setter for timeout + * @param timeout - new value + */ + public void setTimeout(int __timeout) { + this.timeout = __timeout; + this.timeoutSet = true; + } + + /** + * Response waiting time on a particular request. If a response is not received during this time, the request is aborted + * Getter for timeout + * @return timeout value from local variable or value bindings + */ + public int getTimeout() { + if (this.timeoutSet) { + return this.timeout; + } + ValueBinding vb = getValueBinding("timeout"); + if (vb != null) { + Integer value = (Integer) vb.getValue(getFacesContext()); + if (null == value) { + UITree tree = getUITree(); + if (tree != null) { + return tree.getTimeout(); + } + return this.timeout; + } + return (value.intValue()); + } else { + UITree tree = getUITree(); + if (tree != null) { + return tree.getTimeout(); + } + return (this.timeout); + } + } }

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r3047 - in branches/3.1.x/ui/panelmenu/src/main: resources/org/richfaces/renderkit/html/css and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: sergeyhalipov Date: 2007-09-21 10:00:06 -0400 (Fri, 21 Sep 2007) New Revision: 3047 Modified: branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuItem.java branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss Log: Add fixes for RF-901, RF-967 and RF-903 to branch 3.1.1 Modified: branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java =================================================================== --- branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java 2007-09-21 13:58:53 UTC (rev 3046) +++ branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java 2007-09-21 14:00:06 UTC (rev 3047) @@ -22,7 +22,6 @@ package org.richfaces.component; import javax.faces.component.ActionSource; -import javax.faces.component.UIInput; import javax.faces.context.FacesContext; import javax.faces.convert.BooleanConverter; import javax.faces.el.MethodBinding; @@ -32,10 +31,9 @@ import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; -import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.event.AjaxEvent; +import org.ajax4jsf.component.AjaxInputComponent; -public abstract class UIPanelMenuGroup extends UIInput implements ActionSource{ +public abstract class UIPanelMenuGroup extends AjaxInputComponent implements ActionSource{ public static final String COMPONENT_TYPE = "org.richfaces.panelMenuGroup"; @@ -164,9 +162,6 @@ if (listener != null) { listener.processAction((ActionEvent) event); } - } else if (event instanceof AjaxEvent) { - FacesContext context = getFacesContext(); - AjaxContext.getCurrentInstance(context).addRegionsFromComponent(this); } } } Modified: branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuItem.java =================================================================== --- branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuItem.java 2007-09-21 13:58:53 UTC (rev 3046) +++ branches/3.1.x/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuItem.java 2007-09-21 14:00:06 UTC (rev 3047) @@ -21,16 +21,9 @@ package org.richfaces.component; -import javax.faces.component.UICommand; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.FacesEvent; +import org.ajax4jsf.component.AjaxActionComponent; -import org.ajax4jsf.context.AjaxContext; -import org.ajax4jsf.event.AjaxEvent; - -public abstract class UIPanelMenuItem extends UICommand { +public abstract class UIPanelMenuItem extends AjaxActionComponent { public static final String COMPONENT_TYPE = "org.richfaces.panelMenuItem"; @@ -66,15 +59,4 @@ public abstract void setName(String string); public abstract String getName(); - /* (non-Javadoc) - * @see javax.faces.component.UIComponentBase#broadcast(javax.faces.event.FacesEvent) - */ - public void broadcast(FacesEvent event) throws AbortProcessingException { - super.broadcast(event); - if (event instanceof AjaxEvent) { - FacesContext context = getFacesContext(); - AjaxContext.getCurrentInstance(context).addRegionsFromComponent(this); - } - } - } Modified: branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss =================================================================== --- branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2007-09-21 13:58:53 UTC (rev 3046) +++ branches/3.1.x/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2007-09-21 14:00:06 UTC (rev 3047) @@ -7,6 +7,7 @@ <f:verbatim> .dr-pmenu-top-group { height: 20px; + width: 100%; background-repeat: repeat-x; background-position: left top; padding: 2px 1px 2px 2px; @@ -92,4 +93,4 @@ } </f:verbatim> -</f:template> \ No newline at end of file +</f:template>

18 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r3046 - branches/3.1.x/ui/menu-components/src/main/java/org/richfaces/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2007-09-21 09:58:53 -0400 (Fri, 21 Sep 2007) New Revision: 3046 Modified: branches/3.1.x/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java Log: RF-981 Modified: branches/3.1.x/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java =================================================================== --- branches/3.1.x/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2007-09-21 13:27:14 UTC (rev 3045) +++ branches/3.1.x/ui/menu-components/src/main/java/org/richfaces/renderkit/html/MenuItemRendererBase.java 2007-09-21 13:58:53 UTC (rev 3046) @@ -21,6 +21,21 @@ package org.richfaces.renderkit.html; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.faces.component.UIComponent; +import javax.faces.component.UIParameter; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; +import javax.faces.event.PhaseId; + +import org.ajax4jsf.Messages; +import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.renderkit.AjaxRendererUtils; import org.ajax4jsf.renderkit.ComponentVariables; import org.ajax4jsf.renderkit.ComponentsVariableResolver; @@ -29,15 +44,7 @@ import org.richfaces.component.util.ViewUtil; import org.richfaces.renderkit.CompositeRenderer; -import javax.faces.component.UIComponent; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; -import javax.faces.event.PhaseId; -import java.io.IOException; -import java.util.Map; - public class MenuItemRendererBase extends CompositeRenderer { protected Class getComponentClass() { @@ -77,7 +84,40 @@ } } } - + // find and encode UIParameter's components + public List encodeParams(FacesContext context, UIMenuItem component) throws IOException { + + UIMenuItem menuItem = component; + List params = new ArrayList(); + StringBuffer buff = new StringBuffer(); + + List children = menuItem.getChildren(); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + UIComponent child = (UIComponent) iterator.next(); + + if(child instanceof UIParameter){ + + UIParameter param = (UIParameter)child; + String name = param.getName(); + + if (null == name) { + throw new IllegalArgumentException(Messages.getMessage( + Messages.UNNAMED_PARAMETER_ERROR, component.getClientId(context))); + } + + Object value = param.getValue(); + buff.append("params["); + buff.append(ScriptUtils.toScript(name)); + buff.append("] = "); + buff.append(ScriptUtils.toScript(value)); + buff.append(";"); + params.add(buff.toString()); + } + } + + return params; + } + public void initializeResources(FacesContext context, UIMenuItem menuItem) throws IOException { ComponentVariables variables = @@ -105,39 +145,53 @@ StringBuffer scriptValue = new StringBuffer(); String mode = resolveSubmitMode(menuItem); + if (mode.equalsIgnoreCase(MenuComponent.MODE_AJAX)) { scriptValue.append(AjaxRendererUtils.buildOnClick( menuItem, context).toString()); } else if (mode.equalsIgnoreCase(MenuComponent.MODE_SERVER)) { - String id = menuItem.getClientId(context); + + + String id = menuItem.getClientId(context); scriptValue.append('{'); scriptValue.append("var form = A4J.findForm(this);"); scriptValue.append("var params = new Object();"); - scriptValue.append("params['"); - scriptValue.append(id + ":hidden"); - scriptValue.append("'] = '"); - scriptValue.append(id); - scriptValue.append("';"); - scriptValue.append("Richfaces.jsFormSubmit('"); - scriptValue.append(id); - scriptValue.append("', "); - scriptValue.append("form.id, "); - Object target = menuItem.getAttributes().get("target"); - if (null != target) { - scriptValue.append("'"+(String) target+"', "); - } else { - scriptValue.append("'', "); + scriptValue.append("params["); + scriptValue.append(ScriptUtils.toScript(id + ":hidden")); + scriptValue.append("] = "); + scriptValue.append(ScriptUtils.toScript(id)); + scriptValue.append(";"); + + List params = encodeParams(context, menuItem); + if(!params.isEmpty()){ + for (Iterator iterator = params.iterator(); iterator.hasNext();) { + scriptValue.append(iterator.next()); + } } - scriptValue.append("params);}; return false;"); + + scriptValue.append("Richfaces.jsFormSubmit("); + scriptValue.append(ScriptUtils.toScript(id)).append(","); + + scriptValue.append("form.id").append(","); + Object target = menuItem.getAttributes().get("target"); + + if (null != target) { + scriptValue.append(ScriptUtils.toScript(target)); + } else { + scriptValue.append("''"); + } + + scriptValue.append(","); + scriptValue.append("params);}; return false;"); + } else { - scriptValue.append( - getStringAttributeOrEmptyString(menuItem, "onclick")); + scriptValue.append(getStringAttributeOrEmptyString(menuItem, "onclick")); } if (resource.length() > 0) { variables.setVariable("onclick", scriptValue.toString()); } variables.setVariable("menuItemLabelClass", "rich-menu-item-label"); - } + } } @@ -182,23 +236,27 @@ protected String processInlineStyles(FacesContext context, UIMenuItem menuItem, boolean isOnmouseover) { - StringBuffer buffer = new StringBuffer(); + + StringBuffer buffer = new StringBuffer(); Object style = menuItem.getAttributes().get("style"); Object selectStyle = menuItem.getAttributes().get("selectStyle"); + if (null == selectStyle) { return ""; } + + buffer.append("$('" + menuItem.getClientId(context) + "').style.cssText='"); - buffer.append("$('" + menuItem.getClientId(context) - + "').style.cssText='"); if (null != style) { - buffer.append(style.toString() + "; "); - } + buffer.append(style.toString() + "; "); + } + if (isOnmouseover) { - buffer.append(selectStyle.toString() + ";';"); + buffer.append(selectStyle.toString() + ";';"); } else { - buffer.append("';"); + buffer.append("';"); } + return buffer.toString(); } }

18 years, 7 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits September 2007