[richfaces-svn-commits] JBoss Rich Faces SVN: r19205 - in branches/RF-8742: core/impl/src/main/java/org/richfaces/renderkit/html and 13 other directories.

Author: alexsmirnov Date: 2010-09-14 14:41:14 -0400 (Tue, 14 Sep 2010) New Revision: 19205 Added: branches/RF-8742/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml branches/RF-8742/examples/output-demo/src/main/webapp/qunit/tabPanel.xhtml branches/RF-8742/examples/output-demo/src/main/webapp/resources/tests/richfaces-tab-panel-qunit.js branches/RF-8742/ui/common/ui/richfaces-suppressions.xml branches/RF-8742/ui/output/ui/richfaces-suppressions.xml branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/Tab.js branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/TabPanel.js Modified: branches/RF-8742/ branches/RF-8742/core/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java branches/RF-8742/examples/output-demo/src/main/webapp/templates/template.xhtml branches/RF-8742/examples/richfaces-showcase/readme.txt branches/RF-8742/svnmerge-commit-message.txt branches/RF-8742/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java branches/RF-8742/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss branches/RF-8742/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanelTitledItem.java branches/RF-8742/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml branches/RF-8742/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss Log: Merged revisions 19186-19187,19190,19194,19196,19199,19203-19204 via svnmerge from https://svn.jboss.org/repos/richfaces/trunk ....... r19186 | Alex.Kolonitsky | 2010-09-13 23:48:24 -0700 (Mon, 13 Sep 2010) | 1 line Suppressions for checkstyle ....... r19187 | Alex.Kolonitsky | 2010-09-14 01:25:48 -0700 (Tue, 14 Sep 2010) | 1 line fix build ....... r19190 | ilya_shaikovsky | 2010-09-14 03:58:27 -0700 (Tue, 14 Sep 2010) | 1 line ....... r19194 | nbelaevski | 2010-09-14 07:03:40 -0700 (Tue, 14 Sep 2010) | 1 line https://jira.jboss.org/browse/RF-9295 ....... r19196 | nbelaevski | 2010-09-14 07:53:40 -0700 (Tue, 14 Sep 2010) | 1 line https://jira.jboss.org/browse/RF-9344 ....... r19199 | Alex.Kolonitsky | 2010-09-14 08:38:08 -0700 (Tue, 14 Sep 2010) | 1 line RF-7944 Tab Panel Component ....... r19203 | nbelaevski | 2010-09-14 10:20:42 -0700 (Tue, 14 Sep 2010) | 1 line Fixed broken list component unit test ....... r19204 | Alex.Kolonitsky | 2010-09-14 10:40:55 -0700 (Tue, 14 Sep 2010) | 1 line Tab Panel Renderer ....... Property changes on: branches/RF-8742 ___________________________________________________________________ Name: svnmerge-integrated - /trunk:1-19178 + /trunk:1-19204 Modified: branches/RF-8742/core/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java =================================================================== --- branches/RF-8742/core/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java 2010-09-14 17:40:55 UTC (rev 19204) +++ branches/RF-8742/core/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java 2010-09-14 18:41:14 UTC (rev 19205) @@ -47,7 +47,7 @@ * created 02.02.2007 */ @DynamicResource -public class CustomizeableGradient extends Java2Dresource { +public abstract class CustomizeableGradient extends Java2Dresource { private static final String BASE_COLOR = "baseColor"; Copied: branches/RF-8742/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml (from rev 19204, trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml) =================================================================== --- branches/RF-8742/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml (rev 0) +++ branches/RF-8742/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml 2010-09-14 18:41:14 UTC (rev 19205) @@ -0,0 +1,31 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:pn="http://richfaces.org/output"> + +<body> +<ui:composition template="/templates/template.xhtml"> + + <ui:define name="title">Tab Panel Example</ui:define> + <ui:define name="body_head">Tab Panel Example</ui:define> + + <ui:define name="body"> + <p>Page</p> + + <h:form id="f"> + <pn:tabPanel id="panel" switchType="ajax"> + <pn:tab header="tab1 header"> + Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. + </pn:tab> + <pn:tab header="tab2 header"> + He he + </pn:tab> + </pn:tabPanel> + </h:form> + </ui:define> +</ui:composition> +</body> +</html> + Copied: branches/RF-8742/examples/output-demo/src/main/webapp/qunit/tabPanel.xhtml (from rev 19204, trunk/examples/output-demo/src/main/webapp/qunit/tabPanel.xhtml) =================================================================== --- branches/RF-8742/examples/output-demo/src/main/webapp/qunit/tabPanel.xhtml (rev 0) +++ branches/RF-8742/examples/output-demo/src/main/webapp/qunit/tabPanel.xhtml 2010-09-14 18:41:14 UTC (rev 19205) @@ -0,0 +1,47 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:pn="http://richfaces.org/output"> + +<body> +<ui:composition template="/templates/template.xhtml"> + + <ui:define name="scripts"> + <h:outputScript name="qunit/qunit.js" /> + <h:outputScript name="qunit/richfaces-qunit.js" /> + + <h:outputStylesheet name="qunit/qunit.css" /> + </ui:define> + + <ui:define name="title">Tab Panel Example</ui:define> + <ui:define name="body_head">Tab Panel Example</ui:define> + + <ui:define name="body"> + <p>Page</p> + + <h:form id="f"> + <pn:tabPanel id="panel" switchType="ajax"> + <pn:tab header="tab1 header"> + Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. Content will be here. + </pn:tab> + <pn:tab header="tab2 header"> + He he + </pn:tab> + </pn:tabPanel> + </h:form> + + <p>Result</p> + <div> + <ol id="qunit-tests"></ol> + + <div id="testDiv" style="margin-top:10px; border:1px solid #a0a0a0">Main Test Div</div> + + </div> + <h:outputScript name="tests/richfaces-tab-panel-qunit.js" /> + </ui:define> +</ui:composition> +</body> +</html> + Copied: branches/RF-8742/examples/output-demo/src/main/webapp/resources/tests/richfaces-tab-panel-qunit.js (from rev 19204, trunk/examples/output-demo/src/main/webapp/resources/tests/richfaces-tab-panel-qunit.js) =================================================================== --- branches/RF-8742/examples/output-demo/src/main/webapp/resources/tests/richfaces-tab-panel-qunit.js (rev 0) +++ branches/RF-8742/examples/output-demo/src/main/webapp/resources/tests/richfaces-tab-panel-qunit.js 2010-09-14 18:41:14 UTC (rev 19205) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +RichFaces.QUnit.run(function() { + module("richfaces-tab-panel"); + + var TAB_PANEL_ID = "f:panel"; + + function handler (msg, returnValue) { + return function () { + ok(true, msg); + + if (returnValue != undefined) { + return returnValue; + } + }; + } + + test("RichFaces.ui.TabPanel test constructor", function () { + var c = RichFaces.$(TAB_PANEL_ID); + + ok(c instanceof RichFaces.ui.TabPanel, "inctance of RichFaces.ui.TabPanel"); + equals(c.id, TAB_PANEL_ID, "id"); + }); + + test("RichFaces.ui.TabPanel test public api", function () { + var c = RichFaces.$(TAB_PANEL_ID); + + var PUBLIC_API = [/* ... */]; + + for (var i in PUBLIC_API) { + var funcName = PUBLIC_API[i]; + ok(c[funcName], funcName + "present in component"); + // TODO check other functions + check is it function + } + }); + + test("RichFaces.ui.TabPanel test events", function () { + var componentId = TAB_PANEL_ID; + var c = RichFaces.$(componentId); + + expect(5); + var beforeitemchngeHandler = function (event, comp, data) { + ok(true, "beforeitemchnge handler invouked"); + + same(data.id, componentId, "component id"); + same(data.oldItem.getName(), c.items[0].getName(), "old item"); + same(data.newItem.getName(), c.items[1].getName(), "new item"); + + return true; + }; + + var beforeitemchngeHandlerWrapper = RichFaces.Event.bindById(componentId, "beforeitemchange", beforeitemchngeHandler); + + var itemchangeHandler = handler("itemchnge handler invouked", undefined); + var itemchangeHandlerWrapper = RichFaces.Event.bindById(componentId, "itemchange", itemchangeHandler); + + c.switchToItem("name2"); + + RichFaces.Event.unbindById(componentId, "beforeitemchange", beforeitemchngeHandlerWrapper); + RichFaces.Event.unbindById(componentId, "itemchange", itemchangeHandlerWrapper); + + c.switchToItem("name1"); + }); +}); Modified: branches/RF-8742/examples/output-demo/src/main/webapp/templates/template.xhtml =================================================================== --- branches/RF-8742/examples/output-demo/src/main/webapp/templates/template.xhtml 2010-09-14 17:40:55 UTC (rev 19204) +++ branches/RF-8742/examples/output-demo/src/main/webapp/templates/template.xhtml 2010-09-14 18:41:14 UTC (rev 19205) @@ -10,157 +10,6 @@ </title> <meta http-equiv="content-type" content="text/xhtml; charset=UTF-8" /> - - <style type="text/css"> - * { - font-family: verdana - } - - .rftp_toptab { - display: table-cell; - border: 1px solid #A6A6A6; - padding: 0px 0px 3px 0px; - vertical-align: bottom; - background: url(tab_bg.gif) top repeat-x #DAE7F5; - } - - .rftp_active_top { - border-bottom: 0px; - font-weight: bold; - padding: 3px 0px 0px 0px; - vertical-align: top; - background: url(acttab_bg.gif) top repeat-x #C9DBEF; - } - - .rftp_active2_top { - border-bottom: 0px; - font-weight: bold; - padding: 3px 0px 0px 0px; - vertical-align: top; - background: url(acttab2_bg.gif) top repeat-x #FFFFFF; - } - - .rftp_toptab_tabline_vis { - border: 1px solid #a6a6a6; - background: url(tabline_bg.gif) top repeat-x #EEF4FB; - border-bottom: 0px; - padding-top: 2px; - overflow: hidden; - height: 23px; - white-space: nowrap; - position: relative; - } - - .rftp_toptab_tabline_dis { - border-bottom: 0px; - padding-top: 2px; - overflow: hidden; - height: 25px; - white-space: nowrap; - position: relative; - } - - .rftp_toptab_tabs { - display: table; - border: 0px; - width: 100%; - height: 100%; - } - - .rftp_toptab_spacer { - display: table-cell; - border-bottom: 1px solid #A6A6A6; - } - - .rftp_horizonttab_tabspacer_width { - padding-left: 1px; - } - - .rftp_icon { - display: table-cell; - vertical-align: middle; - padding: 0px 5px 0px 5px; - } - - .rftp_close { - display: table-cell; - vertical-align: middle; - padding: 0px 3px 0px 15px; - } - - .rftp_label { - display: table-cell; - vertical-align: middle; - font-family: verdana; - font-size: 11px; - } - - .rftp_toptab_scroll_left { - background: url(acttab_bg.gif) top repeat-x #C9DBEF; - position: absolute; - top: 1px; - left: 1px; - width: 15px; - height: 250px; - border: 1px solid #a6a6a6; - font-weight: bold; - text-align: center; - font-family: verdana; - font-size: 11px; - padding-top: 6px; - } - - .rftp_toptab_scroll_right { - background: url(acttab_bg.gif) top repeat-x #C9DBEF; - position: absolute; - top: 1px; - right: 17px; - width: 15px; - height: 250px; - border: 1px solid #a6a6a6; - font-weight: bold; - text-align: center; - font-family: verdana; - font-size: 11px; - padding-top: 6px; - } - - .rftp_toptab_tabslist { - background: url(acttab_bg.gif) top repeat-x #C9DBEF; - position: absolute; - top: 1px; - right: 1px; - width: 15px; - height: 250px; - border: 1px solid #a6a6a6; - font-weight: bold; - text-align: center; - font-family: verdana; - font-size: 14px; - padding-top: 2px; - } - - .rftp_toptab_border { - border: 1px solid #A6A6A6; - border-top: 0px; - height: 2px; - background: #C9DBEF; - } - - .rftp_toptab_content { - border: 1px solid #A6A6A6; - border-top: 0px; - font-family: verdana; - font-size: 11px; - padding: 10px; - background: #ffffff; - } - - .rftp_hidden { - display: none - } - </style> - </h:head> <h:body> Modified: branches/RF-8742/examples/richfaces-showcase/readme.txt =================================================================== --- branches/RF-8742/examples/richfaces-showcase/readme.txt 2010-09-14 17:40:55 UTC (rev 19204) +++ branches/RF-8742/examples/richfaces-showcase/readme.txt 2010-09-14 18:41:14 UTC (rev 19205) @@ -46,7 +46,8 @@ * mvn clean package -Pgae -Denforcer.skip=true (enforcer skipped as resource plugin using snapshot plugin) -And now you're ready to publish the application to GAE. just use appcfg as for any other one like described at google documentation. +And now you're ready to publish the application to GAE. just use appcfg as for any other one like described at google documentation. Do not forget to register your +own application name and rename the demo application accordingly. more details about the resource plugin(it could be highly usefull not only in case of GAE usage but for general cases like serving resources at separate content systems) - will be published at our wiki and announced at RichFaces usage space. Modified: branches/RF-8742/svnmerge-commit-message.txt =================================================================== --- branches/RF-8742/svnmerge-commit-message.txt 2010-09-14 17:40:55 UTC (rev 19204) +++ branches/RF-8742/svnmerge-commit-message.txt 2010-09-14 18:41:14 UTC (rev 19205) @@ -1,8 +1,34 @@ -Merged revisions 19176 via svnmerge from +Merged revisions 19186-19187,19190,19194,19196,19199,19203-19204 via svnmerge from https://svn.jboss.org/repos/richfaces/trunk ........ - r19176 | alexsmirnov | 2010-09-13 10:42:47 -0700 (Mon, 13 Sep 2010) | 1 line + r19186 | Alex.Kolonitsky | 2010-09-13 23:48:24 -0700 (Mon, 13 Sep 2010) | 1 line - ignore working files in svn + Suppressions for checkstyle ........ + r19187 | Alex.Kolonitsky | 2010-09-14 01:25:48 -0700 (Tue, 14 Sep 2010) | 1 line + + fix build +........ + r19190 | ilya_shaikovsky | 2010-09-14 03:58:27 -0700 (Tue, 14 Sep 2010) | 1 line +........ + r19194 | nbelaevski | 2010-09-14 07:03:40 -0700 (Tue, 14 Sep 2010) | 1 line + + https://jira.jboss.org/browse/RF-9295 +........ + r19196 | nbelaevski | 2010-09-14 07:53:40 -0700 (Tue, 14 Sep 2010) | 1 line + + https://jira.jboss.org/browse/RF-9344 +........ + r19199 | Alex.Kolonitsky | 2010-09-14 08:38:08 -0700 (Tue, 14 Sep 2010) | 1 line + + RF-7944 Tab Panel Component +........ + r19203 | nbelaevski | 2010-09-14 10:20:42 -0700 (Tue, 14 Sep 2010) | 1 line + + Fixed broken list component unit test +........ + r19204 | Alex.Kolonitsky | 2010-09-14 10:40:55 -0700 (Tue, 14 Sep 2010) | 1 line + + Tab Panel Renderer +........ Copied: branches/RF-8742/ui/common/ui/richfaces-suppressions.xml (from rev 19204, trunk/ui/common/ui/richfaces-suppressions.xml) =================================================================== --- branches/RF-8742/ui/common/ui/richfaces-suppressions.xml (rev 0) +++ branches/RF-8742/ui/common/ui/richfaces-suppressions.xml 2010-09-14 18:41:14 UTC (rev 19205) @@ -0,0 +1,11 @@ +<?xml version="1.0"?> + +<!DOCTYPE suppressions PUBLIC + "-//Puppy Crawl//DTD Suppressions 1.0//EN" + "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd"> + +<suppressions> + <suppress checks="MissingSwitchDefault" files="JSONTokener.java" /> + <suppress checks="FallThrough" files="XMLTokener.java" /> + <suppress checks="ModifiedControlVariable" files="Cookie.java" /> +</suppressions> Modified: branches/RF-8742/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java =================================================================== --- branches/RF-8742/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-09-14 17:40:55 UTC (rev 19204) +++ branches/RF-8742/ui/iteration/ui/src/main/java/org/richfaces/renderkit/ListRendererBase.java 2010-09-14 18:41:14 UTC (rev 19205) @@ -133,7 +133,7 @@ } rendererUtils.writeAttribute(writer, HtmlConstants.CLASS_ATTRIBUTE, - HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-t")); + HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-trm")); termFacet.encodeAll(context); writer.endElement(HtmlConstants.DT_ELEMENT); } @@ -145,7 +145,7 @@ } rendererUtils.writeAttribute(writer, HtmlConstants.CLASS_ATTRIBUTE, - HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-d")); + HtmlUtil.concatClasses(helper.getRowClass(), helper.getColumnClass(), "rf-dlst-dfn")); renderHandlers(context, sequence); rendererUtils.encodeChildren(context, sequence); writer.endElement(HtmlConstants.DD_ELEMENT); @@ -191,9 +191,9 @@ } - private ItemsEncoder unorderedListItemsEncoder = new SimpleItemsEncoder("rf-ulst-i"); + private ItemsEncoder unorderedListItemsEncoder = new SimpleItemsEncoder("rf-ulst-itm"); - private ItemsEncoder orderedListItemsEncoder = new SimpleItemsEncoder("rf-olst-i"); + private ItemsEncoder orderedListItemsEncoder = new SimpleItemsEncoder("rf-olst-itm"); private ItemsEncoder definitionItemsEncoder = new DefinitionItemsEncoder(); Modified: branches/RF-8742/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss =================================================================== --- branches/RF-8742/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss 2010-09-14 17:40:55 UTC (rev 19204) +++ branches/RF-8742/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/list.ecss 2010-09-14 18:41:14 UTC (rev 19205) @@ -1,4 +1,4 @@ -.rf-ulst-i, .rf-olst-i, .rf-dlst-t, .rf-dlst-d { +.rf-ulst-itm, .rf-olst-itm, .rf-dlst-trm, .rf-dlst-dfn { font-size: '#{richSkin.generalSizeFont}'; font-family: '#{richSkin.generalFamilyFont}'; color: '#{richSkin.generalTextColor}'; Modified: branches/RF-8742/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java =================================================================== --- branches/RF-8742/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java 2010-09-14 17:40:55 UTC (rev 19204) +++ branches/RF-8742/ui/iteration/ui/src/test/java/org/richfaces/renderkit/ListRendererTest.java 2010-09-14 18:41:14 UTC (rev 19205) @@ -73,7 +73,7 @@ HtmlElement list = (HtmlElement) nodes.get(0); assertEquals("ol", list.getNodeName()); assertEquals("rf-olst", list.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - verifySimpleListItems(list, "rf-olst-i"); + verifySimpleListItems(list, "rf-olst-itm"); } @Test @@ -86,7 +86,7 @@ assertEquals("ul", list.getNodeName()); assertEquals("rf-ulst", list.getAttribute(HtmlConstants.CLASS_ATTRIBUTE)); - verifySimpleListItems((HtmlElement) list, "rf-ulst-i"); + verifySimpleListItems((HtmlElement) list, "rf-ulst-itm"); } @Test @@ -140,7 +140,7 @@ HtmlElement item = (HtmlElement) termItems.get(i); assertEquals("dt", item.getNodeName()); - assertEquals("rf-dlst-t", item.getAttribute("class")); + assertEquals("rf-dlst-trm", item.getAttribute("class")); assertEquals(data.getTerm(), item.asText()); } @@ -149,7 +149,7 @@ HtmlElement item = (HtmlElement) definitionItems.get(i); assertEquals("dd", item.getNodeName()); - assertEquals("rf-dlst-d", item.getAttribute("class")); + assertEquals("rf-dlst-dfn", item.getAttribute("class")); assertEquals(data.getDefinition(), item.asText()); } } Copied: branches/RF-8742/ui/output/ui/richfaces-suppressions.xml (from rev 19204, trunk/ui/output/ui/richfaces-suppressions.xml) =================================================================== --- branches/RF-8742/ui/output/ui/richfaces-suppressions.xml (rev 0) +++ branches/RF-8742/ui/output/ui/richfaces-suppressions.xml 2010-09-14 18:41:14 UTC (rev 19205) @@ -0,0 +1,9 @@ +<?xml version="1.0"?> + +<!DOCTYPE suppressions PUBLIC + "-//Puppy Crawl//DTD Suppressions 1.0//EN" + "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd"> + +<suppressions> + <suppress checks="IllegalCatch" files="AbstractTogglePanel.java" /> +</suppressions> Modified: branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java =================================================================== --- branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2010-09-14 17:40:55 UTC (rev 19204) +++ branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2010-09-14 18:41:14 UTC (rev 19205) @@ -459,9 +459,9 @@ } public AbstractTogglePanelItem getItemByIndex(final int index) { - List<AbstractTogglePanelItem> children = getRenderedChildren(); + List<AbstractTogglePanelItem> children = getRenderedItems(); if (isCycledSwitching()) { - int size = getRenderedChildren().size(); + int size = getRenderedItems().size(); return children.get((size + index) % size); } else if (index < 0 || index >= children.size()) { return null; @@ -470,7 +470,7 @@ } } - private List<AbstractTogglePanelItem> getRenderedChildren() { + public List<AbstractTogglePanelItem> getRenderedItems() { List<AbstractTogglePanelItem> res = new ArrayList<AbstractTogglePanelItem>(getChildCount()); for (UIComponent child : getChildren()) { if (child.isRendered() && child instanceof AbstractTogglePanelItem) { @@ -516,7 +516,7 @@ } public AbstractTogglePanelItem getLastItem() { - return getItemByIndex(getRenderedChildren().size() - 1); + return getItemByIndex(getRenderedItems().size() - 1); } public int getChildIndex(String name) { @@ -524,7 +524,7 @@ throw new IllegalArgumentException("Name is required parameter."); } - List<AbstractTogglePanelItem> items = getRenderedChildren(); + List<AbstractTogglePanelItem> items = getRenderedItems(); for (int ind = 0; ind < items.size(); ind++) { if (name.equals(items.get(ind).getName())) { return ind; Modified: branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanelTitledItem.java =================================================================== --- branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanelTitledItem.java 2010-09-14 17:40:55 UTC (rev 19204) +++ branches/RF-8742/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanelTitledItem.java 2010-09-14 18:41:14 UTC (rev 19205) @@ -44,7 +44,7 @@ } public String getHeader() { - return (String) getStateHelper().eval(PropertyKeys.header); + return (String) getStateHelper().eval(PropertyKeys.header, getName()); } public void setHeader(String header) { Modified: branches/RF-8742/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml =================================================================== --- branches/RF-8742/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-09-14 17:40:55 UTC (rev 19204) +++ branches/RF-8742/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-09-14 18:41:14 UTC (rev 19205) @@ -11,16 +11,6 @@ </behavior> <component> - <component-type>org.richfaces.TabPanel</component-type> - <component-class>org.richfaces.component.html.HtmlTabPanel</component-class> - </component> - - <component> - <component-type>org.richfaces.Tab</component-type> - <component-class>org.richfaces.component.html.HtmlTab</component-class> - </component> - - <component> <component-type>org.richfaces.CollapsiblePanel</component-type> <component-class>org.richfaces.component.html.HtmlCollapsiblePanel</component-class> <property> @@ -695,16 +685,6 @@ </renderer> <renderer> - <component-family>org.richfaces.TabPanel</component-family> - <renderer-type>org.richfaces.TabPanel</renderer-type> - <renderer-class>org.richfaces.renderkit.html.TabPanelRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.TogglePanelTitledItem</component-family> - <renderer-type>org.richfaces.Tab</renderer-type> - <renderer-class>org.richfaces.renderkit.html.TabRenderer</renderer-class> - </renderer> - <renderer> <component-family>org.richfaces.Panel</component-family> <renderer-type>org.richfaces.PanelRenderer</renderer-type> <renderer-class>org.richfaces.renderkit.html.PanelRenderer</renderer-class> Modified: branches/RF-8742/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml =================================================================== --- branches/RF-8742/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-09-14 17:40:55 UTC (rev 19204) +++ branches/RF-8742/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-09-14 18:41:14 UTC (rev 19205) @@ -29,192 +29,6 @@ </tag> <tag> - <tag-name>tabPanel</tag-name> - <component> - <component-type>org.richfaces.TabPanel</component-type> - <renderer-type>org.richfaces.TabPanel</renderer-type> - - </component> - <attribute> - <description></description> - <name>cycledSwitching</name> - <type>boolean</type> - </attribute> - <attribute> - <description></description> - <name>switchType</name> - <type>org.richfaces.component.SwitchType</type> - </attribute> - <attribute> - <description></description> - <name>activeItem</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>bypassUpdates</name> - <type>boolean</type> - </attribute> - <attribute> - <description></description> - <name>limitToList</name> - <type>boolean</type> - </attribute> - <attribute> - <description></description> - <name>data</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <description></description> - <name>status</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>execute</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <description></description> - <name>render</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <description></description> - <name>immediate</name> - <type>boolean</type> - </attribute> - <attribute> - <description></description> - <name>itemChangeListener</name> - <type>javax.el.MethodExpression</type> - </attribute> - <attribute> - <description>Long long text</description> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>binding description</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>I don't know maybe some thing strange</description> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <description></description> - <name>headerPosition</name> - <type>org.richfaces.HeaderPosition</type> - </attribute> - <attribute> - <description></description> - <name>headerAlignment</name> - <type>org.richfaces.HeaderAlignment</type> - </attribute> - <attribute> - <description></description> - <name>tabHeaderClassActive</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>tabHeaderClassDisabled</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>tabHeaderClassInactive</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>tabContentClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>tabHeaderClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onitemchange</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onbeforeitemchange</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>lang</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>title</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>dir</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - - </tag> - - - <tag> <tag-name>collapsiblePanel</tag-name> <component> <component-type>org.richfaces.CollapsiblePanel</component-type> @@ -1070,174 +884,4 @@ </attribute> </tag> - <tag> - <tag-name>tab</tag-name> - <component> - <component-type>org.richfaces.TogglePanelTitledItem</component-type> - <renderer-type>org.richfaces.Tab</renderer-type> - - </component> - <attribute> - <description></description> - <name>disabled</name> - <type>boolean</type> - </attribute> - <attribute> - <description></description> - <name>header</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>name</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>switchType</name> - <type>org.richfaces.component.SwitchType</type> - </attribute> - <attribute> - <description>Long long text</description> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>binding description</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>I don't know maybe some thing strange</description> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <description></description> - <name>headerClassActive</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>headerClassDisabled</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>headerClassInactive</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>headerClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>headerStyle</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>contentClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onheaderclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onheaderdblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onheadermousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onheadermousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onheadermouseup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onenter</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onleave</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>lang</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>title</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>dir</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description></description> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - </tag> - - </facelet-taglib> Copied: branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/Tab.js (from rev 19204, trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/Tab.js) =================================================================== --- branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/Tab.js (rev 0) +++ branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/Tab.js 2010-09-14 18:41:14 UTC (rev 19205) @@ -0,0 +1,130 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +(function ($, rf) { + + rf.ui = rf.ui || {}; + + rf.ui.Tab = rf.ui.TogglePanelItem.extendClass({ + // class name + name:"Tab", + + /** + * @class AccordionItem + * @name AccordionItem + * + * @constructor + * @param {String} componentId - component id + * @param {Hash} options - params + * */ + init : function (componentId, options) { + rf.ui.TogglePanelItem.call(this, componentId, options); + this.index = options["index"]; + this.getTogglePanel().getItems()[this.index] = this; + + rf.Event.bindById(this.id + ":header", "click", this.__onHeaderClick, this) + }, + + /***************************** Public Methods ****************************************************************/ + + __onHeaderClick : function (comp) { + this.getTogglePanel().switchToItem(this.getName()); + }, + + /** + * @param state {string} = inactive | active | disabled + * in that case looking header by css class appropriate to this state + * + * @return {jQuery Object} + * */ + __header : function (state) { + var res = $(rf.getDomElement(this.id + ":header")); + if (state) { + return $(rf.getDomElement(this.id + ":header:" + state)); + } + + return res; + }, + + /** + * @return {jQuery Object} + * */ + __content : function () { + if (!this.__content_) { + this.__content_ = $(rf.getDomElement(this.id)); + } + return this.__content_; + }, + + /** + * @private + * + * used in TogglePanel + * */ + __enter : function () { + + this.__content().show(); + this.__header("inactive").hide(); + this.__header("active").show(); + + return this.__fireEnter(); + }, + + getHeight : function (recalculate) { + if (recalculate || !this.__height) { + this.__height = $(rf.getDomElement(this.id)).outerHeight(true) + } + + return this.__height; + }, + + /** + * @private + * + * used in TogglePanel + * */ + __leave : function () { + var continueProcess = this.__fireLeave(); + if (!continueProcess) { + return false; + } + + this.__content().hide(); + this.__header("active").hide(); + this.__header("inactive").show(); + + return true; + }, + + /***************************** Private Methods ********************************************************/ + + + destroy: function () { + var parent = this.getTogglePanel(); + delete parent.getItems()[this.index]; + + rf.Event.unbindById(this.id, "."+this.namespace); + + this.$super.destroy.call(this); + } + }); +})(jQuery, RichFaces); Copied: branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/TabPanel.js (from rev 19204, trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/TabPanel.js) =================================================================== --- branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/TabPanel.js (rev 0) +++ branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/TabPanel.js 2010-09-14 18:41:14 UTC (rev 19205) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright ${year}, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +(function ($, rf) { + + rf.ui = rf.ui || {}; + + rf.ui.TabPanel = rf.ui.TogglePanel.extendClass({ + // class name + name:"TabPanel", + + /** + * @class TabPanel + * @name TabPanel + * + * @constructor + * @param {String} componentId - component id + * @param {Hash} options - params + * */ + init : function (componentId, options) { + rf.ui.TogglePanel.call(this, componentId, options); + this.items = []; + + this.isKeepHeight = options["isKeepHeight"] || false + }, + + /***************************** Public Methods ****************************************************************/ + + + + /***************************** Private Methods ********************************************************/ + + + destroy: function () { + rf.Event.unbindById(this.id, "."+this.namespace); + + rf.ui.TogglePanel.destroy.call(this); + } + }); +})(jQuery, RichFaces); Modified: branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss =================================================================== --- branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss 2010-09-14 17:40:55 UTC (rev 19204) +++ branches/RF-8742/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/tabPanel.ecss 2010-09-14 18:41:14 UTC (rev 19205) @@ -1,78 +1,420 @@ -*{font-family : verdana /*generalFamilyFont*/} -.rftp_bottomtab {border : 1px solid #A6A6A6 /*panelBorderColor*/; vertical-align : top; background : url(#{resource['org.richfaces:tab_bg.gif']})/*gradient - from generalBackgroundColor to tabBackgroundColor*/ top repeat-x #DAE7F5 /*tabBackgroundColor*/;} -.rftp_active_bottom {border-top : 0px; font-weight : bold; vertical-align : top; background : url(#{resource['org.richfaces:acttab_bottom_bg.gif']})/*gradient - from tabBackgroundColor to generalBackgroundColor*/ top repeat-x #C9DBEF /*additionalBackgroundColor*/;} +.rftp_bottomtab { + border: "1px solid #{richSkin.panelBorderColor}"; + vertical-align: top; +/*gradient - from generalBackgroundColor to tabBackgroundColor*/ + background: "url(#{resource['org.richfaces:tab_bg.gif']}) top repeat-x #{richSkin.tabBackgroundColor}"; +} -.rftp_bottomtab_tabline_vis {padding-bottom : 2px; overflow : hidden; height : 25px; white-space : nowrap; position : relative;} -.rftp_bottomtab_tabs {border : 0px; width : 100%; height : 100%;} -.rftp_bottomtab_spacer {border-top : 1px solid #A6A6A6 /*panelBorderColor*/;} +.rftp_active_bottom { + border-top: 0px; + font-weight: bold; + vertical-align: top; +/*gradient - from tabBackgroundColor to generalBackgroundColor*/ + background: "url(#{resource['org.richfaces:acttab_bottom_bg.gif']}) top repeat-x #{richSkin.additionalBackgroundColor}"; +} -.rftp_bottomtab_border {border : 1px solid #A6A6A6 /*panelBorderColor*/; border-bottom : 0px; height : 2px; background : #C9DBEF /*additionalBackgroundColor*/ /*tabBackgroundColor*/;} -.rftp_bottomtab_content {border : 1px solid #A6A6A6 /*panelBorderColor*/; border-bottom : 0px; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding : 10px; background : #ffffff /*generalBackgroundColor*/;} +.rftp_bottomtab_tabline_vis { + padding-bottom: 2px; + overflow: hidden; + height: 25px; + white-space: nowrap; + position: relative; +} -.rftp_bottomtab_scroll_left {background : url(#{resource['org.richfaces:acttab_bg.gif']})/*gradient - from tabBackgroundColor to generalBackgroundColor*/ bottom repeat-x #C9DBEF /*additionalBackgroundColor*/; position : absolute; bottom : 1px; left : 1px; width : 15px; height : 25px; border : 1px solid #A6A6A6 /*panelBorderColor*/; font-weight : bold; text-align : center; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding-top : 6px;} -.rftp_bottomtab_scroll_right {background : url(#{resource['org.richfaces:acttab_bg.gif']})/*gradient - from tabBackgroundColor to generalBackgroundColor*/ bottom repeat-x #C9DBEF /*additionalBackgroundColor*/; position : absolute; bottom : 1px; right : 17px; width : 15px; height : 25px; border : 1px solid #A6A6A6 /*panelBorderColor*/; font-weight : bold; text-align : center; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding-top : 6px;} -.rftp_bottomtab_tabslist {background : url(#{resource['org.richfaces:acttab_bg.gif']})/*gradient - from tabBackgroundColor to generalBackgroundColor*/ bottom repeat-x #C9DBEF /*additionalBackgroundColor*/; position : absolute; bottom : 1px; right : 1px; width : 15px; height : 25px; border : 1px solid #A6A6A6 /*panelBorderColor*/; font-weight : bold; text-align : center; font-family : verdana /*generalFamilyFont*/; font-size : 14px; padding-top : 2px;} +.rftp_bottomtab_tabs { + border: 0px; + width: 100%; + height: 100%; +} +.rftp_bottomtab_spacer { + border-top: "1px solid #{richSkin.panelBorderColor}"; +} +.rftp_bottomtab_border { + border: "1px solid #{richSkin.panelBorderColor}"; + border-bottom: 0px; + height: 2px; + background: '#{richSkin.additionalBackgroundColor}' +/*tabBackgroundColor*/; +} -.rftp_toptab {border : 1px solid #A6A6A6 /*panelBorderColor*/; vertical-align : top; background : url(#{resource['org.richfaces:tab_bg.gif']})/*gradient - from generalBackgroundColor to tabBackgroundColor*/ top repeat-x #DAE7F5 /*tabBackgroundColor*/;} -.rftp_active_top {border-bottom : 0px; font-weight : bold; vertical-align : top; background : url(#{resource['org.richfaces:acttab_bg.gif']})/*gradient - from tabBackgroundColor to generalBackgroundColor*/ top repeat-x #C9DBEF /*additionalBackgroundColor*/;} +.rftp_bottomtab_content { + border: "1px solid #{richSkin.panelBorderColor}"; + border-bottom: 0px; + font-family: '#{richSkin.generalFamilyFont}'; + font-size: '#{richSkin.generalSizeFont}'; + padding: 10px; + background: '#{richSkin.generalBackgroundColor}'; +} -.rftp_toptab_tabline_vis {padding-top : 2px; overflow : hidden; height : 25px; white-space : nowrap; position : relative;} -.rftp_toptab_tabs {border : 0px; width : 100%; height : 100%;} -.rftp_toptab_spacer {border-bottom : 1px solid #A6A6A6 /*panelBorderColor*/;} +.rftp_bottomtab_scroll_left { +/*gradient - from tabBackgroundColor to generalBackgroundColor*/ + background: "url(#{resource['org.richfaces:acttab_bg.gif']}) bottom repeat-x #{richSkin.additionalBackgroundColor}"; + position: absolute; + bottom: 1px; + left: 1px; + width: 15px; + height: 25px; + border: "1px solid #{richSkin.panelBorderColor}"; + font-weight: bold; + text-align: center; + font-family: '#{richSkin.generalFamilyFont}'; + font-size: '#{richSkin.generalSizeFont}'; + padding-top: 6px; +} -.rftp_horizonttab_tabspacer_width {padding-left : 1px;} +.rftp_bottomtab_scroll_right { +/*gradient - from tabBackgroundColor to generalBackgroundColor*/ + background: "url(#{resource['org.richfaces:acttab_bg.gif']}) bottom repeat-x #{richSkin.additionalBackgroundColor}"; + position: absolute; + bottom: 1px; + right: 17px; + width: 15px; + height: 25px; + border: "1px solid #{richSkin.panelBorderColor}"; + font-weight: bold; + text-align: center; + font-family: '#{richSkin.generalFamilyFont}'; + font-size: '#{richSkin.generalSizeFont}'; + padding-top: 6px; +} -.rftp_icon {position : absolute; top : 4px; left : 4px} -.rftp_close {position : absolute; top : 4px; right : 4px} -.rftp_label {white-space : nowrap; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/;} +.rftp_bottomtab_tabslist { +/*gradient - from tabBackgroundColor to generalBackgroundColor*/ + background: "url(#{resource['org.richfaces:acttab_bg.gif']}) bottom repeat-x #{richSkin.additionalBackgroundColor}"; + position: absolute; + bottom: 1px; + right: 1px; + width: 15px; + height: 25px; + border: "1px solid #{richSkin.panelBorderColor}"; + font-weight: bold; + text-align: center; + font-family: '#{richSkin.generalFamilyFont}'; + font-size: 14px; + padding-top: 2px; +} -.rftp_label_container {position : relative; padding : 5px 37px 0px 22px;} +.rf-tb-hdr { + border: "1px solid #{richSkin.panelBorderColor}"; + vertical-align: top; + + /*gradient - from generalBackgroundColor to tabBackgroundColor*/ + background: "url(#{resource['org.richfaces:tab_bg.gif']}) top repeat-x #DAE7F5"; /* #{richSkin.tabBackgroundColor} */ +} -.rftp_toptab_scroll_left {background : url(#{resource['org.richfaces:acttab_bg.gif']}) top repeat-x #C9DBEF /*additionalBackgroundColor*/; position : absolute; top : 1px; left : 1px; width : 15px; height : 25px; border : 1px solid #A6A6A6 /*panelBorderColor*/; font-weight : bold; text-align : center; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding-top : 6px;} -.rftp_toptab_scroll_right {background : url(#{resource['org.richfaces:acttab_bg.gif']}) top repeat-x #C9DBEF /*additionalBackgroundColor*/; position : absolute; top : 1px; right : 17px; width : 15px; height : 25px; border : 1px solid #A6A6A6 /*panelBorderColor*/; font-weight : bold; text-align : center; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding-top : 6px;} -.rftp_toptab_tabslist {background : url(#{resource['org.richfaces:acttab_bg.gif']}) top repeat-x #C9DBEF /*additionalBackgroundColor*/; position : absolute; top : 1px; right : 1px; width : 15px; height : 25px; border : 1px solid #A6A6A6 /*panelBorderColor*/; font-weight : bold; text-align : center; font-family : verdana /*generalFamilyFont*/; font-size : 14px; padding-top : 2px;} +.rf-tb-hdr { + cursor : pointer; + border : 1px solid #A6A6A6; + padding : 0px 0px 3px 0px; + vertical-align : top; + background-image: "url(#{resource['org.richfaces:tab_bg.gif']})"; + background-position: top; + background-color: #DAE7F5; + background-repeat: repeat-x; +} -.rftp_toptab_border {border : 1px solid #A6A6A6 /*panelBorderColor*/; border-top : 0px; height : 2px; background : #C9DBEF /*additionalBackgroundColor*/;} -.rf-tab-cnt {border : 1px solid #A6A6A6 /*panelBorderColor*/; border-top : 0px; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding : 10px; background : #ffffff /*generalBackgroundColor*/;} -.rftp_hidden {display : none} +.rf-tb-hdr-act { + border-bottom: 0px; + font-weight: bold; + vertical-align: top; -.rftp_topmultitab_tabline_vis {border-bottom : 0px; padding-top : 2px; white-space : nowrap; position : relative;} -.rftp_topmultitab_tabs_first { border : 0px; width : 100%; height : 100%; height : 25px} -.rftp_topmultitab_tabs { border : 0px; width : 100%; height : 100%; height : 25px; margin-bottom : -1px;} -.rftp_topmultitab_spacer {border-bottom : 0px;} -.rftp_topmultitab_border {border : 1px solid #A6A6A6 /*panelBorderColor*/; border-top : 0px; height : 3px; background : #C9DBEF /*additionalBackgroundColor*/;} + /*gradient - from tabBackgroundColor to generalBackgroundColor*/ + background: "url(#{resource['org.richfaces:acttab_bg.gif']}) top repeat-x #{richSkin.additionalBackgroundColor}"; +} -.rftp_multitab_line_1 {width : 17%} -.rftp_multitab_line_2 {width : 50%} +rf-tb-hdr-inact { +} +rf-tb-hdr-dis { +} -.rftp_bottommultitab_tabline_vis {border : 1px solid #A6A6A6 /*panelBorderColor*/; background :url(#{resource['org.richfaces:tabline_bg.gif']}) top repeat-x #EEF4FB; border-top : 0px; padding-bottom : 2px; white-space : nowrap; position : relative;} -.rftp_bottommultitab_tabs_first { border : 0px; width : 100%; height : 100%; height : 25px} -.rftp_bottommultitab_tabs { border : 0px; width : 100%; height : 100%; height : 25px; margin-top : -1px;} -.rftp_bottommultitab_spacer {border-top : 0px;} -.rftp_bottommultitab_border {border : 1px solid #A6A6A6 /*panelBorderColor*/; border-bottom : 0px; height : 3px; background : #C9DBEF /*additionalBackgroundColor*/;} +.rf-tb-hdr_tabline_vis { + padding-top: 2px; + overflow: hidden; + height: 25px; + white-space: nowrap; + position: relative; +} +.rf-tb-hdr_tabs { + border: 0px; + width: 100%; + height: 100%; +} -.rftp_label_vert {white-space : nowrap; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding : 5px 0px 5px 0px;} -.rftp_label_container_vert {position : relative; padding : 0px 37px 0px 22px;} +.rf-tb-hdr_spacer { + border-bottom: "1px solid #{richSkin.panelBorderColor}"; +} +.rftp_horizonttab_tabspacer_width { + padding-left: 1px; +} +.rftp_label { + white-space: nowrap; + font-family: '#{richSkin.generalFamilyFont}'; + font-size: '#{richSkin.generalSizeFont}'; +} -.rftp_lefttab {border : 1px solid #A6A6A6 /*panelBorderColor*/; padding : 2px 0px 2px 0px; vertical-align : middle; background : url(#{resource['org.richfaces:tab_bg.gif']}) top right repeat-x #DAE7F5; margin-right : -1px} -.rftp_lefttab_active {border-right : 0px; font-weight : bold; vertical-align : middle; background : url(#{resource['org.richfaces:actlefttab_bg.gif']}) top left repeat-y #C9DBEF /*additionalBackgroundColor*/; width : 100%;} -.rftp_verttab_spacer {padding-top : 1px;} +.rftp_label_container { + position: relative; + padding: 5px 37px 0px 22px; +} -.rftp_lefttab_border {border : 1px solid #A6A6A6 /*panelBorderColor*/; padding-left : 2px; background : #C9DBEF /*additionalBackgroundColor*/;} -.rftp_lefttab_content {width : 100%; border : 1px solid #A6A6A6 /*panelBorderColor*/; border-left : 0px; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding : 10px; background : #ffffff /*generalBackgroundColor*/; vertical-align : top;} +.rf-tb-hdr_scroll_left { + background: "url(#{resource['org.richfaces:acttab_bg.gif']}) top repeat-x #{richSkin.additionalBackgroundColor}"; + position: absolute; + top: 1px; + left: 1px; + width: 15px; + height: 25px; + border: "1px solid #{richSkin.panelBorderColor}"; + text-align: center; + font-weight: bold; + font-family: '#{richSkin.generalFamilyFont}'; + font-size: '#{richSkin.generalSizeFont}'; + padding-top: 6px; +} +.rf-tb-hdr_scroll_right { + background: "url(#{resource['org.richfaces:acttab_bg.gif']}) top repeat-x #{richSkin.additionalBackgroundColor}"; + position: absolute; + top: 1px; + right: 17px; + width: 15px; + height: 25px; + border: "1px solid #{richSkin.panelBorderColor}"; + text-align: center; + font-family: '#{richSkin.generalFamilyFont}'; + font-size: '#{richSkin.generalSizeFont}'; + font-weight: bold; + padding-top: 6px; +} -.rftp_righttab {border : 1px solid #A6A6A6 /*panelBorderColor*/; padding : 2px 0px 2px 0px; vertical-align : middle; background : url(#{resource['org.richfaces:tab_bg.gif']}) top right repeat-x #DAE7F5; margin-left : -1px} -.rftp_righttab_active {border-left : 0px; font-weight : bold; vertical-align : middle; background : url(#{resource['org.richfaces:actrighttab_bg.gif']}) top right repeat-y #C9DBEF /*additionalBackgroundColor*/; width : 100%;} -.rftp_righttab_spacer {padding-top : 1px;} +.rf-tb-hdr_tabslist { + background: "url(#{resource['org.richfaces:acttab_bg.gif']}) top repeat-x #{richSkin.additionalBackgroundColor}"; + position: absolute; + top: 1px; + right: 1px; + width: 15px; + height: 25px; + border: "1px solid #{richSkin.panelBorderColor}"; + font-weight: bold; + text-align: center; + font-family: '#{richSkin.generalFamilyFont}'; + font-size: 14px; + padding-top: 2px; +} -.rftp_righttab_border {border : 1px solid #A6A6A6 /*panelBorderColor*/; padding-right : 2px; background : #C9DBEF /*additionalBackgroundColor*/;} -.rftp_righttab_content {width : 100%; border : 1px solid #A6A6A6 /*panelBorderColor*/; border-right : 0px; font-family : verdana /*generalFamilyFont*/; font-size : 11px /*generalSizeFont*/; padding : 10px; background : #ffffff /*generalBackgroundColor*/; vertical-align : top;} +.rf-tb-hdr_border { + border: "1px solid #{richSkin.panelBorderColor}"; + border-top: 0px; + height: 2px; + background: '#{richSkin.additionalBackgroundColor}'; +} +.rf-tb-cnt { + border: "1px solid #{richSkin.panelBorderColor}"; + border-top: 0px; + font-family: '#{richSkin.generalFamilyFont}'; + font-size: '#{richSkin.generalSizeFont}'; + padding: 10px; + background: '#{richSkin.generalBackgroundColor}'; +} + +.rftp_hidden { + display: none +} + +.rftp_topmultitab_tabline_vis { + border-bottom: 0px; + padding-top: 2px; + white-space: nowrap; + position: relative; +} + +.rftp_topmultitab_tabs_first { + border: 0px; + width: 100%; + height: 100%; + height: 25px +} + +.rftp_topmultitab_tabs { + border: 0px; + width: 100%; + height: 100%; + height: 25px; + margin-bottom: -1px; +} + +.rftp_topmultitab_spacer { + border-bottom: 0px; +} + +.rftp_topmultitab_border { + border: "1px solid #{richSkin.panelBorderColor}"; + border-top: 0px; + height: 3px; + background: '#{richSkin.additionalBackgroundColor}'; +} + +.rftp_multitab_line_1 { + width: 17% +} + +.rftp_multitab_line_2 { + width: 50% +} + +.rftp_bottommultitab_tabline_vis { + border: "1px solid #{richSkin.panelBorderColor}"; + background: "url(#{resource['org.richfaces:tabline_bg.gif']}) top repeat-x #EEF4FB"; + border-top: 0px; + padding-bottom: 2px; + white-space: nowrap; + position: relative; +} + +.rftp_bottommultitab_tabs_first { + border: 0px; + width: 100%; + height: 100%; + height: 25px +} + +.rftp_bottommultitab_tabs { + border: 0px; + width: 100%; + height: 100%; + height: 25px; + margin-top: -1px; +} + +.rftp_bottommultitab_spacer { + border-top: 0px; +} + +.rftp_bottommultitab_border { + border: "1px solid #{richSkin.panelBorderColor}"; + border-bottom: 0px; + height: 3px; + background: '#{richSkin.additionalBackgroundColor}'; +} + +.rftp_label_vert { + white-space: nowrap; + font-family: '#{richSkin.generalFamilyFont}'; + font-size: '#{richSkin.generalSizeFont}'; + padding: 5px 0px 5px 0px; +} + +.rftp_label_container_vert { + position: relative; + padding: 0px 37px 0px 22px; +} + +.rftp_lefttab { + border: "1px solid #{richSkin.panelBorderColor}"; + padding: 2px 0px 2px 0px; + vertical-align: middle; + background: "url(#{resource['org.richfaces:tab_bg.gif']}) top right repeat-x #DAE7F5"; + margin-right: -1px +} + +.rftp_lefttab_active { + border-right: 0px; + font-weight: bold; + vertical-align: middle; + background: "url(#{resource['org.richfaces:actlefttab_bg.gif']}) top left repeat-y #{richSkin.additionalBackgroundColor}"; + width: 100%; +} + +.rftp_verttab_spacer { + padding-top: 1px; +} + +.rftp_lefttab_border { + border: "1px solid #{richSkin.panelBorderColor}"; + padding-left: 2px; + background: '#{richSkin.additionalBackgroundColor}'; +} + +.rftp_lefttab_content { + width: 100%; + border: "1px solid #{richSkin.panelBorderColor}"; + border-left: 0px; + font-family: '#{richSkin.generalFamilyFont}'; + font-size: '#{richSkin.generalSizeFont}'; + padding: 10px; + background: '#{richSkin.generalBackgroundColor}'; + vertical-align: top; +} + +.rftp_righttab { + border: "1px solid #{richSkin.panelBorderColor}"; + padding: 2px 0px 2px 0px; + vertical-align: middle; + background: "url(#{resource['org.richfaces:tab_bg.gif']}) top right repeat-x #DAE7F5"; + margin-left: -1px +} + +.rftp_righttab_active { + border-left: 0px; + font-weight: bold; + vertical-align: middle; + background: "url(#{resource['org.richfaces:actrighttab_bg.gif']}) top right repeat-y #{richSkin.additionalBackgroundColor}"; + width: 100%; +} + +.rftp_righttab_spacer { + padding-top: 1px; +} + +.rftp_righttab_border { + border: "1px solid #{richSkin.panelBorderColor}"; + padding-right: 2px; + background: '#{richSkin.additionalBackgroundColor}'; +} + +.rftp_righttab_content { + width: 100%; + border: "1px solid #{richSkin.panelBorderColor}"; + border-right: 0px; + font-family: '#{richSkin.generalFamilyFont}'; + font-size: '#{richSkin.generalSizeFont}'; + padding: 10px; + background: '#{richSkin.generalBackgroundColor}'; + vertical-align: top; +} + +.rftp_active_top { cursor : default; border-bottom : 1px solid #C9DBEF; font-weight : bold; padding : 0px 0px 0px 0px; vertical-align : top; background : url(acttab_bg.gif) top repeat-x #C9DBEF;} +.rftp_active2_top { cursor : default; border-bottom : 1px solid #FFFFFF; font-weight : bold; padding : 0px 0px 0px 0px; vertical-align : top; background : url(acttab2_bg.gif) top repeat-x #FFFFFF;} + +.rftp_toptab_tabline_vis {border : 1px solid #a6a6a6; background :url(tabline_bg.gif) top repeat-x #EEF4FB; border-bottom : 0px; padding-top : 2px; overflow : hidden; white-space : nowrap; position : relative;} +.rftp_toptab_tabline_dis {border-bottom : 0px; padding-top : 2px; overflow : hidden; white-space : nowrap; position : relative;} + +.rftp_toptab_tabs {border-collapse : collapse; border : 0px; height : 100%;} +.rftp_toptab_spacer {border-bottom : 1px solid #A6A6A6;} +.rftp_horizonttab_tabspacer_width {padding-left : 1px;} + +.rftp_icon {margin : 4px 0px 0px 5px; vertical-align : top;} +.rftp_close {margin : 4px 5px 0px 10px; vertical-align : top;} +.rftp_label {display : inline-block; font-family : verdana; font-size : 11px; padding : 5px 0px 2px 0px;} + +.rftp_toptab_scroll_left {background : url(acttab_bg.gif) top repeat-x #C9DBEF; position : absolute; top : 1px; left : 1px; width : 15px; height : 250px; border : 1px solid #a6a6a6; font-weight : bold; text-align : center; font-family : verdana; font-size : 11px; padding-top : 6px;} +.rftp_toptab_scroll_right {background : url(acttab_bg.gif) top repeat-x #C9DBEF; position : absolute; top : 1px; right : 17px; width : 15px; height : 250px; border : 1px solid #a6a6a6; font-weight : bold; text-align : center; font-family : verdana; font-size : 11px; padding-top : 6px;} +.rftp_toptab_tabslist {background : url(acttab_bg.gif) top repeat-x #C9DBEF; position : absolute; top : 1px; right : 1px; width : 15px; height : 250px; border : 1px solid #a6a6a6; font-weight : bold; text-align : center; font-family : verdana; font-size : 14px; padding-top : 2px;} + +.rf-tb-hdr_border { + border : 1px solid #A6A6A6; + border-top : 0px; + height : 2px; + background : #C9DBEF; +} + +.rftp_toptab_content {border : 1px solid #A6A6A6; border-top : 0px; font-family : verdana; font-size : 11px; padding : 10px; background : #ffffff;} +.rftp_hidden {display : none}