[minimark] 4 new revisions pushed by lucio.benfante on 2009-09-10 15:33 GMT
codesite...@google.com
Revision: 21b3f4e7f9
Author: lucio.benfante <lucio dot benfante at gmail dot com>
Date: Thu Sep 10 01:14:10 2009
Log: Created fix-issue-1 branch
http://code.google.com/p/minimark/source/detail?r=21b3f4e7f9
Revision: a5f181bf61
Author: lucio.benfante <lucio dot benfante at gmail dot com>
Date: Thu Sep 10 08:19:12 2009
Log: Added blank even page in the end of the assessment PDF printing.
http://code.google.com/p/minimark/source/detail?r=a5f181bf61
Revision: 11998a0d9d
Author: lucio.benfante <lucio dot benfante at gmail dot com>
Date: Thu Sep 10 08:22:16 2009
Log: Merged changes from branch fix-issue-1. Fixes issue 1.
http://code.google.com/p/minimark/source/detail?r=11998a0d9d
Revision: e3684f7906
Author: lucio.benfante <lucio dot benfante at gmail dot com>
Date: Thu Sep 10 08:30:53 2009
Log: Closed brach fix-issue-1. Fixes issue 1.
http://code.google.com/p/minimark/source/detail?r=e3684f7906
==============================================================================
Revision: 21b3f4e7f9
Author: lucio.benfante <lucio dot benfante at gmail dot com>
Date: Thu Sep 10 01:14:10 2009
Log: Created fix-issue-1 branch
http://code.google.com/p/minimark/source/detail?r=21b3f4e7f9
==============================================================================
Revision: a5f181bf61
Author: lucio.benfante <lucio dot benfante at gmail dot com>
Date: Thu Sep 10 08:19:12 2009
Log: Added blank even page in the end of the assessment PDF printing.
http://code.google.com/p/minimark/source/detail?r=a5f181bf61
Modified:
/minimark/src/main/java/com/benfante/minimark/blo/AssessmentXMLFOBuilder.java
/minimark/src/main/webapp/WEB-INF/messages.properties
/minimark/src/main/webapp/WEB-INF/messages_en.properties
/minimark/src/main/webapp/WEB-INF/messages_it.properties
=======================================
---
/minimark/src/main/java/com/benfante/minimark/blo/AssessmentXMLFOBuilder.java
Fri Sep 4 00:37:53 2009
+++
/minimark/src/main/java/com/benfante/minimark/blo/AssessmentXMLFOBuilder.java
Thu Sep 10 08:19:12 2009
@@ -95,7 +95,7 @@
append('\n');
result.append(" <fo:layout-master-set>").append('\n');
result.append(
- " <fo:simple-page-master master-name=\"all\"
page-height=\"210mm\" page-width=\"297mm\" margin-top=\"1cm\"
margin-bottom=\"0.5cm\" margin-left=\"1.5cm\" margin-right=\"1.5cm\">").
+ " <fo:simple-page-master master-name=\"normal\"
page-height=\"210mm\" page-width=\"297mm\" margin-top=\"1cm\"
margin-bottom=\"0.5cm\" margin-left=\"1.5cm\" margin-right=\"1.5cm\">").
append('\n');
result.append(
" <fo:region-body margin-top=\"0cm\"
margin-bottom=\"1.5cm\" column-count=\"2\" column-gap=\"0.25in\"/>").
@@ -103,10 +103,29 @@
result.append(" <fo:region-before
extent=\"0cm\"/>").append('\n');
result.append(" <fo:region-after
extent=\"1cm\"/>").append('\n');
result.append(" </fo:simple-page-master>").append('\n');
+
+ result.append(" <fo:simple-page-master master-name=\"blank\"
page-height=\"210mm\" page-width=\"297mm\" margin-top=\"1cm\"
margin-bottom=\"0.5cm\" margin-left=\"1.5cm\" margin-right=\"1.5cm\">")
+ .append('\n');
+ result.append(" <fo:region-body/>").append('\n');
+ result.append(" <fo:region-before
region-name=\"header-blank\" extent=\"297mm\"/>").append('\n');
+ result.append(" <fo:region-after
extent=\"1cm\"/>").append('\n');
+ result.append(" </fo:simple-page-master>").append('\n');
+ result.append(" <fo:page-sequence-master
master-name=\"all\">").append('\n');
+ result.append("
<fo:repeatable-page-master-alternatives>").append('\n');
+ result.append(" <fo:conditional-page-master-reference
blank-or-not-blank=\"not-blank\"
master-reference=\"normal\"/>").append('\n');
+ result.append(" <fo:conditional-page-master-reference
blank-or-not-blank=\"blank\" master-reference=\"blank\"/>").append('\n');
+ result.append("
</fo:repeatable-page-master-alternatives>").append('\n');
+ result.append(" </fo:page-sequence-master>").append('\n');
+
result.append(" </fo:layout-master-set>").append('\n');
result.append(
- " <fo:page-sequence master-reference=\"all\"
font-family=\"sans-serif\" font-size=\"9pt\" line-height=\"11pt\"
space-after.optimum=\"12pt\">").
+ " <fo:page-sequence id=\"assprintseq\"
master-reference=\"all\" font-family=\"sans-serif\" font-size=\"9pt\"
line-height=\"11pt\" space-after.optimum=\"12pt\"
force-page-count=\"end-on-even\">").
append('\n');
+
+ result.append(" <fo:static-content
flow-name=\"header-blank\">");
+ result.append(" <fo:block space-before=\"100mm\"
text-align-last=\"center\">").append(messageSource.getMessage("IntentionallyLeftBlank",
null, "?IntentionallyLeftBlank?", locale)).append("</fo:block>");
+ result.append(" </fo:static-content>");
+
result.append(" <fo:static-content
flow-name=\"xsl-region-after\">").
append('\n');
result.append(" <fo:block>").append('\n');
@@ -133,14 +152,14 @@
result.append(" <fo:table-cell
text-align=\"center\">").
append('\n');
result.append(" <fo:block>").append('\n');
-
result.append(" ").append(assessment.getSubmittedDate()!=null?dateTimeFormat.format(assessment.getSubmittedDate()):messageSource.getMessage("NotSubmitted",
null, "?Not submitted?", locale)).
+
result.append(" ").append(assessment.getSubmittedDate()!=null?dateTimeFormat.format(assessment.getSubmittedDate()):messageSource.getMessage("NotSubmitted",
null, "?NotSubmitted?", locale)).
append('\n');
result.append(" </fo:block>").append('\n');
result.append(" </fo:table-cell>").append('\n');
result.append(" <fo:table-cell
text-align=\"end\">").append(
'\n');
result.append(" <fo:block>").append('\n');
- result.append(messageSource.getMessage("PageNOfM", new String[]
{"<fo:page-number/>", "<fo:page-number-citation
ref-id='last-page'/>"}, "?PageNOfM?", locale)).
+ result.append(messageSource.getMessage("PageNOfM", new String[]
{"<fo:page-number/>", "<fo:page-number-citation-last
ref-id='assprintseq'/>"}, "?PageNOfM?", locale)).
append('\n');
result.append(" </fo:block>").append('\n');
result.append(" </fo:table-cell>").append('\n');
=======================================
--- /minimark/src/main/webapp/WEB-INF/messages.properties Tue Sep 8
05:45:59 2009
+++ /minimark/src/main/webapp/WEB-INF/messages.properties Thu Sep 10
08:19:12 2009
@@ -211,3 +211,4 @@
MonitoredBy=Monitored by
help.monitoringUsersField=The comma-separated list of usernames of the
users that can monitor this assessment. For example: mario.rossi,john.doe
YourProfile=Your profile
+IntentionallyLeftBlank=Intentionally left blank.
=======================================
--- /minimark/src/main/webapp/WEB-INF/messages_en.properties Tue Sep 8
05:45:59 2009
+++ /minimark/src/main/webapp/WEB-INF/messages_en.properties Thu Sep 10
08:19:12 2009
@@ -212,3 +212,4 @@
MonitoredBy=Monitored by
help.monitoringUsersField=The comma-separated list of usernames of the
users that can monitor this assessment. For example: mario.rossi,john.doe
YourProfile=Your profile
+IntentionallyLeftBlank=Intentionally left blank.
=======================================
--- /minimark/src/main/webapp/WEB-INF/messages_it.properties Tue Sep 8
05:45:59 2009
+++ /minimark/src/main/webapp/WEB-INF/messages_it.properties Thu Sep 10
08:19:12 2009
@@ -212,3 +212,4 @@
MonitoredBy=Monitorato da
help.monitoringUsersField=La lista dei nome-utente degli utenti che
possono monitorare questo compito. Ogni elemento \u00E8 separato da
virgole. Ad esempio: mario.rossi,john.doe
YourProfile=Il tuo profilo
+IntentionallyLeftBlank=Lasciata bianca intenzionalmente.
==============================================================================
Revision: 11998a0d9d
Author: lucio.benfante <lucio dot benfante at gmail dot com>
Date: Thu Sep 10 08:22:16 2009
Log: Merged changes from branch fix-issue-1. Fixes issue 1.
http://code.google.com/p/minimark/source/detail?r=11998a0d9d
==============================================================================
Revision: e3684f7906
Author: lucio.benfante <lucio dot benfante at gmail dot com>
Date: Thu Sep 10 08:30:53 2009
Log: Closed brach fix-issue-1. Fixes issue 1.
http://code.google.com/p/minimark/source/detail?r=e3684f7906