You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/04/19 00:45:31 UTC

svn commit: r1674586 - in /ofbiz/trunk: applications/content/webapp/content/fonts.fo.ftl specialpurpose/example/config/ExampleUiLabels.xml specialpurpose/example/webapp/example/WEB-INF/controller.xml specialpurpose/example/widget/example/ExampleMenus.xml

Author: jleroux
Date: Sat Apr 18 22:45:30 2015
New Revision: 1674586

URL: http://svn.apache.org/r1674586
Log:
I wanted to be sure the degree symbol could be printed with FOP using NoTo fonts and to have this more handy I decided to put a menu link to the FOP fonts file in content from example.

Modified:
    ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl
    ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml
    ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml

Modified: ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl?rev=1674586&r1=1674585&r2=1674586&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/fonts.fo.ftl Sat Apr 18 22:45:30 2015
@@ -1576,6 +1576,9 @@ Euro symbol in Helvetica 12 ( dec 8364,
 Ruppe symbol in NotoSans 12 (dec 8377, hex 20B9): ₹
   </fo:block>
   <fo:block font-family="NotoSans"  font-size="12pt">
+0 &#x00B0;C = 32 &#x00B0;F :)
+  </fo:block>
+  <fo:block font-family="NotoSans"  font-size="12pt">
 I &#x2665; NotoSans!
   </fo:block>
 

Modified: ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml?rev=1674586&r1=1674585&r2=1674586&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml Sat Apr 18 22:45:30 2015
@@ -19,6 +19,10 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd">
+    <property key="ContentFopFonts">
+        <value xml:lang="en">FOP fonts in a PDF</value>
+        <value xml:lang="fr">Polices FOP dans un PDF</value>
+    </property>
     <property key="ExampleAjaxExamples">
         <value xml:lang="en">Ajax Examples</value>
         <value xml:lang="fr">Exemples Ajax</value>
@@ -71,6 +75,10 @@
         <value xml:lang="zh">如果选择"specify other"，下拉框旁边会出现本文框。参考form的drop-down元素的other-field-size属性说明</value>
         <value xml:lang="zh-TW">如果選擇"specify other",下拉清單旁邊會出現本文框.參考form的drop-down元素的other-field-size屬性說明</value>
     </property>
+    <property key="ExampleBarChart">
+        <value xml:lang="en">Bar Chart</value>
+        <value xml:lang="fr">Histogramme</value>
+    </property>
     <property key="ExampleBaseNodeVersion">
         <value xml:lang="de">Verion des Content Knoten</value>
         <value xml:lang="en">Version of the base content node</value>
@@ -122,6 +130,10 @@
         <value xml:lang="zh-CN">OFBiz的一部分</value>
         <value xml:lang="zh-TW">開源軟體OFBiz家族的一部分</value>
     </property>
+    <property key="ExampleChart">
+        <value xml:lang="en">Chart examples</value>
+        <value xml:lang="fr">Graphes</value>
+    </property>
     <property key="ExampleDashboard">
         <value xml:lang="en">Dashboard</value>
         <value xml:lang="fr">Personnalisation des pages</value>
@@ -765,6 +777,10 @@
         <value xml:lang="zh">在用于exampleGenericPermission服务的permission-service元素中，缺少必须的main-action属性</value>
         <value xml:lang="zh-TW">在用於exampleGenericPermission服務的permission-service元素中,缺少必須的main-action屬性</value>
     </property>
+    <property key="ExamplePieChart">
+        <value xml:lang="en">Pie Chart</value>
+        <value xml:lang="fr">Camembert</value>
+    </property>
     <property key="ExamplePointAddress">
         <value xml:lang="en">Geolocation via address</value>
         <value xml:lang="fr">Géolocalisation par l'adresse</value>

Modified: ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml?rev=1674586&r1=1674585&r2=1674586&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml Sat Apr 18 22:45:30 2015
@@ -194,6 +194,11 @@ under the License.
       <security https="true" auth="true"/>
       <response name="success" type="view" value="printExampleFOPFonts"/>
     </request-map>
+    
+    <request-map uri="fonts.pdf">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="fonts.fo"/>
+    </request-map>
 
     <request-map uri="views">
         <security https="true" auth="false"/>
@@ -261,6 +266,9 @@ under the License.
     <!-- Flot view mapping -->
     <view-map name="ExampleBarChart" page="component://example/widget/example/ExampleScreens.xml#ExampleBarChart" type="screen"/>
     <view-map name="ExamplePieChart" page="component://example/widget/example/ExampleScreens.xml#ExamplePieChart" type="screen"/>
+    
+    <!--  content FOP example -->
+    <view-map name="fonts.fo" type="screenfop" page="component://content/widget/CommonScreens.xml#fonts.fo" content-type="application/pdf" encoding="none"/>
 
     <!-- Supported Content Types -->
     <!--

Modified: ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml?rev=1674586&r1=1674585&r2=1674586&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml Sat Apr 18 22:45:30 2015
@@ -42,16 +42,19 @@ under the License.
         <menu-item name="ExampleGeoLocation" title="${uiLabelMap.CommonGeoLocation}">
             <link target="ExampleGeoLocationPointSet1"/>
         </menu-item>
-        <menu-item name="ExampleCharts" title="Chart examples">
+        <menu-item name="ExampleCharts" title="${uiLabelMap.ExampleChart}">
             <link target="ExampleBarChart"/>
         </menu-item>
+        <menu-item name="ExampleCompleteFop" title="${uiLabelMap.ContentFopFonts}">
+                <link target="fonts.pdf"/>
+        </menu-item>
     </menu>
 
     <menu name="EditExample" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="EditExample" title="${uiLabelMap.ExampleExample}">
             <link target="EditExample">
                 <parameter param-name="exampleId"/>
-            </link>            
+            </link>
         </menu-item>
         <menu-item name="EditExampleItems" title="${uiLabelMap.CommonItems}">
             <link target="EditExampleItems">
@@ -88,7 +91,12 @@ under the License.
     </menu>
 
     <menu name="ExampleCharts" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
-        <menu-item name="ExampleBarChart" title="Bar chart"><link target="ExampleBarChart"/></menu-item>
-        <menu-item name="ExamplePieChart" title="Pie chart"><link target="ExamplePieChart"/></menu-item>
+        <menu-item name="ExampleBarChart" title="${uiLabelMap.ExampleBarChart}"><link target="ExampleBarChart"/></menu-item>
+        <menu-item name="ExamplePieChart" title="${uiLabelMap.ExamplePieChart}"><link target="ExamplePieChart"/></menu-item>
+    </menu>
+
+    <menu name="ExampleFopFonts" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="ExampleSimpleFop" title="${uiLabelMap.ExampleFopFonts}"><link target="printExampleFOPFonts"/></menu-item>
+        <menu-item name="ExampleCompleteFop" title="${uiLabelMap.ContentFopFonts}"><link target="fonts.pdf"/></menu-item>
     </menu>
 </menus>