Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 39607 Details for
Bug 64052
Printable documents not easy to get or not really printable.
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to several files to implement suggested improvement
print.patch (text/plain), 8.49 KB, created by
Xavier Neys (RETIRED)
on 2004-09-14 14:09:50 UTC
(
hide
)
Description:
Patch to several files to implement suggested improvement
Filename:
MIME Type:
Creator:
Xavier Neys (RETIRED)
Created:
2004-09-14 14:09:50 UTC
Size:
8.49 KB
patch
obsolete
>Index: ./doc/en/inserts-en.xml >=================================================================== >RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/inserts-en.xml,v >retrieving revision 1.2 >diff -u -t -r1.2 inserts-en.xml >--- ./doc/en/inserts-en.xml 15 Mar 2004 20:45:07 -0000 1.2 >+++ ./doc/en/inserts-en.xml 14 Sep 2004 19:10:56 -0000 >@@ -13,4 +13,6 @@ > <insert name="PrintableDoc">Printable Linux Documentation</insert> > <insert name="PrintablePrj">Printable Linux Project</insert> > <insert name="SpaceBeforeColon"/> >+ <insert name="Print">Print</insert> >+ <insert name="PrintTip">View a printer-friendly version</insert> > </inserts> >Index: ./xsl/handbook.xsl >=================================================================== >RCS file: /var/cvsroot/gentoo/xml/htdocs/xsl/handbook.xsl,v >retrieving revision 1.18 >diff -u -t -r1.18 handbook.xsl >--- ./xsl/handbook.xsl 3 Jun 2004 16:04:40 -0000 1.18 >+++ ./xsl/handbook.xsl 14 Sep 2004 19:10:56 -0000 >@@ -15,14 +15,7 @@ > <xsl:apply-templates select="part" /> > </xsl:when> > <xsl:otherwise> >- <xsl:choose> >- <xsl:when test="$style = 'printable'"> >- <xsl:call-template name="printdoclayout" /> >- </xsl:when> >- <xsl:otherwise> >- <xsl:call-template name="doclayout"/> >- </xsl:otherwise> >- </xsl:choose> >+ <xsl:call-template name="doclayout"/> > </xsl:otherwise> > </xsl:choose> > </xsl:template> >@@ -91,14 +84,7 @@ > </xsl:apply-templates> > </xsl:if> > <xsl:if test="($chap = 0) and ($part = position())"> >- <xsl:choose> >- <xsl:when test="$style = 'printable'"> >- <xsl:call-template name="printdoclayout" /> >- </xsl:when> >- <xsl:otherwise> >- <xsl:call-template name="doclayout" /> >- </xsl:otherwise> >- </xsl:choose> >+ <xsl:call-template name="doclayout" /> > </xsl:if> > </xsl:template> > >@@ -160,8 +146,9 @@ > </xsl:choose> > <!-- Content --> > [ <a href="{/book/@link}?part=0&chap=0">Home</a> ] >- <!-- Printable --> >+ <!-- Printable > [ <a href="{/book/@link}?part={$part}&chap={$chap}&style=printable">Print</a> ] >+ --> > <!-- Next Chapter --> > <xsl:if test="name() = 'book'"> > [ <a href="{/book/@link}?part=1">></a> ] >@@ -212,14 +199,7 @@ > <!-- Chapter inside a part --> > <xsl:template match="/book/part/chapter"> > <xsl:if test="($chap = position()) and ($full = 0)"> >- <xsl:choose> >- <xsl:when test="$style = 'printable'"> >- <xsl:call-template name="printdoclayout" /> >- </xsl:when> >- <xsl:otherwise> >- <xsl:call-template name="doclayout" /> >- </xsl:otherwise> >- </xsl:choose> >+ <xsl:call-template name="doclayout" /> > </xsl:if> > <xsl:if test="$full = 1"> > <xsl:call-template name="bookpartchaptercontent"> >Index: ./xsl/guide-print.xsl >=================================================================== >RCS file: /var/cvsroot/gentoo/xml/htdocs/xsl/guide-print.xsl,v >retrieving revision 1.8 >diff -u -t -r1.8 guide-print.xsl >--- ./xsl/guide-print.xsl 12 Mar 2004 09:25:57 -0000 1.8 >+++ ./xsl/guide-print.xsl 14 Sep 2004 19:10:56 -0000 >@@ -4,34 +4,10 @@ > > <xsl:include href="guide.xsl" /> > >-<!-- Printable style for /guide --> >-<xsl:template name="printdoclayout"> >-<html> >-<head> >- <link title="new" rel="stylesheet" href="/css/main.css" type="text/css"/> >- <title> >- <xsl:choose> >- <xsl:when test="/guide/@type='project'"><xsl:value-of select="xsl:gettext('PrintablePrj')"/></xsl:when> >- <xsl:otherwise><xsl:value-of select="xsl:gettext('PrintableDoc')"/></xsl:otherwise> >- </xsl:choose> >- -- >- <xsl:choose> >- <xsl:when test="subtitle"><xsl:value-of select="title"/>: <xsl:value-of select="subtitle"/></xsl:when> >- <xsl:otherwise><xsl:value-of select="title"/></xsl:otherwise> >- </xsl:choose> >- </title> >-</head> >-<body bgcolor="#ffffff"> >- >-<!-- Content goes here --> >-<xsl:call-template name="content" /> >- >-</body> >-</html> >-</xsl:template> >+<!-- This file can be deleted once the AxKit config has been updated --> > > <xsl:template match="/guide"> >- <xsl:call-template name="printdoclayout" /> >+ <xsl:call-template name="doclayout" /> > </xsl:template> > > </xsl:stylesheet> >Index: ./xsl/guide.xsl >=================================================================== >RCS file: /var/cvsroot/gentoo/xml/htdocs/xsl/guide.xsl,v >retrieving revision 1.117 >diff -u -t -r1.117 guide.xsl >--- ./xsl/guide.xsl 9 Sep 2004 11:08:49 -0000 1.117 >+++ ./xsl/guide.xsl 14 Sep 2004 19:10:57 -0000 >@@ -20,13 +20,13 @@ > > <!-- Content of /guide --> > <xsl:template name="guidecontent"> >- <br/> >- <p class="dochead"> >+ <br /> >+ <h1> > <xsl:choose> > <xsl:when test="/guide/subtitle"><xsl:value-of select="/guide/title"/>: <xsl:value-of select="/guide/subtitle"/></xsl:when> > <xsl:otherwise><xsl:value-of select="/guide/title"/></xsl:otherwise> > </xsl:choose> >- </p> >+ </h1> > > <xsl:choose> > <xsl:when test="$style = 'printable'"> >@@ -70,9 +70,17 @@ > <xsl:otherwise><xsl:value-of select="title"/></xsl:otherwise> > </xsl:choose> > </title> >+ > </head> >+<xsl:choose> >+ <xsl:when test="$style = 'printable'"> >+ <!-- Insert the node-specific content --> >+<body bgcolor="#ffffff"> >+ <xsl:call-template name="content"/> >+</body> >+ </xsl:when> >+ <xsl:otherwise> > <body style="margin:0px;" bgcolor="#ffffff"> >- > <table width="100%" border="0" cellspacing="0" cellpadding="0"> > <tr> > <td valign="top" height="125" bgcolor="#45347b"> >@@ -100,6 +108,25 @@ > </td> > <td width="1%" bgcolor="#dddaec" valign="top"> > <table border="0" cellspacing="5" cellpadding="0"> >+ <!-- Add a "printer-friendly" button when link attribute exists --> >+ <xsl:if test="/book/@link or /guide/@link"> >+ <tr> >+ <td class="altmenu" align="center"> >+ <xsl:variable name="PrintTip"><xsl:value-of select="xsl:gettext('PrintTip')"/></xsl:variable> >+ <xsl:if test="/book"> >+ <xsl:if test="$full=1"> >+ <a title="{$PrintTip}" class="altlink" href="{/book/@link}?full=1&style=printable"><xsl:value-of select="xsl:gettext('Print')"/></a> >+ </xsl:if> >+ <xsl:if test="$full=0"> >+ <a title="{$PrintTip}" class="altlink" href="{/book/@link}?part={$part}&chap={$chap}&style=printable"><xsl:value-of select="xsl:gettext('Print')"/></a> >+ </xsl:if> >+ </xsl:if> >+ <xsl:if test="/guide"> >+ <a title="{$PrintTip}" class="altlink" href="{/guide/@link}?style=printable"><xsl:value-of select="xsl:gettext('Print')"/></a> >+ </xsl:if> >+ </td> >+ </tr> >+ </xsl:if> > <tr> > <td> > <img src="/images/line.gif" alt="line"/> >@@ -241,6 +268,8 @@ > </table> > > </body> >+ </xsl:otherwise> >+ </xsl:choose> > </html> > </xsl:template> > >Index: ./dtd/book.dtd >=================================================================== >RCS file: /var/cvsroot/gentoo/xml/htdocs/dtd/book.dtd,v >retrieving revision 1.7 >diff -u -t -r1.7 book.dtd >--- ./dtd/book.dtd 23 Apr 2004 16:26:32 -0000 1.7 >+++ ./dtd/book.dtd 14 Sep 2004 19:10:57 -0000 >@@ -80,7 +80,7 @@ > <!ENTITY shy "­"> <!-- SOFT HYPHEN --> > > <!ELEMENT book (title, author+, abstract, license?, version, date, part+)> >-<!ATTLIST book link CDATA #IMPLIED >+<!ATTLIST book link CDATA #REQUIRED > lang CDATA #IMPLIED> > <!ELEMENT title (#PCDATA)> > <!ELEMENT author (#PCDATA|mail)*> >Index: ./dtd/guide.dtd >=================================================================== >RCS file: /var/cvsroot/gentoo/xml/htdocs/dtd/guide.dtd,v >retrieving revision 1.15 >diff -u -t -r1.15 guide.dtd >--- ./dtd/guide.dtd 3 Jul 2004 08:36:58 -0000 1.15 >+++ ./dtd/guide.dtd 14 Sep 2004 19:10:57 -0000 >@@ -84,7 +84,7 @@ > id (news|about|contract|packages|graphics|articles|docs|changelog|projects|irc|lists|performace|shots|sponsors|where|newsletter|support) #IMPLIED > lang CDATA #IMPLIED> > <!ELEMENT guide (title, subtitle?, author+, abstract, summary?, license?, glsaindex?, version, date, newsitems?, chapter+)> >-<!ATTLIST guide link CDATA #IMPLIED >+<!ATTLIST guide link CDATA #REQUIRED > type CDATA #IMPLIED > lang CDATA #IMPLIED> > <!ELEMENT news (poster, date, title, body)>
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=39607">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 64052
: 39607
