fix book html generation. add data model diagram.

symmetric/pom.xml

@@ -225,31 +225,50 @@
                     <execution>
                         <phase>pre-site</phase>
                         <goals>
-                            <goal>generate-pdf</goal>
-                            <goal>generate-html</goal>
-                        </goals>
+                            <goal>generate-pdf</goal>
+                            <goal>generate-html</goal>
+                        </goals>
                     </execution>
-                </executions>
+                </executions>
                 <configuration>
                     <sourceDirectory>${docbook.source}</sourceDirectory>
                     <targetDirectory>${docbook.target}</targetDirectory>
                     <xincludeSupported>true</xincludeSupported>
                     <includes>*.xml</includes>
-                    <imgSrcPath>${docbook.source}/images</imgSrcPath>
+                    <!-- <imgSrcPath>${docbook.source}/images</imgSrcPath> -->
                     <admonGraphicsPath>${docbook.source}/resources/images/admons/</admonGraphicsPath>
                     <foCustomization>${docbook.source}/resources/xsl/docbook-fopdf.xsl</foCustomization>
+
                     <chunkedOutput>false</chunkedOutput>
+                    <htmlStylesheet>css/docbook-style.css</htmlStylesheet>
                     <htmlCustomization>${docbook.source}/resources/xsl/docbook-html.xsl</htmlCustomization>
+                    <postProcess>
+                        <copy todir="${docbook.target}">
+                            <fileset dir="${docbook.source}/resources">
+                                <include name="images/*.png" />
+                                <include name="images/*.gif" />
+                                <include name="images/*.jpg" />
+                            </fileset>
+                            <fileset dir="${docbook.source}/resources">
+                                <include name="css/*.css" />
+                            </fileset>
+                        </copy>
+                        <copy todir="${docbook.target}/images" flatten="true">
+                            <fileset dir="${docbook.source}">
+                                <include name="**/images/*" />
+                            </fileset>
+                        </copy>
+                    </postProcess>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.docbook</groupId>
-                        <artifactId>docbook-xml</artifactId>
-                        <version>4.4</version>
-                        <scope>runtime</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.docbook</groupId>
+                        <artifactId>docbook-xml</artifactId>
+                        <version>4.4</version>
+                        <scope>runtime</scope>
+                    </dependency>
+                </dependencies>
+            </plugin>
         </plugins>
     </build>
     <reporting>

symmetric/src/docbook/resources/css/docbook-style.css

@@ -1,13 +1,12 @@
 #banner {
-  background: transparent url( ../images/banner_1.jpg ) no-repeat scroll left top;
-  height: 75px;
+  background: transparent url( ../images/banner-bg.gif ) no-repeat scroll left top;
   border-bottom: 1px solid #fff;
 }
 
 body {
   margin: 0;
   padding: 0;
-  background: url( ../images/book_bg.gif ) top left repeat-x;
+  background: url( ../images/book-bg.gif ) top left repeat-x;
   font-family: Verdana, Arial, helvetica, sans-serif;
 }
 
@@ -89,7 +88,7 @@ ul, ol, li {
 }
 
 ul li, ol li {
-  list-style-image: url( ../images/bullet.png );
+  list-style-image: url( ../images/bullet.gif );
 }
 
 hr {
@@ -376,6 +375,19 @@ span.application {
   margin-left: 20px;
 }
 
+.important {
+  background: #FFF8DE url( ../images/important.gif ) no-repeat scroll 10px 12px;
+  border: 1px solid #EE8C00;
+  padding: 10px;
+  margin: 25px 20px;
+}
+
+.important .title {
+  font-size: 100%;
+  padding-top: 0;
+  margin-left: 40px;
+}
+
 .note {
   background: #EBF5FF url( ../images/info.gif ) no-repeat scroll 10px 12px;
   border: 1px solid #0074E7;

symmetric/src/docbook/resources/xsl/docbook-fopdf.xsl

@@ -31,7 +31,7 @@
                     <fo:table-row>
                         <fo:table-cell text-align="center">
                             <fo:block>
-                                <fo:external-graphic src="./src/docbook/resources/images/banner_logo.gif"/>
+                                <fo:external-graphic src="./src/docbook/resources/images/banner-logo.gif"/>
                             </fo:block>
                             <fo:block font-family="Helvetica" font-size="32pt"
                                       font-weight="bold" padding-before="60mm">

symmetric/src/docbook/resources/xsl/docbook-html.xsl

@@ -20,7 +20,6 @@
     <xsl:param name="callout.extension">1</xsl:param>
     <xsl:param name="graphicsize.extension">0</xsl:param>
     <xsl:param name="keep.relative.image.uris" select="1"></xsl:param>
-    <xsl:param name="img.src.path">./</xsl:param>
 
     <!--###################################################
                      Table Of Contents
@@ -103,9 +102,8 @@
         <div id="banner">
             <a style="border:none;" href="http://www.symmetricds.org/"
                title="SymmetricDS User Guide">
-                <img style="border:none;"
-                  width="455" height="69" alt="SymmetricDS"
-                  src="images/banner_logo.gif"/>
+                <img style="border:none;" alt="SymmetricDS"
+                  src="images/banner-logo.gif"/>
             </a>
         </div>
     </xsl:template>

symmetric/src/docbook/user-guide/ch02-getting-started.xml

@@ -90,13 +90,13 @@ symmetric.runtime.registration.url=http://localhost:8080/sync]]></programlisting
     </section>
     <section>
         <title>Creating and Populating Your Databases</title>
-        <note>
+        <important>
             <para>
                 You must first create the databases for your root and client nodes using the
                 administration tools provided by your database vendor. Make sure the name of the
                 databases you create match the settings in the properties files.
             </para>
-        </note>
+        </important>
         <para>
             Create and load the root node tables with sample data and the synchronization
             configuration. Create the tables in the client node database to prepare it.

symmetric/src/docbook/user-guide/ch03-concepts.xml

@@ -9,7 +9,16 @@
     <title>Concepts</title>
     <section>
         <title>Data Model</title>
-        <para></para>
+        <para>
+            <figure>
+                <title>Data Model - Configuration</title>
+                <mediaobject>
+                    <imageobject>
+                        <imagedata fileref="images/data-model-config.gif" format="GIF" />
+                    </imageobject>
+                </mediaobject>
+            </figure>
+        </para>
     </section>
     <section>
         <title>Node</title>