You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/10/11 19:07:56 UTC
svn commit: r1021429 - in /ofbiz/branches/jquery:
applications/order/webapp/ordermgr/entry/catalog/
applications/order/widget/ordermgr/ specialpurpose/ecommerce/data/
specialpurpose/ecommerce/widget/
Author: jleroux
Date: Mon Oct 11 17:07:56 2010
New Revision: 1021429
URL: http://svn.apache.org/viewvc?rev=1021429&view=rev
Log:
A patch from Sascha Rodekamp "Ecommerce Migration" (https://issues.apache.org/jira/browse/OFBIZ-3978) - OFBIZ-3978
Fixes a problems when hovering on images on main page.
Removes some Prototype calls.
JLR: I also renamed the VisualThemeResource sequenceId and removed the old newcustomer screen in CustomerScreens.xml (I thought I had already committed it, but anyway)
Modified:
ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
ofbiz/branches/jquery/specialpurpose/ecommerce/data/EcommerceTypeData.xml
ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CatalogScreens.xml
ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CustomerScreens.xml
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl?rev=1021429&r1=1021428&r2=1021429&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl Mon Oct 11 17:07:56 2010
@@ -36,7 +36,7 @@ under the License.
<span id="${productInfoLinkId}" class="popup_link"><img src="<@o...@ofbizContentUrl>" alt="Small Image"/></span>
</a>
</div>
- <div id="${productDetailId}" class="popup" >
+ <div id="${productDetailId}" class="popup" style="display:none;">
<table>
<tr valign="top">
<td>
@@ -49,7 +49,11 @@ under the License.
</table>
</div>
<script type="text/javascript">
- new Popup('${productDetailId}','${productInfoLinkId}', {position: 'none'})
+ jQuery("#${productInfoLinkId}").hover(function() {
+ jQuery("#${productDetailId}").fadeIn("slow");
+ }, function () {
+ jQuery("#${productDetailId}").fadeOut("fast");
+ });
</script>
<div class="productbuy">
<#-- check to see if introductionDate hasn't passed yet -->
Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml?rev=1021429&r1=1021428&r2=1021429&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml (original)
+++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryCommonScreens.xml Mon Oct 11 17:07:56 2010
@@ -22,16 +22,13 @@ under the License.
<section>
<actions>
<set field="headerItem" value="orderentry"/>
-
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/>
-
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SetShoppingCart.groovy"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="left-column">
<include-screen name="leftbar"/>
- </decorator-section>
+ </decorator-section>
<decorator-section name="body">
<section>
<widgets>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/data/EcommerceTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/data/EcommerceTypeData.xml?rev=1021429&r1=1021428&r2=1021429&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/data/EcommerceTypeData.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/data/EcommerceTypeData.xml Mon Oct 11 17:07:56 2010
@@ -23,11 +23,10 @@ under the License.
<VisualTheme visualThemeId="EC_DEFAULT" visualThemeSetId="ECOMMERCE" description="OFBiz Ecommerce Standard Floating Layout"/>
<VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/ecommerce/images/blog.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/ecommain.css" sequenceId="02"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/prototypejs/popup.css" sequenceId="03"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/content/images/contentForum.css" sequenceId="04"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/header.ftl" sequenceId="01"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/footer.ftl" sequenceId="01"/>
- <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/images/ecdefaulttheme.jpg" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/content/images/contentForum.css" sequenceId="03"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="04"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="05"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/header.ftl" sequenceId="06"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/footer.ftl" sequenceId="07"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/images/ecdefaulttheme.jpg" sequenceId="08"/>
</entity-engine-xml>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CatalogScreens.xml?rev=1021429&r1=1021428&r2=1021429&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CatalogScreens.xml Mon Oct 11 17:07:56 2010
@@ -248,7 +248,6 @@ under the License.
<set field="rightbarScreenName" value="rightbar"/>
<set field="MainColumnStyle" value="center"/>
<set field="titleProperty" value="PageTitleProductPage"/>
- <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/>
<set field="layoutSettings.javaScripts[]" value="/ecommerce/images/productAdditionalView.js" global="true"/>
<set field="configproductdetailScreen" value="component://ecommerce/widget/CatalogScreens.xml#configproductdetail"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy"/>
Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CustomerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CustomerScreens.xml?rev=1021429&r1=1021428&r2=1021429&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CustomerScreens.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/widget/CustomerScreens.xml Mon Oct 11 17:07:56 2010
@@ -39,44 +39,6 @@ under the License.
</widgets>
</section>
</screen>
-<!--
- <screen name="newcustomer">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleNewCustomer"/>
- <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/NewCustomer.groovy"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/newcustomer.ftl"/></html></platform-specific>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="viewprofile">
- <section>
- <actions>
- <set field="titleProperty" value="PageTitleViewProfile"/>
-
- <set field="partyId" from-field="userLogin.partyId"/>
- <entity-one entity-name="Party" value-field="party"/>
- <entity-one entity-name="Person" value-field="person"/>
- <entity-one entity-name="PartyGroup" value-field="partyGroup"/>
-
- <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/viewprofile.ftl"/></html></platform-specific>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- -->
<screen name="editcontactmech">
<section>
<actions>