[jboss-svn-commits] JBoss PortletSwap SVN: r200 - in portlets/src/framework/RichFacesPortlet/src/main/webapp: css and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jan 18 11:56:43 EST 2008
Author: wesleyhales
Date: 2008-01-18 11:56:43 -0500 (Fri, 18 Jan 2008)
New Revision: 200
Modified:
portlets/src/framework/RichFacesPortlet/src/main/webapp/WEB-INF/ajaxportlet-object.xml
portlets/src/framework/RichFacesPortlet/src/main/webapp/WEB-INF/portlet.xml
portlets/src/framework/RichFacesPortlet/src/main/webapp/WEB-INF/web.xml
portlets/src/framework/RichFacesPortlet/src/main/webapp/css/common.css
portlets/src/framework/RichFacesPortlet/src/main/webapp/templates/main.xhtml
Log:
Cleanup
Modified: portlets/src/framework/RichFacesPortlet/src/main/webapp/WEB-INF/ajaxportlet-object.xml
===================================================================
--- portlets/src/framework/RichFacesPortlet/src/main/webapp/WEB-INF/ajaxportlet-object.xml 2008-01-16 22:46:05 UTC (rev 199)
+++ portlets/src/framework/RichFacesPortlet/src/main/webapp/WEB-INF/ajaxportlet-object.xml 2008-01-18 16:56:43 UTC (rev 200)
@@ -8,29 +8,7 @@
<component-ref>ajaxPortletApp.ajaxPortlet</component-ref>
</instance>
</deployment>
- <!--
- <deployment>
- <parent-ref>default</parent-ref>
- <if-exists>overwrite</if-exists>
- <page>
- <page-name>ajaxPortlet</page-name>
- <window>
- <window-name>ajaxportletWindow</window-name>
- <instance-ref>AjaxPortletInstance</instance-ref>
- <default>true</default>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
- <window-name>ajaxportletSecondWindow</window-name>
- <instance-ref>AjaxPortletSecondInstance</instance-ref>
- <default>true</default>
- <region>center</region>
- <height>0</height>
- </window>
- </page>
- </deployment>
- -->
+
<deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default.default</parent-ref>
@@ -42,12 +20,5 @@
<height>0</height>
</window>
</deployment><!--
- <deployment>
- <parent-ref>default</parent-ref>
- <if-exists>overwrite</if-exists>
- <instance>
- <instance-name>AjaxPortletSecondInstance</instance-name>
- <component-ref>ajaxPortletApp.ajaxPortlet</component-ref>
- </instance>
- </deployment>
+
--></deployments>
Modified: portlets/src/framework/RichFacesPortlet/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- portlets/src/framework/RichFacesPortlet/src/main/webapp/WEB-INF/portlet.xml 2008-01-16 22:46:05 UTC (rev 199)
+++ portlets/src/framework/RichFacesPortlet/src/main/webapp/WEB-INF/portlet.xml 2008-01-18 16:56:43 UTC (rev 200)
@@ -1,6 +1,6 @@
<portlet-app version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/portlet"
- xmlns="http://java.sun.com/xml/ns/portlet">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet"
+ xmlns="http://java.sun.com/xml/ns/portlet">
<portlet>
<portlet-name>ajaxPortlet</portlet-name>
<portlet-class>
Modified: portlets/src/framework/RichFacesPortlet/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portlets/src/framework/RichFacesPortlet/src/main/webapp/WEB-INF/web.xml 2008-01-16 22:46:05 UTC (rev 199)
+++ portlets/src/framework/RichFacesPortlet/src/main/webapp/WEB-INF/web.xml 2008-01-18 16:56:43 UTC (rev 200)
@@ -16,18 +16,18 @@
<param-value>org.ajax4jsf.portlet.application.FaceletPortletViewHandler</param-value>
</context-param>
- <context-param>
- <param-name>org.richfaces.LoadStyleStrategy</param-name>
- <param-value>NONE</param-value>
- </context-param>
- <context-param>
- <param-name>org.richfaces.LoadScriptStrategy</param-name>
- <param-value>NONE</param-value>
- </context-param>
- <context-param>
- <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name>
- <param-value>rfRes</param-value>
- </context-param>
+ <context-param>
+ <param-name>org.richfaces.LoadStyleStrategy</param-name>
+ <param-value>NONE</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.LoadScriptStrategy</param-name>
+ <param-value>NONE</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name>
+ <param-value>rfRes</param-value>
+ </context-param>
<filter>
@@ -44,16 +44,6 @@
<dispatcher>INCLUDE</dispatcher>
</filter-mapping>
- <!-- JSF -->
- <!--<context-param>
- <param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
- <param-value>NEKO,TIDY,NONE</param-value>
- </context-param>-->
- <!--<context-param>
- <param-name>org.ajax4jsf.xmlparser.TIDY</param-name>
- <param-value>/pages/repeater.xhtml,/pages/tabs.xhtml</param-value>
- </context-param>-->
-
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
<param-value>false</param-value>
@@ -79,12 +69,6 @@
<param-value>server</param-value>
</context-param>
- <!--
- <listener>
- <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
- </listener>
- -->
-
<listener>
<listener-class>com.sun.faces.config.ConfigureListener</listener-class>
</listener>
@@ -97,10 +81,6 @@
<servlet-name>FacesServlet</servlet-name>
<url-pattern>/faces/*</url-pattern>
</servlet-mapping>
- <!--<servlet-mapping>-->
- <!--<servlet-name>FacesServlet</servlet-name>-->
- <!--<url-pattern>*.jsf</url-pattern>-->
- <!--</servlet-mapping>-->
<mime-mapping>
<extension>svg</extension>
<mime-type>image/svg+xml</mime-type>
Modified: portlets/src/framework/RichFacesPortlet/src/main/webapp/css/common.css
===================================================================
--- portlets/src/framework/RichFacesPortlet/src/main/webapp/css/common.css 2008-01-16 22:46:05 UTC (rev 199)
+++ portlets/src/framework/RichFacesPortlet/src/main/webapp/css/common.css 2008-01-18 16:56:43 UTC (rev 200)
@@ -351,3 +351,4 @@
.clear {
clear: both;
}
+
Modified: portlets/src/framework/RichFacesPortlet/src/main/webapp/templates/main.xhtml
===================================================================
--- portlets/src/framework/RichFacesPortlet/src/main/webapp/templates/main.xhtml 2008-01-16 22:46:05 UTC (rev 199)
+++ portlets/src/framework/RichFacesPortlet/src/main/webapp/templates/main.xhtml 2008-01-18 16:56:43 UTC (rev 200)
@@ -1,64 +1,71 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
-
+ xmlns:rich="http://richfaces.org/rich">
+
<head>
-<meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8"/>
-<title>
- <ui:insert name="title"/>
-</title>
-<link rel="STYLESHEET" type="text/css" href="${facesContext.externalContext.requestContextPath}/css/common.css"/>
-<ui:include src="/templates/include/dynamic-css.xhtml" />
+ <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8"/>
+ <title>
+ <ui:insert name="title"/>
+ </title>
+ <ui:param name="context" value="#{facesContext.externalContext.requestContextPath}"/>
+ <link rel="STYLESHEET" type="text/css" href="#{context}/css/common.css"/>
+
+ <ui:include src="/templates/include/dynamic-css.xhtml"/>
</head>
<body>
<div style="position:relative;">
-<ui:include src="/templates/include/header.xhtml" />
-<div class="float-left third-width">
-<table class="left_menu" cellpadding="0" cellspacing="0" border="0">
-<tbody>
- <tr>
- <td>
- <ui:include src="/templates/include/references.xhtml" />
- <div class="menu_separator">
-
- </div>
- <ui:include src="/templates/include/components-navigation.xhtml" />
- </td>
- </tr>
-</tbody>
-</table>
-</div>
+ <ui:include src="/templates/include/header.xhtml"/>
+
+ <div class="float-left third-width">
+ <table class="left_menu" cellpadding="0" cellspacing="0" border="0">
+ <tbody>
+ <tr>
+ <td>
+ <ui:include src="/templates/include/references.xhtml"/>
+
+ <div class="menu_separator">
+
+ </div>
+ <ui:include src="/templates/include/components-navigation.xhtml"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
<div class="float-left two-third-width">
-<h:graphicImage value="#{componentNavigator.currentComponent.captionImage}"
- rendered="#{componentNavigator.hasCurrentComponent}" height="40" alt="" border="0" styleClass="component_name" id="componentImage"/>
+ <h:graphicImage value="#{componentNavigator.currentComponent.captionImage}"
+ rendered="#{componentNavigator.hasCurrentComponent}" height="40" alt="" border="0"
+ styleClass="component_name" id="componentImage"/>
-<table cellpadding="0" cellspacing="0" border="0" class="content_container" width="100%">
-<tbody>
- <tr>
+ <table cellpadding="0" cellspacing="0" border="0" class="content_container" width="100%">
+ <tbody>
+ <tr>
- <td width="100%" class="content_container_pdddings">
-<!-- tabpanel begin -->
- <ui:insert name="body2">Body</ui:insert>
+ <td width="100%" class="content_container_pdddings">
+ <!-- tabpanel begin -->
+ <ui:insert name="body2">Body</ui:insert>
-<!-- tabpanel end -->
- <rich:spacer style="height:10px;" />
- <rich:separator style="height:1px" />
- <div style="float:right" class="footer-text">${a4j.version}</div>
- <div style="float:none">
- <a href="http://jboss.com/index.html?module=bb&op=viewtopic&t=104575"
- style="color:#000; display:block" class="footer-text">RichFaces. Most Important Links</a>
- </div>
- </td>
- </tr>
-</tbody>
-</table>
- </div>
-
+ <!-- tabpanel end -->
+ <rich:spacer style="height:10px;"/>
+ <rich:separator style="height:1px"/>
+
+ <div style="float:right" class="footer-text">${a4j.version}</div>
+ <div style="float:none">
+ <a href="http://jboss.com/index.html?module=bb&op=viewtopic&t=104575"
+ style="color:#000; display:block" class="footer-text">RichFaces. Most Important Links</a>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
</div>
</body>
</html>
More information about the jboss-svn-commits
mailing list