diff --git a/jOOQ-website/src/main/java/Transform.java b/jOOQ-website/src/main/java/Transform.java index 68a3ef3d06..75f2f38181 100644 --- a/jOOQ-website/src/main/java/Transform.java +++ b/jOOQ-website/src/main/java/Transform.java @@ -76,12 +76,14 @@ import org.joox.Match; * @author Lukas Eder */ public class Transform { - private static final FopFactory fopFactory = FopFactory.newInstance(); - private static final String minorVersion = Constants.MINOR_VERSION; - private static final String version = Constants.FULL_VERSION; - private static final String codegenXSDVersion; - private static final String exportXSDVersion; - private static final String runtimeXSDVersion; + + private static final FopFactory fopFactory = FopFactory.newInstance(); + private static final String minorVersion = Constants.MINOR_VERSION; + private static final String version = Constants.FULL_VERSION; + private static final String codegenXSDVersion; + private static final String exportXSDVersion; + private static final String runtimeXSDVersion; + private static final String baseDir = ""; static { File xsdDir = new File("./xsd"); @@ -249,7 +251,7 @@ public class Transform { String path = path(StringUtils.join(sections.ids(), "/")); String relativePath = relative(path); String root = root(); - File dir = new File(path); + File dir = new File(baseDir + path); dir.mkdirs(); File file = new File(dir, "index.php"); @@ -313,7 +315,7 @@ public class Transform { Match manual = $(isXML); replaceVariables(manual); - File dir = new File(path("manual-single-page")); + File dir = new File(baseDir + path("manual-single-page")); dir.mkdirs(); System.out.println("Transforming manual"); @@ -347,7 +349,7 @@ public class Transform { replaceVariables(manual); checkCodeBlockLengths(manual); - File dir = new File(path("manual-pdf")); + File dir = new File(baseDir + path("manual-pdf")); dir.mkdirs(); FileOutputStream fout = new FileOutputStream(new File(dir, file("jOOQ-manual.fo.xml"))); diff --git a/jOOQ-website/src/main/resources/html-page.xsl b/jOOQ-website/src/main/resources/html-page.xsl index 43cd713f4a..b965b30036 100644 --- a/jOOQ-website/src/main/resources/html-page.xsl +++ b/jOOQ-website/src/main/resources/html-page.xsl @@ -60,6 +60,9 @@ function getH1() { function getActiveMenu() { return "learn"; } +function printTheme() { + noTheme(); +} function printContent() { global $root; ?> @@ -93,9 +96,9 @@ function printContent() { - - + + diff --git a/jOOQ-website/src/main/resources/html-pages.xsl b/jOOQ-website/src/main/resources/html-pages.xsl index 4039771c8e..307b231516 100644 --- a/jOOQ-website/src/main/resources/html-pages.xsl +++ b/jOOQ-website/src/main/resources/html-pages.xsl @@ -65,6 +65,9 @@ function getH1() { function getActiveMenu() { return "learn"; } +function printTheme() { + noTheme(); +} function printContent() { global $root; ?> @@ -95,8 +98,11 @@ function printContent() {
- +
+ + +

Table of contents

diff --git a/jOOQ-website/src/main/resources/html-util.xsl b/jOOQ-website/src/main/resources/html-util.xsl index f869b92ad2..1e0ae34bd0 100644 --- a/jOOQ-website/src/main/resources/html-util.xsl +++ b/jOOQ-website/src/main/resources/html-util.xsl @@ -81,6 +81,14 @@ + + +
+ + + +
+
@@ -194,82 +202,46 @@ - - ]]> - -
+
                         
                     
- - ]]> - - - ]]> - -
-
-                    
-                
+
+
+                        
+                    
- - ]]> - - - ]]> -
-
-                    
-                
+
+                        
+                    
- - ]]> -
- - ]]> - -
-
-                    
-                
+
+
+                        
+                    
- - ]]> - - - ]]> - -
-
-                    
-                
+
+
+                        
+                    
- - ]]> - - - ]]> -
-
-                    
-                
+
+                        
+                    
- - ]]> -
diff --git a/jOOQ-website/src/main/resources/manual-3.2.xml b/jOOQ-website/src/main/resources/manual-3.2.xml index 93c4092eac..a06125372a 100644 --- a/jOOQ-website/src/main/resources/manual-3.2.xml +++ b/jOOQ-website/src/main/resources/manual-3.2.xml @@ -37,7 +37,7 @@
The jOOQ User Manual. Multiple Pages - +

Overview

This manual is divided into six main sections:

@@ -88,12 +88,12 @@

-
+
Preface - +

jOOQ's reason for being - compared to JPA

Java and SQL have come a long way. SQL is an "ancient", yet established and well-understood technology. Java is a legacy too, although its platform JVM allows for many new and contemporary languages built on top of it. Yet, after all these years, libraries dealing with the interface between SQL and Java have come and gone, leaving JPA to be a standard that is accepted only with doubts, short of any surviving options. @@ -149,7 +149,7 @@

SQL was never meant to be abstracted. To be confined in the narrow boundaries of heavy mappers, hiding the beauty and simplicity of relational data. SQL was never meant to be object-oriented. SQL was never meant to be anything other than... SQL!

-
+