From 4e9847101b17ca5463ca9ff6a64ffd29cc5267b4 Mon Sep 17 00:00:00 2001
From: Ryan Haasken <haasken@cray.com>
Date: Thu, 12 Jun 2014 18:01:40 -0500
Subject: [PATCH] LUDOC-243 style: Improve formatting of version tags (html)

Improved the xsl templates and the manual.css stylesheet so that the
Lustre version tags would not overlap the text.

- Created a versionbox div class for the div which puts a box around
  version-specific content.
- Created a versioncontent span class for the actual content.
- Put the xsl:apply-templates element inside of a versioncontent span.
- Gave the versioncontent class a margin-left of 15px to move the text
  to the right of the versionlabel.
- Capitalized "Introduced" in the version labels.

Signed-off-by: Ryan Haasken <haasken@cray.com>
Change-Id: I4dbacc082211116626298caf8629e942803725e0
Reviewed-on: http://review.whamcloud.com/10707
Tested-by: Jenkins
Reviewed-by: Richard Henwood <richard.henwood@intel.com>
---
 style/customstyle.xsl | 24 +++++++++++++-----------
 style/manual.css      |  9 +++++++--
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/style/customstyle.xsl b/style/customstyle.xsl
index 95e10a8..d54d45f 100644
--- a/style/customstyle.xsl
+++ b/style/customstyle.xsl
@@ -25,11 +25,13 @@
 <xsl:template name='textdecoration_1'>
 	<xsl:param name='version'/>
 	<xsl:param name='chunkid'/>
-	<div class='versioncontent'>
+	<div class='versionbox'>
 		<span class='versionlabel'>
 			<xsl:value-of select='$version'/>
 		</span>
-		<xsl:apply-templates/>
+		<span class='versioncontent'>
+			<xsl:apply-templates/>
+		</span>
 	</div>
 </xsl:template>
 
@@ -43,55 +45,55 @@
 	<xsl:choose>
 		<xsl:when test="@condition = 'l21'">
 			<xsl:call-template name='textdecoration_1'>
-				<xsl:with-param name='version' select="'introduced in Lustre 2.1'"/>
+				<xsl:with-param name='version' select="'Introduced in Lustre 2.1'"/>
 				<xsl:with-param name='chunkid' select="$id"/>
 			</xsl:call-template>
 		</xsl:when>
 		<xsl:when test="@condition = 'l22'">
 			<xsl:call-template name='textdecoration_1'>
-				<xsl:with-param name='version' select="'introduced in Lustre 2.2'"/>
+				<xsl:with-param name='version' select="'Introduced in Lustre 2.2'"/>
 				<xsl:with-param name='chunkid' select="$id"/>
 			</xsl:call-template>
 		</xsl:when>
 		<xsl:when test="@condition = 'l23'">
 			<xsl:call-template name='textdecoration_1'>
-				<xsl:with-param name='version' select="'introduced in Lustre 2.3'"/>
+				<xsl:with-param name='version' select="'Introduced in Lustre 2.3'"/>
 				<xsl:with-param name='chunkid' select="$id"/>
 			</xsl:call-template>
 		</xsl:when>
 		<xsl:when test="@condition = 'l24'">
 			<xsl:call-template name='textdecoration_1'>
-				<xsl:with-param name='version' select="'introduced in Lustre 2.4'"/>
+				<xsl:with-param name='version' select="'Introduced in Lustre 2.4'"/>
 				<xsl:with-param name='chunkid' select="$id"/>
 			</xsl:call-template>
 		</xsl:when>
 		<xsl:when test="@condition = 'l25'">
 			<xsl:call-template name='textdecoration_1'>
-				<xsl:with-param name='version' select="'introduced in Lustre 2.5'"/>
+				<xsl:with-param name='version' select="'Introduced in Lustre 2.5'"/>
 				<xsl:with-param name='chunkid' select="$id"/>
 			</xsl:call-template>
 		</xsl:when>
 		<xsl:when test="@condition = 'l26'">
 			<xsl:call-template name='textdecoration_1'>
-				<xsl:with-param name='version' select="'introduced in Lustre 2.6'"/>
+				<xsl:with-param name='version' select="'Introduced in Lustre 2.6'"/>
 				<xsl:with-param name='chunkid' select="$id"/>
 			</xsl:call-template>
 		</xsl:when>
 		<xsl:when test="@condition = 'l27'">
 			<xsl:call-template name='textdecoration_1'>
-				<xsl:with-param name='version' select="'introduced in Lustre 2.7'"/>
+				<xsl:with-param name='version' select="'Introduced in Lustre 2.7'"/>
 				<xsl:with-param name='chunkid' select="$id"/>
 			</xsl:call-template>
 		</xsl:when>
 		<xsl:when test="@condition = 'l28'">
 			<xsl:call-template name='textdecoration_1'>
-				<xsl:with-param name='version' select="'introduced in Lustre 2.8'"/>
+				<xsl:with-param name='version' select="'Introduced in Lustre 2.8'"/>
 				<xsl:with-param name='chunkid' select="$id"/>
 			</xsl:call-template>
 		</xsl:when>
 		<xsl:when test="@condition = 'l29'">
 			<xsl:call-template name='textdecoration_1'>
-				<xsl:with-param name='version' select="'introduced in Lustre 2.9'"/>
+				<xsl:with-param name='version' select="'Introduced in Lustre 2.9'"/>
 				<xsl:with-param name='chunkid' select="$id"/>
 			</xsl:call-template>
 		</xsl:when>
diff --git a/style/manual.css b/style/manual.css
index 3082a88..76501ac 100644
--- a/style/manual.css
+++ b/style/manual.css
@@ -3,6 +3,10 @@ pre.programlisting, pre.screen
     padding: 5px;
 }
 
+div.versionbox {
+  border: 1px solid gray;
+}
+
 span.versionlabel {
   display: inline-block;
   position: relative;
@@ -11,8 +15,9 @@ span.versionlabel {
   background-color: white;
   border: 1px solid gray;
 }
-div.versioncontent {
-  border: 1px solid gray;
+
+span.versioncontent {
+  margin-left: 15px;
 }
 
 span.floatright {
-- 
1.8.3.1