Skip to content

Commit 8b5b079

Browse files
pramseypramsey
committed
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
1 parent 129d4ae commit 8b5b079

File tree

3 files changed

+50
-54
lines changed

3 files changed

+50
-54
lines changed

‎doc/Makefile.in‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,15 @@ XSLTPROC_COMMONOPTS= \
6262
--param simplesect.in.toc 0 \
6363
--param use.id.as.filename 1 \
6464
--param chunk.quietly 1 \
65+
--param header.rule 0 \
66+
--param footer.rule 0 \
67+
--param table.borders.with.css 1 \
68+
--stringparam chunker.output.encoding UTF-8 \
69+
--stringparam chunker.output.indent no \
70+
--stringparam saxon.character.representation decimal \
71+
--stringparam html.stylesheet style.css \
6572
$(XSLTPROCFLAGS)
6673

67-
XSLTPROC_HTMLOPTS= \
68-
--stringparam html.stylesheet style.css \
6974

7075
HTML_DOCBOOK_XSL=$(XSLBASE)/html/docbook.xsl
7176
CHUNK_HTML_DOCBOOK_XSL=$(XSLBASE)/html/chunk.xsl
@@ -138,7 +143,7 @@ XML_SOURCES = \
138143
reporting.xml \
139144
using_postgis_app.xml \
140145
using_postgis_dataman.xml \
141-
using_raster_dataman.xml
146+
using_raster_dataman.xml
142147

143148
XML_GENERATED_SOURCES = \
144149
postgis_aggs_mm.xml \
@@ -209,44 +214,51 @@ endif
209214

210215
postgis_comments.sql: ./xsl/postgis_comments.sql.xsl $(XML_INPUTS)
211216
$(XSLTPROC) --novalid ./xsl/postgis_comments.sql.xsl postgis-out.xml > $@
212-
217+
213218
postgis_cheatsheet.html: ./xsl/postgis_cheatsheet.html.xsl $(XML_INPUTS)
214219
$(XSLTPROC) --novalid ./xsl/postgis_cheatsheet.html.xsl postgis-out.xml > $@
215-
220+
216221
raster_comments.sql: ./xsl/raster_comments.sql.xsl $(XML_INPUTS)
217222
$(XSLTPROC) --novalid ./xsl/raster_comments.sql.xsl postgis-out.xml > $@
218-
223+
219224
raster_cheatsheet.html: ./xsl/raster_cheatsheet.html.xsl $(XML_INPUTS)
220225
$(XSLTPROC) --novalid ./xsl/raster_cheatsheet.html.xsl postgis-out.xml > $@
221-
226+
222227
topology_comments.sql: ./xsl/topology_comments.sql.xsl $(XML_INPUTS)
223228
$(XSLTPROC) --novalid ./xsl/topology_comments.sql.xsl postgis-out.xml > $@
224-
229+
225230
topology_cheatsheet.html: ./xsl/topology_cheatsheet.html.xsl $(XML_INPUTS)
226231
$(XSLTPROC) --novalid ./xsl/topology_cheatsheet.html.xsl postgis-out.xml > $@
227-
232+
228233
sfcgal_comments.sql: ./xsl/sfcgal_comments.sql.xsl $(XML_INPUTS)
229234
$(XSLTPROC) --novalid ./xsl/sfcgal_comments.sql.xsl postgis-out.xml > $@
230-
235+
231236
sfcgal_cheatsheet.html: ./xsl/sfcgal_cheatsheet.html.xsl $(XML_INPUTS)
232237
$(XSLTPROC) --novalid ./xsl/sfcgal_cheatsheet.html.xsl postgis-out.xml > $@
233-
238+
234239
tiger_geocoder_comments.sql: ./xsl/tiger_geocoder_comments.sql.xsl $(XML_INPUTS)
235240
$(XSLTPROC) --novalid ./xsl/tiger_geocoder_comments.sql.xsl postgis-out.xml > $@
236-
241+
237242
tiger_geocoder_cheatsheet.html: ./xsl/tiger_geocoder_cheatsheet.html.xsl $(XML_INPUTS)
238243
$(XSLTPROC) --novalid ./xsl/tiger_geocoder_cheatsheet.html.xsl postgis-out.xml > $@
239244

240245
postgis-out.xml: postgis.xml Makefile
241246
$(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@
242247

243248
chunked-html: postgis-out.xml Makefile images $(XML_INPUTS)
244-
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \
249+
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
245250
--output html/ \
246-
--stringparam saxon.character.representation decimal \
247251
$(CHUNK_HTML_DOCBOOK_XSL) \
248252
$<
249253

254+
chunked-html-web: postgis-out.xml Makefile images $(XML_INPUTS)
255+
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
256+
--output html/ \
257+
--stringparam html.script ga.js \
258+
$(CHUNK_HTML_DOCBOOK_XSL) \
259+
$<
260+
261+
250262
html: html/postgis$(DOCSUFFIX).html
251263

252264
html-localized:
@@ -256,7 +268,7 @@ html-localized:
256268
done
257269

258270
html/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile images $(XML_INPUTS)
259-
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \
271+
$(XSLTPROC) $(XSLTPROC_COMMONOPTS) \
260272
--output html/postgis$(DOCSUFFIX).html \
261273
$(HTML_DOCBOOK_XSL) \
262274
$<
@@ -280,7 +292,7 @@ postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSIO
280292
-s "${PWD}/texstyle.sty" \
281293
-o postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf $<; \
282294
fi
283-
295+
284296
postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).epub: postgis-out.xml images $(XML_INPUTS)
285297
if test x"$(DBTOEPUB)" = x; then \
286298
echo "Error: dbtoepub not found, can't build epub"; \
@@ -308,13 +320,13 @@ doxygen.cfg: doxygen.cfg.in
308320
doxygen: doxygen.cfg
309321
doxygen $<
310322

