svn commit: r618296 - in /ofbiz/trunk/specialpurpose/bi: config/ webapp/bi/reportbuilder/ widget/

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

svn commit: r618296 - in /ofbiz/trunk/specialpurpose/bi: config/ webapp/bi/reportbuilder/ widget/

mrisaliti
Author: mrisaliti
Date: Mon Feb  4 06:33:42 2008
New Revision: 618296

URL: http://svn.apache.org/viewvc?rev=618296&view=rev
Log:
All the Business Intelligence forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1610)

Added:
    ofbiz/trunk/specialpurpose/bi/config/BiUiLabels.properties   (with props)
    ofbiz/trunk/specialpurpose/bi/config/BiUiLabels_it.properties   (with props)
Modified:
    ofbiz/trunk/specialpurpose/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl
    ofbiz/trunk/specialpurpose/bi/webapp/bi/reportbuilder/SelectStarSchemaFields.ftl
    ofbiz/trunk/specialpurpose/bi/widget/BiForms.xml
    ofbiz/trunk/specialpurpose/bi/widget/BiMenus.xml
    ofbiz/trunk/specialpurpose/bi/widget/BiScreens.xml

Added: ofbiz/trunk/specialpurpose/bi/config/BiUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/config/BiUiLabels.properties?rev=618296&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/config/BiUiLabels.properties (added)
+++ ofbiz/trunk/specialpurpose/bi/config/BiUiLabels.properties Mon Feb  4 06:33:42 2008
@@ -0,0 +1,65 @@
+###############################################################################
+# 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.
+###############################################################################
+BusinessIntelligenceApplication=Business Intelligence Application
+BusinessIntelligenceCompanyName=OFBiz: Business Intelligence
+BusinessIntelligenceCompanySubtitle=Part of the Open For Business Family of Open Source Software
+BusinessIntelligenceCurrentStatus=Current Status
+BusinessIntelligenceFieldName=Field Name
+BusinessIntelligenceFieldDescription=Field Description
+BusinessIntelligenceIntegratedFramework=Business Intelligence Integrated Framework
+BusinessIntelligenceMainPage=Main Page
+BusinessIntelligenceNote1=This is a proof of concept for an OFBiz integrated framework for business intelligence analysis.
+BusinessIntelligenceNote2=The idea is to define a set entities for business intelligence analysis in a separate (olap) database,
+BusinessIntelligenceNote3=accessible, in the same way as the main one (oltp), via the delegator.
+BusinessIntelligenceNote4=The new olap database, will contain all the entities necessary to datawarehouse analysis:
+BusinessIntelligenceNote5=dimensions, facts and star schemas (that are view-entities).
+BusinessIntelligenceNote6=The dimensions, facts and star schemas are defined according to best practices for datawarehouses
+BusinessIntelligenceNote7=and best practices for OFBiz: they are defined as standard entities using the xml entity defs;
+BusinessIntelligenceNote8=clear and consistent naming conventions are used and they are documented
+BusinessIntelligenceNote9=by meta data descriptions (in the entity def).
+BusinessIntelligenceNote10=The best practices for datawarehouses are mainly taken from the great book "The Data Warehouse Toolkit - Second Edition" by Ralph Kimball.
+BusinessIntelligenceNote11=The data for dimensions and facts are maintained and kept up to date using standard OFBiz services
+BusinessIntelligenceNote12=(most of them written in minilang to facilitate customizations) and eca rules (easily customizable).
+BusinessIntelligenceNote13=The main low level services to post data to the datawarehouse,
+BusinessIntelligenceNote14=to map the operational keys with the datawarehouse ones, and to manage
+BusinessIntelligenceNote15=history of data changes are already implemented; they will be improved as the datawarehouse will grow (e.g. performance enhancements).
+BusinessIntelligenceNote16=The following dimensions (and data services) are defined: CurrencyDimension, DateDimension, ProductDimension;
+BusinessIntelligenceNote17=we will have to complete them and design the other ones (the total number of dimension will be probably around 20).
+BusinessIntelligenceNote18=Just one fact and one star schema are defined: SalesInvoiceItemFact and SalesInvoiceItemStarSchema.
+BusinessIntelligenceNote19=You can quickly initialize the datawarehouse by clicking on the link below:
+BusinessIntelligenceNote20=The CurrencyDimension, DateDimension, ProductDimension and the SalesInvoiceItemFact entities will be automatically populated.
+BusinessIntelligenceNote21=Then you can run the analysis using the report builder menu.
+BusinessIntelligenceNote22=The report builder is a very simple tool that allows you to run
+BusinessIntelligenceNote23=the analysis on all the star schemas defined in the system.
+BusinessIntelligenceNote24=However, right now there is just one star schema defined:
+BusinessIntelligenceNote25=SalesInvoiceItemStarSchema that is a simple "profit and loss" (P&L) analysis.
+BusinessIntelligenceNote26=Just select using the checkboxes the fields (columns) you want to see in the report
+BusinessIntelligenceNote27=and a simple report will be shown: according to the columns selected the data will be aggregated (drill up/down);
+BusinessIntelligenceNote28=all the descriptions you see in the report screens are pulled from the entity definitions.
+BusinessIntelligenceNote29=The initialization is needed only once, because the product data and sales invoice data
+BusinessIntelligenceNote30=are kept updated by ecas: if you create/update a product or create a new invoice,
+BusinessIntelligenceNote31=the new information will be immediately included in the datawarehouse analysis.
+BusinessIntelligenceQuickInitDataWarehouse=Quick Init DataWarehouse
+BusinessIntelligenceQuickStartGuide=Quick Start Guide
+BusinessIntelligenceRenderTheReport=Render the Report
+BusinessIntelligenceReportBuilder=Report Builder
+BusinessIntelligenceReportBuilderRenderStarSchemaReport=Render Star Schema Report
+BusinessIntelligenceReportBuilderSelectStarSchema=Select Star Schema
+BusinessIntelligenceReportBuilderSelectStarSchemaFields=Select Star Schema Fields
+BusinessIntelligenceReportBuilderSelectTheStarSchemaReport=Select the start schema (report)
\ No newline at end of file

