6:11 p.m.
Author: SergeySmirnov
Date: 2007-08-21 19:11:09 -0400 (Tue, 21 Aug 2007)
New Revision: 2386
Added:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examples/jpegSample.xhtml
Removed:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examples/jpeg.xhtml
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/MediaBean.java
trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/lib/
trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/status/usage.xhtml
Log:
demo updates
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/MediaBean.java
===================================================================
---
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/MediaBean.java 2007-08-21
20:53:37 UTC (rev 2385)
+++
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/MediaBean.java 2007-08-21
23:11:09 UTC (rev 2386)
@@ -1,53 +1,13 @@
package org.richfaces.demo.media;
-import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.Serializable;
-
import javax.imageio.ImageIO;
public class MediaBean {
- /**
- * Created 21.08.2007
- * @author Nick Belaevski
- * @since 3.1
- */
-
- public static class MediaData implements Serializable {
- private int width;
- private int height;
- private Color background;
- private Color drawColor;
- public int getWidth() {
- return width;
- }
- public void setWidth(int width) {
- this.width = width;
- }
- public int getHeight() {
- return height;
- }
- public void setHeight(int height) {
- this.height = height;
- }
- public Color getBackground() {
- return background;
- }
- public void setBackground(Color background) {
- this.background = background;
- }
- public Color getDrawColor() {
- return drawColor;
- }
- public void setDrawColor(Color drawColor) {
- this.drawColor = drawColor;
- }
- }
-
public void paint(OutputStream out, Object data) throws IOException{
if (data instanceof MediaData) {
Property changes on: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/lib
___________________________________________________________________
Name: svn:ignore
+ phaseTracker.jar
Added:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml
===================================================================
---
trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml
(rev 0)
+++
trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml 2007-08-21
23:11:09 UTC (rev 2386)
@@ -0,0 +1,12 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+ <h:form>
+ <rich:calendar inputType="text" datePattern="dd/MM/yyyy" />
+ </h:form>
+
+</ui:composition>
\ No newline at end of file
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.xhtml
(rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.xhtml 2007-08-21
23:11:09 UTC (rev 2386)
@@ -0,0 +1,26 @@
+<!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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+ <ui:composition template="/templates/component-sample.xhtml">
+ <ui:define name="sample">
+
+ <p>
+ </p>
+
+ <div class="sample-container" >
+
+ <ui:include src="/richfaces/calendar/examples/calSample.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath"
value="/richfaces/calendar/examples/calSample.xhtml"/>
+ </ui:include>
+
+ </div>
+
+ </ui:define>
+
+ </ui:composition>
+</html>
Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml
(rev 0)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar.xhtml 2007-08-21
23:11:09 UTC (rev 2386)
@@ -0,0 +1,17 @@
+<!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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:rich="http://richfaces.org/rich">
+<ui:composition template="/templates/main.xhtml">
+ <ui:define name="title">RichFaces - Open Source Rich JSF Components -
Rich Calendar</ui:define>
+ <ui:define name="body">
+ <rich:tabPanel switchType="server" styleClass="top_tab"
contentClass="content_tab" headerClass="header_tabs_class"
inactiveTabClass="inactive_tab" activeTabClass="active_tab">
+ <rich:tab label="Usage">
+ <ui:include src="/richfaces/calendar/usage.xhtml"/>
+ </rich:tab>
+ </rich:tabPanel>
+ </ui:define>
+</ui:composition>
+</html>
Deleted:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examples/jpeg.xhtml
===================================================================
---
trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examples/jpeg.xhtml 2007-08-21
20:53:37 UTC (rev 2385)
+++
trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examples/jpeg.xhtml 2007-08-21
23:11:09 UTC (rev 2386)
@@ -1,14 +0,0 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
-
-
- <rich:separator height="1" style="padding:10px"/>
- <a4j:mediaOutput element="img" cacheable="false"
session="true"
- createContent="#{mediaBean.paint}" value="#{mediaData}"
mimeType="image/jpeg" />
- <rich:separator height="1" style="padding:10px"/>
-
-</ui:composition>
\ No newline at end of file
Copied:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examples/jpegSample.xhtml
(from rev 2378,
trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examples/jpeg.xhtml)
===================================================================
---
trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examples/jpegSample.xhtml
(rev 0)
+++
trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/examples/jpegSample.xhtml 2007-08-21
23:11:09 UTC (rev 2386)
@@ -0,0 +1,14 @@
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+
+ <rich:separator height="1" style="padding:10px"/>
+ <a4j:mediaOutput element="img" cacheable="false"
session="true"
+ createContent="#{mediaBean.paint}" value="#{mediaData}"
mimeType="image/jpeg" />
+ <rich:separator height="1" style="padding:10px"/>
+
+</ui:composition>
\ No newline at end of file
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usage.xhtml
===================================================================
---
trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usage.xhtml 2007-08-21
20:53:37 UTC (rev 2385)
+++
trunk/samples/richfaces-demo/src/main/webapp/richfaces/mediaOutput/usage.xhtml 2007-08-21
23:11:09 UTC (rev 2386)
@@ -32,9 +32,9 @@
</p>
<div class="sample-container" >
- <ui:include src="/richfaces/mediaOutput/examples/jpeg.xhtml"/>
+ <ui:include src="/richfaces/mediaOutput/examples/jpegSample.xhtml"/>
<ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath"
value="/richfaces/mediaOutput/examples/jpeg.xhtml"/>
+ <ui:param name="sourcepath"
value="/richfaces/mediaOutput/examples/jpegSample.xhtml"/>
<ui:param name="openlabel" value="View Page Source" />
</ui:include>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/status/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/status/usage.xhtml 2007-08-21
20:53:37 UTC (rev 2385)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/status/usage.xhtml 2007-08-21
23:11:09 UTC (rev 2386)
@@ -15,13 +15,6 @@
</p>
<div class="sample-container" >
- <h:outputText value="Ajax Status:"/>
-
- <a4j:status id="commonstatus" startText="In progress..."
stopText="Complete"/>
-
- <h:form>
- <a4j:commandButton eventsQueue="foo" value="Ajax
request"/>
- </h:form>
<ui:include src="/richfaces/status/examples/simple.xhtml"/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath"
value="/richfaces/status/examples/simple.xhtml"/>
@@ -50,21 +43,7 @@
</p>
<div class="sample-container" >
- <a4j:region id="rb">
- <h:panelGrid columns="2">
-
- <h:form>
- <a4j:commandButton eventsQueue="foo2" value="Ajax request
2"/>
- </h:form>
-
- <a4j:status>
- <f:facet name="start">
- <h:graphicImage value="/images/ajax/ajax_process.gif"/>
- </f:facet>
- </a4j:status>
-
- </h:panelGrid>
- </a4j:region>
+
<ui:include src="/richfaces/status/examples/pictured.xhtml"/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath"
value="/richfaces/status/examples/pictured.xhtml"/>