311-
images:
323+
images:
312324
$(MAKE) -C html/image_src images
313325

314326
images-clean:
315327
$(MAKE) -C html/image_src images-clean
316-
317-
clean:
328+
329+
clean:
318330
rm -f html/*.html
319331
rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
320332
rm -f *.epub
@@ -339,7 +351,7 @@ endif
339351
cheatsheets: postgis_cheatsheet.html raster_cheatsheet.html topology_cheatsheet.html sfcgal_cheatsheet.html tiger_geocoder_cheatsheet.html
340352

341353
ifneq ($(CAN_BUILD_COMMENTS),yes)
342-
comments-install:
354+
comments-install:
343355
if test -e postgis_comments.sql -a \
344356
-e raster_comments.sql -a \
345357
-e topology_comments.sql -a \
@@ -371,7 +383,7 @@ docs-install: html/postgis.html html/style.css
371383
$(INSTALL_DATA) html/images/* $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images/
372384
$(INSTALL_DATA) ../README.postgis $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
373385

374-
docs-uninstall:
386+
docs-uninstall:
375387
rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html
376388
rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/style.css
377389
rm -rf $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images
@@ -437,11 +449,11 @@ requirements_not_met_xslbase:
437449
@echo
438450

439451
requirements_not_met_imagemagick:
440-
@echo
452+
@echo
441453
@echo "configure was unable to find the ImageMagick's 'convert' utility program."
442454
@echo "To build the documentation, install ImageMagick and then re-run configure. Alternatively "
443455
@echo "refer to online manual:"
444456
@echo
445457
@echo " http://postgis.net/documentation"
446-
@echo
447-
458+
@echo
459+

‎doc/html/ga.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
2+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
3+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
4+
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
5+
6+
ga('create', 'UA-37775762-1', 'auto');
7+
ga('send', 'pageview');

‎doc/html/style.css‎

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ body {
1010
background: #ffffff;
1111
color: #2e2e2e;
1212
margin: 0;
13-
padding: 0em 4em 0em 4em;
13+
padding: 0em 6em 0em 6em;
1414
}
1515
div.navheader {
16-
margin: 0em -4em 0em -4em;
17-
padding: 2em;
16+
margin: 0em -6em 0em -6em;
17+
padding: 2em 6em 2em 6em;
1818
background: #579;
1919
}
2020

2121
div.navfooter {
22-
margin: 0em -4em 0em -4em;
22+
margin: 0em -6em 0em -6em;
2323
padding: 2em 6em 2em 6em;
2424
background: #579;
2525
color: white;
@@ -51,13 +51,6 @@ div.refnamediv {
5151
display: none;
5252
}
5353

54-
div.refentry {
55-
margin: 2em;
56-
}
57-
hr {
58-
display: none;
59-
}
60-
6154
div.funcsynopsis code {
6255
font: unset;
6356
}
@@ -70,13 +63,13 @@ a {
7063
a:hover, li a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover {
7164
color: #e9cb2b;
7265
}
73-
p,form,td,th,dt,li{
66+
p, form, td, th, dt, li {
7467
/* font-size:10pt */
7568
}
7669
h1, h2 {
7770
color: #579;
7871
}
79-
h3,h4,th,dt,b, div.abstract-title, div.toc-title {
72+
h3, h4, th, dt, b, div.abstract-title, div.toc-title {
8073
color: #579;
8174
}
8275
h1 {
@@ -108,10 +101,6 @@ table, td {
108101
border-collapse: collapse;
109102
}
110103

111-
/*table, td {
112-
border: 1;
113-
padding: 0
114-
}*/
115104

116105
/* 3. Block Formatted ----------------------------------------------------- */
117106

@@ -166,7 +155,6 @@ div.warning table p {
166155
margin: 0 0 0 0;
167156
padding: 0 0 0 0;
168157
}
169-
170158
div.warning table tr td img {
171159
margin: 0 0.5em 0 0;
172160
padding: 0 0 0 0;
@@ -194,8 +182,6 @@ div.important table tr td img {
194182
padding: 0 0 0 0;
195183
}
196184

197-
198-
199185
span.inlinemediaobject img {
200186
vertical-align: middle;
201187
}
@@ -257,17 +243,8 @@ tr.question td {
257243
font-weight: bold;
258244
}
259245

260-
.styledtable table thead th {
261-
border-color: #ddd;
262-
border-style: solid;
263-
}
264-
.styledtable > table {
265-
border-color: #ddd;
266-
border-style: solid;
267-
}
268246
.styledtable table td,th {
269-
color: black;
270-
padding: 0.3em;
247+
padding: 0.5em;
271248
}
272249

273250
table.informaltable {

0 commit comments

Comments
 (0)