Author: akushunin Date: 2007-07-19 12:04:56 -0400 (Thu, 19 Jul 2007) New Revision: 1701 Added: branches/3.0.2/sandbox-samples/calendar-sample/src/main/webapp/pages/Calendar.jsp Modified: branches/3.0.2/sandbox/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx Log: added input and button for popup mode. New page for sample application. Modified: branches/3.0.2/sandbox/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- branches/3.0.2/sandbox/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-07-19 15:43:57 UTC (rev 1700) +++ branches/3.0.2/sandbox/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-07-19 16:04:56 UTC (rev 1701) @@ -1,24 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<f:root - xmlns:f="http://ajax4jsf.org/cdk/template" - xmlns:c=" http://java.sun.com/jsf/core" +<f:root xmlns:f="http://ajax4jsf.org/cdk/template" + xmlns:c=" http://java.sun.com/jsf/core" xmlns:ui=" http://ajax4jsf.org/cdk/ui" xmlns:u=" http://ajax4jsf.org/cdk/u" xmlns:x=" http://ajax4jsf.org/cdk/x" xmlns:vcp=" http://ajax4jsf.org/cdk/vcp" class="org.richfaces.renderkit.html.CalendarRenderer" baseclass="org.richfaces.renderkit.CalendarRendererBase" - component="org.richfaces.component.UICalendar" - > - <f:clientid var="clientId"/> + component="org.richfaces.component.UICalendar"> + <f:clientid var="clientId" /> <h:scripts>new org.ajax4jsf.framework.resource.PrototypeScript(),new org.ajax4jsf.framework.ajax.AjaxScript(),/org/richfaces/renderkit/html/scripts/utils.js,/org/richfaces/renderkit/html/scripts/json/json-dom.js,/org/richfaces/renderkit/html/scripts/calendar.js</h:scripts> <h:styles>/org/richfaces/renderkit/html/css/calendar.xcss</h:styles> - <div id="#{clientId}" style="display:inline; width: #{this:qualifySize(component.attributes['width'])}; height: #{this:qualifySize(component.attributes['height'])}; #{component.attributes['style']}" class="#{component.attributes['styleClass']}" - x:passThruWithExclusions="value,name,type,id" - > - - <script type="text/javascript"> + <div id="#{clientId}" + style="display:inline; width: #{this:qualifySize(component.attributes['width'])}; height: #{this:qualifySize(component.attributes['height'])}; #{component.attributes['style']}" + class="#{component.attributes['styleClass']}" + x:passThruWithExclusions="value,name,type,id"><script + type="text/javascript"> new Calendar('#{clientId}', { submitFunction: <jsp:scriptlet>/*<![CDATA[*/ @@ -72,6 +70,44 @@ writePreloadBody(context, component); /*]]>*/</jsp:scriptlet> ); - </script> + </script> <jsp:scriptlet> + <![CDATA[ + boolean popup = attributeToBoolean(component, "popup"); + if (popup) {]]> + </jsp:scriptlet> + <span> <input + x:passThruWithExclusions="name,id" + value="#{this:getInputValue(context,component)}" + type="text" + readonly="#{component.attributes['readonly']}" + disabled="#{component.attributes['disabled']}" + accesskey="#{component.attributes['accesskey']}" + maxlength="#{component.attributes['maxlength']}" + onchange="#{component.attributes['onchange']}" + onselect="#{component.attributes['onselect']}" + onfocus="#{component.attributes['onfocus']}" + onblur="#{component.attributes['onblur']}" + size="#{component.attributes['inputSize']}" + style="#{component.attributes['style']}" + tabindex="#{component.attributes['tabindex']}" + class="#{component.attributes['class']}" + onclick="#{component.attributes['onclick']}"> + </input> + <button id="#{clientId}Button" + accesskey="#{component.attributes['accesskey']}" + class="#{component.attributes['class']}" + name="#{clientId}" + onclick="#{component.attributes['onclick']}" + value="#{component.attributes['value']" + style="#{component.attributes['style']}" + tabindex="#{component.attributes['tabindex']}" + type="button"> + </button> + </span> + <jsp:scriptlet> + <![CDATA[ + } + ]]> + </jsp:scriptlet> </div> </f:root> Added: branches/3.0.2/sandbox-samples/calendar-sample/src/main/webapp/pages/Calendar.jsp =================================================================== --- branches/3.0.2/sandbox-samples/calendar-sample/src/main/webapp/pages/Calendar.jsp (rev 0) +++ branches/3.0.2/sandbox-samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-07-19 16:04:56 UTC (rev 1701) @@ -0,0 +1,17 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.ajax4jsf.org/calendar" prefix="calendar" %> +<html> + <head> + <title></title> + </head> + <body> + <f:view> + <h:form> + <calendar:calendar id="calendar" > + </calendar:calendar> + + </h:form> + </f:view> + </body> +</html> Property changes on: branches/3.0.2/sandbox-samples/calendar-sample/src/main/webapp/pages/Calendar.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native