On 2/14/20 8:56 PM, Peter Geoghegan wrote: > On Fri, Feb 14, 2020 at 5:51 PM Tom Lane <t...@sss.pgh.pa.us> wrote: >> Hm, I wouldn't go into that much detail; it'd likely soon be out of >> date anyway. I had in mind something more like "If the STYLE=website >> option is used, the generated HTML files will include references to >> stylesheets hosted at www.postgresql.org, so that viewing them will >> require network access." > > But everything else looks good, right? > > I would like to commit this patch shortly.
Language updates attached...mostly kept Tom's suggestions. Thanks, Jonathan
diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index c99198f5e5..64ebdb3257 100644
--- a/doc/src/sgml/docguide.sgml
+++ b/doc/src/sgml/docguide.sgml
@@ -276,6 +276,13 @@ checking for fop... fop
<prompt>doc/src/sgml$ </prompt><userinput>make STYLE=website html</userinput>
</screen>
</para>
+
+ <para>
+ If the <literal>STYLE=website</literal> optoin is used, the generated HTML
+ files include references to stylesheets hosted on <ulink
+ url="https://www.postgresql.org/docs/current/";>postgresql.org</ulink> and
+ require network access to view.
+ </para>
</sect2>
<sect2>
diff --git a/doc/src/sgml/stylesheet-html-common.xsl
b/doc/src/sgml/stylesheet-html-common.xsl
index 9edce52a10..d9961089c6 100644
--- a/doc/src/sgml/stylesheet-html-common.xsl
+++ b/doc/src/sgml/stylesheet-html-common.xsl
@@ -18,6 +18,14 @@
<xsl:param name="link.mailto.url">pgsql-docs@lists.postgresql.org</xsl:param>
<xsl:param name="toc.max.depth">2</xsl:param>
+<!--
+ The below allows the stylesheets provided by the website to be applied fully
+ to the generated HTML.
+ -->
+<xsl:template name="body.attributes">
+ <xsl:attribute name="id">docContent</xsl:attribute>
+ <xsl:attribute name="class">container-fluid col-10</xsl:attribute>
+</xsl:template>
<!-- Change display of some elements -->
diff --git a/doc/src/sgml/stylesheet.xsl b/doc/src/sgml/stylesheet.xsl
index 4ff6e8ed24..bc5a904e0b 100644
--- a/doc/src/sgml/stylesheet.xsl
+++ b/doc/src/sgml/stylesheet.xsl
@@ -23,11 +23,15 @@
<xsl:param name="html.stylesheet">
<xsl:choose>
<xsl:when test="$website.stylesheet = 0">stylesheet.css</xsl:when>
-
<xsl:otherwise>https://www.postgresql.org/media/css/docs.css</xsl:otherwise>
+ <xsl:otherwise>
+ https://www.postgresql.org/media/css/fontawesome.css
+ https://www.postgresql.org/media/css/bootstrap.min.css
+ https://www.postgresql.org/media/css/main.css
+ https://www.postgresql.org/media/css/normalize.css
+ </xsl:otherwise>
</xsl:choose>
</xsl:param>
-
<!-- strip directory name from image filerefs -->
<xsl:template match="imagedata/@fileref">
<xsl:value-of select="substring-after(., '/')"/>
signature.asc
Description: OpenPGP digital signature
