You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2004/10/06 07:50:52 UTC
svn commit: rev 53851 - in forrest/trunk/src/core/context/skins: common/xslt/html tigris/xslt/html
Author: crossley
Date: Tue Oct 5 22:50:51 2004
New Revision: 53851
Modified:
forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl
forrest/trunk/src/core/context/skins/tigris/xslt/html/site2xhtml.xsl
Log:
All reasonably modern browsers do javascript:window.print
so remove old platform-specific code which was to support old IE browsers.
http://marc.theaimsgroup.com/?t=109652576500001
Modified: forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/src/core/context/skins/common/xslt/html/site2xhtml.xsl Tue Oct 5 22:50:51 2004
@@ -227,14 +227,11 @@
<xsl:template match="div[@id='skinconf-printlink']">
<xsl:if test="$disable-print-link = 'false'">
<script type="text/javascript" language="Javascript">
-function printit() {
-if (window.print) {
- window.print() ;
-} else {
- var WebBrowser = '<OBJECT ID="WebBrowser1" WIDTH="0" HEIGHT="0" CLASSID="CLSID:8856F961-340A-11D0-A96B-00C04FD705A2"></OBJECT>';
-document.body.insertAdjacentHTML('beforeEnd', WebBrowser);
- WebBrowser1.ExecWB(6, 2);//Use a 1 vs. a 2 for a prompting dialog box WebBrowser1.outerHTML = "";
-}
+function printit() {
+ if (window.print) {
+ window.focus();
+ window.print();
+ }
}
</script>
Modified: forrest/trunk/src/core/context/skins/tigris/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/src/core/context/skins/tigris/xslt/html/site2xhtml.xsl (original)
+++ forrest/trunk/src/core/context/skins/tigris/xslt/html/site2xhtml.xsl Tue Oct 5 22:50:51 2004
@@ -207,14 +207,11 @@
<xsl:template match="div[@id='skinconf-printlink']">
<xsl:if test="$disable-print-link = 'false'">
<script type="text/javascript" language="Javascript">
-function printit() {
-if (window.print) {
- window.print() ;
-} else {
- var WebBrowser = '<OBJECT ID="WebBrowser1" WIDTH="0" HEIGHT="0" CLASSID="CLSID:8856F961-340A-11D0-A96B-00C04FD705A2"></OBJECT>';
-document.body.insertAdjacentHTML('beforeEnd', WebBrowser);
- WebBrowser1.ExecWB(6, 2);//Use a 1 vs. a 2 for a prompting dialog box WebBrowser1.outerHTML = "";
-}
+function printit() {
+ if (window.print) {
+ window.focus();
+ window.print();
+ }
}
</script>
@@ -368,7 +365,7 @@
<td></td>
<td colspan="4" height="5" class="logos">
<a href="{$url}">
- <img alt="{$name} logo" title="{$name}" border="0">
+ <img alt="{$name} - logo" title="{$name}" border="0">
<xsl:attribute name="src">
<xsl:if test="not(starts-with($image, 'http://'))"><xsl:value-of select="$root"/></xsl:if>
<xsl:value-of select="$image"/>
@@ -450,7 +447,7 @@
<xsl:variable name="width" select="width"/>
<xsl:variable name="height" select="height"/>
<a href="{$url}">
- <img alt="{$name} logo" title="{$name}" border="0">
+ <img alt="{$name} - logo" title="{$name}" border="0">
<xsl:attribute name="src">
<xsl:if test="not(starts-with($image, 'http://'))"><xsl:value-of select="$root"/></xsl:if>
<xsl:value-of select="$image"/>