From: Kurt R. <kr...@us...> - 2006-11-24 20:37:55
|
Update of /cvsroot/xframe/xsddoc/xdocs In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19521/xdocs Modified Files: site.jsl Log Message: allow image ads Index: site.jsl =================================================================== RCS file: /cvsroot/xframe/xsddoc/xdocs/site.jsl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** site.jsl 15 Feb 2006 00:38:53 -0000 1.5 --- site.jsl 24 Nov 2006 20:37:49 -0000 1.6 *************** *** 2,6 **** <!-- * ======================================================================== ! * * Copyright 2004 The Apache Software Foundation. * --- 2,6 ---- <!-- * ======================================================================== ! * * Copyright 2004 The Apache Software Foundation. * *************** *** 8,14 **** * you may not use this file except in compliance with the License. * You may obtain a copy of the License at ! * * http://www.apache.org/licenses/LICENSE-2.0 ! * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, --- 8,14 ---- * you may not use this file except in compliance with the License. * You may obtain a copy of the License at ! * * http://www.apache.org/licenses/LICENSE-2.0 ! * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, *************** *** 16,20 **** * See the License for the specific language governing permissions and * limitations under the License. ! * * ======================================================================== --> --- 16,20 ---- * See the License for the specific language governing permissions and * limitations under the License. ! * * ======================================================================== --> *************** *** 49,56 **** <title>${pom.name} - ${docTitle}</title> </x:if> ! <j:set var="themeUrl" value="${maven.xdoc.theme.url}"/> <util:file var="projectCssFile" name="${maven.docs.src}/style/project.css"/> ! <style type="text/css" media="all"><![CDATA[ @import url("${relativePath}/style/maven-base.css"); --- 49,56 ---- <title>${pom.name} - ${docTitle}</title> </x:if> ! <j:set var="themeUrl" value="${maven.xdoc.theme.url}"/> <util:file var="projectCssFile" name="${maven.docs.src}/style/project.css"/> ! <style type="text/css" media="all"><![CDATA[ @import url("${relativePath}/style/maven-base.css"); *************** *** 66,70 **** ]]></j:if> </style> ! <link rel="stylesheet" type="text/css" href="${relativePath}/style/print.css" media="print"/> <meta http-equiv="Content-Type" content="text/html; charset=${outputencoding}"/> --- 66,70 ---- ]]></j:if> </style> ! <link rel="stylesheet" type="text/css" href="${relativePath}/style/print.css" media="print"/> <meta http-equiv="Content-Type" content="text/html; charset=${outputencoding}"/> *************** *** 73,79 **** <meta name="email" content="${author.attribute('email').value}"/> </x:forEach> ! <jsl:applyTemplates select="$doc/document/head/*"/> ! </head> --- 73,79 ---- <meta name="email" content="${author.attribute('email').value}"/> </x:forEach> ! <jsl:applyTemplates select="$doc/document/head/*"/> ! </head> *************** *** 169,173 **** <div class="clear"><hr /></div> </div> ! <!-- left column start --> <div id="leftColumn"> --- 169,173 ---- <div class="clear"><hr /></div> </div> ! <!-- left column start --> <div id="leftColumn"> *************** *** 214,218 **** </div> <!-- left column end --> ! <!-- body start --> <div id="bodyColumn"> --- 214,218 ---- </div> <!-- left column end --> ! <!-- body start --> <div id="bodyColumn"> *************** *** 227,233 **** <div class="clear"><hr /></div> <!-- body end --> ! ! <!-- footer start --> ! <div id="footer"> <jsl:applyTemplates select="$nav/body/footer"/> <div class="xright"> --- 227,233 ---- <div class="clear"><hr /></div> <!-- body end --> ! ! <!-- footer start --> ! <div id="footer"> <jsl:applyTemplates select="$nav/body/footer"/> <div class="xright"> *************** *** 251,255 **** <div class="clear"><hr /></div> </div> ! <!-- footer end --> </x:element> </html> --- 251,255 ---- <div class="clear"><hr /></div> </div> ! <!-- footer end --> </x:element> </html> *************** *** 356,359 **** --- 356,360 ---- google_ad_height = 600; google_ad_format = "160x600_as"; + google_ad_type = "image"; google_ad_channel =""; google_color_border = "294563"; *************** *** 375,380 **** google_ad_height = 90; google_ad_format = "728x90_as"; google_ad_channel =""; - google_ad_type = "text"; google_color_border = "294563"; google_color_bg = "CFDCED"; --- 376,381 ---- google_ad_height = 90; google_ad_format = "728x90_as"; + google_ad_type = "image"; google_ad_channel =""; google_color_border = "294563"; google_color_bg = "CFDCED"; *************** *** 418,422 **** <div class="source"><pre><jsl:applyTemplates /></pre></div> </jsl:template> ! <!-- preserve whitespace in the following elements --> <jsl:template match="pre | script | style" trim="true"> --- 419,423 ---- <div class="source"><pre><jsl:applyTemplates /></pre></div> </jsl:template> ! <!-- preserve whitespace in the following elements --> <jsl:template match="pre | script | style" trim="true"> *************** *** 429,433 **** </x:element> </jsl:template> ! <!-- xhtml fixup: add missing alt attribute for images --> <jsl:template match="img" trim="true"> --- 430,434 ---- </x:element> </jsl:template> ! <!-- xhtml fixup: add missing alt attribute for images --> <jsl:template match="img" trim="true"> *************** *** 492,496 **** </div> </jsl:template> ! <!-- a goal --> <jsl:template match="goal" trim="true"> --- 493,497 ---- </div> </jsl:template> ! <!-- a goal --> <jsl:template match="goal" trim="true"> *************** *** 503,507 **** </j:otherwise> </j:choose> ! <x:element name="tr"><j:whitespace trim="true"> <x:attribute name="class">${rowMode}</x:attribute> --- 504,508 ---- </j:otherwise> </j:choose> ! <x:element name="tr"><j:whitespace trim="true"> <x:attribute name="class">${rowMode}</x:attribute> *************** *** 510,515 **** <td ><jsl:applyTemplates select="description" /></td> </j:whitespace></x:element> ! </jsl:template> ! <jsl:template match="description"> <jsl:applyTemplates trim="false"/> --- 511,516 ---- <td ><jsl:applyTemplates select="description" /></td> </j:whitespace></x:element> ! </jsl:template> ! <jsl:template match="description"> <jsl:applyTemplates trim="false"/> *************** *** 523,527 **** <j:when test="${attr.name == 'href'}"> <j:set var="href" value="${attr.value}" /> ! <j:choose> <j:when test="${href.startsWith('#')}"> <x:attribute name="href"> --- 524,528 ---- <j:when test="${attr.name == 'href'}"> <j:set var="href" value="${attr.value}" /> ! <j:choose> <j:when test="${href.startsWith('#')}"> <x:attribute name="href"> *************** *** 533,537 **** <x:attribute name="class">externalLink</x:attribute> <x:attribute name="title">External Link</x:attribute> ! </j:when> <j:otherwise> <x:attribute name="href">${href}</x:attribute> --- 534,538 ---- <x:attribute name="class">externalLink</x:attribute> <x:attribute name="title">External Link</x:attribute> ! </j:when> <j:otherwise> <x:attribute name="href">${href}</x:attribute> *************** *** 544,548 **** <x:attribute name="class">newWindow</x:attribute> <x:attribute name="title">New Window</x:attribute> ! </j:if> <x:attribute name="target">${target}</x:attribute> </j:when> --- 545,549 ---- <x:attribute name="class">newWindow</x:attribute> <x:attribute name="title">New Window</x:attribute> ! </j:if> <x:attribute name="target">${target}</x:attribute> </j:when> *************** *** 560,567 **** </x:element> </jsl:template> ! <!-- copy any other elements through --> <jsl:template match="*" trim="false"><jsl:copy trim="false"><jsl:applyTemplates trim="false"/></jsl:copy></jsl:template> ! <!-- element values don't pass through as text --> <jsl:template match="@*"/> --- 561,568 ---- </x:element> </jsl:template> ! <!-- copy any other elements through --> <jsl:template match="*" trim="false"><jsl:copy trim="false"><jsl:applyTemplates trim="false"/></jsl:copy></jsl:template> ! <!-- element values don't pass through as text --> <jsl:template match="@*"/> |