gnome-doc-utils r1129 - in trunk: . xslt/docbook/html

[shaunm svn gnome org]

Author: shaunm
Date: Mon Dec  8 17:00:53 2008
New Revision: 1129
URL: http://svn.gnome.org/viewvc/gnome-doc-utils?rev=1129&view=rev

Log:
* xslt/docbook/html/db2html-block.xsl:
* xslt/docbook/html/db2html-css.xsl:
- Made admons formal to better accomodate RTL icon placement


Modified:
   trunk/ChangeLog
   trunk/xslt/docbook/html/db2html-block.xsl
   trunk/xslt/docbook/html/db2html-css.xsl

Modified: trunk/xslt/docbook/html/db2html-block.xsl
==============================================================================
--- trunk/xslt/docbook/html/db2html-block.xsl	(original)
+++ trunk/xslt/docbook/html/db2html-block.xsl	Mon Dec  8 17:00:53 2008
@@ -308,6 +308,8 @@
 <xsl:template match="caution">
   <xsl:call-template name="db2html.block">
     <xsl:with-param name="class" select="'admonition'"/>
+    <xsl:with-param name="formal" select="true()"/>
+    <xsl:with-param name="title" select="/false"/>
     <xsl:with-param name="indent" select="true()"/>
   </xsl:call-template>
 </xsl:template>
@@ -442,6 +444,8 @@
 <xsl:template match="important">
   <xsl:call-template name="db2html.block">
     <xsl:with-param name="class" select="'admonition'"/>
+    <xsl:with-param name="formal" select="true()"/>
+    <xsl:with-param name="title" select="/false"/>
     <xsl:with-param name="indent" select="true()"/>
   </xsl:call-template>
 </xsl:template>
@@ -484,6 +488,8 @@
         <xsl:text> note-bug</xsl:text>
       </xsl:if>
     </xsl:with-param>
+    <xsl:with-param name="formal" select="true()"/>
+    <xsl:with-param name="title" select="/false"/>
     <xsl:with-param name="indent" select="true()"/>
   </xsl:call-template>
 </xsl:template>
@@ -521,6 +527,8 @@
 <xsl:template match="tip">
   <xsl:call-template name="db2html.block">
     <xsl:with-param name="class" select="'admonition'"/>
+    <xsl:with-param name="formal" select="true()"/>
+    <xsl:with-param name="title" select="/false"/>
     <xsl:with-param name="indent" select="true()"/>
   </xsl:call-template>
 </xsl:template>
@@ -537,6 +545,8 @@
 <xsl:template match="warning">
   <xsl:call-template name="db2html.block">
     <xsl:with-param name="class" select="'admonition'"/>
+    <xsl:with-param name="formal" select="true()"/>
+    <xsl:with-param name="title" select="/false"/>
     <xsl:with-param name="indent" select="true()"/>
   </xsl:call-template>
 </xsl:template>

Modified: trunk/xslt/docbook/html/db2html-css.xsl
==============================================================================
--- trunk/xslt/docbook/html/db2html-css.xsl	(original)
+++ trunk/xslt/docbook/html/db2html-css.xsl	Mon Dec  8 17:00:53 2008
@@ -268,34 +268,30 @@
 
 <!-- == block == -->
 div.admonition {
-  padding: 0.5em 1em 0.5em 1em;
-  <!-- FIXME: rtl -->
-  padding-left: </xsl:text><xsl:value-of select="$theme.icon.admon.size + 12"/><xsl:text>px;
+  padding: 0.5em 6px 0.5em 6px;
   min-height: </xsl:text><xsl:value-of select="$theme.icon.admon.size"/><xsl:text>px;
   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.caution-inner, div.important-inner, div.note-inner, div.tip-inner, div.warning-inner {
   <!-- FIXME: rtl -->
-  background-position: 6px 0.5em;
+  padding-left: </xsl:text><xsl:value-of select="$theme.icon.admon.size + 12"/><xsl:text>px;
+  <!-- FIXME: rtl -->
+  background-position: left top;
   background-repeat: no-repeat;
 }
-div.caution {
-  background-image: url("</xsl:text><xsl:value-of select="$theme.icon.admon.caution"/><xsl:text>");
-}
-div.important {
-  background-image: url("</xsl:text><xsl:value-of select="$theme.icon.admon.important"/><xsl:text>");
-}
-div.note {
-  background-image: url("</xsl:text><xsl:value-of select="$theme.icon.admon.note"/><xsl:text>");
-}
-div.note-bug {
-  background-image: url("</xsl:text><xsl:value-of select="$theme.icon.admon.bug"/><xsl:text>");
-}
-div.tip {
-  background-image: url("</xsl:text><xsl:value-of select="$theme.icon.admon.tip"/><xsl:text>");
-}
-div.warning {
-  background-image: url("</xsl:text><xsl:value-of select="$theme.icon.admon.warning"/><xsl:text>");
-}
+div.caution-inner { background-image: url("</xsl:text>
+  <xsl:value-of select="$theme.icon.admon.caution"/><xsl:text>"); }
+div.important-inner { background-image: url("</xsl:text>
+  <xsl:value-of select="$theme.icon.admon.important"/><xsl:text>"); }
+div.note-inner { background-image: url("</xsl:text>
+  <xsl:value-of select="$theme.icon.admon.note"/><xsl:text>"); }
+div.note-bug div.note-inner { background-image: url("</xsl:text>
+  <xsl:value-of select="$theme.icon.admon.bug"/><xsl:text>"); }
+div.tip-inner { background-image: url("</xsl:text>
+  <xsl:value-of select="$theme.icon.admon.tip"/><xsl:text>"); }
+div.warning-inner { background-image: url("</xsl:text>
+  <xsl:value-of select="$theme.icon.admon.warning"/><xsl:text>"); }
 div.blockquote {
   <!-- FIXME: i18n -->
   background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');