velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r602245 - in /velocity/tools/trunk: ./ xdocs/ xdocs/css/
Date Fri, 07 Dec 2007 22:23:22 GMT
Author: nbubna
Date: Fri Dec  7 14:23:20 2007
New Revision: 602245

URL: http://svn.apache.org/viewvc?rev=602245&view=rev
Log:
enable printer-friendly version and make a variety of little fixes and improvements

Added:
    velocity/tools/trunk/xdocs/css/print.css   (with props)
Modified:
    velocity/tools/trunk/build.xml
    velocity/tools/trunk/xdocs/changes.xml
    velocity/tools/trunk/xdocs/config.java.xml
    velocity/tools/trunk/xdocs/config.properties.xml
    velocity/tools/trunk/xdocs/config.xml
    velocity/tools/trunk/xdocs/config.xml.xml
    velocity/tools/trunk/xdocs/creatingtools.xml
    velocity/tools/trunk/xdocs/css/style.css
    velocity/tools/trunk/xdocs/frameworks.xml
    velocity/tools/trunk/xdocs/generic.index.xml
    velocity/tools/trunk/xdocs/generic.project.xml
    velocity/tools/trunk/xdocs/generic.xml
    velocity/tools/trunk/xdocs/project.xml
    velocity/tools/trunk/xdocs/site.dvsl
    velocity/tools/trunk/xdocs/standalone.xml
    velocity/tools/trunk/xdocs/struts.project.xml
    velocity/tools/trunk/xdocs/struts.xml
    velocity/tools/trunk/xdocs/view.index.xml
    velocity/tools/trunk/xdocs/view.project.xml
    velocity/tools/trunk/xdocs/view.xml

Modified: velocity/tools/trunk/build.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/build.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/build.xml (original)
+++ velocity/tools/trunk/build.xml Fri Dec  7 14:23:20 2007
@@ -341,6 +341,15 @@
         <exclude name="**/*project.xml"/>
         <include name="**/*.xml"/>
     </dvsl>
+    <!-- create printer version of documentation -->
+    <dvsl basedir="${docs.src}"
+          destdir="${docs.dir}/"
+          extension="-printer.html"
+          style="${docs.src}/site.dvsl">
+        <exclude name="**/*project.xml"/>
+        <include name="**/*.xml"/>
+        <tool name="toolbox.string.PrinterFriendlyVersion" value="yes" />
+    </dvsl>
 
     <copy todir="${docs.dir}/images">
       <fileset dir="${docs.src}/images">

Modified: velocity/tools/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/changes.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/changes.xml (original)
+++ velocity/tools/trunk/xdocs/changes.xml Fri Dec  7 14:23:20 2007
@@ -21,7 +21,7 @@
 
 <document>
   <properties>
-    <title>VelocityTools Changes</title>
+    <title>Change Log</title>
     <projectfile>xdocs/project.xml</projectfile>
   </properties>
 <body>

Modified: velocity/tools/trunk/xdocs/config.java.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/config.java.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/config.java.xml (original)
+++ velocity/tools/trunk/xdocs/config.java.xml Fri Dec  7 14:23:20 2007
@@ -22,7 +22,7 @@
 <document>
 
     <properties>
-        <title>VelocityTools Project</title>
+        <title>Using Java</title>
         <projectfile>xdocs/project.xml</projectfile>
         <subprojectfile>xdocs/config.project.xml</subprojectfile>
     </properties>

Modified: velocity/tools/trunk/xdocs/config.properties.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/config.properties.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/config.properties.xml (original)
+++ velocity/tools/trunk/xdocs/config.properties.xml Fri Dec  7 14:23:20 2007
@@ -22,7 +22,7 @@
 <document>
 
     <properties>
-        <title>VelocityTools Project</title>
+        <title>Using Properties</title>
         <projectfile>xdocs/project.xml</projectfile>
         <subprojectfile>xdocs/config.project.xml</subprojectfile>
     </properties>

Modified: velocity/tools/trunk/xdocs/config.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/config.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/config.xml (original)
+++ velocity/tools/trunk/xdocs/config.xml Fri Dec  7 14:23:20 2007
@@ -22,7 +22,7 @@
 <document>
 
     <properties>
-        <title>VelocityTools Project</title>
+        <title>Overview</title>
         <projectfile>xdocs/project.xml</projectfile>
         <subprojectfile>xdocs/config.project.xml</subprojectfile>
     </properties>