Propchange: ofbiz/trunk/specialpurpose/bi/config/BiUiLabels.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/bi/config/BiUiLabels.properties
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/bi/config/BiUiLabels.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: ofbiz/trunk/specialpurpose/bi/config/BiUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/config/BiUiLabels_it.properties?rev=618296&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/config/BiUiLabels_it.properties (added)
+++ ofbiz/trunk/specialpurpose/bi/config/BiUiLabels_it.properties Mon Feb  4 06:33:42 2008
@@ -0,0 +1,65 @@
+###############################################################################
+# 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.
+###############################################################################
+BusinessIntelligenceApplication=Applicazione Business Intelligence
+BusinessIntelligenceCompanyName=OFBiz: Business Intelligence
+BusinessIntelligenceCompanySubtitle=Part of the Open For Business Family of Open Source Software
+BusinessIntelligenceCurrentStatus=Stato Attuale
+BusinessIntelligenceFieldName=Nome Campo
+BusinessIntelligenceFieldDescription=Descrizione Campo
+BusinessIntelligenceIntegratedFramework=Business Intelligence Framework Integrato
+BusinessIntelligenceMainPage=Pagina Principale
+BusinessIntelligenceNote1=Questo รจ un prototipo per un OFBiz framework integrato per analisi di business intelligence.
+BusinessIntelligenceNote2=L\'idea \u00e8 di definire un\'insieme di entit\u00e0 per le analisi di business intelligence in un database (olap) separato,
+BusinessIntelligenceNote3=accessibile, nello stesso modo di quello principale (oltp), attraverso un delegator.
+BusinessIntelligenceNote4=Il nuovo database olap, conterr\u00e0 tutte le entit\u00e0 necessarie alle analisi di datawarehouse:
+BusinessIntelligenceNote5=dimensioni, fatti e star schemas (queste sono view-entities).
+BusinessIntelligenceNote6=Le dimensioni, fatti e star schemas sono definiti in accordo alle migliori pratiche per i datawarehouses
+BusinessIntelligenceNote7=e le migliori pratiche per OFBiz: queste sono definite come entit\u00e0 standard usando le definizioni xml entity;
+BusinessIntelligenceNote8=corretti e consistenti convenzione nei nomi sono usati and sono documentati
+BusinessIntelligenceNote9=dalle descrizione dei meta dati (nella definizione entit\u00e0).
+BusinessIntelligenceNote10=Le migliori pratiche per i datawarehouses sono stati ricavati dal grande libro "The Data Warehouse Toolkit - Second Edition" di Ralph Kimball.
+BusinessIntelligenceNote11=I dati per dimensioni e fatti sono manutenibili e mantenuti aggiornati usando gli standard dei servizi OFBiz
+BusinessIntelligenceNote12=(molti dei quali sono scritti utizzando minilang per facilitare le personalizzazioni) e le regole eca (facilmente personalizzabili).
+BusinessIntelligenceNote13=I servizi principali a basso livello per ricavare i dati del datawarehouse,
+BusinessIntelligenceNote14=la mappa di chiavi operazionali con il datawarehouse, e la gestione
+BusinessIntelligenceNote15=storia di cambio di dati che sono gi\u00e0 implementati; sar\u00e0 aumentato di caratteristiche non appena crescer\u00e0 il datawarehouse (e.g. aumento prestazioni).
+BusinessIntelligenceNote16=Le seguenti dimensioni (e servizi dei dati) sono definiti: CurrencyDimension, DateDimension, ProductDimension;
+BusinessIntelligenceNote17=verranno usati per completare questi e disegnare gli altri (il numero totale di dimensioni saranno probabilmente circa 20).
+BusinessIntelligenceNote18=Solo un fatto e uno star schema sono definiti: SalesInvoiceItemFact e SalesInvoiceItemStarSchema.
+BusinessIntelligenceNote19=Tu puoi velocemente inizializzare il datawarehouse facendo click sul link qui sotto:
+BusinessIntelligenceNote20=Le entit\u00e0 CurrencyDimension, DateDimension, ProductDimension e SalesInvoiceItemFact saranno caricate automaticamente.
+BusinessIntelligenceNote21=Dopo tu puoi eseguire analisi usando il menu costruzione report.
+BusinessIntelligenceNote22=La costruzione report \u00e8 un vero strumento semplice che ti permette di eseguire
+BusinessIntelligenceNote23=le analisi su tutti i star schemas definiti nel sistema.
+BusinessIntelligenceNote24=Comunque, fino adesso c\'\u00e8 solo un star schema definito:
+BusinessIntelligenceNote25=SalesInvoiceItemStarSchema che \u00e8 una semplice analisi di "profit and loss" (P&L).
+BusinessIntelligenceNote26=Appena selezionato i campi dei checkboxes (colonne) tu vorrai vedere
+BusinessIntelligenceNote27=e un semplice report verr\u00e0 mostrato: in accordo alle colonne selezionate i dati verranno aggregati (drill up/down);
+BusinessIntelligenceNote28=tutte le descrizioni che tu vedrai nelle scrermate del report sono prelevare dalla definizioni delle entit\u00e0.
+BusinessIntelligenceNote29=L\'inizializzazione \u00e8 necessaria solo una volta, perch\u00e8 i dati del prodotti e i dati delle fatture di vendita
+BusinessIntelligenceNote30=sono mantenute aggiornate dagli ecas: se tu crei/aggiorni un prodotto o creare una nuova fattura,
+BusinessIntelligenceNote31=la nuova informazione sar\u00e0 immediatamente inclusa nelle analisi del datawarehouse.
+BusinessIntelligenceQuickInitDataWarehouse=Inizializzazione Veloce DataWarehouse
+BusinessIntelligenceQuickStartGuide=Guida Rapida
+BusinessIntelligenceRenderTheReport=Visualizza il Report
+BusinessIntelligenceReportBuilder=Costruzione Report
+BusinessIntelligenceReportBuilderRenderStarSchemaReport=Visualizza Report Star Schema
+BusinessIntelligenceReportBuilderSelectStarSchema=Seleziona Star Schema
+BusinessIntelligenceReportBuilderSelectStarSchemaFields=Seleziona Campi Star Schema
+BusinessIntelligenceReportBuilderSelectTheStarSchemaReport=Seleziona lo start schema (report)
\ No newline at end of file

Propchange: ofbiz/trunk/specialpurpose/bi/config/BiUiLabels_it.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/bi/config/BiUiLabels_it.properties
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/bi/config/BiUiLabels_it.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/specialpurpose/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl?rev=618296&r1=618295&r2=618296&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl (original)
+++ ofbiz/trunk/specialpurpose/bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl Mon Feb  4 06:33:42 2008
@@ -17,7 +17,7 @@
 under the License.
 -->
 
-<table cellspacing="0" class="basic-table form-widget-table dark-grid">
+<table cellspacing="0" class="basic-table hover-bar">
     <tr class="header-row">
         <#list columnNames as columnName>
         <td>
@@ -25,8 +25,9 @@
         </td>
         </#list>
     </tr>
+    <#assign alt_row = false>
     <#list records as record>
-    <tr>
+    <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
         <#list columnNames as columnName>
         <#assign columnValue = record[columnName]?default("")>
         <td<#if columnValue?is_number> class="align-text"</#if>>
@@ -34,6 +35,7 @@
         </td>
         </#list>
     </tr>
+    <#-- toggle the row color -->
+    <#assign alt_row = !alt_row>
     </#list>
-    
-</table>
+</table>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/bi/webapp/bi/reportbuilder/SelectStarSchemaFields.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/webapp/bi/reportbuilder/SelectStarSchemaFields.ftl?rev=618296&r1=618295&r2=618296&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/webapp/bi/reportbuilder/SelectStarSchemaFields.ftl (original)
+++ ofbiz/trunk/specialpurpose/bi/webapp/bi/reportbuilder/SelectStarSchemaFields.ftl Mon Feb  4 06:33:42 2008
@@ -19,20 +19,21 @@
 
 <form action="<@ofbizUrl>ReportBuilderRenderStarSchemaReport</@ofbizUrl>">
     <input type="hidden" name="starSchemaName" value="${starSchemaName}"/>
-    <table cellspacing="0" class="basic-table form-widget-table dark-grid">
+    <table cellspacing="0" class="basic-table hover-bar">
         <tr class="header-row">
             <td>
-                Select
+                ${uiLabelMap.CommonSelect}
             </td>
             <td>
-                Field Name
+                ${uiLabelMap.BusinessIntelligenceFieldName}
             </td>
             <td>
-                Field Description
+                ${uiLabelMap.BusinessIntelligenceFieldDescription}
             </td>
         </tr>
+        <#assign alt_row = false>
         <#list starSchemaFields as starSchemaField>
-        <tr>
+        <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
             <td>
                 <input name="selectedField" value="${starSchemaField.name}" type="checkbox"/>
             </td>
@@ -43,11 +44,13 @@
                 ${starSchemaField.description?default("")}
             </td>
         </tr>
+        <#-- toggle the row color -->
+        <#assign alt_row = !alt_row>
         </#list>
         <tr>
             <td colspan="3">
-                <input name="submitButton" type="submit" value="Render the Report"/>
+                <input name="submitButton" type="submit" value="${uiLabelMap.BusinessIntelligenceRenderTheReport}"/>
             </td>
         </tr>
     </table>
-</form>
+</form>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/bi/widget/BiForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/widget/BiForms.xml?rev=618296&r1=618295&r2=618296&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/widget/BiForms.xml (original)
+++ ofbiz/trunk/specialpurpose/bi/widget/BiForms.xml Mon Feb  4 06:33:42 2008
@@ -3,11 +3,12 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
 
-    <form name="selectStarSchema" title="" type="single" target="ReportBuilderSelectStarSchemaFields">
+    <form name="selectStarSchema" title="" type="single" target="ReportBuilderSelectStarSchemaFields"
+        header-row-style="header-row" default-table-style="basic-table">
         <actions>
             <script location="component://bi/webapp/bi/WEB-INF/actions/reportbuilder/getStarSchemas.bsh"/>
         </actions>
-        <field name="starSchemaName" title="Select the star schema (report)">
+        <field name="starSchemaName" title="${uiLabelMap.BusinessIntelligenceReportBuilderSelectTheStarSchemaReport}">
             <drop-down allow-empty="false">
                 <list-options list-name="starSchemas" key-name="name" description="${title}"/>
             </drop-down>
