More style tweaks and add 'chucked-html-web' target for

building ref docs with google analytics code embedded

git-svn-id: http://svn.osgeo.org/postgis/trunk@16960 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/doc/Makefile.in b/doc/Makefile.in
index ddb882cdf299b3d495851f18566768688cfd244f..ce45699e889d88b11195c98a975a903728f77a7c 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -62,10 +62,15 @@ XSLTPROC_COMMONOPTS= \
        --param simplesect.in.toc 0 \
        --param use.id.as.filename 1 \
        --param chunk.quietly 1 \
+       --param header.rule 0 \
+       --param footer.rule 0 \
+       --param table.borders.with.css 1 \
+       --stringparam chunker.output.encoding UTF-8 \
+       --stringparam chunker.output.indent no \
+       --stringparam saxon.character.representation decimal \
+       --stringparam html.stylesheet style.css \
        $(XSLTPROCFLAGS)
 
-XSLTPROC_HTMLOPTS= \
-       --stringparam html.stylesheet style.css \
 
 HTML_DOCBOOK_XSL=$(XSLBASE)/html/docbook.xsl
 CHUNK_HTML_DOCBOOK_XSL=$(XSLBASE)/html/chunk.xsl
@@ -138,7 +143,7 @@ XML_SOURCES = \
        reporting.xml \
        using_postgis_app.xml \
        using_postgis_dataman.xml \
-       using_raster_dataman.xml 
+       using_raster_dataman.xml
 
 XML_GENERATED_SOURCES = \
        postgis_aggs_mm.xml \
@@ -209,31 +214,31 @@ endif
 
 postgis_comments.sql: ./xsl/postgis_comments.sql.xsl $(XML_INPUTS)
        $(XSLTPROC) --novalid ./xsl/postgis_comments.sql.xsl postgis-out.xml > $@
-       
+
 postgis_cheatsheet.html: ./xsl/postgis_cheatsheet.html.xsl $(XML_INPUTS)
        $(XSLTPROC) --novalid ./xsl/postgis_cheatsheet.html.xsl postgis-out.xml > $@
-       
+
 raster_comments.sql: ./xsl/raster_comments.sql.xsl $(XML_INPUTS)
        $(XSLTPROC) --novalid ./xsl/raster_comments.sql.xsl postgis-out.xml > $@
-       
+
 raster_cheatsheet.html: ./xsl/raster_cheatsheet.html.xsl $(XML_INPUTS)
        $(XSLTPROC) --novalid ./xsl/raster_cheatsheet.html.xsl postgis-out.xml > $@
-       
+
 topology_comments.sql: ./xsl/topology_comments.sql.xsl $(XML_INPUTS)
        $(XSLTPROC) --novalid ./xsl/topology_comments.sql.xsl postgis-out.xml > $@
-       
+
 topology_cheatsheet.html: ./xsl/topology_cheatsheet.html.xsl $(XML_INPUTS)
        $(XSLTPROC) --novalid ./xsl/topology_cheatsheet.html.xsl postgis-out.xml > $@
-       
+
 sfcgal_comments.sql: ./xsl/sfcgal_comments.sql.xsl $(XML_INPUTS)
        $(XSLTPROC) --novalid ./xsl/sfcgal_comments.sql.xsl postgis-out.xml > $@
-       
+
 sfcgal_cheatsheet.html: ./xsl/sfcgal_cheatsheet.html.xsl $(XML_INPUTS)
        $(XSLTPROC) --novalid ./xsl/sfcgal_cheatsheet.html.xsl postgis-out.xml > $@
-       
+
 tiger_geocoder_comments.sql: ./xsl/tiger_geocoder_comments.sql.xsl $(XML_INPUTS)
        $(XSLTPROC) --novalid ./xsl/tiger_geocoder_comments.sql.xsl postgis-out.xml > $@
-       
+
 tiger_geocoder_cheatsheet.html: ./xsl/tiger_geocoder_cheatsheet.html.xsl $(XML_INPUTS)
        $(XSLTPROC) --novalid ./xsl/tiger_geocoder_cheatsheet.html.xsl postgis-out.xml > $@
 
