From b8823e6c293fd7cb4e83ceeec14a220087ff168f Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sat, 7 Jul 2012 12:00:15 +0200 Subject: [PATCH] [#1545] Website and Documentation anchors should be links to themselves, visually recognisable --- jOOQ-website/css/jooq.css | 14 ++++++++++++++ jOOQ-website/download.php | 8 ++++---- jOOQ-website/index.php | 16 ++++++++-------- jOOQ-website/notes.php | 3 ++- jOOQ-website/src/main/resources/html-page.xsl | 5 +++-- jOOQ-website/src/main/resources/html-pages.xsl | 8 ++++++-- jOOQ-website/src/main/resources/manual.xml | 2 +- jOOQ-website/tutorial.php | 16 ++++++++-------- 8 files changed, 46 insertions(+), 26 deletions(-) diff --git a/jOOQ-website/css/jooq.css b/jOOQ-website/css/jooq.css index 209a4a29b8..3540b39cb1 100644 --- a/jOOQ-website/css/jooq.css +++ b/jOOQ-website/css/jooq.css @@ -106,6 +106,20 @@ a:hover { text-decoration: underline; } +h2 a, h2 a:link, h2 a:visited, h2 a:hover, h2 a:active { + color: #aaaaaa; + text-decoration: none; + text-shadow: 0 1px 1px #444444; + + left: -30px; + position: absolute; + width: 740px; +} + +h2 a:hover { + text-decoration: underline; +} + .wrapper { height: auto; min-height: 101%; diff --git a/jOOQ-website/download.php b/jOOQ-website/download.php index 7cbd390d38..0ed3be9b98 100644 --- a/jOOQ-website/download.php +++ b/jOOQ-website/download.php @@ -11,7 +11,7 @@ function printContent() { global $version; ?> -

Download

+

# Download

Get the latest version from SourceForge
https://sourceforge.net/projects/jooq/files/Release/ @@ -31,7 +31,7 @@ jOOQ's sources are hosted at GitHub: git@github.com:jOOQ/jOOQ.git

-

Get the right version of jOOQ

+

# Get the right version of jOOQ

For increased quality, jOOQ uses semantic versioning. The jOOQ roadmap plans for: @@ -66,12 +66,12 @@ The semi-formal roadmap is here:
https://sourceforge.net/apps/trac/jooq/report/6

-

License

+

# License

jOOQ is distributed under the Apache 2.0 licence

-

Download other products of the jOO* family

+

# Download other products of the jOO* family

"jOO*" stands for Java Object Oriented ... It started with jOOQ, an internalised domain specific language (aka SQL), written in Java. This DSL happens to be a diff --git a/jOOQ-website/index.php b/jOOQ-website/index.php index af9517ae89..1c75c617e4 100644 --- a/jOOQ-website/index.php +++ b/jOOQ-website/index.php @@ -9,12 +9,12 @@ function getActiveMenu() { } function printContent() { ?> -

Philosophy

+

# Philosophy

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!

-

What does jOOQ code look like?

+

# What does jOOQ code look like?

It's simple. With the jOOQ DSL, SQL looks almost as if it were natively supported by Java. For instance, get all books published in 2011, ordered by title

@@ -68,7 +68,7 @@ create.select(FIRST_NAME, LAST_NAME, count()) -

What is jOOQ?

+

# What is jOOQ?

jOOQ stands for Java Object Oriented Querying. It combines these essential features:

-

How does jOOQ help you?

+

# How does jOOQ help you?

-

When to use jOOQ

+

# When to use jOOQ

-

When not to use jOOQ

+

# When not to use jOOQ

On the other hand, many people like the ease of use of Hibernate or other products, when it comes to simply persisting any domain model in any database. You should not use jOOQ...

-

What databases are supported

+

# What databases are supported

Every RDMBS out there has its own little specialties. jOOQ considers those specialties as much as possible, while trying to standardise the behaviour in jOOQ. In order to increase the quality of jOOQ, @@ -154,7 +154,7 @@ create.select(FIRST_NAME, LAST_NAME, count())

  • Teradata
    • -

    Other requirements

    +

    # Other requirements

    jOOQ runs with Java 1.6+

    License

    diff --git a/jOOQ-website/notes.php b/jOOQ-website/notes.php index b0caefdd55..e4a008e4d0 100644 --- a/jOOQ-website/notes.php +++ b/jOOQ-website/notes.php @@ -22,7 +22,8 @@ function printContent() { for ($i = 0; $i < count($contents); $i++) { if ($i + 1 < count($contents) && substr($contents[$i + 1], 0, 3) == '===') { - print '

    '; + $id = trim(preg_replace('%Version (\d+\.\d+\.\d+).*\n?%', '$1', $contents[$i])); + print '

    # '; print $contents[$i]; print '

    '; } diff --git a/jOOQ-website/src/main/resources/html-page.xsl b/jOOQ-website/src/main/resources/html-page.xsl index e05831c41d..716524def8 100644 --- a/jOOQ-website/src/main/resources/html-page.xsl +++ b/jOOQ-website/src/main/resources/html-page.xsl @@ -32,12 +32,13 @@ function printContent() { -

    Table of contents

    +

    # Table of contents

    - + # + diff --git a/jOOQ-website/src/main/resources/html-pages.xsl b/jOOQ-website/src/main/resources/html-pages.xsl index 2062e2e023..ecd0435448 100644 --- a/jOOQ-website/src/main/resources/html-pages.xsl +++ b/jOOQ-website/src/main/resources/html-pages.xsl @@ -44,7 +44,11 @@ function printContent() { -

    + + +

    + # +

    @@ -54,7 +58,7 @@ function printContent() { -

    Table of contents

    +

    # Table of contents

     diff --git a/jOOQ-website/src/main/resources/manual.xml b/jOOQ-website/src/main/resources/manual.xml index eefe82d505..ac41a85eea 100644 --- a/jOOQ-website/src/main/resources/manual.xml +++ b/jOOQ-website/src/main/resources/manual.xml @@ -3,7 +3,7 @@
    The jOOQ User Manual. Multiple Pages -

    Overview

    +

    # Overview

    This manual is divided into four main sections:

    • diff --git a/jOOQ-website/tutorial.php b/jOOQ-website/tutorial.php index b4a0cfff32..9a01b1711f 100644 --- a/jOOQ-website/tutorial.php +++ b/jOOQ-website/tutorial.php @@ -10,7 +10,7 @@ function printContent() { global $root; global $version; ?> -

      Introduction

      +

      # Introduction

      Download and run jOOQ in 6 easy steps:

      @@ -25,7 +25,7 @@ Download and run jOOQ in 6 easy steps:
    • Step 6: Explore!
    -

    Preparation: Download jOOQ and your SQL driver

    +

    # Preparation: Download jOOQ and your SQL driver

    If you haven't already downloaded them, download jOOQ:
    https://sourceforge.net/projects/jooq/files/Release/ @@ -52,7 +52,7 @@ If you don't have a MySQL instance up and running yet, get now! XAMPP is a simple installation bundle for Apache, MySQL, PHP and Perl

    -

    Step 1: Create a SQL database and a table

    +

    # Step 1: Create a SQL database and a table

    We're going to create a database called "guestbook" and a corresponding "posts" table. Connect to MySQL via your command line client and type the following:

    @@ -68,7 +68,7 @@ CREATE TABLE `posts` ( ); -

    Step 2: Generate classes

    +

    # Step 2: Generate classes

    In this step, we're going to use jOOQ's command line tools to generate classes that map to the Posts table we just created. More detailed information about how to @@ -225,7 +225,7 @@ INFO: GENERATION FINISHED! : Total: 791.688ms, +9.143ms -

    Step 3: Write a main class and establish a MySQL connection

    +

    # Step 3: Write a main class and establish a MySQL connection

    Let's just write a vanilla main class in the project containing the generated classes:

    @@ -265,7 +265,7 @@ This is pretty standard code for establishing a MySQL connection.

    -

    Step 4: Write a query using jOOQ's DSL

    +

    # Step 4: Write a query using jOOQ's DSL

    Let's add a simple query:

    @@ -285,7 +285,7 @@ the next step.

    -

    Step 5: Iterate over results

    +

    # Step 5: Iterate over results

    After the line where we retrieve the results, let's iterate over the results and print out the data: @@ -362,7 +362,7 @@ public class Main { } -

    Step 6: Explore!

    +

    # Step 6: Explore!

    jOOQ has grown to be a comprehensive SQL library. For more information, please consider the manual:
    http://www.jooq.org/manual/