You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Bruno Busco <br...@gmail.com> on 2010/04/09 12:17:12 UTC
Re: svn commit: r894330 - in /ofbiz/trunk: applications/commonext/widget/
applications/marketing/widget/sfa/ applications/order/widget/ordermgr/
applications/product/widget/catalog/ applications/workeffort/widget/
framework/bi/widget/ framework/commo
Hi Scott,
the geoLocation screen deletion could have better be done in a separate
commit with a proper log message. Sorry about this.
In any case this screen deletion is intentional since it has been replaced
by the geoChart screen.
The geoChart screen is more generic since it gets all parameters in a map.
It can be used to show many points etc.
The common-controller reference should be deleted also.
-Bruno
2010/4/8 Scott Gray <sc...@hotwaxmedia.com>
> 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, buscob@apache.org 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:
> [snip]
> >> 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>
>