You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/08/04 20:11:22 UTC
svn commit: r1369382 [18/19] - in /ofbiz/branches/20120329_portletWidget: ./
applications/accounting/script/org/ofbiz/accounting/payment/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/webapp/accounting/WEB-INF/ appli...
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleFeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleFeatureScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleFeatureScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleFeatureScreens.xml Sat Aug 4 18:11:00 2012
@@ -70,7 +70,9 @@ under the License.
<widgets>
<decorator-screen name="CommonExampleFeatureDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="EditExampleFeature" location="component://example/widget/example/ExampleFeatureForms.xml"/>
+ <screenlet title="${uiLabelMap.ExampleFeature}">
+ <include-form name="EditExampleFeature" location="component://example/widget/example/ExampleFeatureForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -87,8 +89,12 @@ under the License.
<widgets>
<decorator-screen name="CommonExampleFeatureDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="ListExampleFeatureAppls" location="component://example/widget/example/ExampleFeatureForms.xml"/>
- <include-form name="AddExampleFeatureAppl" location="component://example/widget/example/ExampleFeatureForms.xml"/>
+ <screenlet title="${uiLabelMap.ExampleFeaturesByExample}">
+ <include-form name="ListExampleFeatureAppls" location="component://example/widget/example/ExampleFeatureForms.xml"/>
+ </screenlet>
+ <screenlet title="Add Feature To Example">
+ <include-form name="AddExampleFeatureAppl" location="component://example/widget/example/ExampleFeatureForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleForms.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleForms.xml Sat Aug 4 18:11:00 2012
@@ -106,7 +106,6 @@ under the License.
<field use-when="example==null @and exampleId!=null" name="exampleId" title="${uiLabelMap.ExampleExampleId}"><display description="${uiLabelMap.CommonCannotBeFound}: [${exampleId}]" also-hidden="false"/></field>
<field name="exampleTypeId" title="${uiLabelMap.CommonType}" id-name="exampleTypeId" widget-style="required">
<drop-down allow-empty="false">
- <auto-complete/><!--#Eam# portletExample for testing Error Message-->
<!-- this is a neat feature, but not good for the type because the user would have to know the possible types in order to enter at least the first letter, so leaving it out by default; just uncomment to enable: <auto-complete/> -->
<entity-options entity-name="ExampleType" description="${description}">
<entity-order-by field-name="description"/>
@@ -146,7 +145,7 @@ under the License.
<!-- Typically, this extended form wouldn't be necessary. The parent form (EditExample) would
have these settings. -->
<form name="EditExampleBackgroundSubmit" type="single" extends="EditExample" target="updateExampleAjax">
- <alt-target use-when="example==null" target="createExampleJson"/>
+ <alt-target use-when="example==null" target="createExampleAjax"/>
<field name="statusId" use-when="example==null" title="${uiLabelMap.CommonStatus}" id-name="statusId">
<drop-down allow-empty="false">
<entity-options entity-name="ExampleStatusItem" description="${description}"/>
@@ -250,446 +249,4 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
-
-
- <!--#Bam# icons-purpose -->
- <form name="IconsList" type="single">
- <field name="globalHelp" title=" " tooltip="${uiLabelMap.BestPractice_Icons}"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Activate"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Activate2" title="${uiLabelMap.IconsTooltips_Activate}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Activate}" image-title="${uiLabelMap.IconsTooltips_Activate}" />
- </field>
- <field name="Add"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Add2" title="${uiLabelMap.IconsTooltips_Add}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Add}" image-title="${uiLabelMap.IconsTooltips_Add}" />
- </field>
- <field name="AddItem"><display also-hidden="false" description=" " size="1"/></field>
- <field name="AddItem2" title="${uiLabelMap.BestPractice_IconAddItem}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.AddItem}" image-title="${uiLabelMap.IconsTooltips_AddItem}" />
- </field>
- <field name="Address"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Address2" title="${uiLabelMap.IconsTooltips_Address}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Address}" image-title="${uiLabelMap.IconsTooltips_Address}" />
- </field>
- <field name="Adm"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Adm2" title="${uiLabelMap.IconsTooltips_Adm}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Adm}" image-title="${uiLabelMap.IconsTooltips_Adm}" />
- </field>
- <field name="Alarm"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Alarm2" title="${uiLabelMap.IconsTooltips_Alarm}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Alarm}" image-title="${uiLabelMap.IconsTooltips_Alarm}" />
- </field>
- <field name="AppNext"><display also-hidden="false" description=" " size="1"/></field>
- <field name="AppNext2" title="${uiLabelMap.BestPractice_IconAppNext}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.AppNext}" image-title="${uiLabelMap.IconsTooltips_AppNext}" />
- </field>
- <field name="AppPrev"><display also-hidden="false" description=" " size="1"/></field>
- <field name="AppPrev2" title="${uiLabelMap.BestPractice_IconAppPrev}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.AppPrev}" image-title="${uiLabelMap.IconsTooltips_AppPrev}" />
- </field>
- <field name="Associate"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Associate2" title="${uiLabelMap.IconsTooltips_Associate}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Associate}" image-title="${uiLabelMap.IconsTooltips_Associate}" />
- </field>
- <field name="Attach"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Attach2" title="${uiLabelMap.IconsTooltips_Attach}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Attach}" image-title="${uiLabelMap.IconsTooltips_Attach}" />
- </field>
- <field name="Cancel"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Cancel2" title="${uiLabelMap.IconsTooltips_Cancel}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Cancel}" image-title="${uiLabelMap.IconsTooltips_Cancel}" also-hidden="false" />
- </field>
- <field name="Category"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Category2" title="${uiLabelMap.BestPractice_IconCategory}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Category}" image-title="${uiLabelMap.IconsTooltips_Category}" also-hidden="false" />
- </field>
- <field name="ChartBar"><display also-hidden="false" description=" " size="1"/></field>
- <field name="ChartBar2" title="${uiLabelMap.IconsTooltips_Chart}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.ChartBar}" image-title="${uiLabelMap.IconsTooltips_Chart}" also-hidden="false" />
- </field>
- <field name="ChartPie"><display also-hidden="false" description=" " size="1"/></field>
- <field name="ChartPie2" title="${uiLabelMap.IconsTooltips_Chart}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.ChartPie}" image-title="${uiLabelMap.IconsTooltips_Chart}" also-hidden="false" />
- </field>
- <field name="ChartLine"><display also-hidden="false" description=" " size="1"/></field>
- <field name="ChartLine2" title="${uiLabelMap.IconsTooltips_Chart}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.ChartLine}" image-title="${uiLabelMap.IconsTooltips_Chart}" also-hidden="false" />
- </field>
- <field name="ContactMech"><display also-hidden="false" description=" " size="1"/></field>
- <field name="ContactMech2" title="${uiLabelMap.IconsTooltips_ContactMech}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.ContactMech}" image-title="${uiLabelMap.IconsTooltips_ContactMech}" also-hidden="false" />
- </field>
- <field name="Date"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Date2" title="${uiLabelMap.IconsTooltips_Date}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Date}" image-title="${uiLabelMap.IconsTooltips_Date}" />
- </field>
- <field name="Deactivate"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Deactivate2" title="${uiLabelMap.IconsTooltips_Deactivate}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Deactivate}" image-title="${uiLabelMap.IconsTooltips_Deactivate}" />
- </field>
- <field name="Delete"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Delete2" title="${uiLabelMap.IconsTooltips_Delete}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Delete}" image-title="${uiLabelMap.IconsTooltips_Delete}" />
- </field>
- <field name="Details"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Details2" title="${uiLabelMap.IconsTooltips_Details}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Details}" image-title="${uiLabelMap.IconsTooltips_Details}" />
- </field>
- <field name="Docfusion"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Docfusion2" title="${uiLabelMap.IconsTooltips_Docfusion}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Docfusion}" image-title="${uiLabelMap.IconsTooltips_Docfusion}" />
- </field>
- <field name="Done"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Done2" title="${uiLabelMap.IconsTooltips_Done}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Done}" image-title="${uiLabelMap.IconsTooltips_Done}" />
- </field>
- <field name="Download"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Download2" title="${uiLabelMap.IconsTooltips_Download}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Download}" image-title="${uiLabelMap.IconsTooltips_Download}" />
- </field>
- <field name="Duplicate"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Duplicate2" title="${uiLabelMap.IconsTooltips_Duplicate}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Duplicate}" image-title="${uiLabelMap.IconsTooltips_Duplicate}" />
- </field>
- <field name="Edit"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Edit2" title="${uiLabelMap.IconsTooltips_Edit}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Edit}" image-title="${uiLabelMap.IconsTooltips_Edit}" also-hidden="false" />
- </field>
- <field name="Email"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Email2" title="${uiLabelMap.IconsTooltips_Email}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Email}" image-title="${uiLabelMap.IconsTooltips_Email}" />
- </field>
- <field name="EmailAttach"><display also-hidden="false" description=" " size="1"/></field>
- <field name="EmailAttach2" title="${uiLabelMap.IconsTooltips_EmailAttach}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.EmailAttach}" image-title="${uiLabelMap.IconsTooltips_EmailAttach}" />
- </field>
- <field name="EmailEdit"><display also-hidden="false" description=" " size="1"/></field>
- <field name="EmailEdit2" title="${uiLabelMap.IconsTooltips_EmailEdit}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.EmailEdit}" image-title="${uiLabelMap.IconsTooltips_EmailEdit}" />
- </field>
- <field name="EmailGo"><display also-hidden="false" description=" " size="1"/></field>
- <field name="EmailGo2" title="${uiLabelMap.IconsTooltips_EmailGo}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.EmailGo}" image-title="${uiLabelMap.IconsTooltips_EmailGo}" />
- </field>
- <field name="EmailOpen"><display also-hidden="false" description=" " size="1"/></field>
- <field name="EmailOpen2" title="${uiLabelMap.IconsTooltips_EmailOpen}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.EmailOpen}" image-title="${uiLabelMap.IconsTooltips_EmailOpen}" />
- </field>
- <field name="EventCom"><display also-hidden="false" description=" " size="1"/></field>
- <field name="EventCom2" title="${uiLabelMap.IconsTooltips_EventCom}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.EventCom}" image-title="${uiLabelMap.IconsTooltips_EventCom}" />
- </field>
- <field name="Expire"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Expire2" title="${uiLabelMap.IconsTooltips_Expire}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Expire}" image-title="${uiLabelMap.IconsTooltips_Expire}" />
- </field>
- <field name="Filter"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Filter2" title="${uiLabelMap.IconsTooltips_Filter}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Filter}" image-title="${uiLabelMap.IconsTooltips_Filter}" />
- </field>
- <field name="Gantt"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Gantt2" title="${uiLabelMap.IconsTooltips_Gantt}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Gantt}" image-title="${uiLabelMap.IconsTooltips_Gantt}" />
- </field>
- <field name="Grants"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Grants2" title="${uiLabelMap.IconsTooltips_Grants}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Grants}" image-title="${uiLabelMap.IconsTooltips_Grants}" />
- </field>
- <field name="Group"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Group2" title="${uiLabelMap.IconsTooltips_Group}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Group}" image-title="${uiLabelMap.IconsTooltips_Group}" />
- </field>
- <field name="Hierarchy"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Hierarchy2" title="${uiLabelMap.BestPractice_IconHierarchy}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Hierarchy}" image-title="${uiLabelMap.IconsTooltips_Hierarchy}" also-hidden="false" />
- </field>
- <field name="History"><display also-hidden="false" description=" " size="1"/></field>
- <field name="History2" title="${uiLabelMap.IconsTooltips_History}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.History}" image-title="${uiLabelMap.IconsTooltips_History}" />
- </field>
- <field name="HideHistory"><display also-hidden="false" description=" " size="1"/></field>
- <field name="HideHistory2" title="${uiLabelMap.IconsTooltips_HideHistory}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.HideHistory}" image-title="${uiLabelMap.IconsTooltips_HideHistory}" />
- </field>
- <field name="Items"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Items2" title="${uiLabelMap.IconsTooltips_Items}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Items}" image-title="${uiLabelMap.IconsTooltips_Items}" />
- </field>
- <field name="Overview"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Overview2" title="${uiLabelMap.IconsTooltips_Overview}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Overview}" image-title="${uiLabelMap.IconsTooltips_Overview}" />
- </field>
- <field name="Pause"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Pause2" title="${uiLabelMap.IconsTooltips_Pause}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Pause}" image-title="${uiLabelMap.IconsTooltips_Pause}" />
- </field>
- <field name="Payment"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Payment2" title="${uiLabelMap.IconsTooltips_Payment}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Payment}" image-title="${uiLabelMap.IconsTooltips_Payment}" />
- </field>
- <field name="PDF"><display also-hidden="false" description=" " size="1"/></field>
- <field name="PDF2" title="${uiLabelMap.BestPractice_IconPDF}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.PDF}" image-title="${uiLabelMap.IconsTooltips_PDF}" />
- </field>
- <field name="Phone"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Phone2" title="${uiLabelMap.IconsTooltips_Phone}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Phone}" image-title="${uiLabelMap.IconsTooltips_Phone}" />
- </field>
- <field name="Plan"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Plan2" title="${uiLabelMap.IconsTooltips_Plan}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Plan}" image-title="${uiLabelMap.IconsTooltips_Plan}" />
- </field>
- <field name="Print"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Print2" title="${uiLabelMap.BestPractice_IconPrint}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Print}" image-title="${uiLabelMap.IconsTooltips_Print}" />
- </field>
- <field name="Refresh"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Refresh2" title="${uiLabelMap.IconsTooltips_Refresh}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Refresh}" image-title="${uiLabelMap.IconsTooltips_Refresh}" />
- </field>
- <field name="Role"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Role2" title="${uiLabelMap.IconsTooltips_Role}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Role}" image-title="${uiLabelMap.IconsTooltips_Role}" />
- </field>
- <field name="Run"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Run2" title="${uiLabelMap.IconsTooltips_Run}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Run}" image-title="${uiLabelMap.IconsTooltips_Run}" />
- </field>
- <field name="Save"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Save2" title="${uiLabelMap.IconsTooltips_Save}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Save}" image-title="${uiLabelMap.IconsTooltips_Save}" />
- </field>
- <field name="Select"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Select2" title="${uiLabelMap.IconsTooltips_Select}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Select}" image-title="${uiLabelMap.IconsTooltips_Select}" />
- </field>
- <field name="Server"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Server2" title="${uiLabelMap.IconsTooltips_Server}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Server}" image-title="${uiLabelMap.IconsTooltips_Server}" />
- </field>
- <field name="Skills"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Skills2" title="${uiLabelMap.IconsTooltips_Skills}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Skills}" image-title="${uiLabelMap.IconsTooltips_Skills}" />
- </field>
- <field name="Stop"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Stop2" title="${uiLabelMap.IconsTooltips_Stop}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Stop}" image-title="${uiLabelMap.IconsTooltips_Stop}" />
- </field>
- <field name="Switch"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Switch2" title="${uiLabelMap.IconsTooltips_Switch}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Switch}" image-title="${uiLabelMap.IconsTooltips_Switch}" />
- </field>
- <field name="Synchronize"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Synchronize2" title="${uiLabelMap.BestPractice_IconSynchronize}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Synchronize}" image-title="${uiLabelMap.IconsTooltips_Synchronize}" />
- </field>
- <field name="Telephone"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Telephone2" title="${uiLabelMap.IconsTooltips_Telephone}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Telephone}" image-title="${uiLabelMap.IconsTooltips_Telephone}" />
- </field>
- <field name="Template"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Template2" title="${uiLabelMap.IconsTooltips_Template}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Template}" image-title="${uiLabelMap.IconsTooltips_Template}" />
- </field>
- <field name="TimeEntry"><display also-hidden="false" description=" " size="1"/></field>
- <field name="TimeEntry2" title="${uiLabelMap.IconsTooltips_TimeEntry}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.TimeEntry}" image-title="${uiLabelMap.IconsTooltips_TimeEntry}" />
- </field>
- <field name="Tools"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Tools2" title="${uiLabelMap.IconsTooltips_Tools}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Tools}" image-title="${uiLabelMap.IconsTooltips_Tools}" />
- </field>
- <field name="Upload"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Upload2" title="${uiLabelMap.IconsTooltips_Upload}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Upload}" image-title="${uiLabelMap.IconsTooltips_Upload}" />
- </field>
- <field name="UserLogin"><display also-hidden="false" description=" " size="1"/></field>
- <field name="UserLogin2" title="${uiLabelMap.IconsTooltips_UserLogin}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.UserLogin}" image-title="${uiLabelMap.IconsTooltips_UserLogin}" />
- </field>
- <field name="UserAvAvai"><display also-hidden="false" description=" " size="1"/></field>
- <field name="UserAvAvai2" title="${uiLabelMap.IconsTooltips_UserAvAvai}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.UserAvAvai}" image-title="${uiLabelMap.IconsTooltips_UserAvAvai}" />
- </field>
- <field name="UserAvBusy"><display also-hidden="false" description=" " size="1"/></field>
- <field name="UserAvBusy2" title="${uiLabelMap.IconsTooltips_UserAvBusy}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.UserAvBusy}" image-title="${uiLabelMap.IconsTooltips_UserAvBusy}" />
- </field>
- <field name="UserAvAway"><display also-hidden="false" description=" " size="1"/></field>
- <field name="UserAvAway2" title="${uiLabelMap.IconsTooltips_UserAvAway}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.UserAvAway}" image-title="${uiLabelMap.IconsTooltips_UserAvAway}" />
- </field>
- <field name="UserAvUnkn"><display also-hidden="false" description=" " size="1"/></field>
- <field name="UserAvUnkn2" title="${uiLabelMap.IconsTooltips_UserAvUnkn}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.UserAvUnkn}" image-title="${uiLabelMap.IconsTooltips_UserAvUnkn}" />
- </field>
- <field name="Validate"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Validate2" title="${uiLabelMap.IconsTooltips_Validate}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Validate}" image-title="${uiLabelMap.IconsTooltips_Validate}" />
- </field>
- <field name="View"><display also-hidden="false" description=" " size="1"/></field>
- <field name="View2" title="${uiLabelMap.IconsTooltips_View}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.View}" image-title="${uiLabelMap.IconsTooltips_View}" />
- </field>
- <field name="Www"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Www2" title="${uiLabelMap.IconsTooltips_Www}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Www}" image-title="${uiLabelMap.IconsTooltips_Www}" />
- </field>
-
- <!--######################## Objects icons ########################-->
- <field name="Accounting"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Accounting2" title="${uiLabelMap.IconsTooltips_Accounting}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Accounting}" image-title="${uiLabelMap.IconsTooltips_Accounting}" />
- </field>
- <field name="Calendar"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Calendar2" title="${uiLabelMap.IconsTooltips_Calendar}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Calendar}" image-title="${uiLabelMap.IconsTooltips_Calendar}" />
- </field>
- <field name="Contact"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Contact2" title="${uiLabelMap.BestPractice_IconContact}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Contact}" image-title="${uiLabelMap.IconsTooltips_Contact}" />
- </field>
- <field name="Note"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Note2" title="${uiLabelMap.IconsTooltips_Note}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Note}" image-title="${uiLabelMap.IconsTooltips_Note}" />
- </field>
- <field name="Order"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Order2" title="${uiLabelMap.IconsTooltips_Order}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Order}" image-title="${uiLabelMap.IconsTooltips_Order}" />
- </field>
- <field name="Party"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Party2" title="${uiLabelMap.BestPractice_IconParty}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Party}" image-title="${uiLabelMap.IconsTooltips_Party}" />
- </field>
- <field name="Phase"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Phase2" title="${uiLabelMap.IconsTooltips_Phase}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Phase}" image-title="${uiLabelMap.IconsTooltips_Phase}" />
- </field>
- <field name="Product"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Product2" title="${uiLabelMap.IconsTooltips_Product}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Product}" image-title="${uiLabelMap.IconsTooltips_Product}" />
- </field>
- <field name="Project"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Project2" title="${uiLabelMap.IconsTooltips_Project}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Project}" image-title="${uiLabelMap.IconsTooltips_Project}" />
- </field>
- <field name="Quote"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Quote2" title="${uiLabelMap.IconsTooltips_Quote}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Quote}" image-title="${uiLabelMap.IconsTooltips_Quote}" />
- </field>
- <field name="Resource"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Resource2" title="${uiLabelMap.IconsTooltips_Resource}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Resource}" image-title="${uiLabelMap.IconsTooltips_Resource}" />
- </field>
- <field name="Shipment"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Shipment2" title="${uiLabelMap.IconsTooltips_Shipment}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Shipment}" image-title="${uiLabelMap.IconsTooltips_Shipment}" />
- </field>
- <field name="Task"><display also-hidden="false" description=" " size="1"/></field>
- <field name="Task2" title="${uiLabelMap.IconsTooltips_Task}" position="2">
- <hyperlink target="" image-location="${iconsPurpose.Task}" image-title="${uiLabelMap.IconsTooltips_Task}" />
- </field>
- <sort-order>
- <field-group>
- <sort-field name="globalHelp"/>
- </field-group>
- <field-group>
- <sort-field name="Add"/><sort-field name="Add2"/>
- <sort-field name="Duplicate"/><sort-field name="Duplicate2"/>
- <sort-field name="Edit"/><sort-field name="Edit2"/>
- <sort-field name="Associate"/><sort-field name="Associate2"/>
- <sort-field name="AppPrev"/><sort-field name="AppPrev2"/>
- <sort-field name="AppNext"/><sort-field name="AppNext2"/>
- <sort-field name="AddItem"/><sort-field name="AddItem2"/>
- <sort-field name="Expire"/><sort-field name="Expire2"/>
- <sort-field name="Delete"/><sort-field name="Delete2"/>
- <sort-field name="Select"/><sort-field name="Select2"/>
- <sort-field name="Refresh"/><sort-field name="Refresh2"/>
- <sort-field name="Date"/><sort-field name="Date2"/>
- <sort-field name="Filter"/><sort-field name="Filter2"/>
- <sort-field name="View"/><sort-field name="View2"/>
- <sort-field name="Save"/><sort-field name="Save2"/>
- <sort-field name="Switch"/><sort-field name="Switch2"/>
- <sort-field name="Synchronize"/><sort-field name="Synchronize2"/>
- </field-group>
- <field-group>
- <sort-field name="Run"/><sort-field name="Run2"/>
- <sort-field name="Stop"/><sort-field name="Stop2"/>
- <sort-field name="Pause"/><sort-field name="Pause2"/>
- <sort-field name="Validate"/><sort-field name="Validate2"/>
- <sort-field name="Cancel"/><sort-field name="Cancel2"/>
- <sort-field name="Activate"/><sort-field name="Activate2"/>
- <sort-field name="Deactivate"/><sort-field name="Deactivate2"/>
- <sort-field name="Done"/><sort-field name="Done2"/>
- <sort-field name="Plan"/><sort-field name="Plan2"/>
- </field-group>
- <field-group>
- <sort-field name="Items"/><sort-field name="Items2"/>
- <sort-field name="Details"/><sort-field name="Details2"/>
- <sort-field name="Overview"/><sort-field name="Overview2"/>
- <sort-field name="History"/><sort-field name="History2"/>
- <sort-field name="HideHistory"/><sort-field name="HideHistory2"/>
- <sort-field name="Tools"/><sort-field name="Tools2"/>
- </field-group>
- <field-group>
- <sort-field name="Party"/><sort-field name="Party2"/>
- <sort-field name="Contact"/><sort-field name="Contact2"/>
- <sort-field name="ContactMech"/><sort-field name="ContactMech2"/>
- <sort-field name="Group"/><sort-field name="Group2"/>
- <sort-field name="Role"/><sort-field name="Role2"/>
- <sort-field name="UserLogin"/><sort-field name="UserLogin2"/>
- <sort-field name="UserAvAvai"/><sort-field name="UserAvAvai2"/>
- <sort-field name="UserAvAway"/><sort-field name="UserAvAway2"/>
- <sort-field name="UserAvBusy"/><sort-field name="UserAvBusy2"/>
- <sort-field name="UserAvUnkn"/><sort-field name="UserAvUnkn2"/>
- <sort-field name="Grants"/><sort-field name="Grants2"/>
- <sort-field name="Skills"/><sort-field name="Skills2"/>
- <sort-field name="Category"/><sort-field name="Category2"/>
- <sort-field name="Hierarchy"/><sort-field name="Hierarchy2"/>
- </field-group>
- <field-group>
- <sort-field name="Attach"/><sort-field name="Attach2"/>
- <sort-field name="Note"/><sort-field name="Note2"/>
- <sort-field name="PDF"/><sort-field name="PDF2"/>
- <sort-field name="Print"/><sort-field name="Print2"/>
- <sort-field name="Upload"/><sort-field name="Upload2"/>
- <sort-field name="Download"/><sort-field name="Download2"/>
- <sort-field name="Template"/><sort-field name="Template2"/>
- <sort-field name="Docfusion"/><sort-field name="Docfusion2"/>
- <sort-field name="ChartBar"/><sort-field name="ChartBar2"/>
- <sort-field name="ChartPie"/><sort-field name="ChartPie2"/>
- <sort-field name="ChartLine"/><sort-field name="ChartLine2"/>
- </field-group>
- <field-group>
- <sort-field name="Address"/><sort-field name="Address2"/>
- <sort-field name="Phone"/><sort-field name="Phone2"/>
- <sort-field name="Telephone"/><sort-field name="Telephone2"/>
- <sort-field name="Email"/><sort-field name="Email2"/>
- <sort-field name="EmailAttach"/><sort-field name="EmailAttach2"/>
- <sort-field name="EmailEdit"/><sort-field name="EmailEdit2"/>
- <sort-field name="EmailGo"/><sort-field name="EmailGo2"/>
- <sort-field name="EmailOpen"/><sort-field name="EmailOpen2"/>
- <sort-field name="Www"/><sort-field name="Www2"/>
- <sort-field name="Server"/><sort-field name="Server2"/>
- </field-group>
- <field-group>
- <sort-field name="Product"/><sort-field name="Product2"/>
- <sort-field name="Quote"/><sort-field name="Quote2"/>
- <sort-field name="Order"/><sort-field name="Order2"/>
- <sort-field name="Project"/><sort-field name="Project2"/>
- <sort-field name="Phase"/><sort-field name="Phase2"/>
- <sort-field name="Task"/><sort-field name="Task2"/>
- <sort-field name="Calendar"/><sort-field name="Calendar2"/>
- <sort-field name="Gantt"/><sort-field name="Gantt2"/>
- <sort-field name="Resource"/><sort-field name="Resource2"/>
- <sort-field name="TimeEntry"/><sort-field name="TimeEntry2"/>
- <sort-field name="EventCom"/><sort-field name="EventCom2"/>
- <sort-field name="Alarm"/><sort-field name="Alarm2"/>
- <sort-field name="Shipment"/><sort-field name="Shipment2"/>
- <sort-field name="Accounting"/><sort-field name="Accounting2"/>
- <sort-field name="Payment"/><sort-field name="Payment2"/>
- </field-group>
- </sort-order>
- </form>
- <!--#Eam# icons-purpose -->
</forms>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleMenus.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleMenus.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleMenus.xml Sat Aug 4 18:11:00 2012
@@ -34,7 +34,6 @@ under the License.
<link target="authview/findExampleAjax"/>
</menu-item>
<menu-item name="portalPage" parent-portal-page-value="EXAMPLE"/>
- <menu-item name="portalPageWithType" parent-portal-page-value="ExampleMgmt"/>
<menu-item name="Dashboard" title="${uiLabelMap.ExampleDashboard}" align-style="opposed">
<link target="ManagePortalPages">
<parameter param-name="parentPortalPageId" value="EXAMPLE"/>
@@ -43,17 +42,13 @@ under the License.
<menu-item name="ExampleGeoLocation" title="${uiLabelMap.CommonGeoLocation}">
<link target="ExampleGeoLocationPointSet1"/>
</menu-item>
- <menu-item name="Birt" title="${uiLabelMap.ExampleBirtExamples}">
- <link target="BirtMain"/>
- </menu-item>
- <menu-item name="ExampleCharts" title="Chart examples">
- <link target="ExampleBarChart"/>
- </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"/>
+ <link target="EditExample">
+ <parameter param-name="exampleId"/>
+ </link>
</menu-item>
<menu-item name="EditExampleItems" title="${uiLabelMap.CommonItems}">
<link target="EditExampleItems">
@@ -89,15 +84,6 @@ under the License.
<menu-item name="ExampleOsmGeoLocationPointSet4" title="${uiLabelMap.OsmPointSet4}"><link target="ExampleOsmGeoLocationPointSet4"/></menu-item>
</menu>
- <menu name="BirtTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="Report" title="${uiLabelMap.ExampleBirtReport}"><link target="Report"/></menu-item>
- <menu-item name="Export" title="${uiLabelMap.ExampleBirtViewHandler}"><link target="ViewHandler"/></menu-item>
- <menu-item name="Mail" title="${uiLabelMap.ExampleBirtMail}"><link target="Mail"/></menu-item>
- <!-- Reports using charts-->
- <menu-item name="chartReport" title="${uiLabelMap.ExampleBirtChartReport}"><link target="chartReport"/></menu-item>
- <menu-item name="chartExport" title="${uiLabelMap.ExampleBirtChartViewHandler}"><link target="chartViewHandler"/></menu-item>
- </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>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleScreens.xml Sat Aug 4 18:11:00 2012
@@ -478,18 +478,4 @@ under the License.
</widgets>
</section>
</screen>
-
- <!--#Bam# ExampleHelp -->
- <screen name="ExampleEditForm">
- <section>
- <actions>
- <property-map resource="ExampleUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <entity-one entity-name="Example" value-field="example"/>
- </actions>
- <widgets>
- <include-form name="EditExample" location="component://example/widget/example/ExampleForms.xml"/>
- </widgets>
- </section>
- </screen>
- <!--#Eam# ExampleHelp --></screens>
+</screens>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/PortletScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/PortletScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/PortletScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/PortletScreens.xml Sat Aug 4 18:11:00 2012
@@ -96,14 +96,4 @@ under the License.
</widgets>
</section>
</screen>
-
- <!--#Bam# icons-purpose -->
- <screen name="IconsList">
- <section>
- <widgets>
- <include-form name="IconsList" location="component://example/widget/example/ExampleForms.xml"/>
- </widgets>
- </section>
- </screen>
- <!--#Eam# icons-purpose -->
</screens>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/exampleext/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/exampleext/widget/example/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/exampleext/widget/example/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/exampleext/widget/example/CommonScreens.xml Sat Aug 4 18:11:00 2012
@@ -46,7 +46,7 @@ under the License.
<condition>
<and>
<if-has-permission permission="EXAMPLE" action="_VIEW"/>
- <not><if-empty field="example"/></not>
+ <not><if-empty field="example"/></not><!-- This is an example of check useful when only seed data are loaded -->
</and>
</condition>
<widgets>
@@ -63,7 +63,7 @@ under the License.
<widgets>
<section>
<condition>
- <not><if-empty field="example"/></not>
+ <not><if-empty field="example"/></not><!-- This is a check useful when only seed data are loaded -->
</condition>
<widgets>
<container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${example.exampleName} [${exampleId}]</label></container>
Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:r1307080-1307082,1340380-1340445,1340638-1340641,1347751-1347754,1351866,1356000-1369352
Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:r1307080-1307082,1340380-1340445,1340638-1340641,1347751-1347754,1351866,1356000-1369352
Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:r1307080-1307082,1340380-1340445,1340638-1340641,1347751-1347754,1351866,1356000-1369352
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -34,11 +34,6 @@ under the License.
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
<description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/widget/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/widget/CommonScreens.xml Sat Aug 4 18:11:00 2012
@@ -220,40 +220,4 @@ under the License.
</widgets>
</section>
</screen>
- <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
- <screen name="portletUiLabelDecorator">
- <section><!-- Decorator use by portlet define in their preference label -->
- <actions>
- <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <decorator-section-include name="body"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="uiLabelDecorator"><!-- Main decorator -->
- <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
- <actions>
- <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
- </screen>
- <!--#Eam# uiLabelDecorator -->
</screens>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ofbizwebsite/webapp/ofbiz/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ofbizwebsite/webapp/ofbiz/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ofbizwebsite/webapp/ofbiz/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ofbizwebsite/webapp/ofbiz/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -35,11 +35,6 @@ under the License.
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
<description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/pos/config/xpos.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/pos/config/xpos.properties?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/pos/config/xpos.properties (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/pos/config/xpos.properties Sat Aug 4 18:11:00 2012
@@ -1,34 +1,35 @@
###############################################################################
-# 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.
+# 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.
###############################################################################
#
-# Dynamically modified by OFBiz Framework (org.ofbiz.base.util : UtilProperties.setPropertyValue)
-# The comments have been removed, you may still find them on the OFBiz repository...
+# By default the screen is 1024x768 wide. If you want to use another screen size,
+# you must create a new directory under specialpurpose/pos/screens, like the 800x600.
+# You must also set the 3 related parameters (StartClass, ClientWidth, ClientHeight) accordingly.
#
-#Sat Apr 21 21:10:40 CEST 2012
+
+StartPackage=org.ofbiz.pos
+StartClass=default/pospanel
+LogLevel=0
+StyleFile=posstyles.xml
CenterWin=true
ClientHeight=768
-Language=XuiLabels_fr
ClientWidth=1024
-StartClass=default/pospanel
+Language=XuiLabels
Title=OFBiz POS
-StyleFile=posstyles.xml
UseWindow=false
UseFrames=false
-LogLevel=0
-StartPackage=org.ofbiz.pos
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiContainer.java Sat Aug 4 18:11:00 2012
@@ -31,9 +31,9 @@ import org.ofbiz.base.container.Containe
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.DelegatorFactory;
-import org.ofbiz.service.GenericDispatcher;
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.service.ServiceContainer;
public abstract class XuiContainer implements Container {
@@ -68,7 +68,7 @@ public abstract class XuiContainer imple
// get the dispatcher
String dispatcherName = ContainerConfig.getPropertyValue(cc, "dispatcher-name", "xui-dispatcher");
- LocalDispatcher dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, delegator);
+ LocalDispatcher dispatcher = ServiceContainer.getLocalDispatcher(dispatcherName, delegator);
// get the pre-defined session ID
String xuiSessionId = ContainerConfig.getPropertyValue(cc, "xui-session-id", null);
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Sat Aug 4 18:11:00 2012
@@ -67,6 +67,7 @@ import org.ofbiz.order.shoppingcart.Shop
import org.ofbiz.order.shoppinglist.ShoppingListEvents;
import org.ofbiz.party.contact.ContactMechWorker;
import org.ofbiz.pos.component.Journal;
+import org.ofbiz.pos.component.JournalLineParams;
import org.ofbiz.pos.component.Output;
import org.ofbiz.pos.device.DeviceLoader;
import org.ofbiz.pos.device.impl.Receipt;
@@ -955,12 +956,14 @@ public class PosTransaction implements S
BigDecimal subTotal = unitPrice.multiply(quantity);
BigDecimal adjustment = item.getOtherAdjustments();
- XModel line = Journal.appendNode(model, "tr", ""+cart.getItemIndex(item), "");
- Journal.appendNode(line, "td", "sku", item.getProductId());
- Journal.appendNode(line, "td", "desc", item.getName());
- Journal.appendNode(line, "td", "qty", UtilFormatOut.formatQuantity(quantity));
- Journal.appendNode(line, "td", "price", UtilFormatOut.formatPrice(subTotal));
- Journal.appendNode(line, "td", "index", Integer.toString(cart.getItemIndex(item)));
+ XModel line = Journal.appendNode(new JournalLineParams(model, "tr", "" + cart.getItemIndex(item), ""));
+ JournalLineParams sku = new JournalLineParams(line, "td", "sku", item.getProductId());
+ JournalLineParams desc = new JournalLineParams(line, "td", "desc", item.getName());
+ JournalLineParams qty = new JournalLineParams(line, "td", "qty", UtilFormatOut.formatQuantity(quantity));
+ JournalLineParams price = new JournalLineParams(line, "td", "price", UtilFormatOut.formatPrice(subTotal));
+ JournalLineParams index = new JournalLineParams(line, "td", "index", Integer.toString(cart.getItemIndex(item)));
+ JournalLineParams[] journalLineParamses = new JournalLineParams[] {sku, desc, qty, price, index};
+ appendJouralLine(journalLineParamses);
if (this.isAggregatedItem(item.getProductId())) {
// put alterations here
@@ -971,27 +974,48 @@ public class PosTransaction implements S
List<ConfigOption> selected = pcw.getSelectedOptions();
for (ConfigOption configoption : selected) {
if (configoption.isSelected()) {
- XModel option = Journal.appendNode(model, "tr", ""+cart.getItemIndex(item), "");
- Journal.appendNode(option, "td", "sku", "");
- Journal.appendNode(option, "td", "desc", configoption.getDescription());
- Journal.appendNode(option, "td", "qty", "");
- Journal.appendNode(option, "td", "price", UtilFormatOut.formatPrice(configoption.getPrice()));
- Journal.appendNode(option, "td", "index", Integer.toString(cart.getItemIndex(item)));
+ XModel option = Journal.appendNode(new JournalLineParams(model, "tr", "" + cart.getItemIndex(item), ""));
+ sku = new JournalLineParams(option, "td", "sku", "");
+ desc = new JournalLineParams(option, "td", "desc", configoption.getDescription());
+ qty = new JournalLineParams(option, "td", "qty", "");
+ price = new JournalLineParams(option, "td", "price", UtilFormatOut.formatPrice(configoption.getPrice()));
+ index = new JournalLineParams(option, "td", "index", Integer.toString(cart.getItemIndex(item)));
+ journalLineParamses = new JournalLineParams[] {sku, desc, qty, price, index};
+ appendJouralLine(journalLineParamses);
}
}
}
if (adjustment.compareTo(BigDecimal.ZERO) != 0) {
// append the promo info
- XModel promo = Journal.appendNode(model, "tr", "itemadjustment", "");
- Journal.appendNode(promo, "td", "sku", "");
- Journal.appendNode(promo, "td", "desc", UtilProperties.getMessage(resource, "PosItemDiscount", locale));
- Journal.appendNode(promo, "td", "qty", "");
- Journal.appendNode(promo, "td", "price", UtilFormatOut.formatPrice(adjustment));
+ XModel promo = Journal.appendNode(new JournalLineParams(model, "tr", "itemadjustment", ""));
+ sku = new JournalLineParams(promo, "td", "sku", "");
+ desc = new JournalLineParams(promo, "td", "desc", UtilProperties.getMessage(resource, "PosItemDiscount", locale));
+ qty = new JournalLineParams(promo, "td", "qty", "");
+ price = new JournalLineParams(promo, "td", "price", UtilFormatOut.formatPrice(adjustment));
+ journalLineParamses = new JournalLineParams[] {sku, desc, qty, price, index};
+ appendJouralLine(journalLineParamses);
}
}
}
}
+
+ private void appendJouralLine(JournalLineParams[] journalLineParamses) {
+ if (locale.getLanguage().equals("ar")) {
+ int startParamIndex = 2;
+ if (journalLineParamses.length == 4)
+ startParamIndex = 1;
+ for (int p = journalLineParamses.length - startParamIndex; p >= 0; p--) {
+ Journal.appendNode(journalLineParamses[p]);
+ }
+ if (startParamIndex == 2)
+ Journal.appendNode(journalLineParamses[journalLineParamses.length - 1]);
+ } else {
+ for (int p = 0; p < journalLineParamses.length; p++) {
+ Journal.appendNode(journalLineParamses[p]);
+ }
+ }
+ }
public void appendTotalDataModel(XModel model) {
if (cart != null) {
@@ -1012,36 +1036,42 @@ public class PosTransaction implements S
for (GenericValue orderAdjustment : adjustments) {
BigDecimal amount = orderAdjustment.getBigDecimal("amount");
BigDecimal sourcePercentage = orderAdjustment.getBigDecimal("sourcePercentage");
- XModel adjustmentLine = Journal.appendNode(model, "tr", "adjustment", "");
- Journal.appendNode(adjustmentLine, "td", "sku", "");
- Journal.appendNode(adjustmentLine, "td", "desc",
+ XModel adjustmentLine = Journal.appendNode(new JournalLineParams(model, "tr", "adjustment", ""));
+ JournalLineParams[] journalLineParamses = new JournalLineParams[5];
+ journalLineParamses[0] = new JournalLineParams(adjustmentLine, "td", "sku", "");
+ journalLineParamses[1] = new JournalLineParams(adjustmentLine, "td", "desc",
UtilProperties.getMessage(resource, "PosSalesDiscount", locale));
if (UtilValidate.isNotEmpty(amount)) {
- Journal.appendNode(adjustmentLine, "td", "qty", "");
- Journal.appendNode(adjustmentLine, "td", "price", UtilFormatOut.formatPrice(amount));
+ journalLineParamses[2] = new JournalLineParams(adjustmentLine, "td", "qty", "");
+ journalLineParamses[3] = new JournalLineParams(adjustmentLine, "td", "price", UtilFormatOut.formatPrice(amount));
} else if (UtilValidate.isNotEmpty(sourcePercentage)) {
BigDecimal percentage = sourcePercentage.movePointLeft(2).negate(); // sourcePercentage is negative and must be show as a positive value (it's a discount not an amount)
- Journal.appendNode(adjustmentLine, "td", "qty", UtilFormatOut.formatPercentage(percentage));
+ journalLineParamses[2] = new JournalLineParams(adjustmentLine, "td", "qty", UtilFormatOut.formatPercentage(percentage));
amount = cart.getItemTotal().add(itemsAdjustmentsAmount).multiply(percentage); // itemsAdjustmentsAmount is negative
- Journal.appendNode(adjustmentLine, "td", "price", UtilFormatOut.formatPrice(amount.negate())); // amount must be shown as a negative value
+ journalLineParamses[3] = new JournalLineParams(adjustmentLine, "td", "price", UtilFormatOut.formatPrice(amount.negate())); // amount must be shown as a negative value
}
- Journal.appendNode(adjustmentLine, "td", "index", "-1");
+ journalLineParamses[4] = new JournalLineParams(adjustmentLine, "td", "index", "-1");
+ appendJouralLine(journalLineParamses);
}
- XModel taxLine = Journal.appendNode(model, "tr", "tax", "");
- Journal.appendNode(taxLine, "td", "sku", "");
-
- Journal.appendNode(taxLine, "td", "desc", UtilProperties.getMessage(resource, "PosSalesTax", locale));
- Journal.appendNode(taxLine, "td", "qty", "");
- Journal.appendNode(taxLine, "td", "price", UtilFormatOut.formatPrice(taxAmount));
- Journal.appendNode(taxLine, "td", "index", "-1");
-
- XModel totalLine = Journal.appendNode(model, "tr", "total", "");
- Journal.appendNode(totalLine, "td", "sku", "");
- Journal.appendNode(totalLine, "td", "desc", UtilProperties.getMessage(resource, "PosGrandTotal", locale));
- Journal.appendNode(totalLine, "td", "qty", "");
- Journal.appendNode(totalLine, "td", "price", UtilFormatOut.formatPrice(total));
- Journal.appendNode(totalLine, "td", "index", "-1");
+ XModel taxLine = Journal.appendNode(new JournalLineParams(model, "tr", "tax", ""));
+ JournalLineParams[] journalTaxLineParamses = new JournalLineParams[5];
+ journalTaxLineParamses[0] = new JournalLineParams(taxLine, "td", "sku", "");
+
+ journalTaxLineParamses[1] = new JournalLineParams(taxLine, "td", "desc", UtilProperties.getMessage(resource, "PosSalesTax", locale));
+ journalTaxLineParamses[2] = new JournalLineParams(taxLine, "td", "qty", "");
+ journalTaxLineParamses[3] = new JournalLineParams(taxLine, "td", "price", UtilFormatOut.formatPrice(taxAmount));
+ journalTaxLineParamses[4] = new JournalLineParams(taxLine, "td", "index", "-1");
+ appendJouralLine(journalTaxLineParamses);
+
+ XModel totalLine = Journal.appendNode(new JournalLineParams(model, "tr", "total", ""));
+ JournalLineParams[] journalTotalLineParamses = new JournalLineParams[5];
+ journalTotalLineParamses[0] = new JournalLineParams(totalLine, "td", "sku", "");
+ journalTotalLineParamses[1] = new JournalLineParams(totalLine, "td", "desc", UtilProperties.getMessage(resource, "PosGrandTotal", locale));
+ journalTotalLineParamses[2] = new JournalLineParams(totalLine, "td", "qty", "");
+ journalTotalLineParamses[3] = new JournalLineParams(totalLine, "td", "price", UtilFormatOut.formatPrice(total));
+ journalTotalLineParamses[4] = new JournalLineParams(totalLine, "td", "index", "-1");
+ appendJouralLine(journalTotalLineParamses);
}
}
@@ -1074,12 +1104,14 @@ public class PosTransaction implements S
amount = inf.amount;
}
- XModel paymentLine = Journal.appendNode(model, "tr", Integer.toString(i), "");
- Journal.appendNode(paymentLine, "td", "sku", "");
- Journal.appendNode(paymentLine, "td", "desc", descString);
- Journal.appendNode(paymentLine, "td", "qty", "-");
- Journal.appendNode(paymentLine, "td", "price", UtilFormatOut.formatPrice(amount.negate()));
- Journal.appendNode(paymentLine, "td", "index", Integer.toString(i));
+ XModel paymentLine = Journal.appendNode(new JournalLineParams(model, "tr", Integer.toString(i), ""));
+ JournalLineParams[] journalPaymentLineParamses = new JournalLineParams[5];
+ journalPaymentLineParamses[0] = new JournalLineParams(paymentLine, "td", "sku", "");
+ journalPaymentLineParamses[1] = new JournalLineParams(paymentLine, "td", "desc", descString);
+ journalPaymentLineParamses[2] = new JournalLineParams(paymentLine, "td", "qty", "-");
+ journalPaymentLineParamses[3] = new JournalLineParams(paymentLine, "td", "price", UtilFormatOut.formatPrice(amount.negate()));
+ journalPaymentLineParamses[4] = new JournalLineParams(paymentLine, "td", "index", Integer.toString(i));
+ appendJouralLine(journalPaymentLineParamses);
}
}
}
@@ -1088,11 +1120,13 @@ public class PosTransaction implements S
if (cart != null) {
BigDecimal changeDue = this.getTotalDue().negate();
if (changeDue.compareTo(BigDecimal.ZERO) >= 0) {
- XModel changeLine = Journal.appendNode(model, "tr", "", "");
- Journal.appendNode(changeLine, "td", "sku", "");
- Journal.appendNode(changeLine, "td", "desc", "Change");
- Journal.appendNode(changeLine, "td", "qty", "-");
- Journal.appendNode(changeLine, "td", "price", UtilFormatOut.formatPrice(changeDue));
+ XModel changeLine = Journal.appendNode(new JournalLineParams(model, "tr", "", ""));
+ JournalLineParams[] journalPaymentLineParamses = new JournalLineParams[4];
+ journalPaymentLineParamses[0] = new JournalLineParams(changeLine, "td", "sku", "");
+ journalPaymentLineParamses[1] = new JournalLineParams(changeLine, "td", "desc", "Change");
+ journalPaymentLineParamses[2] = new JournalLineParams(changeLine, "td", "qty", "-");
+ journalPaymentLineParamses[3] = new JournalLineParams(changeLine, "td", "price", UtilFormatOut.formatPrice(changeDue));
+ appendJouralLine(journalPaymentLineParamses);
}
}
}
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java Sat Aug 4 18:11:00 2012
@@ -87,9 +87,13 @@ public class Journal {
jtable.setModel(jmodel);
for (int i = 0; i < width.length; i++) {
+ if (defaultLocale.getLanguage().equals("ar")) {
+ jtable.setColWidth(width.length - i - 1, width[i]);
+ } else {
jtable.setColWidth(i, width[i]);
}
}
+ }
jtable.setSelectedRow(0);
}
@@ -172,26 +176,33 @@ public class Journal {
}
jmodel.setTagName("table");
// create the header
- XModel headerNode = appendNode(jmodel, "th", "header", "");
+ XModel headerNode = appendNode(new JournalLineParams(jmodel, "th", "header", ""));
+ if (defaultLocale.getLanguage().equals("ar")) {
+ for (int i = field.length - 1; i >= 0; i--) {
+ appendNode(new JournalLineParams(headerNode, "td", field[i], UtilProperties.getMessage(PosTransaction.resource, name[i], defaultLocale)));
+ }
+ } else {
for (int i = 0 ; i < field.length; i++) {
- appendNode(headerNode, "td", field[i],UtilProperties.getMessage(PosTransaction.resource,name[i],defaultLocale));
+ appendNode(new JournalLineParams(headerNode, "td", field[i], UtilProperties.getMessage(PosTransaction.resource, name[i], defaultLocale)));
+ }
}
return jmodel;
}
private void appendEmpty(XModel jmodel) {
- XModel headerNode = appendNode(jmodel, "tr", "emptyrow", "");
+ XModel headerNode = appendNode(new JournalLineParams(jmodel, "tr", "emptyrow", ""));
for (int i = 0 ; i < field.length; i++) {
- appendNode(headerNode, "td", field[i], "");
+ appendNode(new JournalLineParams(headerNode, "td", field[i], ""));
}
}
- public static XModel appendNode(XModel node, String tag, String name, String value) {
- XModel newNode = (XModel) node.append(name);
- newNode.setTagName(tag);
- if (value != null) {
- newNode.set(value);
+ public static XModel appendNode(JournalLineParams journalLineParams) {
+ XModel newNode = (XModel) journalLineParams.getNode().append(journalLineParams.getName());
+ newNode.setTagName(journalLineParams.getTag());
+
+ if (journalLineParams.getValue() != null) {
+ newNode.set(journalLineParams.getValue());
}
return newNode;
}
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/CommonScreens.xml Sat Aug 4 18:11:00 2012
@@ -390,37 +390,5 @@ under the License.
</widgets>
</section>
</screen>
- <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
- <screen name="portletUiLabelDecorator">
- <section><!-- Decorator use by portlet define in their preference label -->
- <actions>
- <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <decorator-section-include name="body"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="uiLabelDecorator"><!-- Main decorator -->
- <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
- <actions/>
- <widgets>
- <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
- </screen>
- <!--#Eam# uiLabelDecorator -->
</screens>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductBacklogTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductBacklogTest.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductBacklogTest.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductBacklogTest.xml Sat Aug 4 18:11:00 2012
@@ -183,20 +183,6 @@ under the License.
<simple-method method-name="testNewProductBacklogEmail" short-description="Test New Product Backlog Email" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
- <field-map field-name="userLoginId" value="admin"/>
- </entity-one>
- <set-current-user-login value-field="userLogin"/>
- <set field="parameters.productId" value="DEMO-PRODUCT-1"/>
- <set field="parameters.custRequestId" value="TEST10"/>
- <set field="parameters.communicationEventTypeId" value="EMAIL_COMMUNICATION" />
- <set field="parameters.partyIdFrom" value="DemoCustomer-1"/>
- <set field="parameters.partyIdTo" value="SCRUMASTER"/>
- <set field="parameters.subject" value="Test New Product Backlog Email"/>
- <call-service service-name="createCommunicationEvent" in-map-name="parameters"></call-service>
- </simple-method>
-
- <simple-method method-name="testNewProductBacklogEmail" short-description="Test New Product Backlog Email" login-required="false">
- <entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="serviceCtx.userLogin" from-field="userLogin"/>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/servicedef/services.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/servicedef/services.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/servicedef/services.xml Sat Aug 4 18:11:00 2012
@@ -217,10 +217,6 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="false"/>
<attribute name="hours" type="Double" mode="OUT" optional="true"/>
</service>
- <service name="createDefaultTask" engine="simple" invoke="createDefaultTask" auth="true"
- location="component://scrum/script/org/ofbiz/scrum/ScrumServices.xml">
- <attribute name="custRequestId" type="String" mode="IN" optional="false"/>
- </service>
<service name="checkSprintStatus" engine="simple" auth="true"
location="component://scrum/script/org/ofbiz/scrum/ScrumServices.xml" invoke="checkSprintStatus">
</service>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumScreens.xml Sat Aug 4 18:11:00 2012
@@ -2536,7 +2536,7 @@ under the License.
<container>
<label style="h2" text="${uiLabelMap.PartyEmailMessage}"/>
</container>
- <include-form name="allocateMsgToPartyForm" location="component://custserv/widget/CommunicationEventForms.xml"/>
+ <include-form name="allocateMsgToPartyForm" location="component://party/widget/partymgr/CommunicationEventForms.xml"/>
</screenlet>
</widgets>
</section>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -34,11 +34,6 @@
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
<description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java Sat Aug 4 18:11:00 2012
@@ -42,8 +42,8 @@ import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.serialize.SerializeException;
import org.ofbiz.entity.serialize.XmlSerializer;
import org.ofbiz.service.DispatchContext;
-import org.ofbiz.service.GenericDispatcher;
import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ServiceContainer;
import org.ofbiz.workflow.AlreadySuspended;
import org.ofbiz.workflow.CannotResume;
import org.ofbiz.workflow.CannotStop;
@@ -592,7 +592,7 @@ public abstract class WfExecutionObjectI
* @throws WfException
*/
protected LocalDispatcher getDispatcher() throws WfException {
- return GenericDispatcher.getLocalDispatcher(dispatcherName, getDelegator());
+ return ServiceContainer.getLocalDispatcher(dispatcherName, getDelegator());
}
private Map<String, Object> getContext() throws WfException {
Modified: ofbiz/branches/20120329_portletWidget/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/bizznesstime/includes/header.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/themes/bizznesstime/includes/header.ftl Sat Aug 4 18:11:00 2012
@@ -148,7 +148,7 @@ under the License.
<#--if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists-->
<#if parameters.componentName?exists && requestAttributes._CURRENT_VIEW_?exists && helpTopic?exists>
<#include "component://common/webcommon/includes/helplink.ftl" />
- <span><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span>
+ <span><a href="javascript:lookup_popup1('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span>
</#if>
<#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
<span id="last-system-msg">