Author: dmaliarevich Date: 2009-06-02 09:38:25 -0400 (Tue, 02 Jun 2009) New Revision: 15642 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4381, styles and css classes were added to junit test for rich:page, template code was corrected. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java 2009-06-02 12:59:25 UTC (rev 15641) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPageTemplate.java 2009-06-02 13:38:25 UTC (rev 15642) @@ -171,8 +171,8 @@ if(sidebarFacet != null) { pageSidebarDiv = visualDocument.createElement(HTML.TAG_DIV); String sidebarClass = CSS_PAGE_SIDEBAR; - if (ComponentUtil.isNotBlank(attrs.getSiderbarClass())) { - sidebarClass += Constants.WHITE_SPACE + attrs.getSiderbarClass(); + if (ComponentUtil.isNotBlank(attrs.getSidebarClass())) { + sidebarClass += Constants.WHITE_SPACE + attrs.getSidebarClass(); } pageSidebarDiv.setAttribute(HTML.ATTR_CLASS, sidebarClass); pageContentDiv.appendChild(pageSidebarDiv); @@ -302,7 +302,7 @@ private final String MARKUP_TYPE = "markupType"; //$NON-NLS-1$ private final String NAMESPACE = "namespace"; //$NON-NLS-1$ private final String PAGE_TITLE = "pageTitle"; //$NON-NLS-1$ - private final String SIDERBAR_CLASS = "siderbarClass"; //$NON-NLS-1$ + private final String SIDEBAR_CLASS = "sidebarClass"; //$NON-NLS-1$ private final String SIDEBAR_POSITION = "sidebarPosition"; //$NON-NLS-1$ private final String SIDEBAR_WIDTH = "sidebarWidth"; //$NON-NLS-1$ private final String THEME = "theme"; //$NON-NLS-1$ @@ -317,7 +317,7 @@ private String markupType; private String namespace; private String pageTitle; - private String siderbarClass; + private String sidebarClass; private String sidebarPosition; private String sidebarWidth; private String style; @@ -336,7 +336,7 @@ markupType = sourceElement.getAttribute(MARKUP_TYPE); namespace = sourceElement.getAttribute(NAMESPACE); pageTitle = sourceElement.getAttribute(PAGE_TITLE); - siderbarClass = sourceElement.getAttribute(SIDERBAR_CLASS); + sidebarClass = sourceElement.getAttribute(SIDEBAR_CLASS); sidebarPosition = sourceElement.getAttribute(SIDEBAR_POSITION); sidebarWidth = sourceElement.getAttribute(SIDEBAR_WIDTH); style = sourceElement.getAttribute(HTML.ATTR_STYLE); @@ -390,8 +390,8 @@ return pageTitle; } - public String getSiderbarClass() { - return siderbarClass; + public String getSidebarClass() { + return sidebarClass; } public String getSidebarPosition() { Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml =================================================================== (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml 2009-06-02 12:59:25 UTC (rev 15641) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml 2009-06-02 13:38:25 UTC (rev 15642) @@ -2,7 +2,7 @@ <test id="id1"> - <DIV CLASS="rich-page someClass" STYLE="width: 800px; background-color: white;"> + <DIV CLASS="rich-page styleClass" STYLE="width: 800px; background-color: white;"> <DIV CLASS="rich-page-header headerClass"> <DIV CLASS="rich-page-header-content"> <SPAN STYLE="font-size: 2em;"> @@ -16,7 +16,7 @@ </SPAN> </DIV> <DIV CLASS="rich-page-content"> - <DIV CLASS="rich-page-sidebar" STYLE="width: 15em; float: right;"> + <DIV CLASS="rich-page-sidebar sidebarClass" STYLE="width: 15em; float: right;"> <SPAN STYLE="font-size: 2em;"> SIDEBAR </SPAN> @@ -32,7 +32,7 @@ <DIV WIDTH="100%" STYLE="width: 100%;"> <SPAN CLASS="vpe-text"> TOP PANEL - </SPAN> + </SPAN> </DIV> <DIV WIDTH="50%" STYLE="width: 50%; float: left;"> <SPAN CLASS="vpe-text">