Author: pranayp
Date: Sat Jul 16 14:02:45 2016
New Revision: 1752964

URL: http://svn.apache.org/viewvc?rev=1752964&view=rev
Log:
[OFBIZ-7865] No functional change. Corrected formatting of Example component 
ftl files for improved readability. 
Thanks Vaibhav Jain for your contribution.

Modified:
    ofbiz/trunk/specialpurpose/example/template/reports/BarCode.fo.ftl
    ofbiz/trunk/specialpurpose/example/template/reports/Fonts.fo.ftl

Modified: ofbiz/trunk/specialpurpose/example/template/reports/BarCode.fo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/template/reports/BarCode.fo.ftl?rev=1752964&r1=1752963&r2=1752964&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/template/reports/BarCode.fo.ftl 
(original)
+++ ofbiz/trunk/specialpurpose/example/template/reports/BarCode.fo.ftl Sat Jul 
16 14:02:45 2016
@@ -20,44 +20,48 @@ under the License.
 <#escape x as x?xml>
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
 
-    <fo:layout-master-set>
-        <fo:simple-page-master master-name="main" page-height="4in" 
page-width="8in"
-                               margin-top="0.5in" margin-bottom="0.25in" 
margin-left="0.25in" margin-right="0.25in">
-            <fo:region-body margin-top="0in"/>
-            <fo:region-before extent="0in"/>
-            <fo:region-after extent="0in"/>
-        </fo:simple-page-master>
-    </fo:layout-master-set>
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="main" page-height="4in" 
page-width="8in"
+        margin-top="0.5in" margin-bottom="0.25in" margin-left="0.25in" 
margin-right="0.25in">
+      <fo:region-body margin-top="0in"/>
+      <fo:region-before extent="0in"/>
+      <fo:region-after extent="0in"/>
+    </fo:simple-page-master>
+  </fo:layout-master-set>
 
-    <fo:page-sequence master-reference="main">
-        <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
-            <fo:block text-align="center">
-                 ${example.exampleName!}
-            </fo:block>
-            <fo:block text-align="center">
-                <fo:instream-foreign-object>
-                    <barcode:barcode 
xmlns:barcode="http://barcode4j.krysalis.org/ns";
-                                     message="${exampleId}">
-                        <barcode:code39>
-                            <barcode:height>0.75in</barcode:height>
-                            <barcode:module-width>.375mm</barcode:module-width>
-                        </barcode:code39>
-                        <barcode:human-readable>
-                            <barcode:placement>bottom</barcode:placement>
-                            <barcode:font-name>Helvetica</barcode:font-name>
-                            <barcode:font-size>18pt</barcode:font-size>
-                            
<barcode:display-start-stop>false</barcode:display-start-stop>
-                            
<barcode:display-checksum>false</barcode:display-checksum>
-                        </barcode:human-readable>
-                    </barcode:barcode>
-                </fo:instream-foreign-object>
-            </fo:block>
-            <fo:block><fo:leader/></fo:block>
-            <fo:block text-align="center">
-                <#setting url_escaping_charset='UTF-8'>
-                <fo:external-graphic 
src="/example/control/qrcode;jsessionid=${session.id}?message=${example.exampleName?url}&amp;format=bmp&amp;encoding=UTF-8&amp;verifyOutput=true&amp;logoImageMaxWidth=20&amp;logoImageMaxHeight=20"
 overflow="hidden" height="1.5in" content-height="scale-to-fit"/>
-            </fo:block>
-        </fo:flow>
-    </fo:page-sequence>
+  <fo:page-sequence master-reference="main">
+    <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
+      <fo:block text-align="center">
+        ${example.exampleName!}
+      </fo:block>
+      <fo:block text-align="center">
+        <fo:instream-foreign-object>
+          <barcode:barcode xmlns:barcode="http://barcode4j.krysalis.org/ns";
+              message="${exampleId}">
+            <barcode:code39>
+              <barcode:height>0.75in</barcode:height>
+              <barcode:module-width>.375mm</barcode:module-width>
+            </barcode:code39>
+            <barcode:human-readable>
+              <barcode:placement>bottom</barcode:placement>
+              <barcode:font-name>Helvetica</barcode:font-name>
+              <barcode:font-size>18pt</barcode:font-size>
+              <barcode:display-start-stop>false</barcode:display-start-stop>
+              <barcode:display-checksum>false</barcode:display-checksum>
+            </barcode:human-readable>
+          </barcode:barcode>
+        </fo:instream-foreign-object>
+      </fo:block>
+      <fo:block>
+        <fo:leader/>
+      </fo:block>
+      <fo:block text-align="center">
+        <#setting url_escaping_charset='UTF-8'>
+        <fo:external-graphic
+            
src="/example/control/qrcode;jsessionid=${session.id}?message=${example.exampleName?url}&amp;format=bmp&amp;encoding=UTF-8&amp;verifyOutput=true&amp;logoImageMaxWidth=20&amp;logoImageMaxHeight=20"
+            overflow="hidden" height="1.5in" content-height="scale-to-fit"/>
+      </fo:block>
+    </fo:flow>
+  </fo:page-sequence>
 </fo:root>
 </#escape>