Modified: velocity/tools/trunk/xdocs/config.xml.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/config.xml.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/config.xml.xml (original)
+++ velocity/tools/trunk/xdocs/config.xml.xml Fri Dec  7 14:23:20 2007
@@ -22,7 +22,7 @@
 <document>
 
     <properties>
-        <title>VelocityTools Project</title>
+        <title>Using XML</title>
         <projectfile>xdocs/project.xml</projectfile>
         <subprojectfile>xdocs/config.project.xml</subprojectfile>
     </properties>

Modified: velocity/tools/trunk/xdocs/creatingtools.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/creatingtools.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/creatingtools.xml (original)
+++ velocity/tools/trunk/xdocs/creatingtools.xml Fri Dec  7 14:23:20 2007
@@ -22,7 +22,7 @@
 <document>
 
     <properties>
-        <title>VelocityTools Project</title>
+        <title>Creating Tools</title>
         <projectfile>xdocs/project.xml</projectfile>
     </properties>
 

Added: velocity/tools/trunk/xdocs/css/print.css
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/css/print.css?rev=602245&view=auto
==============================================================================
--- velocity/tools/trunk/xdocs/css/print.css (added)
+++ velocity/tools/trunk/xdocs/css/print.css Fri Dec  7 14:23:20 2007
@@ -0,0 +1,29 @@
+#bodyColumn, #banner, #title {
+    width: 625px;
+    margin: 0px;
+}
+#organizationLogo img, #projectLogo img, #projectLogo span{
+  margin: 2px;
+}
+ul {
+    padding: 0px 0px 5px 40px;
+}
+p {
+    margin:3px 0px 5px 1px;
+}
+h1, h2 {
+    padding: 1px 1px 1px 2px;
+    margin: 2px 1px 1px 2px;
+    background-color: white;
+    color: black;
+}
+h3, h4, h5 {
+    padding: 1px 1px 1px 2px;
+    border: none;
+    color: black;
+}
+#title h1 {
+    font-size: 16pt;
+    font-weight: bold;
+    text-align: center;
+}

Propchange: velocity/tools/trunk/xdocs/css/print.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/tools/trunk/xdocs/css/print.css
------------------------------------------------------------------------------
    svn:mime-type = text/css

Modified: velocity/tools/trunk/xdocs/css/style.css
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/css/style.css?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/css/style.css (original)
+++ velocity/tools/trunk/xdocs/css/style.css Fri Dec  7 14:23:20 2007
@@ -7,4 +7,10 @@
 td {
     background-color: #a0ddf0;
     color: #000000;
-}
\ No newline at end of file
+}
+
+#navcolumn h5#printLink {
+    border-top: 1px solid #AAAAAA;
+    border-bottom: none;
+    margin-top: 10px;
+}

Modified: velocity/tools/trunk/xdocs/frameworks.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/frameworks.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/frameworks.xml (original)
+++ velocity/tools/trunk/xdocs/frameworks.xml Fri Dec  7 14:23:20 2007
@@ -22,7 +22,7 @@
 <document>
 
     <properties>
-        <title>VelocityTools Project</title>
+        <title>Web Framework Integration</title>
         <projectfile>xdocs/project.xml</projectfile>
     </properties>
 

Modified: velocity/tools/trunk/xdocs/generic.index.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/generic.index.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/generic.index.xml (original)
+++ velocity/tools/trunk/xdocs/generic.index.xml Fri Dec  7 14:23:20 2007
@@ -22,7 +22,7 @@
 <document>
 
     <properties>
-        <title>GenericTools</title>
+        <title>Overview</title>
         <projectfile>xdocs/project.xml</projectfile>
         <subprojectfile>xdocs/generic.project.xml</subprojectfile>
     </properties>

Modified: velocity/tools/trunk/xdocs/generic.project.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/generic.project.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/generic.project.xml (original)
+++ velocity/tools/trunk/xdocs/generic.project.xml Fri Dec  7 14:23:20 2007
@@ -20,7 +20,7 @@
 -->
 
 <project name="GenericTools" href="index.html"
-    logo="/images/velocitygenerictools.png">
+    logo="images/velocitygenerictools.png">
 
   <breadcrumb href="generic.index.html">GenericTools</breadcrumb>
   <menu>

Modified: velocity/tools/trunk/xdocs/generic.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/generic.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/generic.xml (original)
+++ velocity/tools/trunk/xdocs/generic.xml Fri Dec  7 14:23:20 2007
@@ -22,7 +22,7 @@
 <document>
 
     <properties>
