svn commit: r882357 - in /ofbiz/branches/addbirt: applications/content/ applications/content/data/ framework/birt/ framework/birt/config/ framework/birt/data/ framework/birt/widget/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r882357 - in /ofbiz/branches/addbirt: applications/content/ applications/content/data/ framework/birt/ framework/birt/config/ framework/birt/data/ framework/birt/widget/

hansbak-2
Author: hansbak
Date: Thu Nov 19 23:21:26 2009
New Revision: 882357

URL: http://svn.apache.org/viewvc?rev=882357&view=rev
Log:
move help files to the content component, put more explanantion on the birt main screen

Added:
    ofbiz/branches/addbirt/applications/content/data/BirtHelpData.xml   (with props)
Modified:
    ofbiz/branches/addbirt/applications/content/ofbiz-component.xml
    ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml
    ofbiz/branches/addbirt/framework/birt/data/BirtHelpData.xml
    ofbiz/branches/addbirt/framework/birt/ofbiz-component.xml
    ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml

Added: ofbiz/branches/addbirt/applications/content/data/BirtHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/content/data/BirtHelpData.xml?rev=882357&view=auto
==============================================================================
--- ofbiz/branches/addbirt/applications/content/data/BirtHelpData.xml (added)
+++ ofbiz/branches/addbirt/applications/content/data/BirtHelpData.xml Thu Nov 19 23:21:26 2009
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<entity-engine-xml>
+    <DataResource dataResourceId="HELP_BIRT" localeString="en" dataResourceTypeId="OFBIZ_FILE"
+        objectInfo="framework/birt/data/helpdata/HELP_BIRT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
+        dataResourceName="BIRT" mimeTypeId="text/xml" isPublic="Y" />
+    <Content contentId="HELP_BIRT" contentTypeId="DOCUMENT" contentName="BIRT Overview" templateDataResourceId="HELP_TEMPL"
+        dataResourceId="HELP_BIRT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
+    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_BIRT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="" mapKey="BIRT_main"/>
+</entity-engine-xml>
\ No newline at end of file

Propchange: ofbiz/branches/addbirt/applications/content/data/BirtHelpData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/branches/addbirt/applications/content/data/BirtHelpData.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/branches/addbirt/applications/content/data/BirtHelpData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/branches/addbirt/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/content/ofbiz-component.xml?rev=882357&r1=882356&r2=882357&view=diff
==============================================================================
--- ofbiz/branches/addbirt/applications/content/ofbiz-component.xml (original)
+++ ofbiz/branches/addbirt/applications/content/ofbiz-component.xml Thu Nov 19 23:21:26 2009
@@ -42,6 +42,7 @@
     <!-- these files cannot be loaded in their original component because they are earlier than the content component -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyHelpData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/WebtoolsHelpData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/BirtHelpData.xml"/>
 
     <entity-resource type="data" reader-name="demo" loader="main" location="data/UsersDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoBlogPubPtData.xml"/>

Modified: ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml?rev=882357&r1=882356&r2=882357&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml (original)
+++ ofbiz/branches/addbirt/framework/birt/config/BirtUiLabels.xml Thu Nov 19 23:21:26 2009
@@ -36,19 +36,15 @@
         <value xml:lang="th">Framework Eclipse BIRT</value>
     </property>
     <property key="BirtViewer">
-        <value xml:lang="en">Viewer</value>
-        <value xml:lang="th">Viewer</value>
+        <value xml:lang="en">HTML Paged</value>
     </property>
     <property key="BirtReport">
-        <value xml:lang="en">Report</value>
-        <value xml:lang="th">Report</value>
+        <value xml:lang="en">HTML</value>
     </property>
     <property key="BirtMail">
-        <value xml:lang="en">Mail</value>
-        <value xml:lang="th">Mail</value>
+        <value xml:lang="en">Send any format through Mail</value>
     </property>
     <property key="BirtViewHandler">
-        <value xml:lang="en">View Handler</value>
-        <value xml:lang="th">View Handler</value>
+        <value xml:lang="en">PDF</value>
     </property>
 </resource>

Modified: ofbiz/branches/addbirt/framework/birt/data/BirtHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/data/BirtHelpData.xml?rev=882357&r1=882356&r2=882357&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/data/BirtHelpData.xml (original)
+++ ofbiz/branches/addbirt/framework/birt/data/BirtHelpData.xml Thu Nov 19 23:21:26 2009
@@ -19,10 +19,5 @@
 -->
 
 <entity-engine-xml>
-    <DataResource dataResourceId="HELP_BIRT" localeString="en" dataResourceTypeId="OFBIZ_FILE"
-        objectInfo="framework/birt/data/helpdata/HELP_BIRT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
-        dataResourceName="BIRT" mimeTypeId="text/xml" isPublic="Y" />
-    <Content contentId="HELP_BIRT" contentTypeId="DOCUMENT" contentName="BIRT Overview" templateDataResourceId="HELP_TEMPL"
-        dataResourceId="HELP_BIRT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
-    <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_BIRT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="" mapKey="BIRT_main"/>
+    <!-- The BIRT help data is located in the applications/content/data/BirtHelpData.xml file -->
 </entity-engine-xml>
\ No newline at end of file

Modified: ofbiz/branches/addbirt/framework/birt/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/ofbiz-component.xml?rev=882357&r1=882356&r2=882357&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/ofbiz-component.xml (original)
+++ ofbiz/branches/addbirt/framework/birt/ofbiz-component.xml Thu Nov 19 23:21:26 2009
@@ -34,7 +34,6 @@
     <classpath type="jar" location="lib/platform/plugins/org.w3c.sac_1.3.0.v20070710/lib/flute.jar"/>
     <classpath type="jar" location="build/lib/*"/>
     <classpath type="dir" location="config"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/BirtHelpData.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <webapp name="birt"
         title="BIRT"

Modified: ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml?rev=882357&r1=882356&r2=882357&view=diff
==============================================================================
--- ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml (original)
+++ ofbiz/branches/addbirt/framework/birt/widget/BirtScreens.xml Thu Nov 19 23:21:26 2009
@@ -11,7 +11,10 @@
                     <decorator-section name="body">
                         <section>
                             <widgets>
-                                <label text="BIRT is an open source Eclipse-based reporting system that integrates with your Java/J2EE application to produce compelling reports."/>
+                                <label style="h3" text="BIRT is an open source Eclipse-based reporting system that integrates with any OFBiz application to produce compelling reports including graphical presentations like pie and bar charts."/>
+                                <label style="h3" text="This application provides you with a sample product report."/>
+                                <label style="h3" text="See the help option how to create your own OFBiz intergrated reports."/>
+                                <link style="h3" text="or see the Birt home for more information" target="http://eclipse.org/birt/phoenix/intro/" url-mode="plain" target-window="_blank_"/>
                             </widgets>
                         </section>
                     </decorator-section>