You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ah...@apache.org on 2005/09/04 18:08:31 UTC

svn commit: r278607 - in /maven/maven-1/plugins/trunk/faq: plugin.properties src/plugin-resources/faq.jsl xdocs/changes.xml xdocs/properties.xml

Author: aheritier
Date: Sun Sep  4 09:08:22 2005
New Revision: 278607

URL: http://svn.apache.org/viewcvs?rev=278607&view=rev
Log:
MPFAQ-19 : Optional toplinks and layout fix.
Patch submitted by : Lukas Theussl
Patch reviewed by : Arnaud Heritier

Modified:
    maven/maven-1/plugins/trunk/faq/plugin.properties
    maven/maven-1/plugins/trunk/faq/src/plugin-resources/faq.jsl
    maven/maven-1/plugins/trunk/faq/xdocs/changes.xml
    maven/maven-1/plugins/trunk/faq/xdocs/properties.xml

Modified: maven/maven-1/plugins/trunk/faq/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/plugin.properties?rev=278607&r1=278606&r2=278607&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/faq/plugin.properties Sun Sep  4 09:08:22 2005
@@ -23,3 +23,6 @@
 
 # Destination directory where output xdocs file are produced
 maven.faq.dest=${maven.gen.docs}
+
+# Whether to generate links to the top of the page
+maven.faq.toplinks=true

Modified: maven/maven-1/plugins/trunk/faq/src/plugin-resources/faq.jsl
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/src/plugin-resources/faq.jsl?rev=278607&r1=278606&r2=278607&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/src/plugin-resources/faq.jsl (original)
+++ maven/maven-1/plugins/trunk/faq/src/plugin-resources/faq.jsl Sun Sep  4 09:08:22 2005
@@ -80,10 +80,13 @@
 
   <jsl:template match="answer">
     <dd>
+        <jsl:applyTemplates trim="true" />
+        <j:if test="${context.getVariable('maven.faq.toplinks') == 'true'}">
         <j:set var="top"><x:expr select="../../../@title"/></j:set>
         <j:set var="_top">#<doc:escapeNameToken value="${top}"/></j:set>
         <div class="xright"><a href="${_top}">[top]</a></div>
-        <jsl:applyTemplates trim="true" />
+        <br/>
+        </j:if>
     </dd>
   </jsl:template> 
 

Modified: maven/maven-1/plugins/trunk/faq/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/xdocs/changes.xml?rev=278607&r1=278606&r2=278607&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/faq/xdocs/changes.xml Sun Sep  4 09:08:22 2005
@@ -23,6 +23,7 @@
   </properties>
   <body>
     <release version="1.5-SNAPSHOT" date="in SVN">
+      <action dev="aheritier" type="fix" issue="MPFAQ-19" due-to="Lukas Theussl">Optional toplinks and layout fix.</action>
       <action dev="aheritier" type="fix" issue="MPFAQ-16" due-to="Lukas Theussl">FAQ plugin does not produce valid XHTML 1.0 Transitional.</action>
       <action dev="aheritier" type="add" issue="MPFAQ-15" due-to="Lukas Theussl">Adding a "top" link beside each answer.</action>
       <action dev="dion" type="update" issue="MPFAQ-14" due-to="florent ramiere">Document .fml extension requirement</action>

Modified: maven/maven-1/plugins/trunk/faq/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/xdocs/properties.xml?rev=278607&r1=278606&r2=278607&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/faq/xdocs/properties.xml Sun Sep  4 09:08:22 2005
@@ -44,6 +44,15 @@
             Defaults to the value of maven.gen.docs (which is ${maven.build.dir}/generated-xdocs).
           </td>
         </tr>
+        <tr>
+          <td>maven.faq.toplinks</td>
+          <td>Yes</td>
+          <td>
+            Specifies whether links to the top of the page should be
+            generated after each answer.
+            Defaults to <code>true</code>.
+          </td>
+        </tr>
       </table>
     </section>
   </body>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org