[yelp-xsl] mal2html-page: Fix editor-mode badges for Final and pkgversion

[Shaun McCance <shaunm src gnome org>]

commit 7edaf65089cafa009e7da19470b3463515254dda
Author: Shaun McCance <shaunm gnome org>
Date:   Mon Oct 3 14:34:15 2011 -0400

    mal2html-page: Fix editor-mode badges for Final and pkgversion

 xslt/mallard/html/mal2html-page.xsl |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/xslt/mallard/html/mal2html-page.xsl b/xslt/mallard/html/mal2html-page.xsl
index e494f1e..d9d6484 100644
--- a/xslt/mallard/html/mal2html-page.xsl
+++ b/xslt/mallard/html/mal2html-page.xsl
@@ -181,7 +181,7 @@ REMARK: Describe this template
     </xsl:variable>
     <xsl:variable name="revision"
                   select="$page/mal:info/mal:revision[ date = $date][last()]"/>
-    <xsl:if test="$revision/@status != '' and $revision/@status != 'final'">
+    <xsl:if test="$revision/@status != ''">
       <xsl:text> </xsl:text>
       <span>
         <xsl:attribute name="class">
@@ -288,7 +288,17 @@ REMARK: Describe this template
         <p class="version">
           <!-- FIXME: i18n -->
           <xsl:text>Version </xsl:text>
-          <xsl:value-of select="$revision/@version"/>
+          <xsl:choose>
+            <xsl:when test="$revision/@version">
+              <xsl:value-of select="$revision/@version"/>
+            </xsl:when>
+            <xsl:when test="$revision/@docversion">
+              <xsl:value-of select="$revision/@docversion"/>
+            </xsl:when>
+            <xsl:when test="$revision/@pkgversion">
+              <xsl:value-of select="$revision/@pkgversion"/>
+            </xsl:when>
+          </xsl:choose>
           <xsl:text> on </xsl:text>
           <xsl:value-of select="$revision/@date"/>
         </p>