dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2574
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-01-14 20:27:22 +0100
message:
  Using ubuntu font in jasper report table
modified:
  dhis-2/dhis-web/dhis-web-commons/pom.xml
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/grid.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-commons/pom.xml'
--- dhis-2/dhis-web/dhis-web-commons/pom.xml	2011-01-13 18:38:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons/pom.xml	2011-01-14 19:27:22 +0000
@@ -70,6 +70,10 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-support-test</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-support-system</artifactId>
+    </dependency>
     
     <!-- Web -->
     

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/grid.vm'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/grid.vm	2011-01-14 19:17:45 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/grid.vm	2011-01-14 19:27:22 +0000
@@ -23,28 +23,28 @@
 			<staticText>
 				<reportElement x="12" y="15" width="532" height="41" forecolor="#184F73"/>
 				<textElement textAlignment="Center">
-					<font size="24"/>
+					<font fontName="Ubuntu" size="24"/>
 				</textElement>
 				<text><![CDATA[${grid.title}]]></text>
 			</staticText>
 			<textField>
 				<reportElement x="12" y="67" width="253" height="20"/>
 				<textElement textAlignment="Right">
-					<font size="12"/>
+					<font fontName="Ubuntu" size="12"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[${dollar}F{reporting_month_name}]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="289" y="67" width="255" height="20"/>
 				<textElement>
-					<font size="12"/>
+					<font fontName="Ubuntu" size="12"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[${dollar}F{organisationunitname}]]></textFieldExpression>
 			</textField>
 			<staticText>
 				<reportElement x="265" y="67" width="24" height="20"/>
 				<textElement textAlignment="Center">
-					<font size="12"/>
+					<font fontName="Ubuntu" size="12"/>
 				</textElement>
 				<text><![CDATA[-]]></text>
 			</staticText>
@@ -103,7 +103,7 @@
 			<staticText>
 				<reportElement x="${x}" y="26" width="${offset}" height="20"/>
 				<textElement #if( !$header.meta )textAlignment="Center"#end>
-					<font size="10" isBold="true"/>
+					<font fontName="Ubuntu" size="10" isBold="true"/>
 				</textElement>
 				<text><![CDATA[${header.name}]]></text>
 			</staticText>
@@ -124,7 +124,7 @@
 			<textField>
 				<reportElement x="${x}" y="0" width="${offset}" height="20"/>
 				<textElement #if( !$header.meta )textAlignment="Center"#end>
-					<font size="9"/>
+					<font fontName="Ubuntu" size="9"/>
 				</textElement>
 				<textFieldExpression class="${header.type}"><![CDATA[${dollar}F{${header.column}}]]></textFieldExpression>
 			</textField>