JBoss Rich Faces SVN: r12783 - in trunk: sandbox/ui/layout/src/main/config/component and 12 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2009-02-27 20:03:08 -0500 (Fri, 27 Feb 2009)
New Revision: 12783
Added:
trunk/framework/impl/src/main/java/org/richfaces/util/CollectionsUtils.java
trunk/sandbox/ui/layout/src/main/java/META-INF/
trunk/sandbox/ui/layout/src/main/java/META-INF/MANIFEST.MF
trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
trunk/sandbox/ui/layout/src/main/resources/org/
trunk/sandbox/ui/layout/src/main/resources/org/richfaces/
trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/
trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/
trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/
trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids.css
trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset-fonts-grids.css
Removed:
trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java
Modified:
trunk/sandbox/ui/layout/src/main/config/component/page.xml
trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java
trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx
Log:
rich:page component almost done
Added: trunk/framework/impl/src/main/java/org/richfaces/util/CollectionsUtils.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/util/CollectionsUtils.java (rev 0)
+++ trunk/framework/impl/src/main/java/org/richfaces/util/CollectionsUtils.java 2009-02-28 01:03:08 UTC (rev 12783)
@@ -0,0 +1,67 @@
+/*
+ * $Id$
+ */
+
+
+package org.richfaces.util;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * <p class="changed_added_2_0"></p>
+ * @author asmirnov(a)exadel.com
+ *
+ */
+public class CollectionsUtils {
+
+ private CollectionsUtils() {
+ // this class contains static methods only.
+ }
+
+ public static <T> T[] ar(T...ts){
+ return ts;
+ }
+
+ public static <T> T[] ar(){
+ return null;
+ }
+
+ public static <T,V> ConstMap<T,V> map() {
+ return new ConstMap<T, V>();
+ }
+
+ public <T> Set<T> set(T...ts) {
+ LinkedHashSet<T> set = new LinkedHashSet<T>(ts.length);
+ for (T t : ts) {
+ set.add(t);
+ }
+ return Collections.unmodifiableSet(set);
+ }
+
+ public <T> List<T> list(T...ts) {
+ return Collections.unmodifiableList(Arrays.asList(ts));
+ }
+
+ @SuppressWarnings("serial")
+ public static class ConstMap<T,V> extends LinkedHashMap<T,V> {
+
+ public ConstMap() {
+ super(50, 1.0F);
+ }
+
+ public ConstMap<T, V> add(T key, V value) {
+ put(key, value);
+ return this;
+ }
+
+ public Map<T,V> fix() {
+ return Collections.unmodifiableMap(this);
+ }
+ }
+}
Property changes on: trunk/framework/impl/src/main/java/org/richfaces/util/CollectionsUtils.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/sandbox/ui/layout/src/main/config/component/page.xml
===================================================================
--- trunk/sandbox/ui/layout/src/main/config/component/page.xml 2009-02-27 20:24:32 UTC (rev 12782)
+++ trunk/sandbox/ui/layout/src/main/config/component/page.xml 2009-02-28 01:03:08 UTC (rev 12783)
@@ -28,21 +28,7 @@
</taghandler>
-->
&ui_component_attributes;
- &ajax_region_attributes;
&html_universal_attributes;
- <property hidden="true" existintag="true">
- <name>renderRegionOnly</name>
- <classname>boolean</classname>
- <description>
- Flag to disable rendering in AJAX responses content
- outside of active region. If this attribute set to
- "true" , no one of the components outside of region will
- be included to AJAX response. If set to "false", search
- for components to include in response will be performed
- on all tree. Default value is "true".
- </description>
- <defaultvalue>true</defaultvalue>
- </property>
<property>
<name>pageTitle</name>
<classname>java.lang.String</classname>
@@ -85,6 +71,49 @@
<![CDATA[Set html element default namespace]]>
</description>
</property>
+ <property>
+ <name>width</name>
+ <classname>int</classname>
+ <description>
+ </description>
+ </property>
+ <property>
+ <name>sidebarWidth</name>
+ <classname>int</classname>
+ <description>
+ </description>
+ </property>
+ <property>
+ <name>sidebarPosition</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ </property>
+
+ <property>
+ <name>headerClass</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ </property>
+ <property>
+ <name>footerClass</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ </property>
+ <property>
+ <name>bodyClass</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ </property>
+ <property>
+ <name>sidebarClass</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ </property>
<!--
<property>
<name>param</name>
Added: trunk/sandbox/ui/layout/src/main/java/META-INF/MANIFEST.MF
===================================================================
--- trunk/sandbox/ui/layout/src/main/java/META-INF/MANIFEST.MF (rev 0)
+++ trunk/sandbox/ui/layout/src/main/java/META-INF/MANIFEST.MF 2009-02-28 01:03:08 UTC (rev 12783)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/sandbox/ui/layout/src/main/java/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java
===================================================================
--- trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java 2009-02-27 20:24:32 UTC (rev 12782)
+++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/component/UIPage.java 2009-02-28 01:03:08 UTC (rev 12783)
@@ -4,15 +4,13 @@
package org.richfaces.component;
-import javax.faces.component.UIComponentBase;
+import javax.faces.component.UIPanel;
-import org.ajax4jsf.component.UIAjaxRegion;
-
/**
* JSF component class
*
*/
-public abstract class UIPage extends UIAjaxRegion {
+public abstract class UIPage extends UIPanel {
public static final String COMPONENT_TYPE = "org.richfaces.Page";
Copied: trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java (from rev 12782, trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java)
===================================================================
--- trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java (rev 0)
+++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java 2009-02-28 01:03:08 UTC (rev 12783)
@@ -0,0 +1,120 @@
+/**
+ *
+ */
+package org.richfaces.renderkit;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.ajax4jsf.renderkit.AjaxComponentRendererBase;
+import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
+import org.ajax4jsf.renderkit.html.AjaxPageRenderer;
+
+/**
+ * @author asmirnov
+ *
+ */
+public abstract class AbstractPageRenderer extends HeaderResourcesRendererBase {
+
+ public static final String RENDERER_TYPE = "org.richfaces.PageRenderer";
+
+
+ private static final Map<String,String[]> doctypes ;
+
+ static {
+ // Fill doctype, content-type and namespace map for different formats.
+ doctypes = new HashMap<String,String[]>();
+ doctypes
+ .put(
+ "html-transitional",
+ new String[] {
+ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n",
+ "text/html", null });
+ doctypes.put("html", new String[] {
+ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n"
+ + "\"http://www.w3.org/TR/html4/strict.dtd\">\n",
+ "text/html", null });
+ doctypes.put("html-frameset", new String[] {
+ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\"\n"
+ + "\"http://www.w3.org/TR/html4/frameset.dtd\">\n",
+ "text/html", null });
+ doctypes
+ .put(
+ "xhtml",
+ new String[] {
+ "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"
+ + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n",
+ "application/xhtml+xml",
+ "http://www.w3.org/1999/xhtml" });
+ doctypes
+ .put(
+ "xhtml-transitional",
+ new String[] {
+ "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
+ + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n",
+ "application/xhtml+xml",
+ "http://www.w3.org/1999/xhtml" });
+ doctypes
+ .put(
+ "xhtml-frameset",
+ new String[] {
+ "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\"\n"
+ + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">\n",
+ "application/xhtml+xml",
+ "http://www.w3.org/1999/xhtml" });
+ doctypes.put("html-3.2", new String[] {
+ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n",
+ "text/html", null });
+ }
+
+ public String prolog(FacesContext context, UIComponent component) throws IOException {
+ ResponseWriter out = context.getResponseWriter();
+ Map<String,Object> attributes = component.getAttributes();
+ String format = (String) attributes.get("format");
+ String contentType = null;
+ String namespace = null;
+ // String characterEncoding = out.getCharacterEncoding();
+ String[] docType = null;
+ if (null != format) {
+ docType = (String[]) doctypes.get(format);
+ } else {
+ contentType = out.getContentType();
+ for (Iterator<String[]> iterator = doctypes.values().iterator(); iterator.hasNext();) {
+ String[] types = (String[]) iterator.next();
+ if(types[1].equals(contentType)){
+ docType = types;
+ break;
+ }
+ }
+ }
+ if (null != docType) {
+ contentType = docType[1];
+ namespace = docType[2];
+ out.write(docType[0]);
+ }
+ if (null == contentType) {
+ contentType = (String) attributes.get("contentType");
+ }
+ if (null != contentType) {
+ // response.setContentType(contentType /*+ ";charset=" +
+ // characterEncoding*/);
+ }
+ return namespace;
+ }
+
+ public void styles(FacesContext context, UIComponent component) {
+
+ }
+
+ public String documentClass(FacesContext context, UIComponent component) {
+ //TODO - calculate class.
+ return "ui-t3";
+ }
+
+}
Property changes on: trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java
===================================================================
--- trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java 2009-02-27 20:24:32 UTC (rev 12782)
+++ trunk/sandbox/ui/layout/src/main/java/org/richfaces/renderkit/html/HtmlPageRenderer.java 2009-02-28 01:03:08 UTC (rev 12783)
@@ -1,43 +0,0 @@
-/**
- *
- */
-package org.richfaces.renderkit.html;
-
-import java.io.IOException;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-
-import org.ajax4jsf.renderkit.html.AjaxPageRenderer;
-
-/**
- * @author asmirnov
- *
- */
-public class HtmlPageRenderer extends AjaxPageRenderer {
-
-
- @Override
- public void doEncodeBegin(ResponseWriter out, FacesContext context,
- UIComponent component) throws IOException {
- // generate page lead with header, up to body tag.
- super.doEncodeBegin(out, context, component);
- // header facet.
- // start content body.
- // menu facet.
- // content placeholder.
- }
-
-
- @Override
- public void doEncodeEnd(ResponseWriter out, FacesContext context,
- UIComponent component) throws IOException {
- // close content .
- // footer facet.
- // Close page body.
- // generate page trailer closing tags.
- super.doEncodeEnd(out, context, component);
- }
-
-}
Added: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids.css
===================================================================
--- trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids.css (rev 0)
+++ trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids.css 2009-02-28 01:03:08 UTC (rev 12783)
@@ -0,0 +1,283 @@
+/*
+Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.5.2
+*/
+/*
+ Note: Throughout this file, the *property filter is used to
+ give a value to IE that other browsers do not see.
+*/
+
+/*
+ Section: General Rules
+*/
+
+ body {
+ text-align:center;
+ }
+
+ #ft {
+ clear:both;
+ }
+
+/*
+ Section: Page Width Rules (#doc, #doc2, #doc3, #doc4)
+*/
+
+ /*
+ Subsection: General
+ */
+
+ #doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7 {
+ margin:auto;
+ text-align:left;
+ width:57.69em;*width:56.25em;
+ min-width:750px;
+ }
+ /*
+ Subsection: 950 Centered (doc2)
+ */
+ #doc2 {
+ width:73.076em;*width:71.25em;
+ }
+
+ /*
+ Subsection: 100% (doc3)
+ */
+ #doc3 {
+ /* Left and Right margins are not a structural part of Grids. Without them Grids
+ works fine, but content bleeds to the very edge of the document, which often
+ impairs readability and usability. They are
+ provided because they prevent the content from "bleeding" into the browser's chrome.*/
+ margin:auto 10px;
+ width:auto;
+ }
+
+ /*
+ Subsection: 974 Centered (doc4)
+ */
+ #doc4 {
+ width:74.923em;*width:73.05em;
+ }
+
+/*
+ Section: Preset Template Rules (.yui-t[1-6])
+*/
+
+ /*
+ Subsection: General
+ */
+
+ /* to preserve source-order independence for Gecko */
+ .yui-b{position:relative;}
+ .yui-b{_position:static;}
+ .yui-main .yui-b{position:static;}
+
+ .yui-main {width:100%;}
+
+ .yui-t1 .yui-main,
+ .yui-t2 .yui-main,
+ .yui-t3 .yui-main{float:right;margin-left:-25em;/* IE: preserve layout at narrow widths */}
+
+ .yui-t4 .yui-main,
+ .yui-t5 .yui-main,
+ .yui-t6 .yui-main{float:left;margin-right:-25em;/* IE: preserve layout at narrow widths */}
+
+ /*
+ Subsection: For Specific Template Presets
+ */
+
+ .yui-t1 .yui-b {float:left;width:12.30769em;*width:12.00em;}
+ .yui-t1 .yui-main .yui-b{margin-left:13.30769em;*margin-left:13.05em;}
+
+ .yui-t2 .yui-b {float:left;width:13.8461em;*width:13.50em;}
+ .yui-t2 .yui-main .yui-b {margin-left:14.8461em;*margin-left:14.55em;}
+
+ .yui-t3 .yui-b {float:left;width:23.0769em;*width:22.50em;}
+ .yui-t3 .yui-main .yui-b {margin-left:24.0769em;*margin-left:23.62em;}
+
+ .yui-t4 .yui-b {float:right;width:13.8456em;*width:13.50em;}
+ .yui-t4 .yui-main .yui-b {margin-right:14.8456em;*margin-right:14.55em;}
+
+ .yui-t5 .yui-b {float:right;width:18.4615em;*width:18.00em;}
+ .yui-t5 .yui-main .yui-b {margin-right:19.4615em;*margin-right:19.125em;}
+
+ .yui-t6 .yui-b {float:right;width:23.0769em;*width:22.50em;}
+ .yui-t6 .yui-main .yui-b {margin-right:24.0769em;*margin-right:23.62em;}
+
+ .yui-t7 .yui-main .yui-b {
+ display:block;margin:0 0 1em 0;
+ }
+ .yui-main .yui-b {float:none;width:auto;}
+
+/*
+ Section: Grids and Nesting Grids
+*/
+
+ /*
+ Subsection: Children generally take half the available space
+ */
+
+ .yui-gb .yui-u,
+ .yui-g .yui-gb .yui-u,
+ .yui-gb .yui-g,
+ .yui-gb .yui-gb,
+ .yui-gb .yui-gc,
+ .yui-gb .yui-gd,
+ .yui-gb .yui-ge,
+ .yui-gb .yui-gf,
+ .yui-gc .yui-u,
+ .yui-gc .yui-g,
+ .yui-gd .yui-u {float:left;}
+
+ /*Float units (and sub grids) to the right */
+ .yui-g .yui-u,
+ .yui-g .yui-g,
+ .yui-g .yui-gb,
+ .yui-g .yui-gc,
+ .yui-g .yui-gd,
+ .yui-g .yui-ge,
+ .yui-g .yui-gf,
+ .yui-gc .yui-u,
+ .yui-gd .yui-g,
+ .yui-g .yui-gc .yui-u,
+ .yui-ge .yui-u,
+ .yui-ge .yui-g,
+ .yui-gf .yui-g,
+ .yui-gf .yui-u{float:right;}
+
+ /*Float units (and sub grids) to the left */
+ .yui-g div.first,
+ .yui-gb div.first,
+ .yui-gc div.first,
+ .yui-gd div.first,
+ .yui-ge div.first,
+ .yui-gf div.first,
+ .yui-g .yui-gc div.first,
+ .yui-g .yui-ge div.first,
+ .yui-gc div.first div.first {float:left;}
+
+ .yui-g .yui-u,
+ .yui-g .yui-g,
+ .yui-g .yui-gb,
+ .yui-g .yui-gc,
+ .yui-g .yui-gd,
+ .yui-g .yui-ge,
+ .yui-g .yui-gf {width:49.1%;}
+
+ .yui-gb .yui-u,
+ .yui-g .yui-gb .yui-u,
+ .yui-gb .yui-g,
+ .yui-gb .yui-gb,
+ .yui-gb .yui-gc,
+ .yui-gb .yui-gd,
+ .yui-gb .yui-ge,
+ .yui-gb .yui-gf,
+ .yui-gc .yui-u,
+ .yui-gc .yui-g,
+ .yui-gd .yui-u {width:32%;margin-left:1.99%;}
+
+ /* Give IE some extra breathing room for 1/3-based rounding issues */
+ .yui-gb .yui-u {*margin-left:1.9%;*width:31.9%;}
+
+ .yui-gc div.first,
+ .yui-gd .yui-u {width:66%;}
+ .yui-gd div.first {width:32%;}
+
+ .yui-ge div.first,
+ .yui-gf .yui-u{width:74.2%;}
+
+ .yui-ge .yui-u,
+ .yui-gf div.first {width:24%;}
+
+ .yui-g .yui-gb div.first,
+ .yui-gb div.first,
+ .yui-gc div.first,
+ .yui-gd div.first {margin-left:0;}
+
+ /*
+ Section: Deep Nesting
+ */
+ .yui-g .yui-g .yui-u,
+ .yui-gb .yui-g .yui-u,
+ .yui-gc .yui-g .yui-u,
+ .yui-gd .yui-g .yui-u,
+ .yui-ge .yui-g .yui-u,
+ .yui-gf .yui-g .yui-u {width:49%;*width:48.1%;*margin-left:0;}
+
+ .yui-g .yui-gb div.first,
+ .yui-gb .yui-gb div.first {*margin-right:0;*width:32%;_width:31.7%;}
+
+ .yui-g .yui-gc div.first,
+ .yui-gd .yui-g {width:66%;}
+
+ .yui-gb .yui-g div.first {*margin-right:4%;_margin-right:1.3%;}
+
+ .yui-gb .yui-gc div.first,
+ .yui-gb .yui-gd div.first {*margin-right:0;}
+
+ .yui-gb .yui-gb .yui-u,
+ .yui-gb .yui-gc .yui-u {*margin-left:1.8%;_margin-left:4%;}
+
+ .yui-g .yui-gb .yui-u {_margin-left:1.0%;}
+
+ .yui-gb .yui-gd .yui-u {*width:66%;_width:61.2%;}
+ .yui-gb .yui-gd div.first {*width:31%;_width:29.5%;}
+
+ .yui-g .yui-gc .yui-u,
+ .yui-gb .yui-gc .yui-u {width:32%;_float:right;margin-right:0;_margin-left:0;}
+ .yui-gb .yui-gc div.first {width:66%;*float:left;*margin-left:0;}
+
+ .yui-gb .yui-ge .yui-u,
+ .yui-gb .yui-gf .yui-u {margin:0;}
+
+ .yui-gb .yui-gb .yui-u {_margin-left:.7%;}
+
+ .yui-gb .yui-g div.first,
+ .yui-gb .yui-gb div.first {*margin-left:0;}
+
+ .yui-gc .yui-g .yui-u,
+ .yui-gd .yui-g .yui-u {*width:48.1%;*margin-left:0;}s
+
+ .yui-gb .yui-gd div.first {width:32%;}
+ .yui-g .yui-gd div.first {_width:29.9%;}
+
+ .yui-ge .yui-g {width:24%;}
+ .yui-gf .yui-g {width:74.2%;}
+
+ .yui-gb .yui-ge div.yui-u,
+ .yui-gb .yui-gf div.yui-u {float:right;}
+ .yui-gb .yui-ge div.first,
+ .yui-gb .yui-gf div.first {float:left;}
+
+ /* Width Accommodation for Nested Contexts */
+ .yui-gb .yui-ge .yui-u,
+ .yui-gb .yui-gf div.first {*width:24%;_width:20%;}
+
+ /* Width Accommodation for Nested Contexts */
+ .yui-gb .yui-ge div.first,
+ .yui-gb .yui-gf .yui-u{*width:73.5%;_width:65.5%;}
+
+ /* Patch for GD within GE */
+ .yui-ge div.first .yui-gd .yui-u {width:65%;}
+ .yui-ge div.first .yui-gd div.first {width:32%;}
+
+/*
+ Section: Clearing
+*/
+
+#bd:after,
+.yui-g:after,
+.yui-gb:after,
+.yui-gc:after,
+.yui-gd:after,
+.yui-ge:after,
+.yui-gf:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
+#bd,
+.yui-g,
+.yui-gb,
+.yui-gc,
+.yui-gd,
+.yui-ge,
+.yui-gf{zoom:1;}
Property changes on: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/grids.css
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset-fonts-grids.css
===================================================================
--- trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset-fonts-grids.css (rev 0)
+++ trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset-fonts-grids.css 2009-02-28 01:03:08 UTC (rev 12783)
@@ -0,0 +1,8 @@
+/*
+Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.5.2
+*/
+html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym {border:0;font-variant:normal;}sup {vertical-align:text-top;}sub {vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}body {font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}table {font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;}
+body{text-align:center;}#ft{clear:both;}#doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;}#doc2{width:73.076em;*width:71.25em;}#doc3{margin:auto 10px;width:auto;}#doc4{width:74.923em;*width:73.05em;}.yui-b{position:relative;}.yui-b{_position:static;}#yui-main .yui-b{position:static;}#yui-main{width:100%;}.yui-t1 #yui-main,.yui-t2 #yui-main,.yui-t3 #yui-main{float:right;margin-left:-25em;}.yui-t4 #yui-main,.yui-t5 #yui-main,.yui-t6 #yui-main{float:left;margin-right:-25em;}.yui-t1 .yui-b{float:left;width:12.30769em;*width:12.00em;}.yui-t1 #yui-main .yui-b{margin-left:13.30769em;*margin-left:13.05em;}.yui-t2 .yui-b{float:left;width:13.8461em;*width:13.50em;}.yui-t2 #yui-main .yui-b{margin-left:14.8461em;*margin-left:14.55em;}.yui-t3 .yui-b{float:left;width:23.0769em;*width:22.50em;}.yui-t3 #yui-main .yui-b{margin-left:24.0769em;*margin-left:23.62em;}.yui-t4 .yui-b{float:right!
;width:13.8456em;*width:13.50em;}.yui-t4 #yui-main .yui-b{margin-right:14.8456em;*margin-right:14.55em;}.yui-t5 .yui-b{float:right;width:18.4615em;*width:18.00em;}.yui-t5 #yui-main .yui-b{margin-right:19.4615em;*margin-right:19.125em;}.yui-t6 .yui-b{float:right;width:23.0769em;*width:22.50em;}.yui-t6 #yui-main .yui-b{margin-right:24.0769em;*margin-right:23.62em;}.yui-t7 #yui-main .yui-b{display:block;margin:0 0 1em 0;}#yui-main .yui-b{float:none;width:auto;}.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{float:left;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf,.yui-gc .yui-u,.yui-gd .yui-g,.yui-g .yui-gc .yui-u,.yui-ge .yui-u,.yui-ge .yui-g,.yui-gf .yui-g,.yui-gf .yui-u{float:right;}.yui-g div.first,.yui-gb div.first,.yui-gc div.first,.yui-gd div.first,.yui-ge div.first,.yui-gf div.first,.y!
ui-g .yui-gc div.first,.yui-g .yui-ge div.first,.yui-gc div.first div.
first{float:left;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf{width:49.1%;}.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{width:32%;margin-left:1.99%;}.yui-gb .yui-u{*margin-left:1.9%;*width:31.9%;}.yui-gc div.first,.yui-gd .yui-u{width:66%;}.yui-gd div.first{width:32%;}.yui-ge div.first,.yui-gf .yui-u{width:74.2%;}.yui-ge .yui-u,.yui-gf div.first{width:24%;}.yui-g .yui-gb div.first,.yui-gb div.first,.yui-gc div.first,.yui-gd div.first{margin-left:0;}.yui-g .yui-g .yui-u,.yui-gb .yui-g .yui-u,.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u,.yui-ge .yui-g .yui-u,.yui-gf .yui-g .yui-u{width:49%;*width:48.1%;*margin-left:0;}.yui-g .yui-gb div.first,.yui-gb .yui-gb div.first{*margin-right:0;*width:32%;_width:31.7%;}.yui-g .yui-gc div.first,.yui-gd .yui-g{width:66%;}.yui-gb .yui-g div.first{*margin!
-right:4%;_margin-right:1.3%;}.yui-gb .yui-gc div.first,.yui-gb .yui-gd div.first{*margin-right:0;}.yui-gb .yui-gb .yui-u,.yui-gb .yui-gc .yui-u{*margin-left:1.8%;_margin-left:4%;}.yui-g .yui-gb .yui-u{_margin-left:1.0%;}.yui-gb .yui-gd .yui-u{*width:66%;_width:61.2%;}.yui-gb .yui-gd div.first{*width:31%;_width:29.5%;}.yui-g .yui-gc .yui-u,.yui-gb .yui-gc .yui-u{width:32%;_float:right;margin-right:0;_margin-left:0;}.yui-gb .yui-gc div.first{width:66%;*float:left;*margin-left:0;}.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf .yui-u{margin:0;}.yui-gb .yui-gb .yui-u{_margin-left:.7%;}.yui-gb .yui-g div.first,.yui-gb .yui-gb div.first{*margin-left:0;}.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u{*width:48.1%;*margin-left:0;}s .yui-gb .yui-gd div.first{width:32%;}.yui-g .yui-gd div.first{_width:29.9%;}.yui-ge .yui-g{width:24%;}.yui-gf .yui-g{width:74.2%;}.yui-gb .yui-ge div.yui-u,.yui-gb .yui-gf div.yui-u{float:right;}.yui-gb .yui-ge div.first,.yui-gb .yui-gf div.first{float:left;}.yui-gb!
.yui-ge .yui-u,.yui-gb .yui-gf div.first{*width:24%;_width:20%;}.yui-
gb .yui-ge div.first,.yui-gb .yui-gf .yui-u{*width:73.5%;_width:65.5%;}.yui-ge div.first .yui-gd .yui-u{width:65%;}.yui-ge div.first .yui-gd div.first{width:32%;}#bd:after,.yui-g:after,.yui-gb:after,.yui-gc:after,.yui-gd:after,.yui-ge:after,.yui-gf:after{content:".";display:block;height:0;clear:both;visibility:hidden;}#bd,.yui-g,.yui-gb,.yui-gc,.yui-gd,.yui-ge,.yui-gf{zoom:1;}
\ No newline at end of file
Property changes on: trunk/sandbox/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/reset-fonts-grids.css
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx
===================================================================
--- trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-02-27 20:24:32 UTC (rev 12782)
+++ trunk/sandbox/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-02-28 01:03:08 UTC (rev 12783)
@@ -6,12 +6,44 @@
xmlns:u=" http://ajax4jsf.org/cdk/u"
xmlns:x=" http://ajax4jsf.org/cdk/x"
class="org.richfaces.renderkit.html.PageRenderer"
- baseclass="org.ajax4jsf.renderkit.AjaxComponentRendererBase"
+ baseclass="org.richfaces.renderkit.AbstractPageRenderer"
component="org.richfaces.component.UIPage"
>
+ <h:styles>css/grids.css</h:styles>
<f:clientid var="clientId"/>
- <div id="#{clientId}"
- x:passThruWithExclusions="value,name,type,id"
+ <c:set var="namespace" value="#{this:prolog(context,component)}"/>
+ <html x:xmlns="#{namespace}" x:lang="#{context.viewRoot.locale}"
>
- </div>
+ <head>
+ <title>#{component.attributes['pageTitle']}</title>
+ <f:call name="styles"/>
+ <u:insertFacet name="pageHeader"/>
+ </head>
+ <body x:passThruWithExclusions="value,name,type,id">
+ <div id="doc3" class="#{this:documentClass(context,component)}">
+ <u:insertFacet name="header">
+ <div id="hd" x:class="#{component.attributes['headerClass']}">
+ <u:insertChild/>
+ </div>
+ </u:insertFacet>
+ <div id="bd">
+ <u:insertFacet name="sidebar">
+ <div class="yui-b">
+ <u:insertChild/>
+ </div>
+ </u:insertFacet>
+ <div class="yui-main">
+ <div class="yui-b #{component.attributes['bodyClass']}">
+ <u:insertChildren/>
+ </div>
+ </div>
+ </div>
+ <u:insertFacet name="footer">
+ <div id="ft" x:class="#{component.attributes['footerClass']}">
+ <u:insertChild/>
+ </div>
+ </u:insertFacet>
+ </div>
+ </body>
+ </html>
</f:root>
\ No newline at end of file
15 years, 9 months
JBoss Rich Faces SVN: r12782 - in trunk/framework/impl/src/main/javascript: prototype and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2009-02-27 15:24:32 -0500 (Fri, 27 Feb 2009)
New Revision: 12782
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
trunk/framework/impl/src/main/javascript/prototype/prototype-1.6.0.3.js
Log:
https://jira.jboss.org/jira/browse/RF-3745
https://jira.jboss.org/jira/browse/RF-4030
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2009-02-27 20:00:01 UTC (rev 12781)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2009-02-27 20:24:32 UTC (rev 12782)
@@ -1066,27 +1066,42 @@
var oldDocOpen = window.document.open;
if (isIE) {
LOG.debug("setup custom document.open method");
- window.document.open = function() {
- oldDocOpen.apply(this, arguments);
+ window.document.open = function(sUrl, sName, sFeatures, bReplace) {
+ oldDocOpen(sUrl, sName, sFeatures, bReplace);
}
}
// /maksimkaszynski
window.setTimeout(function() {
var isDocOpen=false;
try {
- window.document.open(req.getContentType(),true);
- LOG.debug("window.document has opened for writing");
+ var contentType = req.getContentType();
+ var responseText = isIE ?
+ req.getResponseText().replace(/(<script(?!\s+src=))/igm, "$1 defer ") :
+ req.getResponseText();
+
+ window.document.open(contentType, "replace");
+ if (window.LOG) {
+ LOG.debug("window.document has opened for writing");
+ }
isDocOpen=true;
- window.document.write(req.getResponseText());
- LOG.debug("window.document has been writed");
+
+ window.document.write(responseText);
+
+ if (window.LOG) {
+ LOG.debug("window.document has been writed");
+ }
window.document.close();
- LOG.debug("window.document has been closed for writing");
+ if (window.LOG) {
+ LOG.debug("window.document has been closed for writing");
+ }
if(isIE){
// For Ie , scripts on page not activated.
window.location.reload(false);
}
} catch(e) {
- LOG.debug("exception during write page content "+e.Message);
+ if (window.LOG) {
+ LOG.debug("exception during write page content "+e.Message);
+ }
if(isDocOpen){
window.document.close();
}
@@ -1094,12 +1109,16 @@
// Use dom manipulation instead.
var oDomDoc = (new DOMParser()).parseFromString(req.getResponseText(), "text/xml");
if(Sarissa.getParseErrorText(oDomDoc) == Sarissa.PARSED_OK){
- LOG.debug("response has parsed as DOM documnet.");
+ if (window.LOG) {
+ LOG.debug("response has parsed as DOM documnet.");
+ }
Sarissa.clearChildNodes(window.document.documentElement);
var docNodes = oDomDoc.documentElement.childNodes;
for(var i = 0;i<docNodes.length;i++){
if(docNodes[i].nodeType == 1){
- LOG.debug("append new node in document");
+ if (window.LOG) {
+ LOG.debug("append new node in document");
+ }
var node = window.document.importNode(docNodes[i], true);
window.document.documentElement.appendChild(node);
}
@@ -1109,13 +1128,17 @@
// window.RichFaces.Memory.clean(oldnode);
//}
} else {
- LOG.error("Error parsing response",Sarissa.getParseErrorText(oDomDoc));
+ if (window.LOG) {
+ LOG.error("Error parsing response",Sarissa.getParseErrorText(oDomDoc));
+ }
}
// TODO - scripts reloading ?
} finally {
window.document.open = oldDocOpen;
}
- LOG.debug("page content has been replaced");
+ if (window.LOG) {
+ LOG.debug("page content has been replaced");
+ }
},0);
}
Modified: trunk/framework/impl/src/main/javascript/prototype/prototype-1.6.0.3.js
===================================================================
--- trunk/framework/impl/src/main/javascript/prototype/prototype-1.6.0.3.js 2009-02-27 20:00:01 UTC (rev 12781)
+++ trunk/framework/impl/src/main/javascript/prototype/prototype-1.6.0.3.js 2009-02-27 20:24:32 UTC (rev 12782)
@@ -4155,12 +4155,18 @@
if (document.readyState != "complete") { // added by Pavel Yaschenko
document.write("<script id=__onDOMContentLoaded defer src=//:><\/script>");
- $("__onDOMContentLoaded").onreadystatechange = function() {
- if (this.readyState == "complete") {
- this.onreadystatechange = null;
- fireContentLoadedEvent();
- }
- };
+ var contentLoadedScript = $("__onDOMContentLoaded");
+
+ //modified by Nick Belaevski - RF-3745
+ if (contentLoadedScript) {
+ contentLoadedScript.onreadystatechange = function() {
+ if (this.readyState == "complete") {
+ this.onreadystatechange = null;
+ fireContentLoadedEvent();
+ }
+ };
+ }
+ //modified by Nick Belaevski
} // added by Pavel Yaschenko
}
})();
15 years, 9 months
JBoss Rich Faces SVN: r12781 - in trunk/ui: dataTable/src/main/config/component and 23 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: SergeySmirnov
Date: 2009-02-27 15:00:01 -0500 (Fri, 27 Feb 2009)
New Revision: 12781
Modified:
trunk/ui/calendar/src/main/config/component/calendar.xml
trunk/ui/dataTable/src/main/config/component/column.xml
trunk/ui/dataTable/src/main/config/component/dataGrid.xml
trunk/ui/dataTable/src/main/config/component/dataTable.xml
trunk/ui/dataTable/src/main/config/component/subTable.xml
trunk/ui/datascroller/src/main/config/component/datascroller.xml
trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml
trunk/ui/extendedDataTable/src/main/config/component/ExtendedDataTable.xml
trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml
trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
trunk/ui/menu-components/src/main/config/component/menucomponents.xml
trunk/ui/message/src/main/config/component/message.xml
trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
trunk/ui/orderingList/src/main/config/component/orderinglist.xml
trunk/ui/panel/src/main/config/component/panel.xml
trunk/ui/panelbar/src/main/config/component/panelbar.xml
trunk/ui/pickList/src/main/config/component/picklist.xml
trunk/ui/progressBAR/src/main/config/component/progressBar.xml
trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
trunk/ui/simpleTogglePanel/src/main/config/component/simpleTogglePanel.xml
trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml
trunk/ui/tabPanel/src/main/config/component/tabPanel.xml
trunk/ui/togglePanel/src/main/config/component/togglePanel.xml
trunk/ui/toolBar/src/main/config/component/toolBar.xml
trunk/ui/tooltip/src/main/config/component/toolTip.xml
trunk/ui/tree/src/main/config/component/tree.xml
trunk/ui/tree/src/main/config/component/treeNode.xml
Log:
facets meta data has been added
Modified: trunk/ui/calendar/src/main/config/component/calendar.xml
===================================================================
--- trunk/ui/calendar/src/main/config/component/calendar.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/calendar/src/main/config/component/calendar.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -22,6 +22,30 @@
<description>
The <rich:calendar> component is a UI control used for creating graphical monthly calendar on a page.
</description>
+ <facet>
+ <name>header</name>
+ <description>Redefines calendar header. Related attribute is "showHeader"</description>
+ </facet>
+ <facet>
+ <name>footer</name>
+ <description>Redefines calendar footer. Related attribute is "showFooter"</description>
+ </facet>
+ <facet>
+ <name>optionalHeader</name>
+ <description>Defines calendar's optional header</description>
+ </facet>
+ <facet>
+ <name>optionalFooter</name>
+ <description>Defines calendar's optional footer</description>
+ </facet>
+ <facet>
+ <name>weekNumber</name>
+ <description>Redefines week number</description>
+ </facet>
+ <facet>
+ <name>weekDay</name>
+ <description>Redefines names of the week days. Related attributes are "weekDayLabels" and "weekDayLabelsShort"</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.CalendarRenderer</name>
<template>org/richfaces/htmlCalendar.jspx</template>
Modified: trunk/ui/dataTable/src/main/config/component/column.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/column.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/dataTable/src/main/config/component/column.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -17,6 +17,14 @@
<description>
<![CDATA[The <rich:column> component for row rendering for a UIData component.]]>
</description>
+ <facet>
+ <name>header</name>
+ <description>Defines the header content</description>
+ </facet>
+ <facet>
+ <name>footer</name>
+ <description>Defines the footer content</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.renderkit.CellRenderer</name>
<classname>org.richfaces.renderkit.CellRenderer</classname>
Modified: trunk/ui/dataTable/src/main/config/component/dataGrid.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/dataGrid.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/dataTable/src/main/config/component/dataGrid.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -15,6 +15,18 @@
<description>
<![CDATA[The <rich:dataGrid> component to render data as a grid that allows choosing data from a model and obtains built-in support of Ajax updates.]]>
</description>
+ <facet>
+ <name>header</name>
+ <description>Defines the header content</description>
+ </facet>
+ <facet>
+ <name>footer</name>
+ <description>Defines the footer content</description>
+ </facet>
+ <facet>
+ <name>caption</name>
+ <description>Defines the caption content</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.DataGridRenderer</name>
<template>org/richfaces/htmlDataGrid.jspx</template>
Modified: trunk/ui/dataTable/src/main/config/component/dataTable.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/dataTable.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/dataTable/src/main/config/component/dataTable.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -15,6 +15,18 @@
<description>
<![CDATA[The <rich:dataTable> component for tables rendering that allows choosing data from a model and obtains built-in support of Ajax updates.]]>
</description>
+ <facet>
+ <name>header</name>
+ <description>Defines the header content</description>
+ </facet>
+ <facet>
+ <name>footer</name>
+ <description>Defines the footer content</description>
+ </facet>
+ <facet>
+ <name>caption</name>
+ <description>Defines the caption content</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.DataTableRenderer</name>
<template>org/richfaces/htmlDataTable.jspx</template>
Modified: trunk/ui/dataTable/src/main/config/component/subTable.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/component/subTable.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/dataTable/src/main/config/component/subTable.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -15,6 +15,14 @@
<description>
<![CDATA[The <rich:subTable> component is used for inserting subtables into tables with opportunity to choose data from a model and built-in Ajax updates support.]]>
</description>
+ <facet>
+ <name>header</name>
+ <description>Defines the header content</description>
+ </facet>
+ <facet>
+ <name>footer</name>
+ <description>Defines the footer content</description>
+ </facet>
<renderer generate="false" override="false">
<name>org.richfaces.SubTableRenderer</name>
<classname>org.richfaces.renderkit.html.SubTableRenderer</classname>
Modified: trunk/ui/datascroller/src/main/config/component/datascroller.xml
===================================================================
--- trunk/ui/datascroller/src/main/config/component/datascroller.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/datascroller/src/main/config/component/datascroller.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -18,7 +18,54 @@
<description>
The <rich:datascroller> component is designed for providing the functionality of tables scrolling using Ajax requests.
</description>
-
+ <facet>
+ <name>controlSeparator</name>
+ <description>Redefines optional separators between controls</description>
+ </facet>
+ <facet>
+ <name>first</name>
+ <description>Redefines the "first" button with the content set</description>
+ </facet>
+ <facet>
+ <name>first_disabled</name>
+ <description>Redefines the disabled "first" button with the content set</description>
+ </facet>
+ <facet>
+ <name>last</name>
+ <description>Redefines the "last" button with the content set</description>
+ </facet>
+ <facet>
+ <name>last_disabled</name>
+ <description>Redefines the disabled "last" button with the content set</description>
+ </facet>
+ <facet>
+ <name>fastrewind</name>
+ <description>Redefines the "fastrewind" button with the content set</description>
+ </facet>
+ <facet>
+ <name>fastrewind_disabled</name>
+ <description>Redefines the disabled "fastrewind" button with the content set</description>
+ </facet>
+ <facet>
+ <name>previous</name>
+ <description>Redefines the "previous" button with the content set</description>
+ </facet>
+ <facet>
+ <name>previous_disabled</name>
+ <description>Redefines the disabled "previous" button with the content set</description>
+ </facet>
+ <facet>
+ <name>next</name>
+ <description>Redefines the "next" button with the content set</description>
+ </facet>
+ <facet>
+ <name>next_disabled</name>
+ <description>Redefines the disabled "next" button with the content set</description>
+ </facet>
+ <facet>
+ <name>pages</name>
+ <description>Redefines the pages buttons with the content set</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.DataScrollerRenderer</name>
<template>org/richfaces/htmlDatascroller.jspx</template>
Modified: trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml
===================================================================
--- trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/dropdown-menu/src/main/config/component/dropdownmenu.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -15,7 +15,14 @@
<description>
The <rich:dropDownMenu> component is used for creating multilevel drop-down menus.
</description>
-
+ <facet>
+ <name>label</name>
+ <description>Redefines the content set of label</description>
+ </facet>
+ <facet>
+ <name>labelDisabled</name>
+ <description>Redefines the content set of disabled label</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.DropDownMenuRenderer</name>
<template>org/richfaces/htmlDropDownMenu.jspx</template>
Modified: trunk/ui/extendedDataTable/src/main/config/component/ExtendedDataTable.xml
===================================================================
--- trunk/ui/extendedDataTable/src/main/config/component/ExtendedDataTable.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/extendedDataTable/src/main/config/component/ExtendedDataTable.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -12,6 +12,18 @@
<classname>org.richfaces.component.html.HtmlExtendedDataTableComponentTest</classname>
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
+ <facet>
+ <name>header</name>
+ <description>Defines the header content</description>
+ </facet>
+ <facet>
+ <name>footer</name>
+ <description>Defines the footer content</description>
+ </facet>
+ <facet>
+ <name>caption</name>
+ <description>Defines the caption content</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.ExtendedDataTableRenderer</name>
<template>org/richfaces/htmlExtendedDataTable.jspx</template>
Modified: trunk/ui/fileUpload/src/main/config/component/fileUpload.xml
===================================================================
--- trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/fileUpload/src/main/config/component/fileUpload.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -40,6 +40,14 @@
<classname>org.richfaces.component.html.HtmlFileUploadComponentTestCase</classname>
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
+ <facet>
+ <name>label</name>
+ <description>Defines the information regarding the ongoing process</description>
+ </facet>
+ <facet>
+ <name>progress</name>
+ <description>Defines the information regarding the uploading process</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.renderkit.html.FileUploadRenderer</name>
<template>org/richfaces/fileUpload.jspx</template>
Modified: trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml
===================================================================
--- trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/inplaceInput/src/main/config/component/inplaceinput.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -17,6 +17,10 @@
<description>
The <rich:inplaceInput> is an input component used for displaying and editing data inputted.
</description>
+ <facet>
+ <name>controls</name>
+ <description>Defines the contols contents. Related attributes are "saveControlIcon" and "cancelControlIcon"</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.renderkit.InplaceInputRenderer</name>
<template>inplaceinput.jspx</template>
Modified: trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml
===================================================================
--- trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/inplaceSelect/src/main/config/component/inplaceselect.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -15,6 +15,10 @@
<description> The <rich:inplaceSelect> is used for creation select
based inputs: it shows the value as text in one state and enables
editing the value, providing a list of options in another state. </description>
+ <facet>
+ <name>controls</name>
+ <description>Defines the contols contents. Related attributes are "saveControlIcon" and "cancelControlIcon"</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.renderkit.InplaceSelectRenderer</name>
<template>inplaceselect.jspx</template>
Modified: trunk/ui/listShuttle/src/main/config/component/listShuttle.xml
===================================================================
--- trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -15,6 +15,42 @@
<description>
The <rich:listShuttle> component is used for moving chosen items from one list into another with their optional reordering there.
</description>
+ <facet>
+ <name>copyAllControl</name>
+ <description>Redefines the label content for the "copyAll" control. Related attribute is "copyAllControlLabel"</description>
+ </facet>
+ <facet>
+ <name>removeAllControl</name>
+ <description>Redefines the label content for the "removeAll" control. Related attribute is "removeAllControlLabel"</description>
+ </facet>
+ <facet>
+ <name>copyControl</name>
+ <description>Redefines the label content for the "copy" control. Related attribute is "copyControlLabel"</description>
+ </facet>
+ <facet>
+ <name>removeControl</name>
+ <description>Redefines the label content for the "remove" control. Related attribute is "removeControlLabel"</description>
+ </facet>
+ <facet>
+ <name>copyAllControlDisabled</name>
+ <description>Redefines the disabled label content for the "copyAll" control</description>
+ </facet>
+ <facet>
+ <name>removeAllControlDisabled</name>
+ <description>Redefines the disabled label content for the "removeAll" control</description>
+ </facet>
+ <facet>
+ <name>caption</name>
+ <description>Redefines the caption control</description>
+ </facet>
+ <facet>
+ <name>sourceCaption</name>
+ <description>Defines source list caption representation text. Related attribute is "sourceCaptionLabel"</description>
+ </facet>
+ <facet>
+ <name>targetCaption</name>
+ <description>Defines source list target representation text. Related attribute is "targetCaptionLabel"</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.ListShuttleRenderer</name>
<template>org/richfaces/htmlListShuttle.jspx</template>
Modified: trunk/ui/menu-components/src/main/config/component/menucomponents.xml
===================================================================
--- trunk/ui/menu-components/src/main/config/component/menucomponents.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/menu-components/src/main/config/component/menucomponents.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -15,7 +15,14 @@
<description>
<![CDATA[The <rich:menuGroup> component is used to define an expandable group of items inside a pop-up list or another group.]]>
</description>
-
+ <facet>
+ <name>icon</name>
+ <description>Redefines the icon for the enabled item state. Related attribute is "icon"</description>
+ </facet>
+ <facet>
+ <name>iconFolder</name>
+ <description>Redefines the folder icon for the enabled item state. Related attribute is "iconFolder"</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.MenuGroupRenderer</name>
<template>org/richfaces/htmlMenuGroup.jspx</template>
@@ -173,7 +180,14 @@
<description>
<![CDATA[The <rich:menuItem> component is used for the definition of a single item inside a pop-up list.]]>
</description>
-
+ <facet>
+ <name>icon</name>
+ <description>Redefines the icon for the enabled item state. Related attribute is "icon"</description>
+ </facet>
+ <facet>
+ <name>iconFolder</name>
+ <description>Redefines the folder icon for the enabled item state. Related attribute is "iconFolder"</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.MenuItemRenderer</name>
<template>org/richfaces/htmlMenuItem.jspx</template>
Modified: trunk/ui/message/src/main/config/component/message.xml
===================================================================
--- trunk/ui/message/src/main/config/component/message.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/message/src/main/config/component/message.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -19,7 +19,26 @@
<description>
<![CDATA[ The <rich:message> component is used for rendering a single message for a specific component. ]]>
</description>
-
+ <facet>
+ <name>errorMarker</name>
+ <description>Redefines the content for the marker if there is message with a severity class of "ERROR"</description>
+ </facet>
+ <facet>
+ <name>fatalError</name>
+ <description>Redefines the content for the marker if there is message with a severity class of "FATAL"</description>
+ </facet>
+ <facet>
+ <name>infoError</name>
+ <description>Redefines the content for the marker if there is message with a severity class of "INFO"</description>
+ </facet>
+ <facet>
+ <name>warnError</name>
+ <description>Redefines the content for the marker if there is message with a severity class of "WARN"</description>
+ </facet>
+ <facet>
+ <name>passedError</name>
+ <description>Redefines the content for the marker if there is no message</description>
+ </facet>
<renderer generate="false" override="true">
<name>org.richfaces.RichMessageRenderer</name>
<classname>org.richfaces.renderkit.html.HtmlRichMessageRenderer</classname>
@@ -280,6 +299,26 @@
<description>
<![CDATA[The <rich:messages> component is similar to <rich:message> component but used for rendering all messages for the components.]]>
</description>
+ <facet>
+ <name>errorMarker</name>
+ <description>Redefines the content for the marker if there is message with a severity class of "ERROR"</description>
+ </facet>
+ <facet>
+ <name>fatalError</name>
+ <description>Redefines the content for the marker if there is message with a severity class of "FATAL"</description>
+ </facet>
+ <facet>
+ <name>infoError</name>
+ <description>Redefines the content for the marker if there is message with a severity class of "INFO"</description>
+ </facet>
+ <facet>
+ <name>warnError</name>
+ <description>Redefines the content for the marker if there is message with a severity class of "WARN"</description>
+ </facet>
+ <facet>
+ <name>passedError</name>
+ <description>Redefines the content for the marker if there is no message</description>
+ </facet>
<renderer generate="false" override="true">
<name>org.richfaces.RichMessagesRenderer</name>
Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
===================================================================
--- trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -16,6 +16,14 @@
<![CDATA[The <rich:modalPanel> component implements a modal dialog window.
All operations in the main application window are locked out while this window is active. Opening and closing the window is done through client JavaScript code.]]>
</description>
+ <facet>
+ <name>header</name>
+ <description>Define the header content</description>
+ </facet>
+ <facet>
+ <name>controls</name>
+ <description>Defines the control elements on the header</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.ModalPanelRenderer</name>
<template>org/richfaces/htmlModalPanel.jspx</template>
Modified: trunk/ui/orderingList/src/main/config/component/orderinglist.xml
===================================================================
--- trunk/ui/orderingList/src/main/config/component/orderinglist.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/orderingList/src/main/config/component/orderinglist.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -15,7 +15,42 @@
<description>
<![CDATA[The <rich:orderingList> is a component for ordering items in a list. This component provides possibilities to reorder a list and sort it on the client side.]]>
</description>
-
+ <facet>
+ <name>caption</name>
+ <description>Redefines the caption content. Related attribute is "captionLabel"</description>
+ </facet>
+ <facet>
+ <name>topControl</name>
+ <description>Redefines the label for the "Top" control. Related attribute is "topControlLabel"</description>
+ </facet>
+ <facet>
+ <name>bottomControl</name>
+ <description>Redefines the label for the "Bottom" control. Related attribute is "bottomControlLabel"</description>
+ </facet>
+ <facet>
+ <name>upControl</name>
+ <description>Redefines the label for the "Up" control. Related attribute is "upControlLabel"</description>
+ </facet>
+ <facet>
+ <name>downControl</name>
+ <description>Redefines the label for the "Down" control. Related attribute is "downControlLabel"</description>
+ </facet>
+ <facet>
+ <name>topControlDisabled</name>
+ <description>Redefines the disabled label for the "Top" control</description>
+ </facet>
+ <facet>
+ <name>bottomControlDisabled</name>
+ <description>Redefines the disabled label for the "Bottom" control</description>
+ </facet>
+ <facet>
+ <name>upControlDisabled</name>
+ <description>Redefines the disabled label for the "Up" control</description>
+ </facet>
+ <facet>
+ <name>downControlDisabled</name>
+ <description>Redefines the disabled label for the "Down" control</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.OrderingListRenderer</name>
<template>org/richfaces/htmlOrderingList.jspx</template>
Modified: trunk/ui/panel/src/main/config/component/panel.xml
===================================================================
--- trunk/ui/panel/src/main/config/component/panel.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/panel/src/main/config/component/panel.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -17,6 +17,10 @@
added using a facet with the attribute, name="header".
]]>
</description>
+ <facet>
+ <name>header</name>
+ <description>Defines the header content</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.PanelRenderer</name>
<template>panel.jspx</template>
Modified: trunk/ui/panelbar/src/main/config/component/panelbar.xml
===================================================================
--- trunk/ui/panelbar/src/main/config/component/panelbar.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/panelbar/src/main/config/component/panelbar.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -161,6 +161,10 @@
<classname>org.richfaces.component.html.HtmlPanelBarItemComponentTest</classname>
<superclassname>org.ajax4jsf.tests.AbstractAjax4JsfTestCase</superclassname>
</test>
+ <facet>
+ <name>label</name>
+ <description>defines the label text on the panel item header</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.PanelBarItemRenderer</name>
<template>panelBarItem.jspx</template>
Modified: trunk/ui/pickList/src/main/config/component/picklist.xml
===================================================================
--- trunk/ui/pickList/src/main/config/component/picklist.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/pickList/src/main/config/component/picklist.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -15,6 +15,42 @@
<description>
<![CDATA[The <rich:pickList> component is used for moving selected item(s) from one list into another. ]]>
</description>
+ <facet>
+ <name>copyAllControl</name>
+ <description>Redefines the label content for the "copyAll" control. Related attribute is "copyAllControlLabel"</description>
+ </facet>
+ <facet>
+ <name>removeAllControl</name>
+ <description>Redefines the label content for the "removeAll" control. Related attribute is "removeAllControlLabel"</description>
+ </facet>
+ <facet>
+ <name>copyControl</name>
+ <description>Redefines the label content for the "copy" control. Related attribute is "copyControlLabel"</description>
+ </facet>
+ <facet>
+ <name>removeControl</name>
+ <description>Redefines the label content for the "remove" control. Related attribute is "removeControlLabel"</description>
+ </facet>
+ <facet>
+ <name>copyAllControlDisabled</name>
+ <description>Redefines the disabled label content for the "copyAll" control</description>
+ </facet>
+ <facet>
+ <name>removeAllControlDisabled</name>
+ <description>Redefines the disabled label content for the "removeAll" control</description>
+ </facet>
+ <facet>
+ <name>copyControlDisabled</name>
+ <description>Redefines the disabled "copy" label with the control set.</description>
+ </facet>
+ <facet>
+ <name>removeControlDisabled</name>
+ <description>Redefines the disabled "remove" label with the control set.</description>
+ </facet>
+ <facet>
+ <name>caption</name>
+ <description>Redefines the caption control</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.PickListRenderer</name>
<template>htmlPickList.jspx</template>
Modified: trunk/ui/progressBAR/src/main/config/component/progressBar.xml
===================================================================
--- trunk/ui/progressBAR/src/main/config/component/progressBar.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/progressBAR/src/main/config/component/progressBar.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -14,6 +14,14 @@
<description>
<![CDATA[The <rich:progressBar> component is designed for displaying a progress bar which shows the current status of the process. ]]>
</description>
+ <facet>
+ <name>initial</name>
+ <description>Defines the information content about the state of the process if the progress value is less or equal to "minValue"</description>
+ </facet>
+ <facet>
+ <name>complete</name>
+ <description>Defines the information content about the state of the process if the value is greater or equal to "maxValue"</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.renderkit.ProgressBarRenderer</name>
<template>org/richfaces/progressBar.jspx</template>
Modified: trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
===================================================================
--- trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -20,6 +20,14 @@
<![CDATA[The <rich:scrollableDataTable> component is used for the table-like component creation.
The component just adds the set of additional features described below in comparison with the standard table. ]]>
</description>
+ <facet>
+ <name>header</name>
+ <description>Defines the header content</description>
+ </facet>
+ <facet>
+ <name>footer</name>
+ <description>Defines the footer content</description>
+ </facet>
<test>
<classname>org.richfaces.component.html.HtmlScrollableDataTableComponentTest</classname>
<superclassname>org.richfaces.component.AbstractScrollableDataTableTestCase</superclassname>
Modified: trunk/ui/simpleTogglePanel/src/main/config/component/simpleTogglePanel.xml
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/config/component/simpleTogglePanel.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/simpleTogglePanel/src/main/config/component/simpleTogglePanel.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -17,6 +17,14 @@
corresponding toggleControl(the other will be hidden).
]]>
</description>
+ <facet>
+ <name>openMarker</name>
+ <description>Redefines the icon for expanding the panel</description>
+ </facet>
+ <facet>
+ <name>closeMarker</name>
+ <description>Redefines the icon for collapsing the panel</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.SimpleTogglePanelRenderer</name>
<template>simpleTogglePanel.jspx</template>
Modified: trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml
===================================================================
--- trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -26,7 +26,22 @@
for input element. If a user clicks on such a table row, its text (or value defined by fetchValue) is inserted as the value of the input field.
]]>
</description>
-
+ <facet>
+ <name>nothingLabel</name>
+ <description>Redefines the content item if the autocomplete returns empty list. Related attribute is "nothingLabel"</description>
+ </facet>
+ <facet>
+ <name>popup</name>
+ <description>Redefines the content for the popup list of the suggestion</description>
+ </facet>
+ <facet>
+ <name>header</name>
+ <description>Defines the header content</description>
+ </facet>
+ <facet>
+ <name>footer</name>
+ <description>Defines the footer content</description>
+ </facet>
<renderer generate="false" override="false">
<name>org.richfaces.SuggestionBox</name>
<classname>
Modified: trunk/ui/tabPanel/src/main/config/component/tabPanel.xml
===================================================================
--- trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/tabPanel/src/main/config/component/tabPanel.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -16,6 +16,10 @@
<![CDATA[A tab panel displaying tabs for grouping content of a panel.
]]>
</description>
+ <facet>
+ <name>label</name>
+ <description>Defines the text for the actual "tab" in a tab section</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.TabPanelRenderer</name>
<template>tabPanel.jspx</template>
Modified: trunk/ui/togglePanel/src/main/config/component/togglePanel.xml
===================================================================
--- trunk/ui/togglePanel/src/main/config/component/togglePanel.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/togglePanel/src/main/config/component/togglePanel.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -19,7 +19,6 @@
<![CDATA[A collapsible panel, which content is shown/hidden after activating a header control.
]]>
</description>
-
<renderer generate="true" override="true">
<name>org.richfaces.TogglePanelRenderer</name>
<template>togglePanel.jspx</template>
Modified: trunk/ui/toolBar/src/main/config/component/toolBar.xml
===================================================================
--- trunk/ui/toolBar/src/main/config/component/toolBar.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/toolBar/src/main/config/component/toolBar.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -13,7 +13,10 @@
<description>
<![CDATA[A horizontal bar with Action items on it that accepts any JSF components as children.]]>
</description>
-
+ <facet>
+ <name>itemSeparator</name>
+ <description>Defines the custom separator. Related attribute is "itemSeparator"</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.ToolBarRenderer</name>
<template>toolBar.jspx</template>
Modified: trunk/ui/tooltip/src/main/config/component/toolTip.xml
===================================================================
--- trunk/ui/tooltip/src/main/config/component/toolTip.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/tooltip/src/main/config/component/toolTip.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -17,6 +17,10 @@
<name>org.richfaces.renderkit.html.ToolTipRenderer</name>
<template>org/richfaces/htmltooltip.jspx</template>
</renderer-->
+ <facet>
+ <name>defaultContent</name>
+ <description>Defines the default content for toolTip. It is used only if mode = "ajax"</description>
+ </facet>
<renderer override="true">
<name>org.richfaces.renderkit.html.ToolTipRenderer</name>
<classname>org.richfaces.renderkit.html.ToolTipRenderer</classname>
Modified: trunk/ui/tree/src/main/config/component/tree.xml
===================================================================
--- trunk/ui/tree/src/main/config/component/tree.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/tree/src/main/config/component/tree.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -20,6 +20,22 @@
<description>
<![CDATA[The <rich:tree> component is designed for hierarchical data presentation and is applied for building a tree structure with a drag-and-drop capability.]]>
</description>
+ <facet>
+ <name>icon</name>
+ <description>Redefines the icon for node. Related attribute is "icon"</description>
+ </facet>
+ <facet>
+ <name>iconCollapsed</name>
+ <description>Redefines the icon for collapsed node. Related attribute is "iconCollapsed"</description>
+ </facet>
+ <facet>
+ <name>iconExpanded</name>
+ <description>Redefines the icon for expanded node. Related attribute is "iconExpanded"</description>
+ </facet>
+ <facet>
+ <name>iconLeaf</name>
+ <description>Redefines the icon for component leaves. Related attribute is "iconLeaf"</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.TreeRenderer</name>
<template>htmlTree.jspx</template>
Modified: trunk/ui/tree/src/main/config/component/treeNode.xml
===================================================================
--- trunk/ui/tree/src/main/config/component/treeNode.xml 2009-02-27 19:56:41 UTC (rev 12780)
+++ trunk/ui/tree/src/main/config/component/treeNode.xml 2009-02-27 20:00:01 UTC (rev 12781)
@@ -20,6 +20,22 @@
<description>
<![CDATA[The <rich:treeNode> component is designed for creating sets of tree elements within a <rich:tree> component.]]>
</description>
+ <facet>
+ <name>icon</name>
+ <description>Redefines the icon for node. Related attribute is "icon"</description>
+ </facet>
+ <facet>
+ <name>iconCollapsed</name>
+ <description>Redefines the icon for collapsed node. Related attribute is "iconCollapsed"</description>
+ </facet>
+ <facet>
+ <name>iconExpanded</name>
+ <description>Redefines the icon for expanded node. Related attribute is "iconExpanded"</description>
+ </facet>
+ <facet>
+ <name>iconLeaf</name>
+ <description>Redefines the icon for component leaves. Related attribute is "iconLeaf"</description>
+ </facet>
<renderer generate="true" override="true">
<name>org.richfaces.TreeNodeRenderer</name>
<template>htmlTreeNode.jspx</template>
15 years, 9 months
JBoss Rich Faces SVN: r12780 - trunk/samples/panelmenu-sample/src/main/webapp/pages.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-02-27 14:56:41 -0500 (Fri, 27 Feb 2009)
New Revision: 12780
Added:
trunk/samples/panelmenu-sample/src/main/webapp/pages/rf6338.jsp
Log:
https://jira.jboss.org/jira/browse/RF-6338
Added: trunk/samples/panelmenu-sample/src/main/webapp/pages/rf6338.jsp
===================================================================
--- trunk/samples/panelmenu-sample/src/main/webapp/pages/rf6338.jsp (rev 0)
+++ trunk/samples/panelmenu-sample/src/main/webapp/pages/rf6338.jsp 2009-02-27 19:56:41 UTC (rev 12780)
@@ -0,0 +1,29 @@
+<%@ 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://labs.jboss.com/jbossrichfaces/ui/panelmenu" prefix="pm"%>
+
+<html>
+ <head>
+ <style type="text/css">
+ </style>
+ </head>
+ <body>
+ <f:view>
+ <h:form>
+ <pm:panelMenu>
+ <pm:panelMenuGroup label="group 1">
+ <pm:panelMenuItem label="it 1.1" action="#{menu.item1Clicked}" />
+ <pm:panelMenuItem label="it 1.2" action="#{menu.item1Clicked}" />
+ <pm:panelMenuItem label="it 1.3" action="#{menu.item1Clicked}" />
+ </pm:panelMenuGroup>
+ <pm:panelMenuGroup label="group 2">
+ <pm:panelMenuItem label="it 2.1" action="#{menu.item1Clicked}" />
+ <pm:panelMenuItem label="it 2.2" action="#{menu.item1Clicked}" />
+ <pm:panelMenuItem label="it 2.3" action="#{menu.item1Clicked}" />
+ </pm:panelMenuGroup>
+ </pm:panelMenu>
+ </h:form>
+ </f:view>
+ </body>
+</html>
\ No newline at end of file
15 years, 9 months
JBoss Rich Faces SVN: r12779 - in trunk/ui/panelmenu/src/main/java/org/richfaces: renderkit/html and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2009-02-27 14:55:31 -0500 (Fri, 27 Feb 2009)
New Revision: 12779
Modified:
trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java
trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java
trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java
Log:
https://jira.jboss.org/jira/browse/RF-6338
Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java
===================================================================
--- trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java 2009-02-27 19:17:11 UTC (rev 12778)
+++ trunk/ui/panelmenu/src/main/java/org/richfaces/component/UIPanelMenuGroup.java 2009-02-27 19:55:31 UTC (rev 12779)
@@ -43,6 +43,11 @@
public static final String EXPAND_MODE_SERVER = "server";
public static final String EXPAND_MODE_NONE = "none";
+ /*
+ * It is same as "none" if you don't set expand mode
+ * */
+ public static final String EXPAND_MODE_EMPTY = "";
+
public abstract String getStyleClass();
public abstract void setStyleClass(String styleClass);
@@ -74,6 +79,7 @@
public abstract String getIconStyle();
public abstract void setIconStyle(String iconStyle);
public abstract String getOncollapse();
+
public abstract void setOncollapse(String ongroupcollapse);
public abstract String getOnexpand();
public abstract void setOnexpand(String ongroupexpand);
@@ -164,6 +170,11 @@
super.broadcast(event);
}
}
-
+ public boolean isNoneExpandMode() {
+ String trimedMode = this.getExpandMode().trim().toLowerCase();
+ return EXPAND_MODE_NONE.equals(trimedMode)
+ || EXPAND_MODE_EMPTY.equals(trimedMode);
+ }
+
}
Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java
===================================================================
--- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2009-02-27 19:17:11 UTC (rev 12778)
+++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2009-02-27 19:55:31 UTC (rev 12779)
@@ -323,8 +323,7 @@
public void renderChildren(FacesContext facesContext, UIComponent component)
throws IOException {
- String mode = ((UIPanelMenuGroup) component).getExpandMode();
- if (UIPanelMenuGroup.EXPAND_MODE_NONE.equalsIgnoreCase(mode)
+ if (((UIPanelMenuGroup) component).isNoneExpandMode()
|| isOpened(facesContext, component)) {
super.renderChildren(facesContext, component);
}
Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java
===================================================================
--- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2009-02-27 19:17:11 UTC (rev 12778)
+++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2009-02-27 19:55:31 UTC (rev 12779)
@@ -126,7 +126,7 @@
}
boolean childRendered = child.isRendered();
- if (!childRendered || !parentRendered || isParentDisabled(child) || !isParentExpended(child)) {
+ if (!childRendered || !parentRendered || isParentDisabled(child)/* || !isParentExpended(child)*/) {
continue;
}
@@ -221,29 +221,26 @@
}
private String getHoverClass(UIPanelMenu panelMenu, UIComponent child) {
+ String hoveredClass = (child instanceof UIPanelMenuGroup ?
+ panelMenu.getHoveredGroupClass() : panelMenu.getHoveredItemClass())
+ + " " + (child instanceof UIPanelMenuGroup ?
+ ((UIPanelMenuGroup)child).getHoverClass() : ((UIPanelMenuItem)child).getHoverClass());
+ String [] hoveredClasses = hoveredClass.trim().split(" ");
+
StringBuffer buffer = new StringBuffer();
-
+
buffer.append("new Array(");
- if (child instanceof UIPanelMenuGroup) {
- String hoveredGroupClass = panelMenu.getHoveredGroupClass();
- if (!"".equals(hoveredGroupClass)) {
- buffer.append("\"").append(hoveredGroupClass).append("\"");
+ for (int i = 0; i < hoveredClasses.length; i++) {
+ if (!"".equals(hoveredClasses[i])) {
+ buffer.append("\"").append(hoveredClasses[i]).append("\"");
+
+ if (i != hoveredClasses.length - 1){
+ buffer.append(",");
+ }
}
- } else {
- String hoveredItemClass = panelMenu.getHoveredItemClass();
- if (!"".equals(hoveredItemClass)) {
- buffer.append("\"").append(hoveredItemClass).append("\"");
- }
-
- buffer.append(",");
-
- String hoverClass = child instanceof UIPanelMenuGroup
- ? ((UIPanelMenuGroup)child).getHoverClass() : ((UIPanelMenuItem)child).getHoverClass();
- if (!"".equals(hoverClass)) {
- buffer.append("\"").append(hoverClass).append("\"");
- }
}
buffer.append("),");
+
return buffer.toString();
}
15 years, 9 months
JBoss Rich Faces SVN: r12778 - in trunk/test-applications/realworld2/web/src/main: java/org/richfaces/realworld/tagClound and 4 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: andrei_exadel
Date: 2009-02-27 14:17:11 -0500 (Fri, 27 Feb 2009)
New Revision: 12778
Added:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tagClound/
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tagClound/TagCloudBean.java
trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/
trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/tagCloud.xhtml
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css
Log:
Tag cloud
Added: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tagClound/TagCloudBean.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tagClound/TagCloudBean.java (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tagClound/TagCloudBean.java 2009-02-27 19:17:11 UTC (rev 12778)
@@ -0,0 +1,68 @@
+/**
+ *
+ */
+package org.richfaces.realworld.tagClound;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.faces.event.ActionEvent;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Out;
+import org.jboss.seam.annotations.Scope;
+
+
+/**
+ * Tag cloud backing bean
+ * @author Andrey Markavtsov
+ *
+ */
+
+@Name("tagCloudBean")
+(a)Scope(ScopeType.CONVERSATION)
+public class TagCloudBean {
+
+ /** Min possible rank for tag */
+ static final int MIN_RANK = 0;
+
+ /** Max possible rank for tag */
+ static final int MAX_RANK = 100;
+
+ /** Scope of existed css classes for each rank. Should be defined ordered ASC by rank */
+ static final String [] TAG_CSS_CLASSSES = new String []
+ {"tag-cloud-rank1", "tag-cloud-rank2",
+ "tag-cloud-rank3", "tag-cloud-rank4",
+ "tag-cloud-rank5", "tag-cloud-rank6",
+ "tag-cloud-rank7" } ;
+
+ /** Count of possible ranks' css classes */
+ static final int TAG_RANK_LEVELS_COUNT = TAG_CSS_CLASSSES.length;
+
+ /** Defines the step to the neighbouring rank */
+ int RANK_LEVEL_STEP = (MAX_RANK ) / TAG_RANK_LEVELS_COUNT;;
+
+
+
+ /**
+ * Calculates css class name for tag with rank defined
+ * @param rank - tags rank
+ * @return css class name
+ */
+ public String getTagCssClass(Integer rank) {
+ int i = rank / RANK_LEVEL_STEP;
+ return TAG_CSS_CLASSSES[i];
+ }
+
+
+
+ /**
+ * Action listener for tag click
+ * @param event
+ */
+ public void processTagClick(ActionEvent event) {
+ // TODO: implement this
+ }
+
+}
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/tagCloud.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/tagCloud.xhtml (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/tagCloud/tagCloud.xhtml 2009-02-27 19:17:11 UTC (rev 12778)
@@ -0,0 +1,17 @@
+<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:c="http://java.sun.com/jstl/core"
+ xmlns:rich="http://richfaces.org/rich">
+ <a4j:outputPanel layout="block" style="width: 200px">
+ <h:form>
+ <c:forEach items="#{tagList.tagMap}" var="tag">
+ <a4j:commandLink value="#{tag.key}"
+ actionListener="#{tagCloudBean.processTagClick(tag.key)}"
+ styleClass="#{tagCloudBean.getTagCssClass(tag.value)}"></a4j:commandLink>
+ </c:forEach>
+ </h:form>
+ </a4j:outputPanel>
+</ui:composition>
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-02-27 18:42:35 UTC (rev 12777)
+++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-02-27 19:17:11 UTC (rev 12778)
@@ -244,4 +244,47 @@
z-index: 3;
left: 50%;
top: 40px;
-}
\ No newline at end of file
+}
+
+.tag-cloud-rank1 {
+ text-decoration: none;
+ font-size: 8px;
+ color: gray;
+}
+
+.tag-cloud-rank2 {
+ text-decoration: none;
+ font-size: 9px;
+ color: yellow;
+}
+
+.tag-cloud-rank3 {
+ text-decoration: none;
+ font-size: 10px;
+ color: blue;
+}
+
+.tag-cloud-rank4 {
+ text-decoration: none;
+ font-size: 11px;
+ color: green;
+}
+
+.tag-cloud-rank5 {
+ text-decoration: none;
+ font-size: 12px;
+ color: brown;
+}
+
+.tag-cloud-rank6 {
+ text-decoration: none;
+ font-size: 14px;
+ color: red;
+}
+
+.tag-cloud-rank7 {
+ text-decoration: none;
+ font-size: 18px;
+ color: black;
+}
+
15 years, 9 months
JBoss Rich Faces SVN: r12777 - trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service.
by richfaces-svn-commits@lists.jboss.org
Author: andrei_exadel
Date: 2009-02-27 13:42:35 -0500 (Fri, 27 Feb 2009)
New Revision: 12777
Added:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ISearchAction.java
Modified:
trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java
Log:
Search Service
Added: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ISearchAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ISearchAction.java (rev 0)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/ISearchAction.java 2009-02-27 18:42:35 UTC (rev 12777)
@@ -0,0 +1,18 @@
+package org.richfaces.realworld.service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.richfaces.realworld.domain.Album;
+import org.richfaces.realworld.domain.Image;
+
+public interface ISearchAction {
+ public List<Image> searchByImage(String name, String description, String path, Integer width, Integer height, Integer size, Date createdDate, Date uploadedDate);
+
+ public List<Image> searchByTags(Map<String, String> params);
+
+ public List<Album> searchByAlbum(String name, String description, String ownerName, boolean shared );
+
+ public List<Image> searchByUsers(Map<String, String> params);
+}
Modified: trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java
===================================================================
--- trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java 2009-02-27 18:42:30 UTC (rev 12776)
+++ trunk/test-applications/realworld2/ejb/src/main/java/org/richfaces/realworld/service/SearchAction.java 2009-02-27 18:42:35 UTC (rev 12777)
@@ -1,10 +1,12 @@
package org.richfaces.realworld.service;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
+import javax.persistence.Query;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
@@ -15,7 +17,7 @@
@Name("searchAction")
@Stateless
-public class SearchAction {
+public class SearchAction implements ISearchAction {
@In(value="entityManager")
EntityManager em;
@@ -23,16 +25,89 @@
@In @Out
private User user;
- public List<Image> searchByImage(Map<String, String> params){
- return null;
+ public List<Image> searchByImage(String name, String description, String path, Integer width, Integer height, Integer size, Date createdDate, Date uploadedDate){
+ StringBuffer b = new StringBuffer("from Image i where ");
+ if (name != null && name.length() > 0) {
+ b.append("i.name like :name");
+ }
+ if (description != null && description.length() > 0) {
+ b.append("i.description like :description");
+ }
+ if (path != null && path.length() > 0) {
+ b.append("i.path like :path");
+ }
+ if (width != null && width > 0) {
+ b.append("i.width =:width");
+ }
+ if (height != null && height > 0) {
+ b.append("i.height =:height)");
+ }
+ if (size != null && size > 0) {
+ b.append("i.size =:size");
+ }
+ if (createdDate != null) {
+ b.append("i.createdDate =:createdDate");
+ }
+ if (uploadedDate != null) {
+ b.append("i.uploadedDate =:uploadedDate");
+ }
+
+
+ Query q = em.createQuery(b.toString());
+
+ if (name != null && name.length() > 0) {
+ q.setParameter("name", name);
+ }
+ if (description != null && description.length() > 0) {
+ q.setParameter("description", description);
+ }
+ if (path != null && path.length() > 0) {
+ q.setParameter("path", path);
+ }
+ if (width != null && width > 0) {
+ q.setParameter("width", width);
+ }
+ if (height != null && height > 0) {
+ q.setParameter("height", height);
+ }
+ if (size != null && size > 0) {
+ q.setParameter("size", size);
+ }
+ if (createdDate != null) {
+ q.setParameter("createdDate", createdDate);
+ }
+ if (uploadedDate != null) {
+ q.setParameter("uploadedDate", uploadedDate);
+ }
+
+ return q.getResultList();
}
public List<Image> searchByTags(Map<String, String> params){
return null;
}
- public List<Album> searchByAlbum(Map<String, String> params){
- return null;
+ public List<Album> searchByAlbum(String name, String description, String ownerName, boolean shared ){
+ StringBuffer b = new StringBuffer("from Album a where a.name like :name and a.shared=:shared");
+ if (description != null && description.length() > 0) {
+ b.append("and a.description like :description ");
+ }
+ if (ownerName != null && ownerName.length() > 0) {
+ b.append("and a.owner.login like :ownewName");
+ }
+
+ Query q = em.createQuery(b.toString())
+ .setParameter("name", name)
+ .setParameter("shared", shared);
+ if (description != null && description.length() > 0) {
+ q.setParameter("description", description);
+ }
+
+ if (ownerName != null && ownerName.length() > 0) {
+ q.setParameter("ownewName", ownerName);
+ }
+
+ return q.getResultList();
}
public List<Image> searchByUsers(Map<String, String> params){
15 years, 9 months
JBoss Rich Faces SVN: r12776 - in trunk/test-applications/realworld2/web/src/main: java/org/richfaces/realworld/search and 6 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: andrei_exadel
Date: 2009-02-27 13:42:30 -0500 (Fri, 27 Feb 2009)
New Revision: 12776
Added:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByAlbumTemplate.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByImageTemplate.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchOptions.xhtml
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/search.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/menu.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js
trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css
Log:
Search Service
Added: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ISearchOption.java 2009-02-27 18:42:30 UTC (rev 12776)
@@ -0,0 +1,53 @@
+/**
+ *
+ */
+package org.richfaces.realworld.search;
+
+import java.util.List;
+
+import org.richfaces.realworld.service.ISearchAction;
+
+/**
+ * @author Andrey Markavtsov
+ *
+ */
+public abstract class ISearchOption {
+
+ private boolean selected;
+
+ private List<?> searchResult;
+
+ public abstract String getName();
+
+ public abstract String getSearchResultName();
+
+ public abstract String getTemplate();
+
+ public abstract String getSearchResultTemplate();
+
+ public abstract void search(ISearchAction action);
+
+ public boolean getSelected() {
+ return selected;
+ }
+
+ public void setSelected(boolean selected) {
+ this.selected = selected;
+ }
+
+ @Override
+ public String toString() {
+ return getName();
+ }
+
+ public List<?> getSearchResult() {
+ return searchResult;
+ }
+
+ public void setSearchResult(List<?> searchResult) {
+ this.searchResult = searchResult;
+ }
+
+
+}
+
Added: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/ImageSearchHelper.java 2009-02-27 18:42:30 UTC (rev 12776)
@@ -0,0 +1,108 @@
+package org.richfaces.realworld.search;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.faces.event.ActionEvent;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Out;
+import org.jboss.seam.annotations.Scope;
+import org.richfaces.realworld.navigation.NavigationEnum;
+import org.richfaces.realworld.service.ISearchAction;
+import org.richfaces.realworld.service.SearchAction;
+import org.richfaces.realworld.util.ConversationState;
+
+@Name("searchImageHelper")
+(a)Scope(ScopeType.CONVERSATION)
+public class ImageSearchHelper implements Serializable {
+
+ private static final long serialVersionUID = -304368268896942902L;
+
+ @In
+ ConversationState conversationState;
+
+ @In(create=true, required=true)
+ ISearchAction searchAction;
+
+ ISearchOption selectedOption;
+
+ List<ISearchOption> options;
+
+ String selectedTab;
+
+ public ImageSearchHelper() {
+ options = new ArrayList<ISearchOption>();
+ options.add(new SearchOptionByAlbum());
+ options.add(new SearchOptionByImage());
+ }
+
+ public void search(ActionEvent event) {
+ conversationState.setMainArea(NavigationEnum.SEARCH);
+ selectedOption.search(searchAction);
+ setSelectedTab(selectedOption.getSearchResultName());
+ }
+
+ boolean isOptionSelected() {
+ return selectedOption != null;
+ }
+
+ public void processSelection(ActionEvent event) {
+ Iterator<ISearchOption> it = options.iterator();
+ while (it.hasNext()) {
+ ISearchOption option = it.next();
+ if (option.getSelected()) {
+ selectedOption = option;
+ break;
+ }
+ }
+ }
+
+ public void back(ActionEvent event) {
+ Iterator<ISearchOption> it = options.iterator();
+ while (it.hasNext()) {
+ it.next().setSelected(false);
+ }
+ selectedOption = null;
+ }
+
+ @Out
+ public String getTemplate() {
+ return (isOptionSelected()) ? selectedOption.getTemplate() : "/includes/search/searchOptions.xhtml";
+ }
+
+
+ public ISearchOption getSelectedOption() {
+ return selectedOption;
+ }
+
+
+ public void setSelectedOption(ISearchOption selectedOption) {
+ this.selectedOption = selectedOption;
+ }
+
+ @Out
+ public List<ISearchOption> getOptions() {
+ return options;
+ }
+
+ public void setOptions(List<ISearchOption> options) {
+ this.options = options;
+ }
+
+ public String getSelectedTab() {
+ return selectedTab;
+ }
+
+ public void setSelectedTab(String selectedTab) {
+ this.selectedTab = selectedTab;
+ }
+
+
+
+
+}
Added: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByAlbum.java 2009-02-27 18:42:30 UTC (rev 12776)
@@ -0,0 +1,77 @@
+package org.richfaces.realworld.search;
+
+import org.richfaces.realworld.service.ISearchAction;
+import org.richfaces.realworld.util.ConversationState;
+
+
+public class SearchOptionByAlbum extends ISearchOption {
+
+
+ String albumName;
+
+ String ownerName;
+
+ String description;
+
+ boolean shared;
+
+ @Override
+ public String getName() {
+ return "Search By Album";
+ }
+
+ @Override
+ public String getSearchResultName() {
+ return "Albums";
+ }
+
+ @Override
+ public void search(ISearchAction action) {
+ setSearchResult(action.searchByAlbum(albumName, description, ownerName, shared));
+ }
+
+ @Override
+ public String getTemplate() {
+ return "/includes/search/searchByAlbumTemplate.xhtml";
+ }
+
+ @Override
+ public String getSearchResultTemplate() {
+ return "/includes/search/result/albumsResult.xhtml";
+ }
+
+
+
+ public String getAlbumName() {
+ return albumName;
+ }
+
+ public void setAlbumName(String albumName) {
+ this.albumName = albumName;
+ }
+
+ public String getOwnerName() {
+ return ownerName;
+ }
+
+ public void setOwnerName(String ownerName) {
+ this.ownerName = ownerName;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public boolean getShared() {
+ return shared;
+ }
+
+ public void setShared(boolean shared) {
+ this.shared = shared;
+ }
+
+}
Added: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/search/SearchOptionByImage.java 2009-02-27 18:42:30 UTC (rev 12776)
@@ -0,0 +1,135 @@
+/**
+ *
+ */
+package org.richfaces.realworld.search;
+
+import java.util.Date;
+
+import org.richfaces.realworld.service.ISearchAction;
+
+/**
+ * @author Andrey Markavtsov
+ *
+ */
+public class SearchOptionByImage extends ISearchOption {
+
+ String fileName;
+
+ String description;
+
+ String path;
+
+ Integer fileSize;
+
+ Integer width;
+
+ Integer height;
+
+ Date uploadedDate;
+
+ Date createdDate;
+
+
+
+ /* (non-Javadoc)
+ * @see org.richfaces.realworld.search.ISearchOption#getName()
+ */
+ public String getName() {
+ return "Search By Image";
+ }
+
+ @Override
+ public String getSearchResultName() {
+ return "Images";
+ }
+
+ @Override
+ public void search(ISearchAction action) {
+ setSearchResult(action.searchByImage(fileName, description, path, width, height, fileSize, createdDate, uploadedDate));
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.richfaces.realworld.search.ISearchOption#getTemplate()
+ */
+ public String getTemplate() {
+ return "/includes/search/searchByImageTemplate.xhtml";
+ }
+
+ @Override
+ public String getSearchResultTemplate() {
+ return "/includes/search/result/imageResult.xhtml";
+ }
+
+
+ public String getFileName() {
+ return fileName;
+ }
+
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
+
+
+ public Integer getFileSize() {
+ return fileSize;
+ }
+
+
+ public void setFileSize(Integer fileSize) {
+ this.fileSize = fileSize;
+ }
+
+
+ public Date getUploadedDate() {
+ return uploadedDate;
+ }
+
+
+ public void setUploadedDate(Date uploadedDate) {
+ this.uploadedDate = uploadedDate;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ public Integer getWidth() {
+ return width;
+ }
+
+ public void setWidth(Integer width) {
+ this.width = width;
+ }
+
+ public Integer getHeight() {
+ return height;
+ }
+
+ public void setHeight(Integer height) {
+ this.height = height;
+ }
+
+ public Date getCreatedDate() {
+ return createdDate;
+ }
+
+ public void setCreatedDate(Date createdDate) {
+ this.createdDate = createdDate;
+ }
+
+
+}
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/albumsResult.xhtml 2009-02-27 18:42:30 UTC (rev 12776)
@@ -0,0 +1,28 @@
+<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:dataGrid id="album"
+ value="#{result}"
+ columns="5" style="width:500px;" var="album" border="0">
+
+ <h:panelGrid id="grid" columns="1">
+ <h:panelGroup id="group">
+ <a4j:commandLink
+ action="#{conversationState.setMainArea(navigationHelper.navigationEnumImagePreview)}"
+ actionListener="#{conversationState.setSelectedAlbum(album)}"
+ reRender="mainArea, tree">
+ <h:graphicImage
+ style="width:100px;height:100px" id="image" value="/img/folder.jpg" />
+ </a4j:commandLink>
+ </h:panelGroup>
+ <a4j:commandLink
+ action="#{conversationState.setMainArea(navigationHelper.navigationEnumImagePreview)}"
+ actionListener="#{conversationState.setSelectedAlbum(album)}"
+ reRender="mainArea, tree" value="#{album.name}">
+ </a4j:commandLink>
+ </h:panelGrid>
+ </rich:dataGrid>
+</ui:composition>
\ No newline at end of file
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/imageResult.xhtml 2009-02-27 18:42:30 UTC (rev 12776)
@@ -0,0 +1,36 @@
+<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">
+ hhh
+ <a4j:repeat id="previewList" value="#{result}" var="item">
+ <table cellpadding="0" cellspacing="0" border="0" width="170" height="170" style="float: left; margin: 0px 10px 10px 0px;" >
+ <tr>
+ <td style="text-align: center;vertical-align: middle; background: white;border: 1px solid #909090">
+ <a4j:commandLink
+ actionListener="#{conversationState.updateSelectedItems(item)}"
+ reRender="mainArea">
+ <a4j:mediaOutput element="img" createContent="#{imageLoader.paintImage}"
+ styleClass="all-images"
+ value="#{fileManager.transformPath(item.path, '_mini')}">
+ <rich:dragSupport rendered="#{renderLogic.isUserAlbum(item.album)}"
+ dragIndicator="dragIndicator" dragType="image" dragValue="#{item}"
+ reRender=" mainArea">
+ <rich:dndParam name="label" value="#{item.name}" />
+ </rich:dragSupport>
+ <ui:include src="/includes/contextMenu/CMForImage.xhtml" >
+ <ui:param name="CMImage" value="#{item}" />
+ </ui:include>
+ <rich:toolTip followMouse="true" direction="top-right"
+ showDelay="500" styleClass="tooltip">
+ <span style="white-space: nowrap"> #{item.description} </span>
+ </rich:toolTip>
+ </a4j:mediaOutput>
+ </a4j:commandLink>
+ </td>
+ </tr>
+ </table>
+ </a4j:repeat>
+</ui:composition>
\ No newline at end of file
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByAlbumTemplate.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByAlbumTemplate.xhtml (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByAlbumTemplate.xhtml 2009-02-27 18:42:30 UTC (rev 12776)
@@ -0,0 +1,20 @@
+<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:panelGrid columns="2">
+ <h:outputText value="Name"></h:outputText>
+ <h:inputText value="#{searchImageHelper.selectedOption.albumName}" />
+ <h:outputText value="Description"></h:outputText>
+ <h:inputText value="#{searchImageHelper.selectedOption.description}"></h:inputText>
+ <h:outputText value="Owner Name"></h:outputText>
+ <h:inputText value="#{searchImageHelper.selectedOption.ownerName}" />
+ <h:outputText value="Shared"></h:outputText>
+ <h:inputText value="#{searchImageHelper.selectedOption.shared}" />
+ </h:panelGrid>
+
+
+</ui:composition>
\ No newline at end of file
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByImageTemplate.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByImageTemplate.xhtml (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchByImageTemplate.xhtml 2009-02-27 18:42:30 UTC (rev 12776)
@@ -0,0 +1,27 @@
+<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:panelGrid columns="2">
+ <h:outputText value="Name"></h:outputText>
+ <h:inputText value="#{searchImageHelper.selectedOption.fileName}" />
+ <h:outputText value="Description"></h:outputText>
+ <h:inputText value="#{searchImageHelper.selectedOption.description}" />
+ <h:outputText value="Path"></h:outputText>
+ <h:inputText value="#{searchImageHelper.selectedOption.path}" />
+ <h:outputText value="Size"></h:outputText>
+ <h:inputText value="#{searchImageHelper.selectedOption.fileSize}" />
+ <h:outputText value="Width"></h:outputText>
+ <h:inputText value="#{searchImageHelper.selectedOption.width}" />
+ <h:outputText value="Height"></h:outputText>
+ <h:inputText value="#{searchImageHelper.selectedOption.height}" />
+ <h:outputText value="Uploaded Date"></h:outputText>
+ <rich:calendar value="#{searchImageHelper.selectedOption.uploadedDate}"></rich:calendar>
+ <h:outputText value="Created Date"></h:outputText>
+ <rich:calendar value="#{searchImageHelper.selectedOption.createdDate}"></rich:calendar>
+
+ </h:panelGrid>
+</ui:composition>
\ No newline at end of file
Added: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchOptions.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchOptions.xhtml (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/searchOptions.xhtml 2009-02-27 18:42:30 UTC (rev 12776)
@@ -0,0 +1,15 @@
+<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:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:rich="http://richfaces.org/rich">
+ <a4j:repeat value="#{searchImageHelper.options}" var="option">
+ <h:outputText value="#{option.name}"></h:outputText>
+ <h:selectBooleanCheckbox value="#{option.selected}">
+ <a4j:support event="onchange" actionListener="#{searchImageHelper.processSelection}" reRender="searchArea"></a4j:support>
+ </h:selectBooleanCheckbox><br/>
+ </a4j:repeat>
+
+</ui:composition>
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/menu.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/layout/template3.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js 2009-02-27 18:41:08 UTC (rev 12775)
+++ trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js 2009-02-27 18:42:30 UTC (rev 12776)
@@ -39,4 +39,12 @@
}
}
+}
+
+function SearchPanelShowHide(e, elt) {
+ if (Element.visible(elt)) {
+ hideSearch();
+ }else {
+ showSearch();
+ }
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-02-27 18:41:08 UTC (rev 12775)
+++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-02-27 18:42:30 UTC (rev 12776)
@@ -58,7 +58,6 @@
border: none;
padding: 0px;
background: url(../img/shell/general_panelbar_bg.gif) repeat-x #A84807;
- overflow-y: hidden;
}
.main-menu-panel-body {
15 years, 9 months
JBoss Rich Faces SVN: r12775 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/gmap and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: konstantin.mishin
Date: 2009-02-27 13:41:08 -0500 (Fri, 27 Feb 2009)
New Revision: 12775
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/gmap/
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/gmap/gmapAutoTest.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/GmapTest.java
Log:
RF-6283
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/gmap/gmapAutoTest.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/gmap/gmapAutoTest.xhtml (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/gmap/gmapAutoTest.xhtml 2009-02-27 18:41:08 UTC (rev 12775)
@@ -0,0 +1,24 @@
+<!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:rich="http://richfaces.org/rich"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<ui:composition template="#{templateBean.autoTestTemplate}">
+ <ui:define name="component">
+ <rich:gmap id="componentId" rendered="#{autoTestBean.rendered}"
+ onclick="EventQueue.fire('onclick')"
+ onmousedown="EventQueue.fire('onmousedown')"
+ onmousemove="EventQueue.fire('onmousemove')"
+ onmouseup="EventQueue.fire('onmouseup')"
+ onmouseout="EventQueue.fire('onmouseout')"
+ onmouseover="EventQueue.fire('onmouseover')"
+ onkeydown="EventQueue.fire('onkeydown')"
+ onkeypress="EventQueue.fire('onkeypress')"
+ onkeyup="EventQueue.fire('onkeyup')"
+ style="width: 100%; color: yellow" styleClass="noname" />
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Added: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/GmapTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/GmapTest.java (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/GmapTest.java 2009-02-27 18:41:08 UTC (rev 12775)
@@ -0,0 +1,50 @@
+package org.richfaces.testng;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.ajax4jsf.template.Template;
+import org.richfaces.AutoTester;
+import org.richfaces.SeleniumTestBase;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class GmapTest extends SeleniumTestBase {
+
+ /**
+ * component is present on the page together with map images and there are no JS errors
+ */
+ @Test
+ public void testImages(Template template) {
+ AutoTester autoTester = getAutoTester(this);
+ autoTester.renderPage(template, null);
+ Assert.assertTrue(selenium.getXpathCount("id('" + autoTester.getClientId(AutoTester.COMPONENT_ID) + "')//img").intValue() != 0);
+ runScript("map.setZoom(1)");
+ }
+
+ /**
+ * component with rendered = false is not present on the page,
+ * style and classes, standard HTML attributes are output to client
+ */
+ @Test
+ public void testStandardAttributes(Template template) {
+ AutoTester autoTester = getAutoTester(this);
+ autoTester.renderPage(template, null);
+ autoTester.testRendered();
+ Map<String, String> styleAttributes = new HashMap<String, String>();
+ styleAttributes.put("width", "100%");
+ styleAttributes.put("color", "yellow");
+ autoTester.testStyleAndClasses(new String[]{"noname"}, styleAttributes);
+ autoTester.testHTMLEvents();
+ }
+
+ @Override
+ public String getTestUrl() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getAutoTestUrl() {
+ return "pages/gmap/gmapAutoTest.xhtml";
+ }
+}
15 years, 9 months
JBoss Rich Faces SVN: r12774 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits@lists.jboss.org
Author: cluts
Date: 2009-02-27 13:00:19 -0500 (Fri, 27 Feb 2009)
New Revision: 12774
Modified:
trunk/docs/userguide/en/src/main/docbook/included/menuItem.desc.xml
Log:
RF-5002 - added new information in description of the component
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuItem.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuItem.desc.xml 2009-02-27 17:57:51 UTC (rev 12773)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuItem.desc.xml 2009-02-27 18:00:19 UTC (rev 12774)
@@ -7,9 +7,11 @@
</sectioninfo>
<section>
<title>Description</title>
- <para>The <emphasis role="bold"><property><rich:menuItem></property></emphasis> component is used for the definition of a single item inside a pop-up list.</para>
+ <para>The <emphasis role="bold"><property><rich:menuItem></property></emphasis> component is used for the definition of a single item inside a pop-up list.</para>
+ <para>This component can be used not only within <emphasis role="bold"><property><rich:dropDownMenu></property></emphasis> and <emphasis role="bold"><property><rich:contextMenu></property></emphasis>, but also it can used as a standalone component.
+ For example, you can use it as nested component of the <emphasis role="bold"><property><rich:toolBar></property></emphasis>.</para>
<figure>
- <title><emphasis role="bold"><property><rich:menuItem></property></emphasis> component</title>
+ <title><emphasis role="bold"><property><rich:menuItem></property></emphasis> component</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/menuItem_init.png" />
15 years, 9 months