OFBiz › OFBiz - Commits

svn commit: r1178183 [3/3] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/content/src/org/ofbiz/content/data/ applications/content/webapp/content/website/ applications/content/widget/ applications/humanres/scri...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

sascharodekamp

svn commit: r1178183 [3/3] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/content/src/org/ofbiz/content/data/ applications/content/webapp/content/website/ applications/content/widget/ applications/humanres/scri...

Modified: ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl Sun Oct 2 12:22:57 2011
@@ -83,18 +83,18 @@ under the License.
<#if value?has_content>${value}</#if><#t/>
</textarea><#lt/>
<#if visualEditorEnable?has_content>
- <script language="javascript" src="/images/jquery/plugins/elrteEditor/elrte.min.js" type="text/javascript"></script><#rt/>
+ <script language="javascript" src="/images/jquery/plugins/elrte-1.3/js/elrte.min.js" type="text/javascript"></script><#rt/>
<#if language?has_content && language != "en">
- <script language="javascript" src="/images/jquery/plugins/elrteEditor/i18n/elrte.${language!"en"}.js" type="text/javascript"></script><#rt/>
+ <script language="javascript" src="/images/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js" type="text/javascript"></script><#rt/>
</#if>
- <link href="/images/jquery/plugins/elrteEditor/css/elrte.full.css" rel="stylesheet" type="text/css">
+ <link href="/images/jquery/plugins/elrte-1.3/css/elrte.min.css" rel="stylesheet" type="text/css">
<script language="javascript" type="text/javascript">
var opts = {
cssClass : 'el-rte',
lang : '${language!"en"}',
toolbar : '${buttons?default("maxi")}',
doctype : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">', //'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">',
- cssfiles : ['/images/jquery/plugins/elrteEditor/css/elrte-inner.css']
+ cssfiles : ['/images/jquery/plugins/elrte-1.3/css/elrte-inner.css']
}
jQuery('#${id?default("")}').elrte(opts);
</script>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/assetmaint/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/assetmaint/entitydef/entitymodel.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/assetmaint/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/assetmaint/entitydef/entitymodel.xml Sun Oct 2 12:22:57 2011
@@ -114,33 +114,10 @@
<member-entity entity-alias="IYIM" entity-name="InventoryItem"/>
<member-entity entity-alias="PT" entity-name="Product"/>
<alias-all entity-alias="IMIE"/>
- <alias entity-alias="IYIM" name="inventoryItemId"/>
- <alias entity-alias="IYIM" name="inventoryItemTypeId"/>
- <alias entity-alias="IYIM" name="productId"/>
- <alias entity-alias="IYIM" name="partyId"/>
- <alias entity-alias="IYIM" name="ownerPartyId"/>
- <alias entity-alias="IYIM" name="statusId"/>
- <alias entity-alias="IYIM" name="datetimeReceived"/>
- <alias entity-alias="IYIM" name="datetimeManufactured"/>
- <alias entity-alias="IYIM" name="expireDate"/>
- <alias entity-alias="IYIM" name="containerId"/>
- <alias entity-alias="IYIM" name="lotId"/>
- <alias entity-alias="IYIM" name="uomId"/>
- <alias entity-alias="IYIM" name="binNumber"/>
- <alias entity-alias="IYIM" name="locationSeqId"/>
- <alias entity-alias="IYIM" name="comments"/>
- <alias entity-alias="IYIM" name="quantityOnHandTotal"/>
- <alias entity-alias="IYIM" name="availableToPromiseTotal"/>
- <alias entity-alias="IYIM" name="accountingQuantityTotal"/>
- <alias entity-alias="IYIM" name="oldQuantityOnHand"/>
- <alias entity-alias="IYIM" name="oldAvailableToPromise"/>
- <alias entity-alias="IYIM" name="serialNumber"/>
- <alias entity-alias="IYIM" name="softIdentifier"/>
- <alias entity-alias="IYIM" name="activationNumber"/>
- <alias entity-alias="IYIM" name="activationValidThru"/>
- <alias entity-alias="IYIM" name="unitCost"/>
- <alias entity-alias="IYIM" name="currencyUomId"/>
- <alias entity-alias="IYIM" name="inventoryItemFixedAssetId" field="fixedAssetId"/>
+ <alias-all entity-alias="IYIM">
+ <exclude field="facilityId"/>
+ <exclude field="fixedAssetId"/>
+ </alias-all>
<alias entity-alias="PT" name="productId"/>
<alias entity-alias="PT" name="productTypeId"/>
<alias entity-alias="PT" name="primaryProductCategoryId"/>
@@ -156,6 +133,7 @@
<alias entity-alias="PT" name="isVariant"/>
<alias entity-alias="PT" name="createdDate"/>
<alias entity-alias="PT" name="createdByUserLogin"/>
+ <alias entity-alias="IYIM" name="inventoryItemFixedAssetId" field="fixedAssetId"/>
<view-link entity-alias="IMIE" rel-entity-alias="IYIM">
<key-map field-name="inventoryItemId"/>
</view-link>
@@ -176,33 +154,10 @@
<member-entity entity-alias="IYIM" entity-name="InventoryItem"/>
<member-entity entity-alias="IMIE" entity-name="ItemIssuance"/>
<alias-all entity-alias="IMIE"/>
- <alias entity-alias="IYIM" name="inventoryItemId"/>
- <alias entity-alias="IYIM" name="inventoryItemTypeId"/>
- <alias entity-alias="IYIM" name="productId"/>
- <alias entity-alias="IYIM" name="partyId"/>
- <alias entity-alias="IYIM" name="ownerPartyId"/>
- <alias entity-alias="IYIM" name="statusId"/>
- <alias entity-alias="IYIM" name="datetimeReceived"/>
- <alias entity-alias="IYIM" name="datetimeManufactured"/>
- <alias entity-alias="IYIM" name="expireDate"/>
- <alias entity-alias="IYIM" name="containerId"/>
- <alias entity-alias="IYIM" name="lotId"/>
- <alias entity-alias="IYIM" name="uomId"/>
- <alias entity-alias="IYIM" name="binNumber"/>
- <alias entity-alias="IYIM" name="locationSeqId"/>
- <alias entity-alias="IYIM" name="comments"/>
- <alias entity-alias="IYIM" name="quantityOnHandTotal"/>
- <alias entity-alias="IYIM" name="availableToPromiseTotal"/>
- <alias entity-alias="IYIM" name="accountingQuantityTotal"/>
- <alias entity-alias="IYIM" name="oldQuantityOnHand"/>
- <alias entity-alias="IYIM" name="oldAvailableToPromise"/>
- <alias entity-alias="IYIM" name="serialNumber"/>
- <alias entity-alias="IYIM" name="softIdentifier"/>
- <alias entity-alias="IYIM" name="activationNumber"/>
- <alias entity-alias="IYIM" name="activationValidThru"/>
- <alias entity-alias="IYIM" name="unitCost"/>
- <alias entity-alias="IYIM" name="currencyUomId"/>
- <alias entity-alias="IYIM" name="inventoryItemFixedAssetId" field="fixedAssetId"/>
+ <alias-all entity-alias="IYIM">
+ <exclude field="facilityId"/>
+ <exclude field="fixedAssetId"/>
+ </alias-all>
<alias entity-alias="PT" name="productId"/>
<alias entity-alias="PT" name="productTypeId"/>
<alias entity-alias="PT" name="primaryProductCategoryId"/>
@@ -218,6 +173,7 @@
<alias entity-alias="PT" name="isVariant"/>
<alias entity-alias="PT" name="createdDate"/>
<alias entity-alias="PT" name="createdByUserLogin"/>
+ <alias entity-alias="IYIM" name="inventoryItemFixedAssetId" field="fixedAssetId"/>
<view-link entity-alias="PT" rel-entity-alias="IYIM">
<key-map field-name="productId"/>
</view-link>
@@ -231,4 +187,4 @@
<key-map field-name="inventoryItemId"/>
</relation>
</view-entity>
-</entitymodel>
+</entitymodel>
\ No newline at end of file

Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 2 12:22:57 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/ebaystore/lib:951708-952957
/ofbiz/branches/jquery/specialpurpose/ebaystore/lib:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
-/ofbiz/trunk/specialpurpose/ebaystore/lib:962442-1176458
+/ofbiz/trunk/specialpurpose/ebaystore/lib:962442-1178182

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl Sun Oct 2 12:22:57 2011
@@ -496,14 +496,18 @@ under the License.
<td width="60%" valign="top">
<table cellspacing="0">
<tr><td>
- <script language="javascript" src="/images/jquery/plugins/elrteEditor/elrte.min.js" type="text/javascript"></script>
- <link href="/images/jquery/plugins/elrteEditor/css/elrte.full.css" rel="stylesheet" type="text/css">
+ <script language="javascript" src="<@ofbizContentUrl>/images/jquery/plugins/elrte-1.3/js/elrte.min.js</@ofbizContentUrl>" type="text/javascript"></script>
+ <#if language?has_content && language != "en">
+ <script language="javascript" src="<@ofbizContentUrl>/images/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js</@ofbizContentUrl>" type="text/javascript"></script><#rt/>
+ </#if>
+ <link href="<@ofbizContentUrl>/images/jquery/plugins/elrte-1.3/css/elrte.min.css</@ofbizContentUrl>" rel="stylesheet" type="text/css">
<script language="javascript" type="text/javascript">
var opts = {
cssClass : 'el-rte',
+ lang : '${language}',
toolbar : 'maxi',
doctype : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">', //'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">',
- cssfiles : ['/images/jquery/plugins/elrteEditor/css/elrte-inner.css']
+ cssfiles : ['/images/jquery/plugins/elrte-1.3/css/elrte-inner.css']
}
</script>
<textarea id="description" name="description" style="width:800px; height:300px">

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/widget/EbayStoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/widget/EbayStoreScreens.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/widget/EbayStoreScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ebaystore/widget/EbayStoreScreens.xml Sun Oct 2 12:22:57 2011
@@ -262,6 +262,7 @@ under the License.
<field-map field-name="productStoreId" from-field="parameters.productStoreId"/>
</entity-one>
<script location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/store/PrepareProductListing.groovy"/>
+ <set field="language" from-field="userLogin.lastLocale" default-value="en"/>
</actions>
<widgets>
<decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Sun Oct 2 12:22:57 2011
@@ -862,6 +862,26 @@ under the License.