Modified: ofbiz/trunk/specialpurpose/example/template/reports/Fonts.fo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/template/reports/Fonts.fo.ftl?rev=1752964&r1=1752963&r2=1752964&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/template/reports/Fonts.fo.ftl (original)
+++ ofbiz/trunk/specialpurpose/example/template/reports/Fonts.fo.ftl Sat Jul 16 
14:02:45 2016
@@ -18,41 +18,69 @@ under the License.
 -->
 
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
-    <fo:layout-master-set>
-      <fo:simple-page-master master-name="portrait"
-                page-width="210mm"   page-height="297mm"
-                margin-top="0mm"  margin-bottom="0mm"
-                margin-left="15mm" margin-right="9mm">
-            <fo:region-body margin-top="19mm" margin-bottom="15mm"/>
-      </fo:simple-page-master>
-   </fo:layout-master-set>
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="portrait"
+        page-width="210mm" page-height="297mm"
+        margin-top="0mm" margin-bottom="0mm"
+        margin-left="15mm" margin-right="9mm">
+      <fo:region-body margin-top="19mm" margin-bottom="15mm"/>
+    </fo:simple-page-master>
+  </fo:layout-master-set>
 
-   <fo:page-sequence master-reference="portrait" initial-page-number="1">
+  <fo:page-sequence master-reference="portrait" initial-page-number="1">
     <fo:flow flow-name="xsl-region-body">
-        <fo:block text-align="center">Font samples</fo:block>
-        <fo:block></fo:block>
-        <fo:block color="red">Helvetica</fo:block>
-        <fo:block font-family="Helvetica" font-style="normal" 
font-weight="normal">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block font-family="Helvetica" font-style="normal" 
font-weight="bold">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block font-family="Helvetica" font-style="italic" 
font-weight="bold">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block font-family="Helvetica" font-style="italic" 
font-weight="normal">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block color="red">Times</fo:block>
-        <fo:block font-family="Times" font-style="normal" 
font-weight="normal">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block font-family="Times" font-style="normal" 
font-weight="bold">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block font-family="Times" font-style="italic" 
font-weight="bold">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block font-family="Times" font-style="italic" 
font-weight="normal">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block color="red">Courier</fo:block>
-        <fo:block font-family="Courier" font-style="normal" 
font-weight="normal">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block font-family="Courier" font-style="normal" 
font-weight="bold">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block font-family="Courier" font-style="italic" 
font-weight="bold">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block font-family="Courier" font-style="italic" 
font-weight="normal">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block color="red">Symbol</fo:block>
-        <fo:block font-family="Symbol" font-style="normal" 
font-weight="normal">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block color="red">Zapf Dingbats</fo:block>
-        <fo:block font-family="ZapfDingbats" font-style="normal" 
font-weight="normal">the quick brown fox jumps over the lazy dog 
1234657890</fo:block>
-        <fo:block font-family="NotoSans">
-                We now use the NotoSans font by default to write special 
characters, like: &#x20AC; &#x20B9; &#x00B0; &#x2665;
-        </fo:block>
-     </fo:flow>
+      <fo:block text-align="center">Font samples</fo:block>
+      <fo:block></fo:block>
+      <fo:block color="red">Helvetica</fo:block>
+      <fo:block font-family="Helvetica" font-style="normal" 
font-weight="normal">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block font-family="Helvetica" font-style="normal" font-weight="bold">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block font-family="Helvetica" font-style="italic" font-weight="bold">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block font-family="Helvetica" font-style="italic" 
font-weight="normal">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block color="red">Times</fo:block>
+      <fo:block font-family="Times" font-style="normal" font-weight="normal">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block font-family="Times" font-style="normal" font-weight="bold">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block font-family="Times" font-style="italic" font-weight="bold">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block font-family="Times" font-style="italic" font-weight="normal">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block color="red">Courier</fo:block>
+      <fo:block font-family="Courier" font-style="normal" font-weight="normal">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block font-family="Courier" font-style="normal" font-weight="bold">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block font-family="Courier" font-style="italic" font-weight="bold">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block font-family="Courier" font-style="italic" font-weight="normal">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block color="red">Symbol</fo:block>
+      <fo:block font-family="Symbol" font-style="normal" font-weight="normal">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block color="red">Zapf Dingbats</fo:block>
+      <fo:block font-family="ZapfDingbats" font-style="normal" 
font-weight="normal">
+        the quick brown fox jumps over the lazy dog 1234657890
+      </fo:block>
+      <fo:block font-family="NotoSans">
+        We now use the NotoSans font by default to write special characters, 
like: &#x20AC; &#x20B9; &#x00B0; &#x2665;
+      </fo:block>
+    </fo:flow>
   </fo:page-sequence>
 </fo:root>


Reply via email to