@@ -241,12 +246,19 @@ postgis-out.xml: postgis.xml Makefile
        $(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@
 
 chunked-html: postgis-out.xml Makefile images $(XML_INPUTS)
-       $(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \
+       $(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
                --output html/ \
-               --stringparam saxon.character.representation decimal \
                $(CHUNK_HTML_DOCBOOK_XSL) \
                $<
 
+chunked-html-web: postgis-out.xml Makefile images $(XML_INPUTS)
+       $(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
+               --output html/ \
+               --stringparam html.script ga.js \
+               $(CHUNK_HTML_DOCBOOK_XSL) \
+               $<
+
+
 html: html/postgis$(DOCSUFFIX).html
 
 html-localized:
@@ -256,7 +268,7 @@ html-localized:
   done
 
 html/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile images $(XML_INPUTS)
-       $(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \
+       $(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
                --output html/postgis$(DOCSUFFIX).html \
                $(HTML_DOCBOOK_XSL) \
                $<
@@ -280,7 +292,7 @@ postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSIO
                   -s "${PWD}/texstyle.sty" \
                   -o postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf $<; \
        fi
-       
+
 postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub: postgis-out.xml images $(XML_INPUTS)
        if test x"$(DBTOEPUB)" = x; then \
           echo "Error: dbtoepub not found, can't build epub"; \
@@ -308,13 +320,13 @@ doxygen.cfg: doxygen.cfg.in
 doxygen: doxygen.cfg
        doxygen $<
 
-images: 
+images:
        $(MAKE) -C html/image_src images
 
 images-clean:
        $(MAKE) -C html/image_src images-clean
-       
-clean: 
+
+clean:
        rm -f html/*.html
        rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
        rm -f *.epub
@@ -339,7 +351,7 @@ endif
 cheatsheets: postgis_cheatsheet.html raster_cheatsheet.html topology_cheatsheet.html sfcgal_cheatsheet.html tiger_geocoder_cheatsheet.html
 
 ifneq ($(CAN_BUILD_COMMENTS),yes)
-comments-install: 
+comments-install:
        if test -e postgis_comments.sql  -a \
                -e raster_comments.sql   -a \
                -e topology_comments.sql -a \
@@ -371,7 +383,7 @@ docs-install: html/postgis.html html/style.css
        $(INSTALL_DATA) html/images/* $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images/
        $(INSTALL_DATA) ../README.postgis $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
 
-docs-uninstall: 
+docs-uninstall:
        rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html
        rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/style.css
        rm -rf $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images
@@ -437,11 +449,11 @@ requirements_not_met_xslbase:
        @echo
 
 requirements_not_met_imagemagick:
-       @echo 
+       @echo
        @echo "configure was unable to find the ImageMagick's 'convert' utility program."
        @echo "To build the documentation, install ImageMagick and then re-run configure. Alternatively "
        @echo "refer to online manual:"
        @echo
        @echo "  http://postgis.net/documentation"
-       @echo 
-       
+       @echo
+

diff --git a/doc/html/ga.js b/doc/html/ga.js
new file mode 100644 (file)
index 0000000..2b4b785
--- /dev/null
+++ b/doc/html/ga.js
@@ -0,0 +1,7 @@
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+ga('create', 'UA-37775762-1', 'auto');
+ga('send', 'pageview');

diff --git a/doc/html/style.css b/doc/html/style.css
index 05d63c3411e78c531dcae1ba8a4c2b0d026c5d36..8672a1e916a3a0fef6567174a79848a508dca9ca 100644 (file)
--- a/doc/html/style.css
+++ b/doc/html/style.css
@@ -10,16 +10,16 @@ body {
     background: #ffffff;
     color: #2e2e2e;
     margin: 0;
-    padding: 0em 4em 0em 4em;
+    padding: 0em 6em 0em 6em;
 }
 div.navheader {
-    margin: 0em -4em 0em -4em;
-    padding: 2em;
+    margin: 0em -6em 0em -6em;
+    padding: 2em 6em 2em 6em;
     background: #579;
 }
 
 div.navfooter {
-    margin: 0em -4em 0em -4em;
+    margin: 0em -6em 0em -6em;
     padding: 2em 6em 2em 6em;
     background: #579;
     color: white;
@@ -51,13 +51,6 @@ div.refnamediv {
     display: none;
 }
 
-div.refentry {
-    margin: 2em;
-}
-hr {
-     display: none;
-}
-
 div.funcsynopsis code {
     font: unset;
 }
@@ -70,13 +63,13 @@ a {
 a:hover, li a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover {
     color: #e9cb2b;
 }
-p,form,td,th,dt,li{
+p, form, td, th, dt, li {
 /*   font-size:10pt */
 }
 h1, h2 {
     color: #579;
 }
-h3,h4,th,dt,b, div.abstract-title, div.toc-title {
+h3, h4, th, dt, b, div.abstract-title, div.toc-title {
     color: #579;
 }
 h1 {
@@ -108,10 +101,6 @@ table, td {
     border-collapse: collapse;
 }
 
-/*table, td {
-    border: 1;
-    padding: 0
-}*/
 
 /* 3. Block Formatted ----------------------------------------------------- */
 
@@ -166,7 +155,6 @@ div.warning table p {
     margin: 0 0 0 0;
     padding: 0 0 0 0;
 }
-
 div.warning table tr td img {
     margin: 0 0.5em 0 0;
     padding: 0 0 0 0;
@@ -194,8 +182,6 @@ div.important table tr td img {
     padding: 0 0 0 0;
 }
 
-
-
 span.inlinemediaobject img {
     vertical-align: middle;
 }
@@ -257,17 +243,8 @@ tr.question td {
     font-weight: bold;
 }
 
-.styledtable table thead th {
-    border-color: #ddd;
-    border-style: solid;
-}
-.styledtable > table {
-     border-color: #ddd;
-     border-style: solid;
-}
 .styledtable table td,th {
-     color: black;
-     padding: 0.3em;
+    padding: 0.5em;
 }
 
 table.informaltable {