[richfaces-svn-commits] JBoss Rich Faces SVN: r12783 - in trunk: sandbox/ui/layout/src/main/config/component and 12 other directories.

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 &quot;true&quot;. - </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