Author: aadamchik
Date: Thu Jan 10 20:16:02 2013
New Revision: 1431605
URL: http://svn.apache.org/viewvc?rev=1431605&view=rev
Log:
CAY-1733 update docs
some minor style additions
(cherry picked from commit b562ed9627093e1bd642800b7bd3cf4972673f66)
Modified:
cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/css/cayenne-doc.css
cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/html.xsl
cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/pdf.xsl
Modified:
cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/css/cayenne-doc.css
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/css/cayenne-doc.css?rev=1431605&r1=1431604&r2=1431605&view=diff
==============================================================================
---
cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/css/cayenne-doc.css
(original)
+++
cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/css/cayenne-doc.css
Thu Jan 10 20:16:02 2013
@@ -134,7 +134,7 @@ span.productname {
}
th.versioninfo {
- font-size: small;
+ font-size: 10px;
font-weight: normal;
text-align: left;
}
\ No newline at end of file
Modified:
cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/html.xsl
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/html.xsl?rev=1431605&r1=1431604&r2=1431605&view=diff
==============================================================================
---
cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/html.xsl
(original)
+++
cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/html.xsl
Thu Jan 10 20:16:02 2013
@@ -73,11 +73,9 @@
<link rev="made" href="{$link.mailto.url}"/>
</xsl:if>
- <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/>
<meta name="keywords" content="Cayenne ${pom.version} documentation"/>
<meta name="description" content="User documentation for Apache
Cayenne version ${pom.version}"/>
-
<xsl:if test="$generate.meta.abstract != 0">
<xsl:variable name="info" select="(d:articleinfo
|d:bookinfo
@@ -151,6 +149,18 @@ body { background-image: url('</xsl:text
<div class="navheader">
<xsl:if test="$row1 or $row2">
<table width="100%" summary="Navigation header">
+
+ <!-- Add Apache Cayenne version info -->
+ <xsl:if test="$row1">
+ <tr>
+ <th class="versioninfo">v.${pom.version}</th>
+ <th align="center">
+ <xsl:apply-templates select="."
mode="object.title.markup"/>
+ </th>
+ <th></th>
+ </tr>
+ </xsl:if>
+
<xsl:if test="$row2">
<tr>
@@ -209,17 +219,6 @@ body { background-image: url('</xsl:text
</xsl:if>
- <!-- Add Apache Cayenne version info -->
- <xsl:if test="$row1">
- <tr>
- <th class="versioninfo">Apache Cayenne
${pom.version}</th>
- <th colspan="" align="center">
- <xsl:apply-templates select="."
mode="object.title.markup"/>
- </th>
- <th></th>
- </tr>
- </xsl:if>
-
</table>
</xsl:if>
<xsl:if test="$header.rule != 0">
Modified:
cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/pdf.xsl
URL:
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/pdf.xsl?rev=1431605&r1=1431604&r2=1431605&view=diff
==============================================================================
---
cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/pdf.xsl
(original)
+++
cayenne/main/branches/STABLE-3.1/docs/docbook/docbook-stylesheets/src/main/resources/stylesheets/pdf.xsl
Thu Jan 10 20:16:02 2013
@@ -141,38 +141,18 @@
<xsl:param name="position" select="''"/>
<xsl:param name="gentext-key" select="''"/>
<xsl:variable name="Version">
- <!--<xsl:if test="//releaseinfo">-->
- <!--<xsl:text>Spring-Integration (</xsl:text>-->
- <!--<xsl:value-of select="//releaseinfo"/>-->
- <!--${pom.version}-->
- <!--<xsl:text>)</xsl:text>-->
- <!--</xsl:if>-->
- <fo:inline min-width="150mm">Apache Cayenne
${pom.version}</fo:inline>
+ <fo:inline min-width="150mm">v.${pom.version}</fo:inline>
</xsl:variable>
<xsl:choose>
<xsl:when test="$sequence='blank'">
- <xsl:if test="$position = 'center'">
+ <xsl:if test="$position = 'left'">
<xsl:value-of select="$Version"/>
</xsl:if>
</xsl:when>
- <!-- for double sided printing, print page numbers on alternating
sides (of the page) -->
- <xsl:when test="$double.sided != 0">
- <xsl:choose>
- <xsl:when test="$sequence = 'even' and $position='left'">
- <fo:page-number/>
- </xsl:when>
- <xsl:when test="$sequence = 'odd' and $position='right'">
- <fo:page-number/>
- </xsl:when>
- <xsl:when test="$position='center'">
- <xsl:value-of select="$Version"/>
- </xsl:when>
- </xsl:choose>
- </xsl:when>
<!-- for single sided printing, print all page numbers on the
right (of the page) -->
<xsl:when test="$double.sided = 0">
<xsl:choose>
- <xsl:when test="$position='center'">
+ <xsl:when test="$position='left'">
<xsl:value-of select="$Version"/>
</xsl:when>
<xsl:when test="$position='right'">
