- Made admons formal to better accomodate RTL icon placement

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

svn path=/trunk/; revision=1129

3 files changed, 34 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index b0e5a3b..536a46c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-08  Shaun McCance  <shaunm@gnome.org>
+
+	* xslt/docbook/html/db2html-block.xsl:
+	* xslt/docbook/html/db2html-css.xsl:
+	- Made admons formal to better accomodate RTL icon placement
+
 2008-10-24  Christian Persch  <chpe@gnome.org>
 
 	* configure.in: chmod +x gnome-doc-{tool,prepare} on configure. Bug
diff --git a/xslt/docbook/html/db2html-block.xsl b/xslt/docbook/html/db2html-block.xsl
index 3edb9f4..c0e3661 100644
--- a/xslt/docbook/html/db2html-block.xsl
+++ b/xslt/docbook/html/db2html-block.xsl
@@ -308,6 +308,8 @@ template.
 <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 @@ template.
 <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 @@ template.
         <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 @@ template.
 <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 @@ template.
 <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>
diff --git a/xslt/docbook/html/db2html-css.xsl b/xslt/docbook/html/db2html-css.xsl
index 466cc06..9e71aa5 100644
--- a/xslt/docbook/html/db2html-css.xsl
+++ b/xslt/docbook/html/db2html-css.xsl
@@ -268,34 +268,30 @@ span.bibliolabel {
 
 <!-- == 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 -->
+  padding-left: </xsl:text><xsl:value-of select="$theme.icon.admon.size + 12"/><xsl:text>px;
   <!-- FIXME: rtl -->
-  background-position: 6px 0.5em;
+  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');