Re: svn commit: r894330 - in /ofbiz/trunk: applications/commonext/widget/ applications/marketing/widget/
Locked
Re: svn commit: r894330 - in /ofbiz/trunk: applications/commonext/widget/ applications/marketing/widget/
 
|
Hi Bruno,
I know it was a while ago but in this commit you removed the geoLocation screen and made no mention of it in the commit log, was it intentional? The screen is still referenced from the common-controller. Thanks Scott HotWax Media http://www.hotwaxmedia.com On 29/12/2009, at 2:22 AM, [hidden email] wrote: > Author: buscob > Date: Tue Dec 29 09:22:45 2009 > New Revision: 894330 > > URL: http://svn.apache.org/viewvc?rev=894330&view=rev > Log: > [OFBIZ-3274] - Using decorator sections to control the left-bar > The leftbar content is now defined using the "left-column" ApplicationDecorator section instead of setting the variables "leftbarScreenName", "leftbarScreenLocation" and "MainColumnStyle". > The logic that checks if the "left-column" section has content, and thus if a left column must be rendered, has been moved from the GlobalDecorator to the ApplicationDecorator. > > Modified: > ofbiz/trunk/applications/commonext/widget/CommonScreens.xml > ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml > ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml > ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml > ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml > ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml > ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml > ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml > ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml > ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml > ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml > ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml > ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml > ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml > ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml > ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml > ofbiz/trunk/applications/product/widget/catalog/ReviewScreens.xml > ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml > ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml > ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml > ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml > ofbiz/trunk/framework/bi/widget/BiScreens.xml > ofbiz/trunk/framework/common/widget/CommonScreens.xml > ofbiz/trunk/framework/example/widget/example/CommonScreens.xml > > Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original) > +++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Tue Dec 29 09:22:45 2009 > @@ -69,7 +69,36 @@ > </actions> > <widgets/> > </section> > - <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/> > + <decorator-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"> > + <decorator-section name="pre-body"> > + <decorator-section-include name="pre-body"/> > + </decorator-section> > + <decorator-section name="body"> > + <container id="column-container"> > + <section> > + <condition> > + <if-empty-section section-name="left-column"/> > + </condition> > + <widgets> > + <container id="content-main-section"> > + <decorator-section-include name="body"/> > + </container> > + </widgets> > + <fail-widgets> > + <container style="left"> > + <decorator-section-include name="left-column"/> > + </container> > + <container id="content-main-section" style="leftonly"> > + <container style="no-clear"> > + <decorator-section-include name="body"/> > + </container> > + </container> > + </fail-widgets> > + </section> > + <container style="clear"></container> > + </container> > + </decorator-section> > + </decorator-screen> > </widgets> > </section> > </screen> > > Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original) > +++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Tue Dec 29 09:22:45 2009 > @@ -60,26 +60,27 @@ > </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar"/> > + </decorator-section> > <decorator-section name="body"> > - <container style="no-clear"> > - <section> > - <actions> > - <entity-one entity-name="PortalPage" value-field="portalPage"/> > - <entity-and entity-name="PortalPageColumn" list="portalPageColumns"> > - <field-map field-name="portalPageId" from-field="parameters.portalPageId"/> > - <order-by field-name="columnSeqId"/> > - </entity-and> > - <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets"> > - <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/> > - <order-by field-name="columnSeqId"/> > - <order-by field-name="sequenceNum"/> > - </entity-and> > - </actions> > - <widgets> > - <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific> > - </widgets> > - </section> > - </container> > + <section> > + <actions> > + <entity-one entity-name="PortalPage" value-field="portalPage"/> > + <entity-and entity-name="PortalPageColumn" list="portalPageColumns"> > + <field-map field-name="portalPageId" from-field="parameters.portalPageId"/> > + <order-by field-name="columnSeqId"/> > + </entity-and> > + <entity-and entity-name="PortalPagePortletView" list="portalPagePortlets"> > + <field-map field-name="portalPageId" from-field="portalPage.portalPageId"/> > + <order-by field-name="columnSeqId"/> > + <order-by field-name="sequenceNum"/> > + </entity-and> > + </actions> > + <widgets> > + <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific> > + </widgets> > + </section> > </decorator-section> > </decorator-screen> > </widgets> > @@ -90,14 +91,12 @@ > <section> > <condition><not><if-empty field="userLogin"/></not></condition> > <widgets> > - <container style="left-larger"> > - <screenlet id ="SfaQuickAddContactPanel" title="${uiLabelMap.SfaQuickAddContact}" collapsible="true"> > - <include-form name="QuickAddContact" location="component://marketing/widget/sfa/forms/ContactForms.xml"/> > - </screenlet> > - <screenlet id= "SfaQuickAddLeadPanel" title="${uiLabelMap.SfaQuickAddLead}" collapsible="true"> > - <include-form name="QuickAddLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/> > - </screenlet> > - </container> > + <screenlet id ="SfaQuickAddContactPanel" title="${uiLabelMap.SfaQuickAddContact}" collapsible="true"> > + <include-form name="QuickAddContact" location="component://marketing/widget/sfa/forms/ContactForms.xml"/> > + </screenlet> > + <screenlet id= "SfaQuickAddLeadPanel" title="${uiLabelMap.SfaQuickAddLead}" collapsible="true"> > + <include-form name="QuickAddLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/> > + </screenlet> > </widgets> > </section> > </screen> > @@ -113,6 +112,9 @@ > <decorator-section name="pre-body"> > <include-menu name="OpportunityTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> > </decorator-section> > + <decorator-section name="left-column"> > + <include-screen name="leftbar"/> > + </decorator-section> > <decorator-section name="body"> > <decorator-section-include name="body"/> > </decorator-section> > @@ -197,9 +199,7 @@ > <label style="h1" text="${uiLabelMap.PartyTheProfileOf} ${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName} ${lookupPerson.suffix} ${lookupGroup.groupName} [${partyId}]"/> > </widgets> > </section> > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </widgets> > <fail-widgets> > <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> > @@ -389,13 +389,9 @@ > <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <include-menu name="OpportunitySubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> > - <container style="screenlet-body"> > - <container style="no-clear"> > - <screenlet title="${uiLabelMap.PageTitleListCommunications}"> > - <decorator-section-include name="body"/> > - </screenlet> > - </container> > - </container> > + <screenlet title="${uiLabelMap.PageTitleListCommunications}"> > + <decorator-section-include name="body"/> > + </screenlet> > </decorator-section> > </decorator-screen> > </widgets> > @@ -404,6 +400,9 @@ > <decorator-section name="pre-body"> > <include-menu name="OpportunityTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> > </decorator-section> > + <decorator-section name="left-column"> > + <include-screen name="leftbar"/> > + </decorator-section> > <decorator-section name="body"> > <include-menu name="OpportunitySubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> > <decorator-section-include name="body"/> > @@ -421,11 +420,12 @@ > <decorator-section name="pre-body"> > <include-menu name="AccountTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> > </decorator-section> > + <decorator-section name="left-column"> > + <include-screen name="leftbar"/> > + </decorator-section> > <decorator-section name="body"> > <include-menu name="AccountSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </decorator-section> > </decorator-screen> > </widgets> > @@ -438,11 +438,12 @@ > <decorator-section name="pre-body"> > <include-menu name="ContactTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> > </decorator-section> > + <decorator-section name="left-column"> > + <include-screen name="leftbar"/> > + </decorator-section> > <decorator-section name="body"> > <include-menu name="ContactSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </decorator-section> > </decorator-screen> > </widgets> > @@ -465,9 +466,7 @@ > </decorator-section> > <decorator-section name="body"> > <include-menu name="LeadSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </decorator-section> > </decorator-screen> > </widgets> > @@ -483,11 +482,12 @@ > <decorator-section name="pre-body"> > <include-menu name="EventTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> > </decorator-section> > + <decorator-section name="left-column"> > + <include-screen name="leftbar"/> > + </decorator-section> > <decorator-section name="body"> > <include-menu name="EventSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/> > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </decorator-section> > </decorator-screen> > </widgets> > > Modified: ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml (original) > +++ ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml Tue Dec 29 09:22:45 2009 > @@ -32,6 +32,9 @@ > </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://marketing/widget/sfa/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <widgets> > > Modified: ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml (original) > +++ ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml Tue Dec 29 09:22:45 2009 > @@ -28,6 +28,9 @@ > </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://marketing/widget/sfa/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <widgets> > @@ -56,6 +59,9 @@ > </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://marketing/widget/sfa/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <widgets> > > Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original) > +++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Tue Dec 29 09:22:45 2009 > @@ -32,6 +32,9 @@ > </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://marketing/widget/sfa/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <widgets> > > Modified: ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml (original) > +++ ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml Tue Dec 29 09:22:45 2009 > @@ -29,6 +29,9 @@ > </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://marketing/widget/sfa/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="body"> > <container style="no-clear"> > <screenlet title="${uiLabelMap.SfaFindOpportunities}"> > > Modified: ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original) > +++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Tue Dec 29 09:22:45 2009 > @@ -34,8 +34,6 @@ > <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> > <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> > > - <set field="MainColumnStyle" value="nocolumns" global="true"/> > - > <set field="layoutSettings.companyName" from-field="uiLabelMap.OrderCompanyName" global="true"/> > <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.OrderCompanySubtitle" global="true"/> > <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set, > > Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml (original) > +++ ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml Tue Dec 29 09:22:45 2009 > @@ -24,8 +24,6 @@ > <section> > <actions> > <set field="titleProperty" value="PageTitleEditProductCatalog"/> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > <set field="headerItem" value="catalog"/> > <set field="tabButtonItem" value="ProductCatalog"/> > > @@ -50,8 +48,6 @@ > <section> > <actions> > <set field="titleProperty" value="PageTitleEditProductCatalogCategories"/> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > <set field="headerItem" value="catalog"/> > <set field="tabButtonItem" value="ProductCategories"/> > > @@ -89,8 +85,6 @@ > <section> > <actions> > <set field="titleProperty" value="PageTitleEditProductCatalogParties"/> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > <set field="headerItem" value="catalog"/> > <set field="tabButtonItem" value="PartyParties"/> > > @@ -124,8 +118,6 @@ > <section> > <actions> > <set field="titleProperty" value="PageTitleEditProductCatalogStores"/> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > <set field="headerItem" value="catalog"/> > <set field="tabButtonItem" value="ProductStores"/> > > @@ -159,8 +151,6 @@ > <section> > <actions> > <set field="titleProperty" value="PageTitleFindProductCatalog"/> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > > <entity-condition entity-name="ProdCatalog" list="prodCatalogs"> > <order-by field-name="catalogName"/> > > Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original) > +++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Tue Dec 29 09:22:45 2009 > @@ -22,11 +22,6 @@ > xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> > <screen name="CommonCategoryDecorator"> > <section> > - <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="pre-body"> > @@ -43,6 +38,9 @@ > </widgets> > </section> > </decorator-section> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <!-- do check for CATALOG, _VIEW permission --> > @@ -71,9 +69,7 @@ > </container> > </widgets> > </section> > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </widgets> > <fail-widgets> > <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> > > Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) > +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Tue Dec 29 09:22:45 2009 > @@ -30,8 +30,6 @@ > <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> > <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> > > - <set field="MainColumnStyle" value="nocolumns" global="true"/> > - > <set field="layoutSettings.companyName" from-field="uiLabelMap.ProductCatalogCompanyName" global="true"/> > <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ProductCompanySubtitle" global="true"/> > <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set, > @@ -55,10 +53,6 @@ > <actions> > <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> > <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - > <set field="productId" from-field="parameters.productId"/> > <entity-one entity-name="Product" value-field="product"/> > <set field="productName" from-field="product.productName"/> > @@ -78,6 +72,9 @@ > </widgets> > </section> > </decorator-section> > + <decorator-section name="left-column"> > + <include-screen name="leftbar"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <!-- do check for CATALOG, _VIEW permission --> > @@ -110,10 +107,7 @@ > </container> > </widgets> > </section> > - > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </widgets> > <fail-widgets> > <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> > @@ -127,11 +121,6 @@ > > <screen name="CommonCatalogDecorator"> > <section> > - <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="pre-body"> > @@ -148,6 +137,9 @@ > </widgets> > </section> > </decorator-section> > + <decorator-section name="left-column"> > + <include-screen name="leftbar"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <!-- do check for CATALOG, _VIEW permission --> > @@ -159,10 +151,7 @@ > <link target="EditProdCatalog" text="${uiLabelMap.ProductNewProdCatalog}" style="buttontext"/> > </container> > > - <!-- add Create Product and View Product (in ecommerce) links --> > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </widgets> > <fail-widgets> > <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> > @@ -176,11 +165,6 @@ > > <screen name="CommonProductStoreDecorator"> > <section> > - <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="pre-body"> > @@ -196,6 +180,9 @@ > </widgets> > </section> > </decorator-section> > + <decorator-section name="left-column"> > + <include-screen name="leftbar"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <!-- do check for CATALOG, _VIEW permission --> > @@ -230,10 +217,7 @@ > </widgets> > </section> > > - <!-- add Create Product and View Product (in ecommerce) links --> > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </widgets> > <fail-widgets> > <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> > @@ -247,11 +231,6 @@ > > <screen name="CommonShippingDecorator"> > <section> > - <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="pre-body"> > @@ -264,6 +243,9 @@ > </widgets> > </section> > </decorator-section> > + <decorator-section name="left-column"> > + <include-screen name="leftbar"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <!-- do check for CATALOG, _VIEW permission --> > @@ -275,9 +257,7 @@ > <container> > <label style="h1">${uiLabelMap[labelTitleProperty]}</label> > </container> > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </widgets> > <fail-widgets> > <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> > @@ -395,16 +375,15 @@ > <screen name="main"> > <section> > <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > <set field="headerItem" value="main"/> > - > <set field="productId" from-field="parameters.productId"/> > <entity-one entity-name="Product" value-field="product"/> > </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar"/> > + </decorator-section> > <decorator-section name="body"> > <platform-specific> > <html><html-template location="component://product/webapp/catalog/main.ftl"/></html> > > Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original) > +++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Tue Dec 29 09:22:45 2009 > @@ -22,11 +22,6 @@ > xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> > <screen name="CommonConfigDecorator"> > <section> > - <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="pre-body"> > @@ -42,6 +37,9 @@ > </widgets> > </section> > </decorator-section> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <!-- do check for CATALOG, _VIEW permission --> > @@ -60,9 +58,7 @@ > </container> > </widgets> > </section> > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </widgets> > <fail-widgets> > <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> > @@ -171,7 +167,6 @@ > </screenlet> > </widgets> > <fail-widgets> > - > <screenlet title="${uiLabelMap.ProductCreateNewConfigOptions}"> > <include-form name="CreateConfigOption" location="component://product/widget/catalog/ConfigForms.xml"/> > </screenlet> > > Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original) > +++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Tue Dec 29 09:22:45 2009 > @@ -22,14 +22,6 @@ > xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> > <screen name="CommonFeatureDecorator"> > <section> > - <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - > - <!--<set field="productId" from-field="parameters.productId"/>--> > - <!--<entity-one entity-name="Product" value-field="product"/>--> > - </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="pre-body"> > @@ -43,6 +35,9 @@ > </widgets> > </section> > </decorator-section> > + <decorator-section name="left-column"> > + <include-screen name="leftbar"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <!-- do check for CATALOG, _VIEW permission --> > @@ -50,10 +45,7 @@ > <if-has-permission permission="CATALOG" action="_VIEW"/> > </condition> > <widgets> > - <!-- add Create Product and View Product (in ecommerce) links --> > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </widgets> > <fail-widgets> > <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> > > Modified: ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml (original) > +++ ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml Tue Dec 29 09:22:45 2009 > @@ -22,13 +22,11 @@ > xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> > <screen name="CommonFindDecorator"> > <section> > - <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <!-- do check for CATALOG, _VIEW permission --> > @@ -114,10 +112,6 @@ > <screen name="FindProductById"> > <section> > <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - > <set field="titleProperty" value="ProductFindProductWithIdValue"/> > > <set field="idValue" from-field="parameters.idValue"/> > @@ -132,6 +126,9 @@ > </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="body"> > <platform-specific><html><html-template location="component://product/webapp/catalog/find/FindProductById.ftl"/></html></platform-specific> > </decorator-section> > > Modified: ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml (original) > +++ ofbiz/trunk/applications/product/widget/catalog/PriceScreens.xml Tue Dec 29 09:22:45 2009 > @@ -22,13 +22,11 @@ > xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> > <screen name="CommonPriceDecorator"> > <section> > - <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <!-- do check for CATALOG, _VIEW permission --> > @@ -36,9 +34,7 @@ > <if-has-permission permission="CATALOG" action="_VIEW"/> > </condition> > <widgets> > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </widgets> > <fail-widgets> > <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> > > Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) > +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Tue Dec 29 09:22:45 2009 > @@ -1001,10 +1001,6 @@ > </screen> > <screen name="CreateVirtualWithVariantsForm"> > <section> > - <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - </actions> > <widgets> > <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > > Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original) > +++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Tue Dec 29 09:22:45 2009 > @@ -22,13 +22,11 @@ > xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> > <screen name="CommonPromoDecorator"> > <section> > - <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="pre-body"> > <section> > <condition> > @@ -61,9 +59,7 @@ > </widgets> > </section> > > - <container style="no-clear"> > - <decorator-section-include name="body"/> > - </container> > + <decorator-section-include name="body"/> > </widgets> > <fail-widgets> > <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> > > Modified: ofbiz/trunk/applications/product/widget/catalog/ReviewScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ReviewScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/widget/catalog/ReviewScreens.xml (original) > +++ ofbiz/trunk/applications/product/widget/catalog/ReviewScreens.xml Tue Dec 29 09:22:45 2009 > @@ -22,13 +22,11 @@ > xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> > <screen name="CommonReviewDecorator"> > <section> > - <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <!-- do check for CATALOG, _VIEW permission --> > > Modified: ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml (original) > +++ ofbiz/trunk/applications/product/widget/catalog/ShippingScreens.xml Tue Dec 29 09:22:45 2009 > @@ -29,10 +29,6 @@ > <set field="headerItem" value="shipping"/> > <set field="tabButtonItem" value="ListQuantityBreaks"/> > > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - > <entity-condition entity-name="QuantityBreak" list="quantityBreaks"> > <order-by field-name="quantityBreakId"/> > </entity-condition> > @@ -59,10 +55,6 @@ > <set field="headerItem" value="shipping"/> > <set field="tabButtonItem" value="ListShipmentMethodTypes"/> > > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - > <entity-condition entity-name="ShipmentMethodType" list="shipmentMethodTypes"> > <order-by field-name="sequenceNum"/> > <order-by field-name="description"/> > @@ -91,10 +83,6 @@ > <set field="headerItem" value="shipping"/> > <set field="tabButtonItem" value="ListCarrierShipmentMethods"/> > > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - > <entity-condition entity-name="CarrierShipmentMethod" list="carrierShipmentMethods"> > <order-by field-name="sequenceNumber"/> > </entity-condition> > > Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml (original) > +++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Tue Dec 29 09:22:45 2009 > @@ -31,6 +31,9 @@ > </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <condition> > @@ -71,6 +74,22 @@ > </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> > + </decorator-section> > + <decorator-section name="pre-body"> > + <section> > + <condition> > + <and> > + <if-service-permission service-name="subscriptionPermissionCheck" main-action="VIEW"/> > + <not><if-empty field="subscription"/></not> > + </and> > + </condition> > + <widgets> > + <include-menu name="EditSubscription" location="component://product/widget/catalog/SubscriptionMenus.xml"/> > + </widgets> > + </section> > + </decorator-section> > <decorator-section name="body"> > <section> > <condition> > @@ -82,7 +101,6 @@ > <not><if-empty field="subscription"/></not> > </condition> > <widgets> > - <include-menu name="EditSubscription" location="component://product/widget/catalog/SubscriptionMenus.xml"/> > <container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${subscription.description} [${subscriptionId}]</label></container> > <container style="button-bar"><link target="EditSubscription" text="${uiLabelMap.ProductNewSubscription}" style="buttontext"/></container> > </widgets> > > Modified: ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml (original) > +++ ofbiz/trunk/applications/product/widget/catalog/ThesaurusScreens.xml Tue Dec 29 09:22:45 2009 > @@ -22,13 +22,11 @@ > xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> > <screen name="CommonThesaurusDecorator"> > <section> > - <actions> > - <set field="leftbarScreenName" value="leftbar"/> > - <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/> > - <set field="MainColumnStyle" value="leftonly"/> > - </actions> > <widgets> > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="left-column"> > + <include-screen name="leftbar" location="component://product/widget/catalog/CommonScreens.xml"/> > + </decorator-section> > <decorator-section name="body"> > <section> > <!-- do check for CATALOG, _VIEW permission --> > > Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original) > +++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Tue Dec 29 09:22:45 2009 > @@ -46,7 +46,15 @@ > <set field="applicationTitle" value="${uiLabelMap.WorkEffortManagerApplication}" global="true"/> > </actions> > <widgets> > - <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> > + <include-screen name="SingleColumnDecorator" location="component://commonext/widget/CommonScreens.xml"/> > + </widgets> > + </section> > + </screen> > + > + <screen name="login-decorator"> > + <section> > + <widgets> > + <include-screen name="main-decorator"/> > </widgets> > </section> > </screen> > > Modified: ofbiz/trunk/framework/bi/widget/BiScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/widget/BiScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/framework/bi/widget/BiScreens.xml (original) > +++ ofbiz/trunk/framework/bi/widget/BiScreens.xml Tue Dec 29 09:22:45 2009 > @@ -35,7 +35,19 @@ > <set field="applicationTitle" value="${uiLabelMap.BusinessIntelligenceApplication}" global="true"/> > </actions> > <widgets> > - <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/> > + <decorator-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"> > + <decorator-section name="pre-body"> > + <decorator-section-include name="pre-body"/> > + </decorator-section> > + <decorator-section name="body"> > + <container id="column-container"> > + <container id="content-main-section"> > + <decorator-section-include name="body"/> > + </container> > + <container style="clear"></container> > + </container> > + </decorator-section> > + </decorator-screen> > </widgets> > </section> > </screen> > > Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) > +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Tue Dec 29 09:22:45 2009 > @@ -198,20 +198,11 @@ > > <!-- render messages --> > <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific> > + > + <!-- render content area --> > <container style="contentarea"> > - <!-- may be used by sight disabled persons to skip directly to content area--> > <decorator-section-include name="pre-body"/> > - <!-- Please don't change the column-container id : it's referenced to allow skipping navigation--> > - <container id="column-container"> > - <!-- by default will render left-bar only if leftbarScreen value not empty --> > - <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/> > - > - <container id="content-main-section" style="${MainColumnStyle}"> > - <!-- render messages --> > - <decorator-section-include name="body"/> > - </container> > - <container style="clear"></container> > - </container> > + <decorator-section-include name="body"/> > </container> > > <!-- render footer --> > @@ -413,7 +404,7 @@ > <screen name="forgotPassword"> > <section> > <widgets> > - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > + <decorator-screen name="login-decorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <platform-specific> > <html><html-template location="component://common/webcommon/forgotPassword.ftl"/></html> > @@ -498,27 +489,6 @@ > </section> > </screen> > > - <screen name="geoLocation"> > - <section> > - <actions> > - <set field="titleProperty" value="PageTitleCommonGeoLocation"/> > - <entity-one entity-name="GeoPoint" value-field="geoPoint"> > - <field-map field-name="geoPointId" from-field="parameters.geoPointId"/> > - </entity-one> > - <script location="component://common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy"/> > - </actions> > - <widgets> > - <decorator-screen name="SimpleDecorator"> > - <decorator-section name="body"> > - <platform-specific> > - <html><html-template location="component://common/webcommon/WEB-INF/geolocation.ftl"/></html> > - </platform-specific> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - > <screen name="geoChart"> > <section> > <actions> > > Modified: ofbiz/trunk/framework/example/widget/example/CommonScreens.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/CommonScreens.xml?rev=894330&r1=894329&r2=894330&view=diff > ============================================================================== > --- ofbiz/trunk/framework/example/widget/example/CommonScreens.xml (original) > +++ ofbiz/trunk/framework/example/widget/example/CommonScreens.xml Tue Dec 29 09:22:45 2009 > @@ -48,7 +48,19 @@ > <set field="applicationTitle" value="${uiLabelMap.ExampleApplication}" global="true"/> > </actions> > <widgets> > - <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/> > + <decorator-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"> > + <decorator-section name="pre-body"> > + <decorator-section-include name="pre-body"/> > + </decorator-section> > + <decorator-section name="body"> > + <container id="column-container"> > + <container id="content-main-section"> > + <decorator-section-include name="body"/> > + </container> > + <container style="clear"></container> > + </container> > + </decorator-section> > + </decorator-screen> > </widgets> > </section> > </screen> > > |
smime.p7s (3K)
Re: svn commit: r894330 - in /ofbiz/trunk: applications/commonext/widget/ applications/marketing/widget/
|
|
Sorry I should have snipped to the relevant portion, it's done below.
Regards Scott On 7/04/2010, at 11:29 PM, Scott Gray wrote: > Hi Bruno, > > I know it was a while ago but in this commit you removed the geoLocation screen and made no mention of it in the commit log, was it intentional? The screen is still referenced from the common-controller. > > Thanks > Scott > > HotWax Media > http://www.hotwaxmedia.com > > On 29/12/2009, at 2:22 AM, [hidden email] wrote: > >> Author: buscob >> Date: Tue Dec 29 09:22:45 2009 >> New Revision: 894330 >> >> URL: http://svn.apache.org/viewvc?rev=894330&view=rev >> Log: >> [OFBIZ-3274] - Using decorator sections to control the left-bar >> The leftbar content is now defined using the "left-column" ApplicationDecorator section instead of setting the variables "leftbarScreenName", "leftbarScreenLocation" and "MainColumnStyle". >> The logic that checks if the "left-column" section has content, and thus if a left column must be rendered, has been moved from the GlobalDecorator to the ApplicationDecorator. >> >> Modified: >> ofbiz/trunk/framework/common/widget/CommonScreens.xml >> ofbiz/trunk/framework/example/widget/example/CommonScreens.xml >> Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=894330&r1=894329&r2=894330&view=diff >> ============================================================================== >> --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) >> +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Tue Dec 29 09:22:45 2009 >> @@ -198,20 +198,11 @@ >> >> <!-- render messages --> >> <platform-specific><html><html-template location="${messagesTemplateLocation}"/></html></platform-specific> >> + >> + <!-- render content area --> >> <container style="contentarea"> >> - <!-- may be used by sight disabled persons to skip directly to content area--> >> <decorator-section-include name="pre-body"/> >> - <!-- Please don't change the column-container id : it's referenced to allow skipping navigation--> >> - <container id="column-container"> >> - <!-- by default will render left-bar only if leftbarScreen value not empty --> >> - <include-screen name="${leftbarScreenName}" location="${leftbarScreenLocation}"/> >> - >> - <container id="content-main-section" style="${MainColumnStyle}"> >> - <!-- render messages --> >> - <decorator-section-include name="body"/> >> - </container> >> - <container style="clear"></container> >> - </container> >> + <decorator-section-include name="body"/> >> </container> >> >> <!-- render footer --> >> @@ -413,7 +404,7 @@ >> <screen name="forgotPassword"> >> <section> >> <widgets> >> - <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> >> + <decorator-screen name="login-decorator" location="${parameters.mainDecoratorLocation}"> >> <decorator-section name="body"> >> <platform-specific> >> <html><html-template location="component://common/webcommon/forgotPassword.ftl"/></html> >> @@ -498,27 +489,6 @@ >> </section> >> </screen> >> >> - <screen name="geoLocation"> >> - <section> >> - <actions> >> - <set field="titleProperty" value="PageTitleCommonGeoLocation"/> >> - <entity-one entity-name="GeoPoint" value-field="geoPoint"> >> - <field-map field-name="geoPointId" from-field="parameters.geoPointId"/> >> - </entity-one> >> - <script location="component://common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy"/> >> - </actions> >> - <widgets> >> - <decorator-screen name="SimpleDecorator"> >> - <decorator-section name="body"> >> - <platform-specific> >> - <html><html-template location="component://common/webcommon/WEB-INF/geolocation.ftl"/></html> >> - </platform-specific> >> - </decorator-section> >> - </decorator-screen> >> - </widgets> >> - </section> >> - </screen> >> - >> <screen name="geoChart"> >> <section> >> <actions> |
| Free forum by Nabble | Edit this page |