-        <title>GenericTools</title>
+        <title>Overview</title>
         <projectfile>xdocs/project.xml</projectfile>
         <subprojectfile>xdocs/generic.project.xml</subprojectfile>
     </properties>

Modified: velocity/tools/trunk/xdocs/project.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/project.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/project.xml (original)
+++ velocity/tools/trunk/xdocs/project.xml Fri Dec  7 14:23:20 2007
@@ -66,5 +66,7 @@
             <item name="Source Code"    href="index.html#Subversion%20Repository"/>
             <item name="Report Issue"   href="http://issues.apache.org/jira/browse/VELTOOLS"/>
         </group>
+        
+        <printerversion/>
     </menu>
 </project>

Modified: velocity/tools/trunk/xdocs/site.dvsl
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/site.dvsl?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/site.dvsl (original)
+++ velocity/tools/trunk/xdocs/site.dvsl Fri Dec  7 14:23:20 2007
@@ -29,14 +29,6 @@
 ##     If its value is "yes", the generated page has no left-hand menu.
 ##     This facilitates the printing of documentation.
 ##
-## $context.toolbox.LinkToPrinterFriendlyVersion
-##     If its value is "yes", a link to a printer-friendly version of
-##     the same document is added to the end of the left-hand menu.
-##     The file name of the printer-frienly document is derived from the
-##     the name of the current template in the following way:
-##     filename.html becomes filename-printer.html
-##  
-##
 ## Shown below is a configuration example of an ant task:
 ##     <!-- create printer version of documentation -->
 ##     <dvsl
@@ -53,6 +45,8 @@
 ##
 
 #match( "document" )
+    ## identify if this is to be a printer-friendly version
+    #set( $printerFriendly = $context.toolbox.PrinterFriendlyVersion.equals('yes') )
     ## alias the current node
     #set( $document = $node )
     ## get path to the project file
@@ -70,11 +64,13 @@
       #set( $subtitle = $subproject.attribute('name') )
     #end
     #set( $pagetitle = $document.properties.title )
-    ## build up crumbs
-    #set( $crumbs = $project.selectNodes('breadcrumb') )
-    #set( $subcrumbs = $subproject.selectNodes('breadcrumb') )
-    #if( $subcrumbs && !$subcrumbs.empty )
-      #set( $foo = $crumbs.addAll($subcrumbs) )
+    ## build up crumbs if they'll be needed
+    #if( !$printerFriendly )
+        #set( $crumbs = $project.selectNodes('breadcrumb') )
+        #set( $subcrumbs = $subproject.selectNodes('breadcrumb') )
+        #if( $subcrumbs && !$subcrumbs.empty )
+          #set( $foo = $crumbs.addAll($subcrumbs) )
+        #end
     #end
 
     <html>
@@ -96,6 +92,9 @@
        #foreach( $style in $document.properties.selectNodes('style') )
         @import url("$style.attribute('href')");
        #end
+       #if( $printerFriendly )
+        @import url("css/print.css");
+       #end
       </style>        
     </head>
 
@@ -105,6 +104,7 @@
       <div id="banner">
         <a href="http://velocity.apache.org/" id="bannerLeft">
           <img src="http://velocity.apache.org/images/velocity_project_wide.png"
+             #if( $printerFriendly )width="400" height="40"#end
              align="left" alt="The Velocity Project" border="0"/>
         </a>
         #if( $subproject.attribute('logo') )
@@ -129,7 +129,18 @@
         </div>
       </div>
 
+      ## PRINTER FRIENDLY TITLE
+      #if( $printerFriendly )
+      <div id="title">
+        <h1>#if( $subtitle )$subtitle - #end#if( $pagetitle )$pagetitle#end</h1>
+        <div class="clear">
+          <hr/>
+        </div>
+      </div>
+      #end
+
       ## BREADCRUMB LINKS
+      #if( !$printerFriendly )
       <div id="breadcrumbs">
         <div class="xleft">
           #foreach( $crumb in $crumbs )
@@ -147,16 +158,18 @@
           <hr/>
         </div>
       </div>
+      #end
 
 
         <!-- LEFT SIDE NAVIGATION -->
-        #if( !$context.toolbox.PrinterFriendlyVersion.equals("yes") )            
+        #if( !$printerFriendly )            
         <div id="leftColumn">
           <div id="navcolumn">
             $context.applyTemplates( $project, "menu/group" )
             #if( $subproject )
                 $context.applyTemplates( $subproject, "menu/group" )
             #end