<simple-method method-name="createUpdateUserLogin" short-description="Create and update a user login" login-required="false">
+ 
+ <session-to-field field="user" session-name="userLogin"/>
+ <session-to-field field="cart" session-name="shoppingCart"/>
+
+ <if>
+ <condition>
+ <and>
+ <if-compare operator="equals" value="anonymous" field="cart.userLogin.userLoginId" />
+ <if-compare operator="equals" value="anonymous" field="user.userLoginId" />
+ <if-compare operator="equals" value="anonymous" field="userLogin.userLoginId" />
+ </and>
+ </condition>
+ <then>
+ <clear-field field="userLogin"/>
+ <call-object-method method-name="removeAttribute" obj-field="session">
+ <string value="userLogin" />
+ </call-object-method>
+ </then>
+ </if>
+
<if-empty field="parameters.partyId">
<request-to-field request-name="partyId" field="parameters.partyId"/>
</if-empty>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/ajaxbreadcrumbs.ftl Sun Oct 2 12:22:57 2011
@@ -18,25 +18,52 @@ under the License.
-->

<div class="breadcrumbs">
+<#assign isDefaultTheme = !layoutSettings.VT_FTR_TMPLT_LOC?contains("multiflex")>
+<#if isDefaultTheme>
+ <a href="<@ofbizUrl>main</@ofbizUrl>" class="linktext">${uiLabelMap.CommonMain}</a> >
+<#else>
<ul>
<li>
<a href="<@ofbizUrl>main</@ofbizUrl>" class="linktext">${uiLabelMap.CommonMain}</a>
</li>
+</#if>
<#-- Show the category branch -->
<#if productCategoryTrail?exists>
<#list productCategoryTrail as trail>
- <li>
- <a href="<@ofbizCatalogAltUrl productCategoryId=trail.productCategoryId previousCategoryId=trail.parentCategory!""/>" class="linktext">
- <#if trail.title?exists>
- ${trail.title}
- <#else>
- ${trail.productCategoryId}
- </#if>
- </a>
- </li>
+ <#if !isDefaultTheme>
+ <li>
+ <a href="<@ofbizCatalogAltUrl productCategoryId=trail.productCategoryId previousCategoryId=trail.parentCategory!""/>" class="linktext">
+ <#if trail.title?exists>
+ ${trail.title}
+ <#else>
+ ${trail.productCategoryId}
+ </#if>
+ </a>
+ </li>
+ <#else>
+ <a href="<@ofbizCatalogAltUrl productCategoryId=trail.productCategoryId previousCategoryId=trail.parentCategory!""/>" class="linktext">
+ <#if trail.title?exists>
+ ${trail.title} >
+ <#else>
+ ${trail.productCategoryId} >
+ </#if>
+ </a>
+ </#if>
</#list>
</#if>
- <li>
+ <#if !isDefaultTheme>
+ <li>
+ <a href="<@ofbizCatalogAltUrl productCategoryId=currentCategoryId previousCategoryId=parameters.parentCategoryStr/>" class="linktext">
+ <#if currentCategoryName?exists>
+ ${currentCategoryName}
+ <#elseif currentCategoryDescription?exists>
+ ${currentCategoryDescription}
+ <#else>
+ ${currentCategoryId}
+ </#if>
+ </a>
+ </li>
+ <#else>
<a href="<@ofbizCatalogAltUrl productCategoryId=currentCategoryId previousCategoryId=parameters.parentCategoryStr/>" class="linktext">
<#if currentCategoryName?exists>
${currentCategoryName}
@@ -46,10 +73,6 @@ under the License.
${currentCategoryId}
</#if>
</a>
- </li>
- <#-- Show the product, if there is one -->
- <#if productContentWrapper?exists>
- <li>${productContentWrapper.get("PRODUCT_NAME")?if_exists}</li>
</#if>
</ul>
</div>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl Sun Oct 2 12:22:57 2011
@@ -24,11 +24,13 @@ under the License.
<a class="button" href="<@ofbizUrl>editProfile</@ofbizUrl>">${uiLabelMap.EcommerceEditProfile}</a>
<h3>${uiLabelMap.PartyContactInformation}</h3>
<label>${firstName?if_exists} ${lastName?if_exists}</label>
- <input type="hidden" id="updatedEmailContactMechId" name="emailContactMechId" value="${emailContactMechId}" />
- <input type="hidden" id="updatedEmailAddress" name="updatedEmailAddress" value="${emailAddress}" />
- <label>${emailAddress}</label>
- <a href="mailto:${emailAddress}" class="linktext">(${uiLabelMap.PartySendEmail})</a>
- <div id="serverError_${emailContactMechId}" class="errorMessage"></div>
+ <input type="hidden" id="updatedEmailContactMechId" name="emailContactMechId" value="${emailContactMechId?if_exists}" />
+ <input type="hidden" id="updatedEmailAddress" name="updatedEmailAddress" value="${emailAddress?if_exists}" />
+ <#if emailAddress?exists>
+ <label>${emailAddress?if_exists}</label>
+ <a href="mailto:${emailAddress?if_exists}" class="linktext">(${uiLabelMap.PartySendEmail})</a>
+ </#if>
+ <div id="serverError_${emailContactMechId?if_exists}" class="errorMessage"></div>
</div>
<#-- Manage Addresses -->
<div>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Sun Oct 2 12:22:57 2011
@@ -93,47 +93,47 @@ under the License.
<span>
<label for="shipToCountryCode">${uiLabelMap.PartyCountry}*
<span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
- </label>
- <input type="text" name="shipToCountryCode" class="required" id="shipToCountryCode" value="${shipToTelecomNumber.countryCode?if_exists}" size="5" maxlength="3" /> -
+ </label>
+ <input type="text" name="shipToCountryCode" class="required" id="shipToCountryCode" value="${shipToTelecomNumber.countryCode?if_exists}" size="5" maxlength="10" /> -
</span>
<span>
<label for="shipToAreaCode">${uiLabelMap.PartyAreaCode}*
<span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
</label>
- <input type="text" name="shipToAreaCode" class="required" id="shipToAreaCode" value="${shipToTelecomNumber.areaCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="shipToAreaCode" class="required" id="shipToAreaCode" value="${shipToTelecomNumber.areaCode?if_exists}" size="5" maxlength="10" /> -
</span>
<span>
<label for="shipToContactNumber">${uiLabelMap.PartyContactNumber}*
<span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
</label>
- <input type="text" name="shipToContactNumber" class="required" id="shipToContactNumber" value="${shipToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="7" /> -
+ <input type="text" name="shipToContactNumber" class="required" id="shipToContactNumber" value="${shipToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="15" /> -
</span>
<span>
<label for="shipToExtension">${uiLabelMap.PartyExtension}</label>
- <input type="text" name="shipToExtension" id="shipToExtension" value="${shipToExtension?if_exists}" size="5" maxlength="3" />
+ <input type="text" name="shipToExtension" id="shipToExtension" value="${shipToExtension?if_exists}" size="5" maxlength="10" />
</span>
<#else>
<span>
<label for="shipToCountryCode">${uiLabelMap.PartyCountry}*
<span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
</label>
- <input type="text" name="shipToCountryCode" class="required" id="shipToCountryCode" value="${parameters.shipToCountryCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="shipToCountryCode" class="required" id="shipToCountryCode" value="${parameters.shipToCountryCode?if_exists}" size="5" maxlength="10" /> -
</span>
<span>
<label for="shipToAreaCode">${uiLabelMap.PartyAreaCode}*
<span id="advice-required-shipToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
</label>
- <input type="text" name="shipToAreaCode" class="required" id="shipToAreaCode" value="${parameters.shipToAreaCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="shipToAreaCode" class="required" id="shipToAreaCode" value="${parameters.shipToAreaCode?if_exists}" size="5" maxlength="10" /> -
</span>
<span>
<label for="shipToContactNumber">${uiLabelMap.PartyContactNumber}*
<span id="advice-required-shipToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
</label>
- <input type="text" name="shipToContactNumber" class="required" id="shipToContactNumber" value="${parameters.shipToContactNumber?if_exists}" size="10" maxlength="7" /> -
+ <input type="text" name="shipToContactNumber" class="required" id="shipToContactNumber" value="${parameters.shipToContactNumber?if_exists}" size="10" maxlength="15" /> -
</span>
<span>
<label for="shipToExtension">${uiLabelMap.PartyExtension}</label>
- <input type="text" name="shipToExtension" id="shipToExtension" value="${parameters.shipToExtension?if_exists}" size="5" maxlength="3" />
+ <input type="text" name="shipToExtension" id="shipToExtension" value="${parameters.shipToExtension?if_exists}" size="5" maxlength="10" />
</span>
</#if>
</div>
@@ -317,46 +317,46 @@ under the License.
<label for="billToCountryCode">${uiLabelMap.PartyCountry}*
<span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
</label>
- <input type="text" name="billToCountryCode" class="required" id="billToCountryCode" value="${billToTelecomNumber.countryCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="billToCountryCode" class="required" id="billToCountryCode" value="${billToTelecomNumber.countryCode?if_exists}" size="5" maxlength="10" /> -
</span>
<span>
<label for="billToAreaCode">${uiLabelMap.PartyAreaCode}*
<span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
</label>
- <input type="text" name="billToAreaCode" class="required" id="billToAreaCode" value="${billToTelecomNumber.areaCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="billToAreaCode" class="required" id="billToAreaCode" value="${billToTelecomNumber.areaCode?if_exists}" size="5" maxlength="10" /> -
</span>
<span>
<label for="billToContactNumber">${uiLabelMap.PartyContactNumber}*
<span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
</label>
- <input type="text" name="billToContactNumber" class="required" id="billToContactNumber" value="${billToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="7" /> -
+ <input type="text" name="billToContactNumber" class="required" id="billToContactNumber" value="${billToTelecomNumber.contactNumber?if_exists}" size="10" maxlength="15" /> -
</span>
<span>
<label for="billToExtension">${uiLabelMap.PartyExtension}</label>
- <input type="text" name="billToExtension" id="billToExtension" value="${billToExtension?if_exists}" size="5" maxlength="3" />
+ <input type="text" name="billToExtension" id="billToExtension" value="${billToExtension?if_exists}" size="5" maxlength="10" />
</span>
<#else>
<span>
<label for="billToCountryCode">${uiLabelMap.PartyCountry}*
<span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
</label>
- <input type="text" name="billToCountryCode" class="required" id="billToCountryCode" value="${parameters.billToCountryCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="billToCountryCode" class="required" id="billToCountryCode" value="${parameters.billToCountryCode?if_exists}" size="5" maxlength="10" /> -
</span>
<span>
<label for="billToAreaCode">${uiLabelMap.PartyAreaCode}*
<span id="advice-required-billToAreaCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
</label>
- <input type="text" name="billToAreaCode" class="required" id="billToAreaCode" value="${parameters.billToAreaCode?if_exists}" size="5" maxlength="3" /> -
+ <input type="text" name="billToAreaCode" class="required" id="billToAreaCode" value="${parameters.billToAreaCode?if_exists}" size="5" maxlength="10" /> -
</span>
<span>
<label for="billToContactNumber">${uiLabelMap.PartyContactNumber}*
<span id="advice-required-billToContactNumber" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
</label>
- <input type="text" name="billToContactNumber" class="required" id="billToContactNumber" value="${parameters.billToContactNumber?if_exists}" size="10" maxlength="7" /> -
+ <input type="text" name="billToContactNumber" class="required" id="billToContactNumber" value="${parameters.billToContactNumber?if_exists}" size="10" maxlength="15" /> -
</span>
<span>
<label for="billToExtension">${uiLabelMap.PartyExtension}</label>
- <input type="text" name="billToExtension" id="billToExtension" value="${parameters.billToExtension?if_exists}" size="5" maxlength="3" />
+ <input type="text" name="billToExtension" id="billToExtension" value="${parameters.billToExtension?if_exists}" size="5" maxlength="10" />
</span>
</#if>
</div>

Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml?rev=1178183&r1=1178182&r2=1178183&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CatalogScreens.xml Sun Oct 2 12:22:57 2011
@@ -511,6 +511,12 @@ under the License.
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy"/>
<set field="check" type="PlainString" value="${groovy: return request.getAttribute('checkValue');}"/>
+ <set field="visualThemeId" from-field="productStore.visualThemeId" default-value="EC_DEFAULT"/>
+ <service service-name="getVisualThemeResources">
+ <field-map field-name="visualThemeId"/>
+ <field-map field-name="themeResources" from-field="layoutSettings"/>
+ </service>
+ <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
</actions>
<widgets>
<section>

Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 2 12:22:57 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1176458
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1178182

Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 2 12:22:57 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1176458
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1178182

Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 2 12:22:57 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1176458
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1178182