@@ -17,7 +18,8 @@
         </field>
     </form>
 
-    <form name="SalesInvoiceItemStarSchema" list-name="invoiceItemFacts" title="" type="list">
+    <form name="SalesInvoiceItemStarSchema" list-name="invoiceItemFacts" title="" type="list"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="SalesInvoiceItemStarSchema" list-name="invoiceItemFacts">
                 <select-field field-name="invoiceDateDayName"/>
@@ -31,4 +33,4 @@
         <field name="extGrossAmount"><display/></field>
         <field name="quantity"><display/></field>
     </form>
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/bi/widget/BiMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/widget/BiMenus.xml?rev=618296&r1=618295&r2=618296&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/widget/BiMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/bi/widget/BiMenus.xml Mon Feb  4 06:33:42 2008
@@ -21,7 +21,7 @@
     <menu name="BiAppBar" default-menu-item-name="main" id="app-navigation" type="simple" title="${uiLabelMap.BusinessIntelligenceApplication}"
         default-selected-style="selected" selected-menuitem-context-field-name="headerItem">
         <menu-item name="main" title="${uiLabelMap.CommonMain}"><link target="main"/></menu-item>
-        <menu-item name="reportbuilder" title="${uiLabelMap.ReportBuilder}"><link target="ReportBuilderSelectStarSchema"/></menu-item>
+        <menu-item name="reportbuilder" title="${uiLabelMap.BusinessIntelligenceReportBuilder}"><link target="ReportBuilderSelectStarSchema"/></menu-item>
 
         <menu-item name="Logout" title="Logout" align-style="col-right" selected-style="selected">
             <condition><not><if-empty field-name="userLogin"/></not></condition>
@@ -32,4 +32,4 @@
             <link target="${checkLoginUrl}"/>
         </menu-item>
     </menu>
-</menus>
+</menus>
\ No newline at end of file

Modified: ofbiz/trunk/specialpurpose/bi/widget/BiScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/widget/BiScreens.xml?rev=618296&r1=618295&r2=618296&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/widget/BiScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/bi/widget/BiScreens.xml Mon Feb  4 06:33:42 2008
@@ -24,10 +24,11 @@
         <section>
             <actions>
                 <!-- base/top/specific map first, then more common map added for shared labels -->
+                <property-map resource="BiUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
 
-                <set field="layoutSettings.companyName" value="OFBiz : Business Intelligence" global="true"/>
-                <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ManufacturingCompanySubtitle" global="true"/>
+                <set field="layoutSettings.companyName" from-field="uiLabelMap.BusinessIntelligenceCompanyName" global="true"/>
+                <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.BusinessIntelligenceCompanySubtitle" global="true"/>
                 <set field="activeApp" value="bi" global="true"/>
                 <set field="applicationMenuName" value="BiAppBar" global="true"/>
                 <set field="applicationMenuLocation" value="component://bi/widget/BiMenus.xml" global="true"/>
@@ -40,12 +41,26 @@
     <screen name="ReportBuilderSelectStarSchema">
         <section>
             <actions>
+                <set field="titleProperty" value="BusinessIntelligenceReportBuilderSelectStarSchema"/>
                 <set field="headerItem" value="reportbuilder"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="selectStarSchema" location="component://bi/widget/BiForms.xml"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head3">
+                                    <label text="${uiLabelMap.BusinessIntelligenceReportBuilderSelectStarSchema}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>    
+                                        <include-form name="selectStarSchema" location="component://bi/widget/BiForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -54,15 +69,29 @@
     <screen name="ReportBuilderSelectStarSchemaFields">
         <section>
             <actions>
+                <set field="titleProperty" value="BusinessIntelligenceReportBuilderSelectStarSchemaFields"/>
                 <set field="headerItem" value="reportbuilder"/>
                 <script location="component://bi/webapp/bi/WEB-INF/actions/reportbuilder/getStarSchemaFields.bsh"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://bi/webapp/bi/reportbuilder/SelectStarSchemaFields.ftl"/></html>
-                        </platform-specific>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head3">
+                                    <label text="${uiLabelMap.BusinessIntelligenceReportBuilderSelectStarSchemaFields}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>    
+                                        <platform-specific>
+                                            <html><html-template location="component://bi/webapp/bi/reportbuilder/SelectStarSchemaFields.ftl"/></html>
+                                        </platform-specific>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -71,15 +100,29 @@
     <screen name="ReportBuilderRenderStarSchemaReport">
         <section>
             <actions>
+                <set field="titleProperty" value="BusinessIntelligenceReportBuilderRenderStarSchemaReport"/>
                 <set field="headerItem" value="reportbuilder"/>
                 <script location="component://bi/webapp/bi/WEB-INF/actions/reportbuilder/runStarSchemaQuery.bsh"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl"/></html>
-                        </platform-specific>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head3">
+                                    <label text="${uiLabelMap.BusinessIntelligenceReportBuilderRenderStarSchemaReport}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>    
+                                        <platform-specific>
+                                            <html><html-template location="component://bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl"/></html>
+                                        </platform-specific>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -89,6 +132,7 @@
     <screen name="main">
         <section>
             <actions>
+                <set field="titleProperty" value="BusinessIntelligenceMainPage"/>
                 <set field="headerItem" value="main"/>
                 <set field="fromDate" value="2007-01-01 00:00:00.0" type="Timestamp"/>
                 <set field="thruDate" value="2008-01-01 00:00:00.0" type="Timestamp"/>
@@ -97,103 +141,103 @@
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <container>
-                            <label style="head1">Business Intelligence integrated framework</label>
+                            <label style="head1">${uiLabelMap.BusinessIntelligenceIntegratedFramework}</label>
                         </container>
                         <container>
                             <label>
-                                This is a proof of concept for an OFBiz integrated framework for business intelligence analysis.
+                                ${uiLabelMap.BusinessIntelligenceNote1}
                             </label>
                         </container>
                         <container>
                             <label>
-                                The idea is to define a set entities for business intelligence analysis in a separate (olap) database,
-                                accessible, in the same way as the main one (oltp), via the delegator.
+                                ${uiLabelMap.BusinessIntelligenceNote2}
+                                ${uiLabelMap.BusinessIntelligenceNote3}
                             </label>
                         </container>
                         <container>
                             <label>
-                                The new olap database, will contain all the entities necessary to datawarehouse analysis:
-                                dimensions, facts and star schemas (that are view-entities).
+                                ${uiLabelMap.BusinessIntelligenceNote4}
+                                ${uiLabelMap.BusinessIntelligenceNote5}
                             </label>
                         </container>
                         <container>
                             <label>
-                                The dimensions, facts and star schemas are defined according to best practices for datawarehouses
-                                and best practices for OFBiz: they are defined as standard entities using the xml entity defs;
-                                clear and consistent naming conventions are used and they are documented
-                                by meta data descriptions (in the entity def).
+                                ${uiLabelMap.BusinessIntelligenceNote6}
+                                ${uiLabelMap.BusinessIntelligenceNote7}
+                                ${uiLabelMap.BusinessIntelligenceNote8}
+                                ${uiLabelMap.BusinessIntelligenceNote9}
                             </label>
                         </container>
                         <container>
                             <label>
-                                The best practices for datawarehouses are mainly taken from the great book "The Data Warehouse Toolkit - Second Edition" by Ralph Kimball.
+                                ${uiLabelMap.BusinessIntelligenceNote10}
                             </label>
                         </container>
                         <container>
                             <label>
-                                The data for dimensions and facts are maintained and kept up to date using standard OFBiz services
-                                (most of them written in minilang to facilitate customizations) and eca rules (easily customizable).
+                                ${uiLabelMap.BusinessIntelligenceNote11}
+                                ${uiLabelMap.BusinessIntelligenceNote12}
                             </label>
                         </container>
                         <container>
                             <label style="head3">
-                                Current Status
+                                ${uiLabelMap.BusinessIntelligenceCurrentStatus}
                             </label>
                         </container>
                         <container>
                             <label>