+            $context.applyTemplates( $project, "menu/printerversion" )
             <a class="poweredBy" href="http://velocity.apache.org/" title="Apache Velocity"
>
               <img class="poweredBy" alt="Apache Velocity" src="http://velocity.apache.org/images/pbv90x30.png"/>
             </a>
@@ -235,11 +248,9 @@
  *   Insert a link to a printerfriendly version of the document
  *#
 #match( "printerversion" )
-<p>
-#if ($context.toolbox.LinkToPrinterFriendlyVersion.equals("yes"))
-<a href="$context.getAppValue('infilename').substring(0, $context.getAppValue('infilename').lastIndexOf("."))-printer.html">Printer-friendly
Version</a>
-#end    
-</p>
+#set( $filename = $context.getAppValue('infilename') )
+#set( $filename = $filename.substring(0, $filename.lastIndexOf('.')) )
+<h5 id="printLink"><a href="${filename}-printer.html">Print-Friendly Version</a></h5>
 #end
 
 

Modified: velocity/tools/trunk/xdocs/standalone.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/standalone.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/standalone.xml (original)
+++ velocity/tools/trunk/xdocs/standalone.xml Fri Dec  7 14:23:20 2007
@@ -22,7 +22,7 @@
 <document>
 
     <properties>
-        <title>VelocityTools Project</title>
+        <title>Standalone Use</title>
         <projectfile>xdocs/project.xml</projectfile>
     </properties>
 

Modified: velocity/tools/trunk/xdocs/struts.project.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/struts.project.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/struts.project.xml (original)
+++ velocity/tools/trunk/xdocs/struts.project.xml Fri Dec  7 14:23:20 2007
@@ -20,7 +20,7 @@
 -->
 
 <project name="VelocityStruts" href="index.html"
-    logo="/images/velocitystruts.png">
+    logo="images/velocitystruts.png">
 
   <breadcrumb href="view.index.html">VelocityStruts</breadcrumb>
   <menu>

Modified: velocity/tools/trunk/xdocs/struts.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/struts.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/struts.xml (original)
+++ velocity/tools/trunk/xdocs/struts.xml Fri Dec  7 14:23:20 2007
@@ -22,7 +22,7 @@
 <document>
 
     <properties>
-        <title>VelocityTools Project</title>
+        <title>Overview</title>
         <projectfile>xdocs/project.xml</projectfile>
         <subprojectfile>xdocs/struts.project.xml</subprojectfile>
     </properties>

Modified: velocity/tools/trunk/xdocs/view.index.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/view.index.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/view.index.xml (original)
+++ velocity/tools/trunk/xdocs/view.index.xml Fri Dec  7 14:23:20 2007
@@ -21,7 +21,7 @@
 
 <document>
   <properties>
-    <title>VelocityView</title>
+    <title>Overview</title>
     <projectfile>xdocs/project.xml</projectfile>
     <subprojectfile>xdocs/view.project.xml</subprojectfile>
   </properties>
@@ -30,7 +30,7 @@
 
   <section name="Overview">
     <p>VelocityView provides support for rapidly and cleanly building web applications
-    using Velocity templates as the view layer.  The project is designed with the
+    using Velocity templates in the view layer.  The project is designed with the
     <a href="http://jakarta.apache.org/turbine/further-reading/pullmodel.html">Pull-MVC
Model</a>
     in mind and works well in conjunction with web application frameworks that act
     as the controller (e.g. <a href="../struts/index.html">Struts</a>), but can
be used

Modified: velocity/tools/trunk/xdocs/view.project.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/view.project.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/view.project.xml (original)
+++ velocity/tools/trunk/xdocs/view.project.xml Fri Dec  7 14:23:20 2007
@@ -20,7 +20,7 @@
 -->
 
 <project name="VelocityView" href="index.html"
-    logo="/images/velocityview.png">
+    logo="images/velocityview.png">
 
   <breadcrumb href="view.index.html">VelocityView</breadcrumb>
   <menu>

Modified: velocity/tools/trunk/xdocs/view.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/view.xml?rev=602245&r1=602244&r2=602245&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/view.xml (original)
+++ velocity/tools/trunk/xdocs/view.xml Fri Dec  7 14:23:20 2007
@@ -22,7 +22,7 @@
 <document>
 
     <properties>
-        <title>VelocityTools Project</title>
+        <title>Overview</title>
         <projectfile>xdocs/project.xml</projectfile>
         <subprojectfile>xdocs/view.project.xml</subprojectfile>
     </properties>



Mime
View raw message