GNOME.org
 

[gnome-doc-utils/mallard] [mal2html] Stylistic changes to status marker & link trails

commit dee39e62b93e87eb5e25a15e846930a77a6c3d6b
Author: Shaun McCance <shaunm gnome org>
Date:   Fri May 29 13:19:53 2009 -0500

    [mal2html] Stylistic changes to status marker & link trails
---
 xslt/mallard/html/mal2html-css.xsl  |   18 ++++-----
 xslt/mallard/html/mal2html-page.xsl |   73 +++++++++++++++++------------------
 2 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/xslt/mallard/html/mal2html-css.xsl b/xslt/mallard/html/mal2html-css.xsl
index 20fbba9..b283f62 100644
--- a/xslt/mallard/html/mal2html-css.xsl
+++ b/xslt/mallard/html/mal2html-css.xsl
@@ -158,6 +158,8 @@ div.linktrail {
   font-size: 0.83em;
   padding-left: 1.2em;
   margin: 0 1px 0.2em 1px;
+  color: </xsl:text>
+    <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
 }
 
 td.twocolumnleft { width: 48%; vertical-align: top; padding: 0; margin: 0; }
@@ -212,24 +214,20 @@ FIXME
 -->
 <xsl:template name="mal2html.css.editor">
 <xsl:text>
-body.status-stub { background-color:  </xsl:text>
-  <xsl:value-of select="$theme.color.red_background"/><xsl:text>; }
-body.status-draft { background-color:  </xsl:text>
-  <xsl:value-of select="$theme.color.red_background"/><xsl:text>; }
-body.status-incomplete { background-color:  </xsl:text>
-  <xsl:value-of select="$theme.color.red_background"/><xsl:text>; }
-body.status-review { background-color:  </xsl:text>
-  <xsl:value-of select="$theme.color.yellow_background"/><xsl:text>; }
 div.version {
-  margin: 0 0 1em 0;
+  position: absolute;
+  right: 12px;
+  opacity: 0.2;
+  margin-top: -1em;
   padding: 0.5em 1em 0.5em 1em;
-  max-width: 48em;
+  max-width: 24em;
   -moz-border-radius: 6px;
   border: solid 1px </xsl:text>
     <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
   background-color: </xsl:text>
     <xsl:value-of select="$theme.color.yellow_background"/><xsl:text>;
 }
+div.version:hover { opacity: 0.8; }
 div.version p.version { margin-top: 0.2em; }
 div.pagelink div.title span.status {
   font-size: 0.83em;
diff --git a/xslt/mallard/html/mal2html-page.xsl b/xslt/mallard/html/mal2html-page.xsl
index 7a10165..d064b31 100644
--- a/xslt/mallard/html/mal2html-page.xsl
+++ b/xslt/mallard/html/mal2html-page.xsl
@@ -484,44 +484,41 @@ REMARK: Describe this template
       <xsl:call-template name="mal2html.css"/>
     </head>
     <body>
-      <xsl:if test="$mal2html.editor_mode and $version/@status != ''">
-        <xsl:attribute name="class">
-          <xsl:value-of select="concat(' status-', $version/@status)"/>
-        </xsl:attribute>
-        <div class="version">
-          <!-- FIXME: i18n -->
-          <div class="title">
-            <xsl:choose>
-              <xsl:when test="$version/@status = 'stub'">
-                <xsl:text>Stub</xsl:text>
-              </xsl:when>
-              <xsl:when test="$version/@status = 'incomplete'">
-                <xsl:text>Incomplete</xsl:text>
-              </xsl:when>
-              <xsl:when test="$version/@status = 'draft'">
-                <xsl:text>Draft</xsl:text>
-              </xsl:when>
-              <xsl:when test="$version/@status = 'review'">
-                <xsl:text>Ready for review</xsl:text>
-              </xsl:when>
-              <xsl:when test="$version/@status = 'final'">
-                <xsl:text>Final</xsl:text>
-              </xsl:when>
-            </xsl:choose>
-          </div>
-          <p class="version">
-            <xsl:text>Version </xsl:text>
-            <xsl:value-of select="$version/@number"/>
-            <xsl:text> on </xsl:text>
-            <xsl:value-of select="$version/@date"/>
-          </p>
-          <xsl:apply-templates mode="mal2html.block.mode" select="$version/*"/>
-        </div>
-      </xsl:if>
       <xsl:call-template name="mal2html.page.linktrails">
         <xsl:with-param name="node" select="mal:page"/>
       </xsl:call-template>
       <div class="body">
+        <xsl:if test="$mal2html.editor_mode and $version/@status != ''">
+          <div class="version">
+            <!-- FIXME: i18n -->
+            <div class="title">
+              <xsl:choose>
+                <xsl:when test="$version/@status = 'stub'">
+                  <xsl:text>Stub</xsl:text>
+                </xsl:when>
+                <xsl:when test="$version/@status = 'incomplete'">
+                  <xsl:text>Incomplete</xsl:text>
+                </xsl:when>
+                <xsl:when test="$version/@status = 'draft'">
+                  <xsl:text>Draft</xsl:text>
+                </xsl:when>
+                <xsl:when test="$version/@status = 'review'">
+                  <xsl:text>Ready for review</xsl:text>
+                </xsl:when>
+                <xsl:when test="$version/@status = 'final'">
+                  <xsl:text>Final</xsl:text>
+                </xsl:when>
+              </xsl:choose>
+            </div>
+            <p class="version">
+              <xsl:text>Version </xsl:text>
+              <xsl:value-of select="$version/@number"/>
+              <xsl:text> on </xsl:text>
+              <xsl:value-of select="$version/@date"/>
+            </p>
+            <xsl:apply-templates mode="mal2html.block.mode" select="$version/*"/>
+          </div>
+        </xsl:if>
         <xsl:apply-templates select="mal:page"/>
       </div>
       <xsl:call-template name="db2html.page.copyrights">
@@ -534,8 +531,8 @@ REMARK: Describe this template
 <!-- = page = -->
 <xsl:template match="mal:page">
   <div class="header">
-    <xsl:apply-templates mode="mal2html.title.mode"
-                         select="mal:title | mal:subtitle"/>
+    <xsl:apply-templates mode="mal2html.title.mode" select="mal:title"/>
+    <xsl:apply-templates mode="mal2html.title.mode" select="mal:subtitle"/>
   </div>
   <div class="contents">
     <xsl:for-each
@@ -560,8 +557,8 @@ REMARK: Describe this template
 <xsl:template match="mal:section">
   <div class="section" id="{ id}">
     <div class="header">
-      <xsl:apply-templates mode="mal2html.title.mode"
-                           select="mal:title | mal:subtitle"/>
+      <xsl:apply-templates mode="mal2html.title.mode" select="mal:title"/>
+      <xsl:apply-templates mode="mal2html.title.mode" select="mal:subtitle"/>
     </div>
     <div class="contents">
       <xsl:for-each
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]