-                                The main low level services to post data to the datawarehouse,
-                                to map the operational keys with the datawarehouse ones, and to manage
-                                history of data changes are already implemented; they will be improved as the datawarehouse will grow (e.g. performance enhancements).
+                                ${uiLabelMap.BusinessIntelligenceNote13}
+                                ${uiLabelMap.BusinessIntelligenceNote14}
+                                ${uiLabelMap.BusinessIntelligenceNote15}
                             </label>
                         </container>
                         <container>
                             <label>
-                                The following dimensions (and data services) are defined: CurrencyDimension, DateDimension, ProductDimension;
-                                we will have to complete them and design the other ones (the total number of dimension will be probably around 20).
+                                ${uiLabelMap.BusinessIntelligenceNote16}
+                                ${uiLabelMap.BusinessIntelligenceNote17}
                             </label>
                         </container>
                         <container>
                             <label>
-                                Just one fact and one star schema are defined: SalesInvoiceItemFact and SalesInvoiceItemStarSchema.
+                                ${uiLabelMap.BusinessIntelligenceNote18}
                             </label>
                         </container>
                         <container>
                             <label style="head3">
-                                Quick Start Guide
+                                ${uiLabelMap.BusinessIntelligenceQuickStartGuide}
                             </label>
                         </container>
                         <container>
                             <label>
-                                You can quickly initialize the datawarehouse by clicking on the link below:
-                                The CurrencyDimension, DateDimension, ProductDimension and the SalesInvoiceItemFact entities will be automatically populated.
+                                ${uiLabelMap.BusinessIntelligenceNote19}
+                                ${uiLabelMap.BusinessIntelligenceNote20}
                             </label>
                         </container>
                         <container>
                             <label>
-                                Then you can run the analysis using the report builder menu.
-                                The report builder is a very simple tool that allows you to run
-                                the analysis on all the star schemas defined in the system.
-                                However, right now there is just one star schema defined:
-                                SalesInvoiceItemStarSchema that is a simple "profit and loss" (P&amp;L) analysis.
+                                ${uiLabelMap.BusinessIntelligenceNote21}
+                                ${uiLabelMap.BusinessIntelligenceNote22}
+                                ${uiLabelMap.BusinessIntelligenceNote23}
+                                ${uiLabelMap.BusinessIntelligenceNote24}
+                                ${uiLabelMap.BusinessIntelligenceNote25}
                             </label>
                         </container>
                         <container>
                             <label>
-                                Just select using the checkboxes the fields (columns) you want to see in the report
-                                and a simple report will be shown: according to the columns selected the data will be aggregated (drill up/down);
-                                all the descriptions you see in the report screens are pulled from the entity definitions.
+                                ${uiLabelMap.BusinessIntelligenceNote26}
+                                ${uiLabelMap.BusinessIntelligenceNote27}
+                                ${uiLabelMap.BusinessIntelligenceNote28}
                             </label>
                         </container>
                         <container>
-                            <link target="quickInitDataWarehouse?fromDate=${fromDate}&amp;thruDate=${thruDate}" text="Quick Init DataWarehouse" style="buttontext"/>
-                            <label> (from date ${fromDate} thru date ${thruDate})</label>
+                            <link target="quickInitDataWarehouse?fromDate=${fromDate}&amp;thruDate=${thruDate}" text="${uiLabelMap.BusinessIntelligenceQuickInitDataWarehouse}" style="buttontext"/>
+                            <label> (${uiLabelMap.CommonFromDate} ${fromDate} ${uiLabelMap.CommonThruDate} ${thruDate})</label>
                         </container>
                         <container>
                             <label>
-                                The initialization is needed only once, because the product data and sales invoice data
-                                are kept updated by ecas: if you create/update a product or create a new invoice,
-                                the new information will be immediately included in the datawarehouse analysis.
+                                ${uiLabelMap.BusinessIntelligenceNote29}
+                                ${uiLabelMap.BusinessIntelligenceNote30}
+                                ${uiLabelMap.BusinessIntelligenceNote31}
                             </label>
                         </container>
                     </decorator-section>
@@ -201,5 +245,4 @@
             </widgets>
         </section>
     </screen>
-</screens>
-
+</screens>
\ No newline at end of file