diff --git a/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml b/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml index 54970c50e..6380c5b57 100644 --- a/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml +++ b/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml @@ -32,8 +32,8 @@ - - + + diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml index 5974b77b8..4cf7891b0 100644 --- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml @@ -196,9 +196,9 @@ - - - + + + diff --git a/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml b/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml index dbb5f1f4a..6f86d8b4f 100644 --- a/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml @@ -257,9 +257,9 @@ - - - + + + diff --git a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml index fb6d388a6..4878ee5e6 100644 --- a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml @@ -45,8 +45,8 @@ <band height="176" splitType="Stretch"> <image scaleImage="RealHeight"> - <reportElement x="316" y="3" width="239" height="65"/> - <imageExpression class="java.lang.String"><![CDATA["logos/navalpro_logo.gif"]]></imageExpression> + <reportElement x="316" y="3" width="180" height="53"/> + <imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression> </image> <staticText> <reportElement style="Title" x="0" y="13" width="263" height="33"/> diff --git a/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml index 52a27e1dd..e8b63cebb 100644 --- a/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml +++ b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml @@ -168,8 +168,8 @@ <title> <band height="132" splitType="Stretch"> <image scaleImage="RealHeight"> - <reportElement x="318" y="0" width="237" height="65"/> - <imageExpression class="java.lang.String"><![CDATA["logos/navalpro_logo.gif"]]></imageExpression> + <reportElement x="318" y="0" width="180" height="53"/> + <imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression> </image> <staticText> <reportElement x="0" y="80" width="83" height="15"> diff --git a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml index 8766e9245..4fb4a01cb 100644 --- a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml @@ -356,8 +356,8 @@ <text><![CDATA[Working arrangements]]></text> </staticText> <image scaleImage="RealHeight"> - <reportElement x="318" y="0" width="237" height="65"/> - <imageExpression class="java.lang.String"><![CDATA["logos/navalpro_logo.gif"]]></imageExpression> + <reportElement x="318" y="0" width="180" height="53"/> + <imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression> </image> <staticText> <reportElement x="1" y="79" width="68" height="15"/> diff --git a/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml b/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml index 0ae0579ea..88b759fd6 100644 --- a/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml +++ b/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml @@ -27,8 +27,8 @@ <title> <band height="131" splitType="Stretch"> <image scaleImage="RealHeight"> - <reportElement x="316" y="3" width="239" height="65"/> - <imageExpression class="java.lang.String"><![CDATA["logos/navalpro_logo.gif"]]></imageExpression> + <reportElement x="316" y="3" width="180" height="53"/> + <imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression> </image> <staticText> <reportElement x="1" y="96" width="85" height="20"/> diff --git a/navalplanner-webapp/src/main/resources/logos/logo.png b/navalplanner-webapp/src/main/resources/logos/logo.png new file mode 100644 index 000000000..819092808 Binary files /dev/null and b/navalplanner-webapp/src/main/resources/logos/logo.png differ