remove pdf export from functions sample and extract css stylesheet fr…

…om docs xsl templates
TIBCOSoftware · Sep 5, 2023 · 1f04dbe · 1f04dbe
1 parent b1596c7
commit 1f04dbe
Show file tree

Hide file tree

Showing 11 changed files with 162 additions and 501 deletions.
diff --git a/jasperreports/build.xml b/jasperreports/build.xml
@@ -280,10 +280,6 @@
 		</copy>
 		<ant dir="./demo/samples/functions" target="test"/>
 		<copy todir="./dist/docs/sample.reference/functions" file="./demo/samples/functions/build/reports/FunctionsReport.html"/>
-		<mkdir dir="./dist/docs/sample.reference/functions/FunctionsReport.html_files"/> 
-		<copy todir="./dist/docs/sample.reference/functions/FunctionsReport.html_files">
-			<fileset dir="./demo/samples/functions/build/reports/FunctionsReport.html_files"/>
-		</copy>
 	</target>
 
 	<target name="docs" depends="preparedocs, javadoc, schemaref, partschemaref, componentschemaref, configref, sampleref" description="Generates all documentation."/>

diff --git a/jasperreports/demo/samples/functions/build.xml b/jasperreports/demo/samples/functions/build.xml
@@ -38,10 +38,6 @@
 		<ant dir="../" target="view"/>
 	</target>
 
-	<target name="pdf" description="Generates a PDF version of the report by converting the .jrprint file.">
-		<ant dir="../" target="pdf"/>
-	</target>
-
 	<target name="html" description="Generates a HTML version of the report by converting the .jrprint file.">
 		<ant dir="../" target="html"/>
 	</target>

diff --git a/jasperreports/demo/samples/functions/reports/FunctionsReport.jrxml b/jasperreports/demo/samples/functions/reports/FunctionsReport.jrxml
@@ -25,7 +25,7 @@
 	<property name="com.jaspersoft.studio.unit.rightMargin" value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.columnWidth" value="pixel"/>
 	<property name="com.jaspersoft.studio.unit.columnSpacing" value="pixel"/>
-	<property name="net.sf.jasperreports.export.html.exclude.origin.band.1" value="pageFooter"/>
+	<property name="net.sf.jasperreports.components.table.interactive" value="false"/>
 	<import value="net.sf.jasperreports.engine.data.JRBeanCollectionDataSource"/>
 	<style name="BaseStyle" isDefault="true" fontSize="9"/>
 	<style name="Title" style="BaseStyle" isBold="true" fontSize="11">
@@ -680,20 +680,4 @@
 			</componentElement>
 		</band>
 	</detail>
-	<pageFooter>
-		<band height="20">
-			<frame>
-				<reportElement x="0" y="0" width="832" height="20" uuid="abf542e8-9ea6-4459-a995-38f9617bb40a"/>
-				<textField>
-					<reportElement x="315" y="0" width="95" height="20" uuid="22d634e8-c83f-4e03-bd84-0ce11827a919"/>
-					<textElement textAlignment="Right"/>
-					<textFieldExpression><![CDATA["Page "+$V{PAGE_NUMBER}+" of"]]></textFieldExpression>
-				</textField>
-				<textField evaluationTime="Report">
-					<reportElement x="410" y="0" width="40" height="20" uuid="925057b9-4145-4800-a8bb-a78627f39a05"/>
-					<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
-				</textField>
-			</frame>
-		</band>
-	</pageFooter>
 </jasperReport>
diff --git a/jasperreports/demo/samples/functions/src/FunctionsApp.java b/jasperreports/demo/samples/functions/src/FunctionsApp.java
@@ -57,7 +57,6 @@ public static void main(String[] args)
 	public void test() throws JRException
 	{
 		fill();
-		pdf();
 		html();
 	}
 
@@ -74,17 +73,6 @@ public void fill() throws JRException
 	}
 
 
-	/**
-	 *
-	 */
-	public void pdf() throws JRException
-	{
-		long start = System.currentTimeMillis();
-		JasperExportManager.exportReportToPdfFile("build/reports/FunctionsReport.jrprint");
-		System.err.println("PDF creation time : " + (System.currentTimeMillis() - start));
-	}
-
-
 	/**
 	 *
 	 */

