svn commit: r555997 - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r555997 - in /ofbiz/trunk: applications/accounting/webapp
 
|
Author: jleroux
Date: Fri Jul 13 06:48:00 2007 New Revision: 555997 URL: http://svn.apache.org/viewvc?view=rev&rev=555997 Log: A 2st patch (ofbiz-642-locale_tz.patch)from Adriam Crum "Make OFBiz more dial-up friendly" (https://issues.apache.org/jira/browse/OFBIZ-642) Added: ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl (with props) ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl (with props) Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml ofbiz/trunk/framework/common/config/CommonUiLabels.properties ofbiz/trunk/framework/common/webcommon/includes/header.ftl ofbiz/trunk/framework/common/widget/LookupForms.xml ofbiz/trunk/framework/common/widget/LookupScreens.xml ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Fri Jul 13 06:48:00 2007 @@ -72,6 +72,28 @@ </request-map> <!-- End of Security Mappings --> + <!-- Common Mappings used for locales and timezones --> + <request-map uri="setSessionLocale"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="setSessionTimeZone"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="LookupLocales"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupLocales" /> + </request-map> + <request-map uri="LookupTimezones"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupTimezones" /> + </request-map> + <!-- Request Mappings --> <request-map uri="view"> <security https="true" auth="false"/> @@ -89,12 +111,6 @@ <response name="success" type="view" value="main"/> <response name="error" type="view" value="error"/> </request-map> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> <request-map uri="main"> <security https="true" auth="true"/> @@ -1391,6 +1407,8 @@ <view-map name="main" type="screen" page="component://accounting/widget/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://accounting/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://accounting/widget/CommonScreens.xml#requirePasswordChange"/> + <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> + <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <!-- BillingAccount --> <view-map name="FindBillingAccount" type="screen" page="component://accounting/widget/BillingAccountScreens.xml#FindBillingAccount"/> @@ -1555,6 +1573,6 @@ <!-- Assignment Mappings --> <view-map name="EditPartyFixedAssetAssignments" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#EditPartyFixedAssetAssignments"/> - + <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Fri Jul 13 06:48:00 2007 @@ -71,7 +71,29 @@ </request-map> <!-- End of Security Mappings --> - <!-- Request Mappings --> + <!-- Common Mappings used for locales and timezones --> + <request-map uri="setSessionLocale"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="setSessionTimeZone"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="LookupLocales"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupLocales" /> + </request-map> + <request-map uri="LookupTimezones"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupTimezones" /> + </request-map> + + <!-- Request Mappings --> <request-map uri="view"><security https="false" auth="false"/><response name="success" type="view" value="main"/></request-map> <request-map uri="views"><security https="true" auth="false"/><response name="success" type="view" value="main"/></request-map> @@ -80,12 +102,6 @@ <response name="success" type="request" value="/view"/> <response name="error" type="view" value="error"/> </request-map> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> <request-map uri="main"><security https="true" auth="true"/><response name="success" type="view" value="FindWebSite"/></request-map> @@ -1682,6 +1698,8 @@ <view-map name="main" type="screen" page="component://content/widget/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://content/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://content/widget/CommonScreens.xml#requirePasswordChange"/> + <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> + <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="fonts.fo" type="screenfop" page="component://content/widget/CommonScreens.xml#fonts.fo" content-type="application/pdf" encoding="none"/> <view-map name="FindForumGroups" page="component://content/widget/forum/ForumScreens.xml#FindForumGroups" type="screen"/> Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Fri Jul 13 06:48:00 2007 @@ -73,6 +73,28 @@ </request-map> <!-- End of Security Mappings --> + <!-- Common Mappings used for locales and timezones --> + <request-map uri="setSessionLocale"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="setSessionTimeZone"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="LookupLocales"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupLocales" /> + </request-map> + <request-map uri="LookupTimezones"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupTimezones" /> + </request-map> + <!-- Request Mappings --> <request-map uri="view"> <security https="true" auth="false"/> @@ -90,12 +112,6 @@ <response name="success" type="view" value="main"/> <response name="error" type="view" value="error"/> </request-map> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> <request-map uri="main"> <security https="true" auth="true"/> @@ -536,6 +552,8 @@ <view-map name="main" type="screen" page="component://humanres/widget/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://humanres/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://humanres/widget/CommonScreens.xml#requirePasswordChange"/> + <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> + <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="ListPerfReviews" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#ListPerfReviews"/> <view-map name="EditPerfReviews" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPerfReviews"/> <view-map name="EditPerfReviewItems" type="screen" page="component://humanres/widget/PartyAbilityScreens.xml#EditPerfReviewItems"/> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Fri Jul 13 06:48:00 2007 @@ -73,6 +73,28 @@ </request-map> <!-- End of Security Mappings --> + <!-- Common Mappings used for locales and timezones --> + <request-map uri="setSessionLocale"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="setSessionTimeZone"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="LookupLocales"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupLocales" /> + </request-map> + <request-map uri="LookupTimezones"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupTimezones" /> + </request-map> + <!-- Request Mappings --> <request-map uri="view"> <security https="false" auth="false"/> @@ -91,12 +113,6 @@ <response name="success" type="view" value="main"/> <response name="error" type="view" value="error"/> </request-map> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> <request-map uri="main"> <security https="true" auth="true"/> @@ -755,6 +771,8 @@ <view-map name="main" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#FindProductionRun" type="screen"/> <view-map name="login" type="screen" page="component://manufacturing/widget/manufacturing/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://manufacturing/widget/manufacturing/CommonScreens.xml#requirePasswordChange"/> + <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> + <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <!-- Routing view mappings --> <view-map name="FindCalendar" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#FindCalendar" type="screen"/> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Fri Jul 13 06:48:00 2007 @@ -74,6 +74,28 @@ </request-map> <!-- End of Security Mappings --> + <!-- Common Mappings used for locales and timezone --> + <request-map uri="setSessionLocale"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="setSessionTimeZone"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="LookupLocales"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupLocales" /> + </request-map> + <request-map uri="LookupTimezones"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupTimezones" /> + </request-map> + <!-- Request Mappings --> <request-map uri="view"><security https="true" auth="false"/><response name="success" type="view" value="main"/></request-map> <request-map uri="authview"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map> @@ -85,12 +107,6 @@ <response name="success" type="view" value="main"/> <response name="error" type="view" value="error"/> </request-map> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> <!-- =========== DataSource =========== --> <request-map uri="FindDataSource"><security https="true" auth="true"/><response name="success" type="view" value="FindDataSource"/></request-map> @@ -409,6 +425,8 @@ <view-map name="main" type="screen" page="component://marketing/widget/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://marketing/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://marketing/widget/CommonScreens.xml#requirePasswordChange"/> + <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> + <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="MarketingReport" type="screen" page="component://marketing/widget/MarketingReportScreens.xml#MarketingReportList"/> <view-map name="FindDataSource" type="screen" page="component://marketing/widget/DataSourceScreens.xml#ListDataSource"/> @@ -461,6 +479,5 @@ <view-map name="TrackingCodeReport" type="screen" page="component://marketing/widget/MarketingReportScreens.xml#TrackingCodeReport"/> <view-map name="MarketingCampaignReport" type="screen" page="component://marketing/widget/MarketingReportScreens.xml#MarketingCampaignReport"/> - <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Fri Jul 13 06:48:00 2007 @@ -73,6 +73,28 @@ </request-map> <!-- End of Security Mappings --> + <!-- Common Mappings used for locales and timezones --> + <request-map uri="setSessionLocale"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="setSessionTimeZone"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="LookupLocales"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupLocales" /> + </request-map> + <request-map uri="LookupTimezones"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupTimezones" /> + </request-map> + <!-- Request Mappings --> <request-map uri="view"> <security https="false" auth="false"/> @@ -85,12 +107,6 @@ <response name="success" type="view" value="main"/> <response name="error" type="view" value="error"/> </request-map> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> <request-map uri="main"> <security https="true" auth="true"/> @@ -1509,6 +1525,8 @@ <view-map name="main" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#OrderHeaderListView"/> <view-map name="login" type="screen" page="component://order/widget/ordermgr/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://order/widget/ordermgr/CommonScreens.xml#requirePasswordChange"/> + <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> + <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="orderstats" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#OrderStats"/> <view-map name="findorders" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#OrderFindOrder"/> @@ -1652,6 +1670,5 @@ <view-map name="ShipGroupsPDF" type="screenfop" page="component://order/widget/ordermgr/OrderPrintScreens.xml#ShipGroupsPDF" content-type="application/pdf" encoding="none"/> <view-map name="SendConfirmationMail" type="screen" page="component://order/widget/ordermgr/OrderViewScreens.xml#SendOrderConfirmation"/> - <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Fri Jul 13 06:48:00 2007 @@ -70,16 +70,31 @@ </request-map> <!-- End of Security Mappings --> - <!-- Request Mappings --> - <request-map uri="view"><security https="true" auth="false"/><response name="success" type="view" value="main"/></request-map> - <request-map uri="authview"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map> - + <!-- Common Mappings used for locales and timezone --> <request-map uri="setSessionLocale"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> <response name="success" type="view" value="main"/> <response name="error" type="view" value="main"/> </request-map> + <request-map uri="setSessionTimeZone"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="LookupLocales"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupLocales" /> + </request-map> + <request-map uri="LookupTimezones"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupTimezones" /> + </request-map> + + <!-- Request Mappings --> + <request-map uri="view"><security https="true" auth="false"/><response name="success" type="view" value="main"/></request-map> + <request-map uri="authview"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map> <request-map uri="main"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map> @@ -933,6 +948,8 @@ <view-map name="main" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#findparty"/> <view-map name="login" type="screen" page="component://party/widget/partymgr/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://party/widget/partymgr/CommonScreens.xml#requirePasswordChange"/> + <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> + <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="findparty" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#findparty"/> Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Fri Jul 13 06:48:00 2007 @@ -72,6 +72,28 @@ </request-map> <!-- End of Security Mappings --> + <!-- Common Mappings used for locales and timezone --> + <request-map uri="setSessionLocale"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="setSessionTimeZone"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="LookupLocales"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupLocales" /> + </request-map> + <request-map uri="LookupTimezones"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupTimezones" /> + </request-map> + <!-- Request Mappings --> <request-map uri="view"> <security https="true" auth="false"/> @@ -84,13 +106,6 @@ <response name="error" type="view" value="error"/> </request-map> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="main"> <security https="true" auth="true"/> <response name="success" type="view" value="main"/> @@ -2399,6 +2414,8 @@ <view-map name="main" type="screen" page="component://product/widget/catalog/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://product/widget/catalog/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://product/widget/catalog/CommonScreens.xml#requirePasswordChange"/> + <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> + <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="ChooseTopCategory" type="screen" page="component://product/widget/catalog/CommonScreens.xml#ChooseTopCategory"/> <view-map name="FastLoadCache" type="screen" page="component://product/widget/catalog/CommonScreens.xml#FastLoadCache"/> @@ -2541,6 +2558,5 @@ <view-map name="LookupProductStore" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductStore"/> <view-map name="LookupFacilityLocation" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation" type="screen"/> <view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/> - <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Fri Jul 13 06:48:00 2007 @@ -72,6 +72,28 @@ </request-map> <!-- End of Security Mappings --> + <!-- Common Mappings used for locales and timezone --> + <request-map uri="setSessionLocale"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="setSessionTimeZone"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="LookupLocales"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupLocales" /> + </request-map> + <request-map uri="LookupTimezones"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupTimezones" /> + </request-map> + <!-- Request Mappings --> <request-map uri="view"> <security https="true" auth="false"/> @@ -85,13 +107,6 @@ <response name="error" type="view" value="error"/> </request-map> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="main"> <security https="true" auth="true"/> <response name="success" type="view" value="main"/> @@ -1130,6 +1145,8 @@ <view-map name="main" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FindFacility"/> <view-map name="login" type="screen" page="component://product/widget/facility/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://product/widget/facility/CommonScreens.xml#requirePasswordChange"/> + <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> + <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="FindFacility" type="screen" page="component://product/widget/facility/FacilityScreens.xml#FindFacility"/> <view-map name="EditFacility" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacility"/> @@ -1203,6 +1220,5 @@ <view-map name="LookupProductCategory" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductCategory"/> <view-map name="LookupFacilityLocation" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation" type="screen"/> <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/> - <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Fri Jul 13 06:48:00 2007 @@ -72,13 +72,29 @@ <response name="success" type="view" value="main"/> <response name="error" type="view" value="error"/> </request-map> + <!-- End of Security Mappings --> + + <!-- Common Mappings used for locales and timezone --> <request-map uri="setSessionLocale"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> <response name="success" type="view" value="main"/> <response name="error" type="view" value="main"/> </request-map> - <!-- End of Security Mappings --> + <request-map uri="setSessionTimeZone"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="LookupLocales"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupLocales" /> + </request-map> + <request-map uri="LookupTimezones"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupTimezones" /> + </request-map> <!-- Request Mappings --> @@ -608,6 +624,8 @@ <view-map name="main" type="screen" page="component://workeffort/widget/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://workeffort/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://workeffort/widget/CommonScreens.xml#requirePasswordChange"/> + <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> + <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="RequestList" type="screen" page="component://workeffort/widget/RequestScreens.xml#RequestList"/> @@ -684,6 +702,6 @@ <view-map name="LookupQuoteItem" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupQuoteItem"/> <view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/> <view-map name="LookupInvoice" page="component://accounting/widget/LookupScreens.xml#LookupInvoice" type="screen"/> - <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/> + <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/> <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.properties?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/framework/common/config/CommonUiLabels.properties (original) +++ ofbiz/trunk/framework/common/config/CommonUiLabels.properties Fri Jul 13 06:48:00 2007 @@ -408,6 +408,7 @@ CommonThruDateTime=Thru Date & Time CommonThursday=Thursday CommonTime=Time +CommonTimeZone=Time Zone CommonTitle=Title CommonTitleDr=Dr. CommonTitleMr=Mr. Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Fri Jul 13 06:48:00 2007 @@ -18,6 +18,8 @@ under the License. --> +<#setting locale = locale.toString()> +<#setting time_zone = timeZone.getID()> <#if (requestAttributes.person)?exists><#assign person = requestAttributes.person></#if> <#if (requestAttributes.partyGroup)?exists><#assign partyGroup = requestAttributes.partyGroup></#if> @@ -68,31 +70,9 @@ ${uiLabelMap.CommonWelcome}! </#if> </p> - <p>${Static["org.ofbiz.base.util.UtilDateTime"].timeStampToString(nowTimestamp, timeZone, locale)}</p> - <form method="post" action="<@ofbizUrl>setSessionLocale</@ofbizUrl>"> - <select name="locale"> - <option value="${locale.toString()}">${locale.getDisplayName(locale)}</option> - <option value="${locale.toString()}"></option> - <#list availableLocales as availableLocale> - <#assign langAttr = availableLocale.toString()?replace("_", "-")> - <#assign langDir = "ltr"> - <#if "ar.iw"?contains(langAttr?substring(0, 2))> - <#assign langDir = "rtl"> - </#if> - <option lang="${langAttr}" dir="${langDir}" value="${availableLocale.toString()}">${availableLocale.getDisplayName(availableLocale)}</option> - </#list> - </select> - <input type="submit" value="${uiLabelMap.CommonSet}"/> - <br /> - <#assign displayStyle = Static["java.util.TimeZone"].LONG> - <select name="tzId"> - <option value="${timeZone.getID()}">${timeZone.getDisplayName(timeZone.useDaylightTime(), displayStyle, locale)}</option> - <option value="${timeZone.getID()}"></option> - <#list availableTimeZones as availableTz> - <option value="${availableTz.getID()}">${availableTz.getDisplayName(availableTz.useDaylightTime(), displayStyle, locale)}</option> - </#list> - </select> - </form> + <p>${nowTimestamp?datetime?string.short}</p> + <p>${uiLabelMap.CommonLanguageTitle} : ${locale.getDisplayName(locale)} <a href="<@ofbizUrl>LookupLocales</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonChange}</a></p> + <p>${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)} <a href="<@ofbizUrl>LookupTimezones</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonChange}</a></p> </li> </ul> <br class="clear" /> Added: ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl?view=auto&rev=555997 ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl (added) +++ ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl Fri Jul 13 06:48:00 2007 @@ -0,0 +1,58 @@ +<#-- +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. +--> + +<style type="text/css"> +.screenlet { +margin-left: 25%; +margin-right: 25%; +margin-top: 1em; +} +.basic-table tr td { +text-align: center; +} +.basic-table tr td a { +display: block; +} +</style> + +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.CommonLanguageTitle}</li> + <li><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonCancel}</a></li> + </ul> + <br class="clear"/> + </div> + <table cellspacing="0" class="basic-table hover-bar"> + <#assign altRow = true> + <#list availableLocales as availableLocale> + <#assign altRow = !altRow> + <#assign langAttr = availableLocale.toString()?replace("_", "-")> + <#assign langDir = "ltr"> + <#if "ar.iw"?contains(langAttr?substring(0, 2))> + <#assign langDir = "rtl"> + </#if> + <tr <#if altRow>class="alternate-row"</#if>> + <td lang="${langAttr}" dir="${langDir}"> + <a href="<@ofbizUrl>setSessionLocale</@ofbizUrl>?locale=${availableLocale.toString()}">${availableLocale.getDisplayName(availableLocale)}</a> + </td> + </tr> + </#list> + </table> +</div> Propchange: ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl?view=auto&rev=555997 ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl (added) +++ ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl Fri Jul 13 06:48:00 2007 @@ -0,0 +1,54 @@ +<#-- +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. +--> + +<style type="text/css"> +.screenlet { +margin-left: 25%; +margin-right: 25%; +margin-top: 1em; +} +.basic-table tr td { +text-align: center; +} +.basic-table tr td a { +display: block; +} +</style> + +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.CommonTimeZone}</li> + <li><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonCancel}</a></li> + </ul> + <br class="clear"/> + </div> + <table cellspacing="0" class="basic-table hover-bar"> + <#assign altRow = true> + <#assign displayStyle = Static["java.util.TimeZone"].LONG> + <#list availableTimeZones as availableTz> + <#assign altRow = !altRow> + <tr<#if altRow> class="alternate-row"</#if>> + <td> + <a href="<@ofbizUrl>setSessionTimeZone</@ofbizUrl>?tzId=${availableTz.getID()}">${availableTz.getDisplayName(availableTz.useDaylightTime(), displayStyle, locale)} (${availableTz.getID()})</a> + </td> + </tr> + </#list> + </table> +</div> Propchange: ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/framework/common/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupForms.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/framework/common/widget/LookupForms.xml (original) +++ ofbiz/trunk/framework/common/widget/LookupForms.xml Fri Jul 13 06:48:00 2007 @@ -37,8 +37,7 @@ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupGeo" list-name="listIt" target="" title="" type="list" - paginate-target="LookupGeo"> + <form name="listLookupGeo" list-name="listIt" target="" title="" type="list" paginate-target="LookupGeo"> <actions> <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Fri Jul 13 06:48:00 2007 @@ -42,4 +42,44 @@ </widgets> </section> </screen> + + <!-- Locales Lookup Screen --> + <screen name="LookupLocales"> + <section> + <actions> + <set field="title" value="${uiLabelMap.CommonChooseLanguage}"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <platform-specific> + <html> + <html-template location="component://common/webcommon/includes/listLocales.ftl"/> + </html> + </platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <!-- Timezones Lookup Screen --> + <screen name="LookupTimezones"> + <section> + <actions> + <set field="title" value="${uiLabelMap.CommonTime}"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="body"> + <platform-specific> + <html> + <html-template location="component://common/webcommon/includes/listTimezones.ftl"/> + </html> + </platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml (original) +++ ofbiz/trunk/framework/example/webapp/example/WEB-INF/controller.xml Fri Jul 13 06:48:00 2007 @@ -76,15 +76,31 @@ </request-map> <!-- End of Security Mappings --> - <!-- Request Mappings --> - <request-map uri="main"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map> - <request-map uri="authview"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map> + <!-- Common Mappings used for locales and timezones --> <request-map uri="setSessionLocale"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> <response name="success" type="view" value="main"/> <response name="error" type="view" value="main"/> </request-map> + <request-map uri="setSessionTimeZone"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="LookupLocales"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupLocales" /> + </request-map> + <request-map uri="LookupTimezones"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupTimezones" /> + </request-map> + + <!-- Request Mappings --> + <request-map uri="main"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map> + <request-map uri="authview"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map> <!-- Example Requests --> <request-map uri="FindExample"><security https="true" auth="true"/><response name="success" type="view" value="FindExample"/></request-map> @@ -187,6 +203,8 @@ <view-map name="main" type="screen" page="component://example/widget/example/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://example/widget/example/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://example/widget/example/CommonScreens.xml#requirePasswordChange"/> + <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> + <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="FindExample" type="screen" page="component://example/widget/example/ExampleScreens.xml#FindExample"/> <view-map name="EditExample" type="screen" page="component://example/widget/example/ExampleScreens.xml#EditExample"/> Modified: ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml (original) +++ ofbiz/trunk/framework/shark/webapp/shark/WEB-INF/controller.xml Fri Jul 13 06:48:00 2007 @@ -71,6 +71,28 @@ </request-map> <!-- End of Security Mappings --> + <!-- Common Mappings used for locales and timezones --> + <request-map uri="setSessionLocale"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="setSessionTimeZone"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="LookupLocales"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupLocales" /> + </request-map> + <request-map uri="LookupTimezones"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupTimezones" /> + </request-map> + <!-- Request Mappings --> <request-map uri="view"> <security https="false" auth="false"/> @@ -89,12 +111,6 @@ <response name="success" type="view" value="main"/> </request-map> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> <request-map uri="repository"> <security https="true" auth="true"/> <response name="success" type="view" value="repository"/> @@ -126,6 +142,8 @@ <view-map name="main" type="screen" page="component://shark/widget/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://shark/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://shark/widget/CommonScreens.xml#requirePasswordChange"/> + <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> + <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="repository" type="screen" page="component://shark/widget/RepositoryScreens.xml#showRepository"/> <view-map name="processList" type="screen" page="component://shark/widget/ProcessScreens.xml#processList"/> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?view=diff&rev=555997&r1=555996&r2=555997 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Fri Jul 13 06:48:00 2007 @@ -74,6 +74,28 @@ </request-map> <!-- End of Security Mappings --> + <!-- Common Mappings used for locales and timezones --> + <request-map uri="setSessionLocale"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="setSessionTimeZone"> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionTimeZone"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="main"/> + </request-map> + <request-map uri="LookupLocales"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupLocales" /> + </request-map> + <request-map uri="LookupTimezones"> + <security https="true" auth="false" /> + <response name="success" type="view" value="LookupTimezones" /> + </request-map> + <!-- Request Mappings --> <!-- Begin Utility Requests --> @@ -135,13 +157,6 @@ <response name="error" type="view" value="main"/> </request-map> - <request-map uri="setSessionLocale"> - <security https="true" auth="false"/> - <event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/> - <response name="success" type="view" value="main"/> - <response name="error" type="view" value="main"/> - </request-map> - <request-map uri="view"> <security https="true" auth="false"/> <response name="success" type="view" value="main"/> @@ -558,6 +573,8 @@ <view-map name="main" type="screen" page="component://webtools/widget/CommonScreens.xml#main"/> <view-map name="login" type="screen" page="component://webtools/widget/CommonScreens.xml#login"/> <view-map name="requirePasswordChange" type="screen" page="component://webtools/widget/CommonScreens.xml#requirePasswordChange"/> + <view-map name="LookupLocales" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocales"/> + <view-map name="LookupTimezones" type="screen" page="component://common/widget/LookupScreens.xml#LookupTimezones"/> <view-map name="ping" type="ftl" page="/ping.ftl"/> <view-map name="showDateTime" type="ftl" page="/showDateTime.ftl"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |