Author: sergeyhalipov
Date: 2007-11-14 07:53:58 -0500 (Wed, 14 Nov 2007)
New Revision: 3982
Modified:
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java
branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/tagInfo.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-1344 and
http://jira.jboss.com/jira/browse/RF-1262
Modified:
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java
===================================================================
---
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java 2007-11-14
11:50:57 UTC (rev 3981)
+++
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java 2007-11-14
12:53:58 UTC (rev 3982)
@@ -97,5 +97,13 @@
public void setGroup(String group) {
this.group = group;
}
+
+ public String getTagInfoLocation() {
+ int pos = tldDocLocation.indexOf("tlddoc");
+ if (pos >= 0) {
+ return tldDocLocation.substring(pos);
+ }
+ return tldDocLocation;
+ }
}
Modified:
branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/tagInfo.xhtml
===================================================================
---
branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/tagInfo.xhtml 2007-11-14
11:50:57 UTC (rev 3981)
+++
branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/tagInfo.xhtml 2007-11-14
12:53:58 UTC (rev 3982)
@@ -1,13 +1,12 @@
-<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:rich="http://richfaces.org/rich">
-<ui:composition>
- <rich:tab label="Tag Information">
- <rich:insert src="/WEB-INF/tlddoc/#{path}.html"
- errorContent="/templates/include/tagInfoNotes.xhtml"/>
- </rich:tab>
-</ui:composition>>
-</html>
-
+<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:rich="http://richfaces.org/rich">
+<ui:composition>
+ <rich:tab label="Tag Information">
+ <rich:insert
src="/WEB-INF/#{componentNavigator.currentComponent.tagInfoLocation}"
+ errorContent="/templates/include/tagInfoNotes.xhtml"/>
+ </rich:tab>
+</ui:composition>
+</html>