diff --git a/jasperreports/docs/components.schema.reference.xsl b/jasperreports/docs/components.schema.reference.xsl
@@ -15,71 +15,8 @@
 <html>
 <head>
 <title>JasperReports <xsl:value-of select="$version"/> - Components Schema Reference</title>
+<link rel="stylesheet" href="resources/stylesheet.css"/>
 <style type="text/css">
-.title {
-	font-family: Arial, Verdana, Helvetica, sans-serif;
-	font-size: 28px;
-	font-weight: normal;
-}
-
-.toc {
-	font-family: Courier New, Courier, serif;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-.name {
-	font-family: Courier New, Courier, serif;
-	font-size: 16px;
-	font-weight: bold;
-}
-
-.label {
-	font-family: Arial, Verdana, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	font-style: italic;
-}
-
-.description {
-	font-family: Arial, Verdana, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-.value {
-	font-family: Courier New, Courier, serif;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-.element {
-	font-family: Courier New, Courier, serif;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-.attribute {
-	font-family: Courier New, Courier, serif;
-	font-size: 12px;
-	font-weight: bold;
-	text-decoration: none;
-	color: #000000;
-}
-
-.copy {
-	font-decoration: none;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 8pt;
-	font-style: normal;
-	color: #000000;
-}
-
-.code {
-  	font-family: Courier New, Courier, serif;
-	font-size: 13px;
-}
-
 </style>
 </head>
 <body bgcolor="#FFFFFF">

diff --git a/jasperreports/docs/config.reference.xsl b/jasperreports/docs/config.reference.xsl
@@ -14,84 +14,8 @@
 <html>
 <head>
 <title>JasperReports <xsl:value-of select="$version"/> - Configuration Reference</title>
+<link rel="stylesheet" href="resources/stylesheet.css"/>
 <style type="text/css">
-.title {
-	font-family: Arial, Verdana, Helvetica, sans-serif;
-	font-size: 28px;
-	font-weight: normal;
-}
-
-.toc {
-	font-family: Courier New, Courier, serif;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-.name {
-	font-family: Courier New, Courier, serif;
-	font-size: 16px;
-	font-weight: bold;
-}
-
-.label {
-	font-family: Arial, Verdana, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	font-style: italic;
-	padding-right:8px;
-}
-
-.description {
-	font-family: Arial, Verdana, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-.value {
-	font-family: Courier New, Courier, serif;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-.element {
-	font-family: Courier New, Courier, serif;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-.attribute {
-	font-family: Courier New, Courier, serif;
-	font-size: 12px;
-	font-weight: bold;
-}
-
-.copy {
-	font-decoration: none;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 8pt;
-	font-style: normal;
-	color: #000000;
-}
-
-.note {
-	font-family: Arial, Verdana, Helvetica, sans-serif;
-	font-size: 12px;
-	font-style: italic;
-	color: #990000;
-}
-
-.text {
-	font-size: 12px;
-}
-
-.bold {
-	font-weight: bold;
-}
-
-.code {
-  	font-family: Courier New, Courier, serif;
-	font-size: 13px;
-}
 </style>
 </head>
 <body bgcolor="#FFFFFF">

diff --git a/jasperreports/docs/parts.schema.reference.xsl b/jasperreports/docs/parts.schema.reference.xsl
@@ -15,66 +15,8 @@
 <html>
 <head>
 <title>JasperReports <xsl:value-of select="$version"/> - Report Parts Schema Reference</title>
+<link rel="stylesheet" href="resources/stylesheet.css"/>
 <style type="text/css">
-.title {
-	font-family: Arial, Verdana, Helvetica, sans-serif;
-	font-size: 28px;
-	font-weight: normal;
-}
-
-.toc {
-	font-family: Courier New, Courier, serif;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-.name {
-	font-family: Courier New, Courier, serif;
-	font-size: 16px;
-	font-weight: bold;
-}
-
-.label {
-	font-family: Arial, Verdana, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	font-style: italic;
-}
-
-.description {
-	font-family: Arial, Verdana, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-.value {
-	font-family: Courier New, Courier, serif;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-.element {
-	font-family: Courier New, Courier, serif;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-.attribute {
-	font-family: Courier New, Courier, serif;
-	font-size: 12px;
-	font-weight: bold;
-	text-decoration: none;
-	color: #000000;
-}
-
-.copy {
-	font-decoration: none;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 8pt;
-	font-style: normal;
-	color: #000000;
-}
-
 </style>
 </head>
 <body bgcolor="#FFFFFF">