Author: thorsten Date: Tue May 3 07:54:43 2005 New Revision: 167914 URL: http://svn.apache.org/viewcvs?rev=167914&view=rev Log: various changes and bugfixes that I noted when I developed another format implementation of the viewHelper. Diwaker Gupta noticed that I used xhtml instead of html as tag. The templates are only allowed to be imported once when 2 or more times the same contract got used. Added explanation about * matches. Renamed prepare.*.** (which prepared the final stylesheet to be used) to getStylesheet to make it more self explaning. Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.css.xsl forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.include.xsl forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.properties.xsl forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/src/documentation/content/xdocs/howItWork.xml forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/output.xmap forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/src/documentation/content/xdocs/index.xml Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap?rev=167914&r1=167913&r2=167914&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap Tue May 3 07:54:43 2005 @@ -116,6 +116,7 @@ + - + @@ -175,7 +181,7 @@ - + Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.properties.xsl URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.properties.xsl?rev=167914&r1=167913&r2=167914&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.properties.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.properties.xsl Tue May 3 07:54:43 2005 @@ -27,7 +27,7 @@ - + Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl?rev=167914&r1=167913&r2=167914&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl Tue May 3 07:54:43 2005 @@ -40,7 +40,7 @@ - + @@ -67,7 +67,7 @@ - + Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/src/documentation/content/xdocs/howItWork.xml URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/src/documentation/content/xdocs/howItWork.xml?rev=167914&r1=167913&r2=167914&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/src/documentation/content/xdocs/howItWork.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/src/documentation/content/xdocs/howItWork.xml Tue May 3 07:54:43 2005 @@ -34,7 +34,7 @@ 1. viewHelper This is the template producing factory. -a. ]]> -> Resolving factory +a. ]]> -> Resolving factory Project implementation of templates have priority before default ones. If no implementation can be found we use the noFt (~ - no forrest:template) implementation.-> this match is implemented in the viewHelper plugin Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/output.xmap URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/output.xmap?rev=167914&r1=167913&r2=167914&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/output.xmap (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/output.xmap Tue May 3 07:54:43 2005 @@ -82,8 +82,8 @@ Resolving factory Project implementation of templates have priority before default ones. If no implementation can be found we use the noFt (~ - no forrest:template) implementation. - --> - + {1} name of the contract--> + @@ -97,34 +97,51 @@ - + {1} format to deliver + {2} contract name-#-> - + + --> + + + + + + + + + - - + + - + - + @@ -216,14 +233,14 @@ --> - + - + Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/src/documentation/content/xdocs/index.xml URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/src/documentation/content/xdocs/index.xml?rev=167914&r1=167913&r2=167914&view=diff ============================================================================== --- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/src/documentation/content/xdocs/index.xml (original) +++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper/src/documentation/content/xdocs/index.xml Tue May 3 07:54:43 2005 @@ -43,6 +43,7 @@
  • Add after the ]]> something like
  • + ]]> +
    1. Change the css in ]]>. I tried but the result is not nice. If you succeed please change the name of the contract to "nav-main-div", add the patch to the issue-tracker and I add